diff --git a/.drone.yml b/.drone.yml
index 4ec43d1fd15f0..16a432cf3fa42 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -56,6 +56,13 @@ steps:
       - php -v
       - ./libraries/vendor/bin/phpunit --testsuite Unit
 
+  - name: php82-unit
+    depends_on: [ phpcs ]
+    image: joomlaprojects/docker-images:php8.2
+    commands:
+      - php -v
+      - ./libraries/vendor/bin/phpunit --testsuite Unit
+
   - name: php81-integration
     depends_on: [ npm ]
     image: joomlaprojects/docker-images:php8.1
@@ -365,6 +372,6 @@ trigger:
 
 ---
 kind: signature
-hmac: 7d729d1bdab99cbf37d96324d129a7f3c7eca72a271c70af8755d99c0ae91142
+hmac: 6b06b1c7f407650fe98f0851dc865911f399422116fa4f250a52d01a556397ed
 
 ...
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
new file mode 100644
index 0000000000000..fbb91302cfb5a
--- /dev/null
+++ b/.git-blame-ignore-revs
@@ -0,0 +1,9 @@
+# Short array syntax change https://github.com/joomla/joomla-cms/pull/39616
+10f250f418851674c2e4104b6b39b9b665496544
+
+# Code style fixes from PHP CS fixer https://github.com/joomla/joomla-cms/pull/39745
+1e7527b60ec42032abe7bfb9c000bacf38f65845
+
+# PSR 12
+dd91072a956a19a43798515239892edd2b49ac7b
+e7f5cc182bb1cd39c7f085d529888ac4fa6fc77e
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 9aceb79e81cad..50b6393e5c76d 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -14,12 +14,12 @@ If it is a PR, include what the issue is, what the PR is addressing, testing ins
 Please be patient as not all items will be tested immediately (remember, all bug testing for the Joomla! CMS is done by volunteers) and be receptive to feedback about your code.
 
 #### Branches
-PRs should usually be made to the `4.2-dev` branch as this contains the most recent version of the code.
+PRs should usually be made to the `4.3-dev` branch as this contains the most recent version of the code.
 There are other branches available which serve specific purposes.
 
 | Branch | Purpose |
 | ------ | ------- |
 | 3.10-dev | Branch for the Joomla 3.x series. The 3.10 series release will now only include security patches. |
-| 4.2-dev | Branch for the current minor Joomla version.|
-| 4.3-dev | Branch for the next minor Joomla version. New features go into this branch. Commits to 4.2-dev will be applied to this branch as well. |
-| 5.0-dev | Branch for the next major Joomla version. |
+| 4.3-dev | Branch for the current minor Joomla version.|
+| 4.4-dev | Branch for the next minor Joomla version. Commits to 4.3-dev will be applied to this branch as well. |
+| 5.0-dev | Branch for the next major Joomla version. New features go into this branch. |
diff --git a/.github/workflows/create-translation-pull-request-v4.yml b/.github/workflows/create-translation-pull-request-v4.yml
index cbd7229c4e1bd..d149f3cb4d9fc 100644
--- a/.github/workflows/create-translation-pull-request-v4.yml
+++ b/.github/workflows/create-translation-pull-request-v4.yml
@@ -37,7 +37,7 @@ jobs:
           git remote add upstream https://github.com/joomla/joomla-cms.git
           git fetch upstream
           git checkout --progress --force -B translation refs/remotes/origin/translation
-          git merge upstream/4.2-dev
+          git merge upstream/4.3-dev
 
       - name: Fetch and extract translations
         run: |
@@ -74,4 +74,4 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.API_TOKEN_GITHUB }}
         run: |
           gh pr list -R joomla/joomla-cms --state open --author joomla-translation-bot -S "Translation Update" | grep -v "No pull" || \
-            gh pr create --title "Translation Update" --body "Automatically created pull request based on core-translation repository changes" -R joomla/joomla-cms --base 4.2-dev
+            gh pr create --title "Translation Update" --body "Automatically created pull request based on core-translation repository changes" -R joomla/joomla-cms --base 4.3-dev
diff --git a/.phan/config.php b/.phan/config.php
index e8873f0ff8752..a4663fd197680 100644
--- a/.phan/config.php
+++ b/.phan/config.php
@@ -15,8 +15,8 @@
  * default configuration. Command line arguments will be applied
  * after this file is read.
  *
- * @see https://github.com/phan/phan/wiki/Phan-Config-Settings for all configurable options
- * @see https://github.com/phan/phan/tree/v4/src/Phan/Config.php
+ * @link https://github.com/phan/phan/wiki/Phan-Config-Settings for all configurable options
+ * @link https://github.com/phan/phan/tree/v4/src/Phan/Config.php
  *
  * A Note About Paths
  * ==================
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 69c9a61acd05a..4c6103b5b360e 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -9,8 +9,8 @@
 /**
  * This is the configuration file for php-cs-fixer
  *
- * @see https://github.com/FriendsOfPHP/PHP-CS-Fixer
- * @see https://mlocati.github.io/php-cs-fixer-configurator/#version:3.0
+ * @link https://github.com/FriendsOfPHP/PHP-CS-Fixer
+ * @link https://mlocati.github.io/php-cs-fixer-configurator/#version:3.0
  *
  *
  * If you would like to run the automated clean up, then open a command line and type one of the commands below
@@ -78,6 +78,12 @@
             'binary_operator_spaces'         => ['operators' => ['=>' => 'align_single_space_minimal', '=' => 'align']],
             // The "No break" comment in switch statements
             'no_break_comment'               => ['comment_text' => 'No break'],
+            // Remove unused imports
+            'no_unused_imports'              => true,
+            // Classes from the global namespace should not be imported
+            'global_namespace_import'        => ['import_classes' => false, 'import_constants' => false, 'import_functions' => false],
+            // Alpha order imports
+            'ordered_imports'                => ['imports_order' => ['class', 'function', 'const'], 'sort_algorithm' => 'alpha'],
         ]
     )
     ->setFinder($finder);
diff --git a/administrator/components/com_actionlogs/src/Controller/ActionlogsController.php b/administrator/components/com_actionlogs/src/Controller/ActionlogsController.php
index 1d38d94cce466..fee0dc2470129 100644
--- a/administrator/components/com_actionlogs/src/Controller/ActionlogsController.php
+++ b/administrator/components/com_actionlogs/src/Controller/ActionlogsController.php
@@ -10,12 +10,10 @@
 
 namespace Joomla\Component\Actionlogs\Administrator\Controller;
 
-use DateTimeZone;
-use Exception;
-use InvalidArgumentException;
 use Joomla\CMS\Application\CMSApplication;
 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;
@@ -48,7 +46,7 @@ class ActionlogsController extends AdminController
      *
      * @since   3.9.0
      *
-     * @throws  Exception
+     * @throws  \Exception
      */
     public function __construct($config = [], MVCFactoryInterface $factory = null, $app = null, $input = null)
     {
@@ -64,7 +62,7 @@ public function __construct($config = [], MVCFactoryInterface $factory = null, $
      *
      * @since   3.9.0
      *
-     * @throws  Exception
+     * @throws  \Exception
      */
     public function exportLogs()
     {
@@ -89,7 +87,7 @@ public function exportLogs()
         if (\count($data)) {
             try {
                 $rows = ActionlogsHelper::getCsvData($data);
-            } catch (InvalidArgumentException $exception) {
+            } catch (\InvalidArgumentException $exception) {
                 $this->setMessage(Text::_('COM_ACTIONLOGS_ERROR_COULD_NOT_EXPORT_DATA'), 'error');
                 $this->setRedirect(Route::_('index.php?option=com_actionlogs&view=actionlogs', false));
 
@@ -99,7 +97,7 @@ public function exportLogs()
             // Destroy the iterator now
             unset($data);
 
-            $date     = new Date('now', new DateTimeZone('UTC'));
+            $date     = new Date('now', new \DateTimeZone('UTC'));
             $filename = 'logs_' . $date->format('Y-m-d_His_T');
 
             $csvDelimiter = ComponentHelper::getComponent('com_actionlogs')->getParams()->get('csv_delimiter', ',');
@@ -116,7 +114,7 @@ public function exportLogs()
             }
 
             fclose($output);
-            $this->app->triggerEvent('onAfterLogExport', []);
+            $this->getDispatcher()->dispatch('onAfterLogExport', new AfterLogExportEvent('onAfterLogExport'));
             $this->app->close();
         } else {
             $this->setMessage(Text::_('COM_ACTIONLOGS_NO_LOGS_TO_EXPORT'));
diff --git a/administrator/components/com_actionlogs/src/Controller/DisplayController.php b/administrator/components/com_actionlogs/src/Controller/DisplayController.php
index 3ff880b1ebeed..7493052e2de1c 100644
--- a/administrator/components/com_actionlogs/src/Controller/DisplayController.php
+++ b/administrator/components/com_actionlogs/src/Controller/DisplayController.php
@@ -17,7 +17,7 @@
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Plugins master display controller.
+ * Plugins display controller.
  *
  * @since  4.0.0
  */
diff --git a/administrator/components/com_actionlogs/src/Dispatcher/Dispatcher.php b/administrator/components/com_actionlogs/src/Dispatcher/Dispatcher.php
index 778d74d4b96fa..adfe2f4e5f0ff 100644
--- a/administrator/components/com_actionlogs/src/Dispatcher/Dispatcher.php
+++ b/administrator/components/com_actionlogs/src/Dispatcher/Dispatcher.php
@@ -18,14 +18,14 @@
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * ComponentDispatcher class for com_admin
+ * ComponentDispatcher class for com_actionlogs
  *
  * @since  4.2.7
  */
 class Dispatcher extends ComponentDispatcher
 {
     /**
-     * com_admin does not require check permission, so we override checkAccess method and have it empty
+     * Method to check component access permission
      *
      * @return  void
      *
diff --git a/administrator/components/com_actionlogs/src/Field/LogtypeField.php b/administrator/components/com_actionlogs/src/Field/LogtypeField.php
index d55071386192f..6aae799f0c2b2 100644
--- a/administrator/components/com_actionlogs/src/Field/LogtypeField.php
+++ b/administrator/components/com_actionlogs/src/Field/LogtypeField.php
@@ -21,7 +21,7 @@
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Field to load a list of all users that have logged actions
+ * Field to load a list of all extensions that have logged actions
  *
  * @since  3.9.0
  */
diff --git a/administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php b/administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php
index 339f7ded1eab2..63c0543667a23 100644
--- a/administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php
+++ b/administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php
@@ -10,13 +10,12 @@
 
 namespace Joomla\Component\Actionlogs\Administrator\Helper;
 
-use Generator;
 use Joomla\CMS\Date\Date;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Router\Route;
+use Joomla\Filesystem\Path;
 use Joomla\String\StringHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -44,13 +43,13 @@ class ActionlogsHelper
      *
      * @param   array|\Traversable  $data  The logs data objects to be exported
      *
-     * @return  Generator
+     * @return  \Generator
      *
      * @since   3.9.0
      *
      * @throws  \InvalidArgumentException
      */
-    public static function getCsvData($data): Generator
+    public static function getCsvData($data): \Generator
     {
         if (!is_iterable($data)) {
             throw new \InvalidArgumentException(
diff --git a/administrator/components/com_actionlogs/src/Model/ActionlogConfigModel.php b/administrator/components/com_actionlogs/src/Model/ActionlogConfigModel.php
index 1fc8fbd166782..9ff7c98f3dafb 100644
--- a/administrator/components/com_actionlogs/src/Model/ActionlogConfigModel.php
+++ b/administrator/components/com_actionlogs/src/Model/ActionlogConfigModel.php
@@ -11,7 +11,6 @@
 namespace Joomla\Component\Actionlogs\Administrator\Model;
 
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use stdClass;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -29,11 +28,11 @@ class ActionlogConfigModel extends BaseDatabaseModel
      *
      * @param   string    $context  The context of the content
      *
-     * @return  stdClass|null  An object contains content type parameters, or null if not found
+     * @return  \stdClass|null  An object contains content type parameters, or null if not found
      *
      * @since   4.2.0
      */
-    public function getLogContentTypeParams(string $context): ?stdClass
+    public function getLogContentTypeParams(string $context): ?\stdClass
     {
         $db    = $this->getDatabase();
         $query = $db->getQuery(true)
diff --git a/administrator/components/com_actionlogs/src/Model/ActionlogModel.php b/administrator/components/com_actionlogs/src/Model/ActionlogModel.php
index fbf7acd1f4ac2..53b4aeff79519 100644
--- a/administrator/components/com_actionlogs/src/Model/ActionlogModel.php
+++ b/administrator/components/com_actionlogs/src/Model/ActionlogModel.php
@@ -17,6 +17,8 @@
 use Joomla\CMS\Mail\Exception\MailDisabledException;
 use Joomla\CMS\Mail\MailTemplate;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+use Joomla\CMS\User\UserFactoryAwareInterface;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\Component\Actionlogs\Administrator\Helper\ActionlogsHelper;
 use Joomla\Utilities\IpHelper;
 use PHPMailer\PHPMailer\Exception as phpMailerException;
@@ -30,8 +32,10 @@
  *
  * @since  3.9.0
  */
-class ActionlogModel extends BaseDatabaseModel
+class ActionlogModel extends BaseDatabaseModel implements UserFactoryAwareInterface
 {
+    use UserFactoryAwareTrait;
+
     /**
      * Function to add logs to the database
      * This method adds a record to #__action_logs contains (message_language_key, message, date, context, user)
@@ -45,9 +49,13 @@ class ActionlogModel extends BaseDatabaseModel
      *
      * @since   3.9.0
      */
-    public function addLog($messages, $messageLanguageKey, $context, $userId = null)
+    public function addLog($messages, $messageLanguageKey, $context, $userId = 0)
     {
-        $user   = Factory::getUser($userId);
+        if (!is_numeric($userId)) {
+            @trigger_error(sprintf('User ID must be an integer in %s.', __METHOD__), E_USER_DEPRECATED);
+        }
+
+        $user   = $userId ? $this->getUserFactory()->loadUserById($userId) : $this->getCurrentUser();
         $db     = $this->getDatabase();
         $date   = Factory::getDate();
         $params = ComponentHelper::getComponent('com_actionlogs')->getParams();
diff --git a/administrator/components/com_actionlogs/src/Model/ActionlogsModel.php b/administrator/components/com_actionlogs/src/Model/ActionlogsModel.php
index fbdea7913fd13..8a523aa2dbfb0 100644
--- a/administrator/components/com_actionlogs/src/Model/ActionlogsModel.php
+++ b/administrator/components/com_actionlogs/src/Model/ActionlogsModel.php
@@ -10,10 +10,9 @@
 
 namespace Joomla\Component\Actionlogs\Administrator\Model;
 
-use DateTimeZone;
-use Exception;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Date\Date;
+use Joomla\CMS\Event\ActionLog\AfterLogPurgeEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Text;
@@ -22,7 +21,6 @@
 use Joomla\Database\DatabaseQuery;
 use Joomla\Database\ParameterType;
 use Joomla\Utilities\ArrayHelper;
-use RuntimeException;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -42,7 +40,7 @@ class ActionlogsModel extends ListModel
      *
      * @since   3.9.0
      *
-     * @throws  Exception
+     * @throws  \Exception
      */
     public function __construct($config = [])
     {
@@ -71,7 +69,7 @@ public function __construct($config = [])
      *
      * @since   3.9.0
      *
-     * @throws  Exception
+     * @throws  \Exception
      */
     protected function populateState($ordering = 'a.id', $direction = 'desc')
     {
@@ -85,7 +83,7 @@ protected function populateState($ordering = 'a.id', $direction = 'desc')
      *
      * @since   3.9.0
      *
-     * @throws  Exception
+     * @throws  \Exception
      */
     protected function getListQuery()
     {
@@ -174,7 +172,7 @@ protected function getListQuery()
      *
      * @since   3.9.0
      *
-     * @throws  Exception
+     * @throws  \Exception
      */
     private function buildDateRange($range)
     {
@@ -212,7 +210,7 @@ private function buildDateRange($range)
                 $dStart->setTime(0, 0, 0);
 
                 // Now change the timezone back to UTC.
-                $tz = new DateTimeZone('GMT');
+                $tz = new \DateTimeZone('GMT');
                 $dStart->setTimezone($tz);
                 break;
         }
@@ -341,13 +339,13 @@ public function delete(&$pks)
 
         try {
             $db->execute();
-        } catch (RuntimeException $e) {
+        } catch (\RuntimeException $e) {
             $this->setError($e->getMessage());
 
             return false;
         }
 
-        Factory::getApplication()->triggerEvent('onAfterLogPurge', []);
+        $this->getDispatcher()->dispatch('onAfterLogPurge', new AfterLogPurgeEvent('onAfterLogPurge'));
 
         return true;
     }
@@ -363,11 +361,11 @@ public function purge()
     {
         try {
             $this->getDatabase()->truncateTable('#__action_logs');
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             return false;
         }
 
-        Factory::getApplication()->triggerEvent('onAfterLogPurge', []);
+        $this->getDispatcher()->dispatch('onAfterLogPurge', new AfterLogPurgeEvent('onAfterLogPurge'));
 
         return true;
     }
diff --git a/administrator/components/com_actionlogs/src/Plugin/ActionLogPlugin.php b/administrator/components/com_actionlogs/src/Plugin/ActionLogPlugin.php
index 87ad75ea15785..5a8ef46738ca5 100644
--- a/administrator/components/com_actionlogs/src/Plugin/ActionLogPlugin.php
+++ b/administrator/components/com_actionlogs/src/Plugin/ActionLogPlugin.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Component\Actionlogs\Administrator\Plugin;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\CMSPlugin;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -64,7 +63,7 @@ abstract class ActionLogPlugin extends CMSPlugin
      */
     protected function addLog($messages, $messageLanguageKey, $context, $userId = null)
     {
-        $user = Factory::getUser();
+        $user = $this->app->getIdentity();
 
         foreach ($messages as $index => $message) {
             if (!\array_key_exists('userid', $message)) {
diff --git a/administrator/components/com_actionlogs/src/View/Actionlogs/HtmlView.php b/administrator/components/com_actionlogs/src/View/Actionlogs/HtmlView.php
index 31aa54c168ddb..9084f4eab2005 100644
--- a/administrator/components/com_actionlogs/src/View/Actionlogs/HtmlView.php
+++ b/administrator/components/com_actionlogs/src/View/Actionlogs/HtmlView.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Component\Actionlogs\Administrator\View\Actionlogs;
 
-use Exception;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Text;
@@ -98,7 +97,7 @@ class HtmlView extends BaseHtmlView
      *
      * @since   3.9.0
      *
-     * @throws  Exception
+     * @throws  \Exception
      */
     public function display($tpl = null)
     {
diff --git a/administrator/components/com_admin/postinstall/behindproxy.php b/administrator/components/com_admin/postinstall/behindproxy.php
index 47e27d57dfcf0..35594f72b4b07 100644
--- a/administrator/components/com_admin/postinstall/behindproxy.php
+++ b/administrator/components/com_admin/postinstall/behindproxy.php
@@ -9,9 +9,9 @@
  */
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Language\Text;
 use Joomla\Filesystem\File;
+use Joomla\Filesystem\Path;
 use Joomla\Registry\Registry;
 use Joomla\Utilities\ArrayHelper;
 
diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
index 1c18197af42d5..3f5cf6cb4d666 100644
--- a/administrator/components/com_admin/script.php
+++ b/administrator/components/com_admin/script.php
@@ -10,16 +10,19 @@
  * @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\Filesystem\File;
 use Joomla\CMS\Filesystem\Folder;
 use Joomla\CMS\Installer\Installer;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Table\Table;
-use Joomla\Component\Fields\Administrator\Model\FieldModel;
+use Joomla\CMS\Uri\Uri;
 use Joomla\Database\ParameterType;
-use Joomla\Filesystem\File;
+use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -90,8 +93,8 @@ public function update($installer)
             // Informational log only
         }
 
-        // Uninstall plugins before removing their files and folders
-        $this->uninstallEosPlugin();
+        // Uninstall extensions before removing their files and folders
+        $this->uninstallExtensions();
 
         // This needs to stay for 2.5 update compatibility
         $this->deleteUnexistingFiles();
@@ -205,50 +208,201 @@ protected function updateDatabaseMysql()
     }
 
     /**
-     * Uninstall the 3.10 EOS plugin
+     * Uninstall extensions and optionally migrate their parameters when
+     * updating from a version older than 5.0.1.
      *
      * @return  void
      *
-     * @since   4.0.0
+     * @since   5.0.0
      */
-    protected function uninstallEosPlugin()
+    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')) {
+            return true;
+        }
+
+        $extensions = [
+            /**
+             * Define here the extensions to be uninstalled and optionally migrated on update.
+             * For each extension, specify an associative array with following elements (key => value):
+             * 'type'         => Field `type` in the `#__extensions` table
+             * 'element'      => Field `element` in the `#__extensions` table
+             * 'folder'       => Field `folder` in the `#__extensions` table
+             * '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.
+             */
+             ['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' => 'updatenotification', 'folder' => 'system', 'client_id' => 0, 'pre_function' => 'migrateUpdatenotificationPlugin'],
+        ];
+
         $db = Factory::getDbo();
 
-        // Check if the plg_quickicon_eos310 plugin is present
-        $extensionId = $db->setQuery(
-            $db->getQuery(true)
-                ->select('extension_id')
-                ->from('#__extensions')
-                ->where('name = ' . $db->quote('plg_quickicon_eos310'))
-        )->loadResult();
+        foreach ($extensions as $extension) {
+            $row = $db->setQuery(
+                $db->getQuery(true)
+                    ->select('*')
+                    ->from($db->quoteName('#__extensions'))
+                    ->where($db->quoteName('type') . ' = ' . $db->quote($extension['type']))
+                    ->where($db->quoteName('element') . ' = ' . $db->quote($extension['element']))
+                    ->where($db->quoteName('folder') . ' = ' . $db->quote($extension['folder']))
+                    ->where($db->quoteName('client_id') . ' = ' . $db->quote($extension['client_id']))
+            )->loadObject();
+
+            // Skip migrating and uninstalling if the extension doesn't exist
+            if (!$row) {
+                continue;
+            }
 
-        // Skip uninstalling if it doesn't exist
-        if (!$extensionId) {
-            return;
+            // If there is a function for migration to be called before uninstalling, call it
+            if ($extension['pre_function'] && method_exists($this, $extension['pre_function'])) {
+                $this->{$extension['pre_function']}($row);
+            }
+
+            try {
+                $db->transactionStart();
+
+                // Unlock and unprotect the plugin so we can uninstall it
+                $db->setQuery(
+                    $db->getQuery(true)
+                        ->update($db->quoteName('#__extensions'))
+                        ->set($db->quoteName('locked') . ' = 0')
+                        ->set($db->quoteName('protected') . ' = 0')
+                        ->where($db->quoteName('extension_id') . ' = :extension_id')
+                        ->bind(':extension_id', $row->extension_id, ParameterType::INTEGER)
+                )->execute();
+
+                // Uninstall the plugin
+                $installer = new Installer();
+                $installer->setDatabase($db);
+                $installer->uninstall($extension['type'], $row->extension_id);
+
+                $db->transactionCommit();
+            } catch (\Exception $e) {
+                $db->transactionRollback();
+                echo Text::sprintf('JLIB_DATABASE_ERROR_FUNCTION_FAILED', $e->getCode(), $e->getMessage()) . '<br>';
+                throw $e;
+            }
         }
+    }
 
-        try {
-            $db->transactionStart();
+    /**
+     * 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();
 
-            // Unprotect the plugin so we can uninstall it
-            $db->setQuery(
-                $db->getQuery(true)
-                    ->update('#__extensions')
-                    ->set('protected = 0')
-                    ->where($db->quoteName('extension_id') . ' = ' . $extensionId)
-            )->execute();
+        $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   __DEPLOY_VERSION__
+     */
+    private function migrateLogRotationPlugin($data)
+    {
+        if (!$data->enabled) {
+            return;
+        }
 
-            // Uninstall the plugin
-            $installer = new Installer();
-            $installer->setDatabase($db);
-            $installer->uninstall('plugin', $extensionId);
+        /** @var SchedulerComponent $component */
+        $component = Factory::getApplication()->bootComponent('com_scheduler');
+
+        /** @var 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'           => 'RotateLogs',
+            '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);
+    }
 
-            $db->transactionCommit();
-        } catch (\Exception $e) {
-            $db->transactionRollback();
-            throw $e;
+    /**
+     * 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   __DEPLOY_VERSION__
+     */
+    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 SchedulerComponent $component */
+        $component = Factory::getApplication()->bootComponent('com_scheduler');
+
+        /** @var TaskModel $model */
+        $model = $component->getMVCFactory()->createModel('Task', 'Administrator', ['ignore_request' => true]);
+        $task  = [
+            'title'           => 'UpdateNotification',
+            '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);
     }
 
     /**
@@ -380,6 +534,10 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
             '/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/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',
@@ -439,29 +597,33 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
             '/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',
             '/libraries/src/Schema/ChangeItem/SqlsrvChangeItem.php',
-            '/libraries/vendor/beberlei/assert/LICENSE',
             '/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/lib/Assert/functions.php',
+            '/libraries/vendor/beberlei/assert/LICENSE',
             '/libraries/vendor/google/recaptcha/ARCHITECTURE.md',
             '/libraries/vendor/jfcherng/php-color-output/src/helpers.php',
             '/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/config/replacements.php',
+            '/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/laminas/laminas-zendframework-bridge/src/autoload.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',
@@ -479,6 +641,8 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
             '/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',
@@ -487,22 +651,16 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
             '/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/php-http/message-factory/LICENSE',
-            '/libraries/vendor/php-http/message-factory/puli.json',
-            '/libraries/vendor/php-http/message-factory/src/MessageFactory.php',
-            '/libraries/vendor/php-http/message-factory/src/RequestFactory.php',
-            '/libraries/vendor/php-http/message-factory/src/ResponseFactory.php',
-            '/libraries/vendor/php-http/message-factory/src/StreamFactory.php',
-            '/libraries/vendor/php-http/message-factory/src/UriFactory.php',
             '/libraries/vendor/psr/log/Psr/Log/AbstractLogger.php',
             '/libraries/vendor/psr/log/Psr/Log/InvalidArgumentException.php',
-            '/libraries/vendor/psr/log/Psr/Log/LogLevel.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',
@@ -527,6 +685,7 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
             '/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',
@@ -551,7 +710,6 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
             '/libraries/vendor/ramsey/uuid/src/UuidFactory.php',
             '/libraries/vendor/ramsey/uuid/src/UuidFactoryInterface.php',
             '/libraries/vendor/ramsey/uuid/src/UuidInterface.php',
-            '/libraries/vendor/ramsey/uuid/src/functions.php',
             '/libraries/vendor/spomky-labs/base64url/LICENSE',
             '/libraries/vendor/spomky-labs/base64url/src/Base64Url.php',
             '/libraries/vendor/spomky-labs/cbor-php/src/ByteStringWithChunkObject.php',
@@ -610,6 +768,28 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
             '/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',
@@ -658,6 +838,10 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
             '/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',
@@ -694,6 +878,1122 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
             '/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',
         ];
 
         $folders = [
@@ -706,6 +2006,7 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
             '/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',
@@ -745,9 +2046,6 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
             '/libraries/vendor/ramsey',
             '/libraries/vendor/psr/log/Psr/Log',
             '/libraries/vendor/psr/log/Psr',
-            '/libraries/vendor/php-http/message-factory/src',
-            '/libraries/vendor/php-http/message-factory',
-            '/libraries/vendor/php-http',
             '/libraries/vendor/nyholm/psr7/src/Factory',
             '/libraries/vendor/nyholm/psr7/src',
             '/libraries/vendor/nyholm/psr7',
@@ -766,6 +2064,155 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
             '/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',
         ];
 
         $status['files_checked']   = $files;
@@ -895,9 +2342,328 @@ public function postflight($action, $installer)
         }
 
         // 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();
+
+        return true;
+    }
+
+    /**
+     * Migrate Deleteactionlogs plugin configuration
+     *
+     * @return  boolean  True on success
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    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) {
+            echo Text::sprintf('JLIB_DATABASE_ERROR_FUNCTION_FAILED', $e->getCode(), $e->getMessage()) . '<br>';
+
+            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 SchedulerComponent $component */
+        $component = Factory::getApplication()->bootComponent('com_scheduler');
+
+        /** @var TaskModel $model */
+        $model = $component->getMVCFactory()->createModel('Task', 'Administrator', ['ignore_request' => true]);
+        $task  = [
+            'title'           => 'DeleteActionLogs',
+            '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) {
+            echo Text::sprintf('JLIB_DATABASE_ERROR_FUNCTION_FAILED', $e->getCode(), $e->getMessage()) . '<br>';
+
+            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) {
+            echo Text::sprintf('JLIB_DATABASE_ERROR_FUNCTION_FAILED', $e->getCode(), $e->getMessage()) . '<br>';
+
+            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 SchedulerComponent $component */
+        $component = Factory::getApplication()->bootComponent('com_scheduler');
+
+        /** @var TaskModel $model */
+        $model = $component->getMVCFactory()->createModel('Task', 'Administrator', ['ignore_request' => true]);
+        $task  = [
+            'title'           => 'PrivacyConsent',
+            '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) {
+            echo Text::sprintf('JLIB_DATABASE_ERROR_FUNCTION_FAILED', $e->getCode(), $e->getMessage()) . '<br>';
+
+            return false;
+        }
+
+        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) {
+            echo Text::sprintf('JLIB_DATABASE_ERROR_FUNCTION_FAILED', $e->getCode(), $e->getMessage()) . '<br>';
+
+            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) {
+            echo Text::sprintf('JLIB_DATABASE_ERROR_FUNCTION_FAILED', $e->getCode(), $e->getMessage()) . '<br>';
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * setup Guided Tours Unique Identifiers
+     *
+     * @return  boolean  True on success
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    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.
@@ -912,6 +2678,8 @@ protected function fixFilenameCasing()
             // 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',
         ];
 
         foreach ($files as $old => $expected) {
@@ -948,7 +2716,9 @@ protected function fixFilenameCasing()
                     }
                 } else {
                     // On Unix with both files: Delete the incorrectly cased file.
-                    File::delete(JPATH_ROOT . $old);
+                    if (is_file(JPATH_ROOT . $old)) {
+                        File::delete(JPATH_ROOT . $old);
+                    }
                 }
             }
         }
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
new file mode 100644
index 0000000000000..4f6aa1f79b567
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-03-17.sql
@@ -0,0 +1 @@
+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
new file mode 100644
index 0000000000000..882f857346fd7
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-07-12.sql
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 0000000000000..68f3966136529
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-07-25.sql
@@ -0,0 +1,23 @@
+--
+-- 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`
+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, 0, '', '{}', '', 1, 0),
+(0, 'plg_schemaorg_book', 'plugin', 'book', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 2, 0),
+(0, 'plg_schemaorg_event', 'plugin', 'event', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 3, 0),
+(0, 'plg_schemaorg_organization', 'plugin', 'organization', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 4, 0),
+(0, 'plg_schemaorg_person', 'plugin', 'person', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 5, 0),
+(0, 'plg_schemaorg_recipe', 'plugin', 'recipe', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 6, 0),
+(0, 'plg_schemaorg_jobposting', 'plugin', 'jobposting', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 7, 0),
+(0, 'plg_system_schemaorg', 'plugin', 'schemaorg', 'system', 0, 1, 1, 0, 0, '', '{}', '', 0, 0);
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/5.0.0-2023-07-29.sql
new file mode 100644
index 0000000000000..aff03ebad6261
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-07-29.sql
@@ -0,0 +1,2 @@
+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_behaviour_compat', 'plugin', 'compat', 'behaviour', 0, 1, 1, 0, 1, '', '{"classes_aliases":"1","es5_assets":"1"}', '', -1, 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
new file mode 100644
index 0000000000000..53a45aa687c0d
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-08-21.sql
@@ -0,0 +1,17 @@
+--
+-- 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
new file mode 100644
index 0000000000000..6126e568478e7
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-08-26.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`) VALUES
+(0, 'plg_task_globalcheckin', 'plugin', 'globalcheckin', 'task', 0, 1, 1, 0, 0, '', '{}', '', 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
new file mode 100644
index 0000000000000..34c1d727cb1e7
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-08-28.sql
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 0000000000000..85790c1132a04
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-08-29.sql
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 0000000000000..8b144004d1147
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-08-30.sql
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 0000000000000..4e74349940933
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-09-02.sql
@@ -0,0 +1,13 @@
+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_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-03-17.sql b/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-03-17.sql
new file mode 100644
index 0000000000000..c3bb4daede595
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-03-17.sql
@@ -0,0 +1 @@
+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
new file mode 100644
index 0000000000000..0c83e0d5360fd
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-07-12.sql
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 0000000000000..18e8bd027d608
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-07-25.sql
@@ -0,0 +1,23 @@
+--
+-- 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"
+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, 0, '', '{}', '', 1, 0),
+(0, 'plg_schemaorg_book', 'plugin', 'book', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 2, 0),
+(0, 'plg_schemaorg_event', 'plugin', 'event', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 3, 0),
+(0, 'plg_schemaorg_organization', 'plugin', 'organization', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 4, 0),
+(0, 'plg_schemaorg_person', 'plugin', 'person', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 5, 0),
+(0, 'plg_schemaorg_recipe', 'plugin', 'recipe', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 6, 0),
+(0, 'plg_schemaorg_jobposting', 'plugin', 'jobposting', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 7, 0),
+(0, 'plg_system_schemaorg', 'plugin', 'schemaorg', 'system', 0, 1, 1, 0, 0, '', '{}', '', 0, 0);
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/5.0.0-2023-07-29.sql
new file mode 100644
index 0000000000000..489861e7681ae
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-07-29.sql
@@ -0,0 +1,2 @@
+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_behaviour_compat', 'plugin', 'compat', 'behaviour', 0, 1, 1, 0, 1, '', '{"classes_aliases":"1","es5_assets":"1"}', '', -1, 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
new file mode 100644
index 0000000000000..bcca1d7e0835f
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-08-21.sql
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 0000000000000..ce78be2301d1a
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-08-26.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") VALUES
+(0, 'plg_task_globalcheckin', 'plugin', 'globalcheckin', 'task', 0, 1, 1, 0, 0, '', '{}', '', 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
new file mode 100644
index 0000000000000..252410f0e0baa
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-08-28.sql
@@ -0,0 +1,14 @@
+
+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
new file mode 100644
index 0000000000000..21666a58eb649
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-08-29.sql
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 0000000000000..6cdba7c66ee3c
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-08-30.sql
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 0000000000000..08e8541039d17
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-09-02.sql
@@ -0,0 +1,13 @@
+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_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/src/Controller/DisplayController.php b/administrator/components/com_admin/src/Controller/DisplayController.php
index 7d4d97c91c56c..77bdd03953fb5 100644
--- a/administrator/components/com_admin/src/Controller/DisplayController.php
+++ b/administrator/components/com_admin/src/Controller/DisplayController.php
@@ -27,7 +27,8 @@ class DisplayController extends BaseController
      * View method
      *
      * @param   boolean  $cachable   If true, the view output will be cached
-     * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link \JFilterInput::clean()}.
+     * @param   array    $urlparams  An array of safe URL parameters and their variable types.
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  static  Supports chaining.
      *
diff --git a/administrator/components/com_admin/src/Extension/AdminComponent.php b/administrator/components/com_admin/src/Extension/AdminComponent.php
index 5319fbfc6bb45..009cc42947687 100644
--- a/administrator/components/com_admin/src/Extension/AdminComponent.php
+++ b/administrator/components/com_admin/src/Extension/AdminComponent.php
@@ -20,7 +20,7 @@
 use Psr\Container\ContainerInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/administrator/components/com_admin/src/Model/HelpModel.php b/administrator/components/com_admin/src/Model/HelpModel.php
index e93a2384f4750..139a9ffebdcf0 100644
--- a/administrator/components/com_admin/src/Model/HelpModel.php
+++ b/administrator/components/com_admin/src/Model/HelpModel.php
@@ -58,7 +58,7 @@ class HelpModel extends BaseDatabaseModel
      * @var    array
      * @since  1.6
      */
-    protected $toc = null;
+    protected $toc = [];
 
     /**
      * URL for the latest version check
@@ -128,7 +128,7 @@ public function getLangTag()
      */
     public function &getToc()
     {
-        if (!\is_null($this->toc)) {
+        if (\count($this->toc)) {
             return $this->toc;
         }
 
@@ -152,8 +152,7 @@ public function &getToc()
         }
 
         // Get Help files
-        $files     = Folder::files(JPATH_BASE . '/help/' . $lang_tag, '\.xml$|\.html$');
-        $this->toc = [];
+        $files = Folder::files(JPATH_BASE . '/help/' . $lang_tag, '\.xml$|\.html$');
 
         foreach ($files as $file) {
             $buffer = file_get_contents(JPATH_BASE . '/help/' . $lang_tag . '/' . $file);
diff --git a/administrator/components/com_admin/src/Model/SysinfoModel.php b/administrator/components/com_admin/src/Model/SysinfoModel.php
index 0fa96f5ede7db..a8abd3bda895e 100644
--- a/administrator/components/com_admin/src/Model/SysinfoModel.php
+++ b/administrator/components/com_admin/src/Model/SysinfoModel.php
@@ -11,12 +11,15 @@
 namespace Joomla\Component\Admin\Administrator\Model;
 
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Extension\ExtensionHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Version;
 use Joomla\Registry\Registry;
+use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -321,12 +324,27 @@ public function &getInfo(): array
             'server'                 => $_SERVER['SERVER_SOFTWARE'] ?? getenv('SERVER_SOFTWARE'),
             'sapi_name'              => PHP_SAPI,
             'version'                => (new Version())->getLongVersion(),
+            'compatpluginenabled'    => PluginHelper::isEnabled('behaviour', 'compat'),
+            'compatpluginparameters' => $this->getCompatPluginParameters(),
             'useragent'              => $_SERVER['HTTP_USER_AGENT'] ?? '',
         ];
 
         return $this->info;
     }
 
+    private function getCompatPluginParameters()
+    {
+        $record = ExtensionHelper::getExtensionRecord('compat', 'plugin', 0, 'behaviour');
+
+        if ($record) {
+            $params = new Registry($record->params);
+
+            return ArrayHelper::toString($params->toArray(), ':', ', ');
+        }
+
+        return '';
+    }
+
     /**
      * Check if the phpinfo function is enabled
      *
@@ -336,7 +354,9 @@ public function &getInfo(): array
      */
     public function phpinfoEnabled(): bool
     {
-        return !\in_array('phpinfo', explode(',', ini_get('disable_functions')));
+        // remove any spaces from the ini value before exploding it
+        $disabledFunctions = str_replace(' ', '', ini_get('disable_functions'));
+        return !\in_array('phpinfo', explode(',', $disabledFunctions));
     }
 
     /**
diff --git a/administrator/components/com_admin/src/View/Help/HtmlView.php b/administrator/components/com_admin/src/View/Help/HtmlView.php
index 02abc9ba16989..9d893b8cd8a70 100644
--- a/administrator/components/com_admin/src/View/Help/HtmlView.php
+++ b/administrator/components/com_admin/src/View/Help/HtmlView.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Component\Admin\Administrator\View\Help;
 
-use Exception;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Toolbar\ToolbarHelper;
@@ -68,7 +67,7 @@ class HtmlView extends BaseHtmlView
      *
      * @since   1.6
      *
-     * @throws  Exception
+     * @throws  \Exception
      */
     public function display($tpl = null): void
     {
diff --git a/administrator/components/com_admin/src/View/Sysinfo/HtmlView.php b/administrator/components/com_admin/src/View/Sysinfo/HtmlView.php
index 3b915c8c257b5..3ef5b7c049c95 100644
--- a/administrator/components/com_admin/src/View/Sysinfo/HtmlView.php
+++ b/administrator/components/com_admin/src/View/Sysinfo/HtmlView.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Component\Admin\Administrator\View\Sysinfo;
 
-use Exception;
 use Joomla\CMS\Access\Exception\NotAllowed;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
@@ -80,7 +79,7 @@ class HtmlView extends BaseHtmlView
      *
      * @since   1.6
      *
-     * @throws  Exception
+     * @throws  \Exception
      */
     public function display($tpl = null): void
     {
diff --git a/administrator/components/com_admin/src/View/Sysinfo/JsonView.php b/administrator/components/com_admin/src/View/Sysinfo/JsonView.php
index 4ea9d7d79ef07..f9eafe564abba 100644
--- a/administrator/components/com_admin/src/View/Sysinfo/JsonView.php
+++ b/administrator/components/com_admin/src/View/Sysinfo/JsonView.php
@@ -10,11 +10,12 @@
 
 namespace Joomla\Component\Admin\Administrator\View\Sysinfo;
 
-use Exception;
 use Joomla\CMS\Access\Exception\NotAllowed;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\AbstractView;
+use Joomla\CMS\User\CurrentUserInterface;
+use Joomla\CMS\User\CurrentUserTrait;
 use Joomla\Component\Admin\Administrator\Model\SysinfoModel;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -26,8 +27,10 @@
  *
  * @since  3.5
  */
-class JsonView extends AbstractView
+class JsonView extends AbstractView implements CurrentUserInterface
 {
+    use CurrentUserTrait;
+
     /**
      * Execute and display a template script.
      *
@@ -37,12 +40,12 @@ class JsonView extends AbstractView
      *
      * @since   3.5
      *
-     * @throws  Exception
+     * @throws  \Exception
      */
     public function display($tpl = null): void
     {
         // Access check.
-        if (!Factory::getUser()->authorise('core.admin')) {
+        if (!$this->getCurrentUser()->authorise('core.admin')) {
             throw new NotAllowed(Text::_('JERROR_ALERTNOAUTHOR'), 403);
         }
 
diff --git a/administrator/components/com_admin/src/View/Sysinfo/TextView.php b/administrator/components/com_admin/src/View/Sysinfo/TextView.php
index 603c565aeaebe..48b8ac17245e8 100644
--- a/administrator/components/com_admin/src/View/Sysinfo/TextView.php
+++ b/administrator/components/com_admin/src/View/Sysinfo/TextView.php
@@ -10,11 +10,12 @@
 
 namespace Joomla\Component\Admin\Administrator\View\Sysinfo;
 
-use Exception;
 use Joomla\CMS\Access\Exception\NotAllowed;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\AbstractView;
+use Joomla\CMS\User\CurrentUserInterface;
+use Joomla\CMS\User\CurrentUserTrait;
 use Joomla\Component\Admin\Administrator\Model\SysinfoModel;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -26,8 +27,10 @@
  *
  * @since  3.5
  */
-class TextView extends AbstractView
+class TextView extends AbstractView implements CurrentUserInterface
 {
+    use CurrentUserTrait;
+
     /**
      * Execute and display a template script.
      *
@@ -37,12 +40,12 @@ class TextView extends AbstractView
      *
      * @since   3.5
      *
-     * @throws  Exception
+     * @throws  \Exception
      */
     public function display($tpl = null): void
     {
         // Access check.
-        if (!Factory::getUser()->authorise('core.admin')) {
+        if (!$this->getCurrentUser()->authorise('core.admin')) {
             throw new NotAllowed(Text::_('JERROR_ALERTNOAUTHOR'), 403);
         }
 
@@ -146,6 +149,7 @@ protected function renderSection(string $sectionName, array $sectionData, int $l
                 }
 
                 if (\is_int($name) && ($name == 0 || $name == 1)) {
+                    // The term "Master" is used because it is the term used in phpinfo() and this is a text representation of that.
                     $name = ($name == 0 ? 'Local Value' : 'Master Value');
                 }
 
diff --git a/administrator/components/com_admin/tmpl/help/langforum.php b/administrator/components/com_admin/tmpl/help/langforum.php
index 979c726533351..b73500e014529 100644
--- a/administrator/components/com_admin/tmpl/help/langforum.php
+++ b/administrator/components/com_admin/tmpl/help/langforum.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 
-Factory::getLanguage()->load('mod_menu', JPATH_ADMINISTRATOR);
+$this->getLanguage()->load('mod_menu', JPATH_ADMINISTRATOR);
 
 $forumId   = (int) Text::_('MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM_VALUE');
 
diff --git a/administrator/components/com_admin/tmpl/sysinfo/default_system.php b/administrator/components/com_admin/tmpl/sysinfo/default_system.php
index 0891b5c2ef82b..06e1bdb41f60a 100644
--- a/administrator/components/com_admin/tmpl/sysinfo/default_system.php
+++ b/administrator/components/com_admin/tmpl/sysinfo/default_system.php
@@ -120,6 +120,14 @@
                     <?php echo $this->info['version']; ?>
                 </td>
             </tr>
+            <tr>
+                <th scope="row">
+                    <?php echo Text::_('COM_ADMIN_JOOMLA_COMPAT_PLUGIN'); ?>
+                </th>
+                <td>
+                    <?php echo $this->info['compatpluginenabled'] ? Text::_('JENABLED') . ' (' . $this->info['compatpluginparameters'] . ')' : Text::_('JDISABLED'); ?>
+                </td>
+            </tr>
             <tr>
                 <th scope="row">
                     <?php echo Text::_('COM_ADMIN_USER_AGENT'); ?>
diff --git a/administrator/components/com_associations/src/Model/AssociationsModel.php b/administrator/components/com_associations/src/Model/AssociationsModel.php
index 3e3ecc3491208..1c9756a3aed34 100644
--- a/administrator/components/com_associations/src/Model/AssociationsModel.php
+++ b/administrator/components/com_associations/src/Model/AssociationsModel.php
@@ -395,7 +395,7 @@ protected function getListQuery()
         $baselevel = 1;
 
         if ($categoryId = $this->getState('filter.category_id')) {
-            $categoryTable = Table::getInstance('Category', 'JTable');
+            $categoryTable = Table::getInstance('Category', '\\Joomla\\CMS\\Table\\');
             $categoryTable->load($categoryId);
             $baselevel = (int) $categoryTable->level;
 
diff --git a/administrator/components/com_associations/src/View/Association/HtmlView.php b/administrator/components/com_associations/src/View/Association/HtmlView.php
index 8b6409f76c69a..e4b047a8d6ee3 100644
--- a/administrator/components/com_associations/src/View/Association/HtmlView.php
+++ b/administrator/components/com_associations/src/View/Association/HtmlView.php
@@ -16,7 +16,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Pagination\Pagination;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Toolbar\Toolbar;
@@ -59,7 +58,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var    CMSObject
+     * @var    \Joomla\Registry\Registry
      *
      * @since  3.7.0
      */
@@ -318,7 +317,7 @@ public function display($tpl = null): void
              * Let's put the target src into a variable to use in the javascript code
              * to avoid race conditions when the reference iframe loads.
              */
-            $this->document->addScriptOptions('targetSrc', Route::_($this->editUri . '&task=' . $task . '&id=' . (int) $this->targetId));
+            $this->getDocument()->addScriptOptions('targetSrc', Route::_($this->editUri . '&task=' . $task . '&id=' . (int) $this->targetId));
             $this->form->setValue('itemlanguage', '', $this->targetLanguage . ':' . $this->targetId . ':' . $this->targetAction);
         }
 
diff --git a/administrator/components/com_associations/tmpl/associations/default.php b/administrator/components/com_associations/tmpl/associations/default.php
index 43ffc9f124e7e..7de2d1e98f222 100644
--- a/administrator/components/com_associations/tmpl/associations/default.php
+++ b/administrator/components/com_associations/tmpl/associations/default.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;
@@ -25,7 +24,7 @@
 
 $listOrder        = $this->escape($this->state->get('list.ordering'));
 $listDirn         = $this->escape($this->state->get('list.direction'));
-$canManageCheckin = Factory::getUser()->authorise('core.manage', 'com_checkin');
+$canManageCheckin = $this->getCurrentUser()->authorise('core.manage', 'com_checkin');
 
 $iconStates = [
     -2 => 'icon-trash',
diff --git a/administrator/components/com_associations/tmpl/associations/modal.php b/administrator/components/com_associations/tmpl/associations/modal.php
index 35597a263b8b6..a42d1e8ef5679 100644
--- a/administrator/components/com_associations/tmpl/associations/modal.php
+++ b/administrator/components/com_associations/tmpl/associations/modal.php
@@ -32,7 +32,7 @@
 $function         = $app->getInput()->getCmd('function', 'jSelectAssociation');
 $listOrder        = $this->escape($this->state->get('list.ordering'));
 $listDirn         = $this->escape($this->state->get('list.direction'));
-$canManageCheckin = Factory::getUser()->authorise('core.manage', 'com_checkin');
+$canManageCheckin = $this->getCurrentUser()->authorise('core.manage', 'com_checkin');
 
 $iconStates = [
     -2 => 'icon-trash',
diff --git a/administrator/components/com_banners/forms/banner.xml b/administrator/components/com_banners/forms/banner.xml
index 9c3dc80f97ddd..a00dadac9c07f 100644
--- a/administrator/components/com_banners/forms/banner.xml
+++ b/administrator/components/com_banners/forms/banner.xml
@@ -77,7 +77,7 @@
 			name="description"
 			type="editor"
 			label="JGLOBAL_DESCRIPTION"
-			filter="JComponentHelper::filterText"
+			filter="\Joomla\CMS\Component\ComponentHelper::filterText"
 			buttons="true"
 			hide="readmore,pagebreak,module,article,contact,menu"
 		/>
diff --git a/administrator/components/com_banners/src/Controller/DisplayController.php b/administrator/components/com_banners/src/Controller/DisplayController.php
index 72a595c51c13a..8b1df338ad92a 100644
--- a/administrator/components/com_banners/src/Controller/DisplayController.php
+++ b/administrator/components/com_banners/src/Controller/DisplayController.php
@@ -20,7 +20,7 @@
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Banners master display controller.
+ * Banners display controller.
  *
  * @since  1.6
  */
@@ -38,7 +38,8 @@ class DisplayController extends BaseController
      * Method to display a view.
      *
      * @param   boolean  $cachable   If true, the view output will be cached
-     * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link \JFilterInput::clean()}.
+     * @param   array    $urlparams  An array of safe URL parameters and their variable types
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  BaseController|boolean  This object to support chaining.
      *
diff --git a/administrator/components/com_banners/src/Controller/TracksController.php b/administrator/components/com_banners/src/Controller/TracksController.php
index f3c181b39d2c2..1652afc823768 100644
--- a/administrator/components/com_banners/src/Controller/TracksController.php
+++ b/administrator/components/com_banners/src/Controller/TracksController.php
@@ -92,7 +92,8 @@ public function delete()
      * Display method for the raw track data.
      *
      * @param   boolean  $cachable   If true, the view output will be cached
-     * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link \JFilterInput::clean()}.
+     * @param   array    $urlparams  An array of safe URL parameters and their variable types.
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  static  This object to support chaining.
      *
diff --git a/administrator/components/com_banners/src/Extension/BannersComponent.php b/administrator/components/com_banners/src/Extension/BannersComponent.php
index 5e88ca857c273..319ab8011e52a 100644
--- a/administrator/components/com_banners/src/Extension/BannersComponent.php
+++ b/administrator/components/com_banners/src/Extension/BannersComponent.php
@@ -24,7 +24,7 @@
 use Psr\Container\ContainerInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/administrator/components/com_banners/src/Model/BannerModel.php b/administrator/components/com_banners/src/Model/BannerModel.php
index cc244df4cc977..b03de8fd0eb8f 100644
--- a/administrator/components/com_banners/src/Model/BannerModel.php
+++ b/administrator/components/com_banners/src/Model/BannerModel.php
@@ -15,8 +15,10 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\TableInterface;
 use Joomla\CMS\Versioning\VersionableModelTrait;
 use Joomla\Component\Categories\Administrator\Helper\CategoriesHelper;
+use Joomla\Database\ParameterType;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -64,6 +66,34 @@ class BannerModel extends AdminModel
         'language_id' => 'batchLanguage',
     ];
 
+    /**
+     * Data cleanup after batch copying data
+     *
+     * @param   TableInterface  $table  The table object containing the newly created item
+     * @param   integer         $newId  The id of the new item
+     * @param   integer         $oldId  The original item id
+     *
+     * @return  void
+     *
+     * @since  4.3.2
+     */
+    protected function cleanupPostBatchCopy(TableInterface $table, $newId, $oldId)
+    {
+        // Initialise clicks and impmade
+        $db    = $this->getDatabase();
+
+        $query = $db->getQuery(true)
+                ->update($db->quoteName('#__banners'))
+                ->set($db->quoteName('clicks') . ' = 0')
+                ->set($db->quoteName('impmade') . ' = 0')
+                ->where($db->quoteName('id') . ' = :newId')
+                ->bind(':newId', $newId, ParameterType::INTEGER);
+
+        $db->setQuery($query);
+        $db->execute();
+    }
+
+
     /**
      * Batch client changes for a group of banners.
      *
@@ -134,7 +164,7 @@ protected function canDelete($record)
      * for alias and title to use the batch move and copy methods
      *
      * @param   integer  $categoryId  The target category id
-     * @param   Table    $table       The JTable within which move or copy is taking place
+     * @param   Table    $table       The \Joomla\CMS\Table\Table within which move or copy is taking place
      *
      * @return  void
      *
@@ -429,6 +459,11 @@ public function save($data)
             $data['state'] = 0;
         }
 
+        if ($input->get('task') == 'save2copy' || $input->get('task') == 'copy') {
+            $data['clicks']  = 0;
+            $data['impmade'] = 0;
+        }
+
         return parent::save($data);
     }
 
diff --git a/administrator/components/com_banners/src/Table/BannerTable.php b/administrator/components/com_banners/src/Table/BannerTable.php
index d3cee7485bfa7..03a0016ee3803 100644
--- a/administrator/components/com_banners/src/Table/BannerTable.php
+++ b/administrator/components/com_banners/src/Table/BannerTable.php
@@ -160,7 +160,7 @@ public function check()
     /**
      * Overloaded bind function
      *
-     * @param   mixed  $array   An associative array or object to bind to the \JTable instance.
+     * @param   mixed  $array   An associative array or object to bind to the \Joomla\CMS\Table\Table instance.
      * @param   mixed  $ignore  An optional array or space separated list of properties to ignore while binding.
      *
      * @return  boolean  True on success
diff --git a/administrator/components/com_banners/src/View/Banner/HtmlView.php b/administrator/components/com_banners/src/View/Banner/HtmlView.php
index 2072be8c75867..5e17f8619e499 100644
--- a/administrator/components/com_banners/src/View/Banner/HtmlView.php
+++ b/administrator/components/com_banners/src/View/Banner/HtmlView.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Component\Banners\Administrator\View\Banner;
 
-use Exception;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
@@ -66,7 +65,7 @@ class HtmlView extends BaseHtmlView
      *
      * @since   1.5
      *
-     * @throws  Exception
+     * @throws  \Exception
      */
     public function display($tpl = null): void
     {
@@ -92,7 +91,7 @@ public function display($tpl = null): void
      * @return  void
      *
      * @since   1.6
-     * @throws  Exception
+     * @throws  \Exception
      */
     protected function addToolbar(): void
     {
diff --git a/administrator/components/com_banners/src/View/Banners/HtmlView.php b/administrator/components/com_banners/src/View/Banners/HtmlView.php
index 4d47c5dc1ffda..9d6108a4bdb76 100644
--- a/administrator/components/com_banners/src/View/Banners/HtmlView.php
+++ b/administrator/components/com_banners/src/View/Banners/HtmlView.php
@@ -10,8 +10,6 @@
 
 namespace Joomla\Component\Banners\Administrator\View\Banners;
 
-use Exception;
-use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Language\Multilanguage;
@@ -100,7 +98,7 @@ class HtmlView extends BaseHtmlView
      * @return  void
      *
      * @since   1.6
-     * @throws  Exception
+     * @throws  \Exception
      */
     public function display($tpl = null): void
     {
@@ -143,7 +141,7 @@ public function display($tpl = null): void
     protected function addToolbar(): void
     {
         $canDo   = ContentHelper::getActions('com_banners', 'category', $this->state->get('filter.category_id'));
-        $user    = Factory::getApplication()->getIdentity();
+        $user    = $this->getCurrentUser();
         $toolbar = Toolbar::getInstance();
 
         ToolbarHelper::title(Text::_('COM_BANNERS_MANAGER_BANNERS'), 'bookmark banners');
diff --git a/administrator/components/com_banners/src/View/Client/HtmlView.php b/administrator/components/com_banners/src/View/Client/HtmlView.php
index b95de433a3cca..4e9fcf299d53c 100644
--- a/administrator/components/com_banners/src/View/Client/HtmlView.php
+++ b/administrator/components/com_banners/src/View/Client/HtmlView.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Component\Banners\Administrator\View\Client;
 
-use Exception;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
@@ -53,7 +52,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var    CMSObject
+     * @var    \Joomla\Registry\Registry
      * @since  1.5
      */
     protected $state;
@@ -61,7 +60,7 @@ class HtmlView extends BaseHtmlView
     /**
      * Object containing permissions for the item
      *
-     * @var    CMSObject
+     * @var    \Joomla\Registry\Registry
      * @since  1.5
      */
     protected $canDo;
@@ -75,7 +74,7 @@ class HtmlView extends BaseHtmlView
      *
      * @since   1.5
      *
-     * @throws  Exception
+     * @throws  \Exception
      */
     public function display($tpl = null): void
     {
@@ -103,7 +102,7 @@ public function display($tpl = null): void
      *
      * @since   1.6
      *
-     * @throws  Exception
+     * @throws  \Exception
      */
     protected function addToolbar(): void
     {
diff --git a/administrator/components/com_banners/src/View/Clients/HtmlView.php b/administrator/components/com_banners/src/View/Clients/HtmlView.php
index 9f18a5ad8418e..afcf386fdc93f 100644
--- a/administrator/components/com_banners/src/View/Clients/HtmlView.php
+++ b/administrator/components/com_banners/src/View/Clients/HtmlView.php
@@ -10,13 +10,11 @@
 
 namespace Joomla\Component\Banners\Administrator\View\Clients;
 
-use Exception;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Pagination\Pagination;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
@@ -68,7 +66,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var    CMSObject
+     * @var    \Joomla\Registry\Registry
      * @since  1.6
      */
     protected $state;
@@ -90,7 +88,7 @@ class HtmlView extends BaseHtmlView
      *
      * @since   1.6
      *
-     * @throws  Exception
+     * @throws  \Exception
      */
     public function display($tpl = null): void
     {
diff --git a/administrator/components/com_banners/src/View/Download/HtmlView.php b/administrator/components/com_banners/src/View/Download/HtmlView.php
index 1f104358106a8..2a545f8673970 100644
--- a/administrator/components/com_banners/src/View/Download/HtmlView.php
+++ b/administrator/components/com_banners/src/View/Download/HtmlView.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Component\Banners\Administrator\View\Download;
 
-use Exception;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
@@ -44,7 +43,7 @@ class HtmlView extends BaseHtmlView
      *
      * @since   1.6
      *
-     * @throws  Exception
+     * @throws  \Exception
      */
     public function display($tpl = null): void
     {
diff --git a/administrator/components/com_banners/src/View/Tracks/HtmlView.php b/administrator/components/com_banners/src/View/Tracks/HtmlView.php
index ba79131d71007..4a1f0ddc87702 100644
--- a/administrator/components/com_banners/src/View/Tracks/HtmlView.php
+++ b/administrator/components/com_banners/src/View/Tracks/HtmlView.php
@@ -10,13 +10,11 @@
 
 namespace Joomla\Component\Banners\Administrator\View\Tracks;
 
-use Exception;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Pagination\Pagination;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Toolbar\Toolbar;
@@ -69,7 +67,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var    CMSObject
+     * @var    \Joomla\Registry\Registry
      * @since  1.6
      */
     protected $state;
@@ -90,7 +88,7 @@ class HtmlView extends BaseHtmlView
      * @return  void
      *
      * @since   1.6
-     * @throws  Exception
+     * @throws  \Exception
      */
     public function display($tpl = null): void
     {
diff --git a/administrator/components/com_banners/src/View/Tracks/RawView.php b/administrator/components/com_banners/src/View/Tracks/RawView.php
index dbafaabd13158..b52fafab0efd1 100644
--- a/administrator/components/com_banners/src/View/Tracks/RawView.php
+++ b/administrator/components/com_banners/src/View/Tracks/RawView.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Component\Banners\Administrator\View\Tracks;
 
-use Exception;
 use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Factory;
 use Joomla\CMS\MVC\View\GenericDataException;
@@ -37,7 +36,7 @@ class RawView extends BaseHtmlView
      *
      * @since   1.6
      *
-     * @throws  Exception
+     * @throws  \Exception
      */
     public function display($tpl = null): void
     {
@@ -53,7 +52,7 @@ public function display($tpl = null): void
             throw new GenericDataException(implode("\n", $errors), 500);
         }
 
-        $this->document->setMimeEncoding($mimeType);
+        $this->getDocument()->setMimeEncoding($mimeType);
 
         /** @var CMSApplication $app */
         $app = Factory::getApplication();
diff --git a/administrator/components/com_banners/tmpl/banner/edit.php b/administrator/components/com_banners/tmpl/banner/edit.php
index d6fe9c69f9a88..bf94c3d9beeca 100644
--- a/administrator/components/com_banners/tmpl/banner/edit.php
+++ b/administrator/components/com_banners/tmpl/banner/edit.php
@@ -25,7 +25,7 @@
 
 ?>
 
-<form action="<?php echo Route::_('index.php?option=com_banners&layout=edit&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="banner-form" aria-label="<?php echo Text::_('COM_BANNERS_BANNER_FORM_' . ((int) $this->item->id === 0 ? 'NEW' : 'EDIT'), true); ?>" class="form-validate">
+<form action="<?php echo Route::_('index.php?option=com_banners&layout=edit&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="banner-form" aria-label="<?php echo Text::_('COM_BANNERS_BANNER_' . ((int) $this->item->id === 0 ? 'NEW' : 'EDIT'), true); ?>" class="form-validate">
 
     <?php echo LayoutHelper::render('joomla.edit.title_alias', $this); ?>
 
diff --git a/administrator/components/com_banners/tmpl/banners/default.php b/administrator/components/com_banners/tmpl/banners/default.php
index bbbf39629fc3b..d5eaca038ecb5 100644
--- a/administrator/components/com_banners/tmpl/banners/default.php
+++ b/administrator/components/com_banners/tmpl/banners/default.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
@@ -25,7 +24,7 @@
 $wa->useScript('table.columns')
     ->useScript('multiselect');
 
-$user      = Factory::getUser();
+$user      = $this->getCurrentUser();
 $userId    = $user->get('id');
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
diff --git a/administrator/components/com_banners/tmpl/banners/default_batch_body.php b/administrator/components/com_banners/tmpl/banners/default_batch_body.php
index fbc990db6f439..66d0ca9f02e4a 100644
--- a/administrator/components/com_banners/tmpl/banners/default_batch_body.php
+++ b/administrator/components/com_banners/tmpl/banners/default_batch_body.php
@@ -16,7 +16,7 @@
 
 /** @var \Joomla\Component\Banners\Administrator\View\Banners\HtmlView $this */
 
-$published = $this->state->get('filter.published');
+$published = (int) $this->state->get('filter.published');
 ?>
 
 
diff --git a/administrator/components/com_banners/tmpl/banners/emptystate.php b/administrator/components/com_banners/tmpl/banners/emptystate.php
index b4b0db976c3a1..6e094c154b1b5 100644
--- a/administrator/components/com_banners/tmpl/banners/emptystate.php
+++ b/administrator/components/com_banners/tmpl/banners/emptystate.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Layout\LayoutHelper;
 
 $displayData = [
@@ -20,7 +19,7 @@
     'icon'       => 'icon-bookmark banners',
 ];
 
-$user = Factory::getApplication()->getIdentity();
+$user = $this->getCurrentUser();
 
 if ($user->authorise('core.create', 'com_banners') || count($user->getAuthorisedCategories('com_banners', 'core.create')) > 0) {
     $displayData['createURL'] = 'index.php?option=com_banners&task=banner.add';
diff --git a/administrator/components/com_banners/tmpl/client/edit.php b/administrator/components/com_banners/tmpl/client/edit.php
index bd0b60e087fb0..557714e88039f 100644
--- a/administrator/components/com_banners/tmpl/client/edit.php
+++ b/administrator/components/com_banners/tmpl/client/edit.php
@@ -24,7 +24,7 @@
 
 ?>
 
-<form action="<?php echo Route::_('index.php?option=com_banners&layout=edit&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="client-form" aria-label="<?php echo Text::_('COM_BANNERS_CLIENT_FORM_' . ((int) $this->item->id === 0 ? 'NEW' : 'EDIT'), true); ?>" class="form-validate">
+<form action="<?php echo Route::_('index.php?option=com_banners&layout=edit&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="client-form" aria-label="<?php echo Text::_('COM_BANNERS_CLIENT_' . ((int) $this->item->id === 0 ? 'NEW' : 'EDIT'), true); ?>" class="form-validate">
 
     <?php echo LayoutHelper::render('joomla.edit.title_alias', $this); ?>
 
diff --git a/administrator/components/com_banners/tmpl/clients/default.php b/administrator/components/com_banners/tmpl/clients/default.php
index 8db12d77ee7f3..6b06f8d5734bd 100644
--- a/administrator/components/com_banners/tmpl/clients/default.php
+++ b/administrator/components/com_banners/tmpl/clients/default.php
@@ -10,17 +10,16 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Router\Route;
+use Joomla\Registry\Registry;
 
 /** @var \Joomla\Component\Banners\Administrator\View\Clients\HtmlView $this */
 
 /** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
-$wa = $this->document->getWebAssetManager();
+$wa = $this->getDocument()->getWebAssetManager();
 $wa->useScript('table.columns')
     ->useScript('multiselect');
 
@@ -32,11 +31,11 @@
     '5' => 'DAILY',
 ];
 
-$user       = Factory::getUser();
+$user       = $this->getCurrentUser();
 $userId     = $user->get('id');
 $listOrder  = $this->escape($this->state->get('list.ordering'));
 $listDirn   = $this->escape($this->state->get('list.direction'));
-$params     = $this->state->params ?? new CMSObject();
+$params     = $this->state->get('params') ?? new Registry();
 ?>
 <form action="<?php echo Route::_('index.php?option=com_banners&view=clients'); ?>" method="post" name="adminForm" id="adminForm">
     <div class="row">
diff --git a/administrator/components/com_banners/tmpl/clients/emptystate.php b/administrator/components/com_banners/tmpl/clients/emptystate.php
index c7e79091d9a11..fbec8486b575a 100644
--- a/administrator/components/com_banners/tmpl/clients/emptystate.php
+++ b/administrator/components/com_banners/tmpl/clients/emptystate.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Layout\LayoutHelper;
 
 $displayData = [
@@ -20,7 +19,7 @@
     'icon'       => 'icon-bookmark banners',
 ];
 
-if (count(Factory::getApplication()->getIdentity()->getAuthorisedCategories('com_banners', 'core.create')) > 0) {
+if (count($this->getCurrentUser()->getAuthorisedCategories('com_banners', 'core.create')) > 0) {
     $displayData['createURL'] = 'index.php?option=com_banners&task=client.add';
 }
 
diff --git a/administrator/components/com_cache/src/Controller/DisplayController.php b/administrator/components/com_cache/src/Controller/DisplayController.php
index e3039c1e9dd9a..4fbb455f1c963 100644
--- a/administrator/components/com_cache/src/Controller/DisplayController.php
+++ b/administrator/components/com_cache/src/Controller/DisplayController.php
@@ -10,6 +10,7 @@
 
 namespace Joomla\Component\Cache\Administrator\Controller;
 
+use Joomla\CMS\Event\Cache\AfterPurgeEvent;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
@@ -131,7 +132,7 @@ public function deleteAll()
             $this->app->enqueueMessage(Text::_('COM_CACHE_MSG_SOME_CACHE_GROUPS_CLEARED'), 'warning');
         }
 
-        $this->app->triggerEvent('onAfterPurge', []);
+        $this->getDispatcher()->dispatch('onAfterPurge', new AfterPurgeEvent('onAfterPurge'));
         $this->setRedirect('index.php?option=com_cache&view=cache');
     }
 
diff --git a/administrator/components/com_cache/src/Model/CacheModel.php b/administrator/components/com_cache/src/Model/CacheModel.php
index 63f2ad17d143d..57c1ff29d6fe5 100644
--- a/administrator/components/com_cache/src/Model/CacheModel.php
+++ b/administrator/components/com_cache/src/Model/CacheModel.php
@@ -14,6 +14,7 @@
 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\Model\ListModel;
@@ -230,7 +231,7 @@ public function clean($group = '')
             return false;
         }
 
-        Factory::getApplication()->triggerEvent('onAfterPurge', [$group]);
+        $this->getDispatcher()->dispatch('onAfterPurge', new AfterPurgeEvent('onAfterPurge', ['subject' => $group]));
 
         return true;
     }
@@ -270,7 +271,7 @@ public function purge()
             return false;
         }
 
-        Factory::getApplication()->triggerEvent('onAfterPurge', []);
+        $this->getDispatcher()->dispatch('onAfterPurge', new AfterPurgeEvent('onAfterPurge'));
 
         return true;
     }
diff --git a/administrator/components/com_cache/src/View/Cache/HtmlView.php b/administrator/components/com_cache/src/View/Cache/HtmlView.php
index 78fe269e25619..b0795bf7d8a8a 100644
--- a/administrator/components/com_cache/src/View/Cache/HtmlView.php
+++ b/administrator/components/com_cache/src/View/Cache/HtmlView.php
@@ -14,7 +14,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Pagination\Pagination;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
@@ -74,7 +73,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var    CMSObject
+     * @var    \Joomla\Registry\Registry
      * @since  1.6
      */
     protected $state;
@@ -106,7 +105,7 @@ public function display($tpl = null): void
             throw new GenericDataException(implode("\n", $errors), 500);
         }
 
-        if (!\count($this->data)) {
+        if (!\count($this->data) && $this->state->get('filter.search') === '') {
             $this->setLayout('emptystate');
         }
 
diff --git a/administrator/components/com_categories/forms/category.xml b/administrator/components/com_categories/forms/category.xml
index 1485f478ff17e..e80358d98c713 100644
--- a/administrator/components/com_categories/forms/category.xml
+++ b/administrator/components/com_categories/forms/category.xml
@@ -96,7 +96,7 @@
 		name="description"
 		type="editor"
 		label="JGLOBAL_DESCRIPTION"
-		filter="JComponentHelper::filterText"
+		filter="\Joomla\CMS\Component\ComponentHelper::filterText"
 		buttons="true"
 		hide="readmore,pagebreak"
 	/>
diff --git a/administrator/components/com_categories/forms/filter_categories.xml b/administrator/components/com_categories/forms/filter_categories.xml
index d8b76d3ca0337..f6acd1dddd735 100644
--- a/administrator/components/com_categories/forms/filter_categories.xml
+++ b/administrator/components/com_categories/forms/filter_categories.xml
@@ -63,6 +63,18 @@
 			>
 			<option value="">JOPTION_SELECT_MAX_LEVELS</option>
 		</field>
+
+		<field
+			name="category_id"
+			type="category"
+			label="JOPTION_SELECT_CATEGORY"
+			multiple="true"
+			extension="dynamic"
+			layout="joomla.form.field.list-fancy-select"
+			hint="JOPTION_SELECT_CATEGORY"
+			published="0,1,2"
+			class="js-select-submit-on-change"
+		/>
 	</fields>
 
 	<fields name="list">
diff --git a/administrator/components/com_categories/src/Controller/AjaxController.php b/administrator/components/com_categories/src/Controller/AjaxController.php
index a3afbb272c97d..ecad1f22377ca 100644
--- a/administrator/components/com_categories/src/Controller/AjaxController.php
+++ b/administrator/components/com_categories/src/Controller/AjaxController.php
@@ -64,7 +64,7 @@ public function fetchAssociations()
 
             // Add the title to each of the associated records
             Table::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_categories/tables');
-            $categoryTable = Table::getInstance('Category', 'JTable');
+            $categoryTable = Table::getInstance('Category', '\\Joomla\\CMS\\Table\\');
 
             foreach ($associations as $lang => $association) {
                 $categoryTable->load($association->id);
diff --git a/administrator/components/com_categories/src/Controller/DisplayController.php b/administrator/components/com_categories/src/Controller/DisplayController.php
index 8481ded0815ac..9a1901e7fd2df 100644
--- a/administrator/components/com_categories/src/Controller/DisplayController.php
+++ b/administrator/components/com_categories/src/Controller/DisplayController.php
@@ -68,7 +68,8 @@ public function __construct($config = [], MVCFactoryInterface $factory = null, $
      * Method to display a view.
      *
      * @param   boolean  $cachable   If true, the view output will be cached
-     * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link \JFilterInput::clean()}.
+     * @param   array    $urlparams  An array of safe URL parameters and their variable types.
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  static|boolean  This object to support chaining.
      *
diff --git a/administrator/components/com_categories/src/Extension/CategoriesComponent.php b/administrator/components/com_categories/src/Extension/CategoriesComponent.php
index 7c03e5f6dce1f..820c9c859b593 100644
--- a/administrator/components/com_categories/src/Extension/CategoriesComponent.php
+++ b/administrator/components/com_categories/src/Extension/CategoriesComponent.php
@@ -17,7 +17,7 @@
 use Psr\Container\ContainerInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/administrator/components/com_categories/src/Field/CategoryeditField.php b/administrator/components/com_categories/src/Field/CategoryeditField.php
index f791bcf0baf67..a90a687570564 100644
--- a/administrator/components/com_categories/src/Field/CategoryeditField.php
+++ b/administrator/components/com_categories/src/Field/CategoryeditField.php
@@ -170,7 +170,7 @@ protected function getOptions()
             : (int) $oldCat;
 
         $db   = $this->getDatabase();
-        $user = Factory::getUser();
+        $user = $this->getCurrentUser();
 
         $query = $db->getQuery(true)
             ->select(
diff --git a/administrator/components/com_categories/src/Model/CategoriesModel.php b/administrator/components/com_categories/src/Model/CategoriesModel.php
index dffd9bd7711c1..48d0e3e0a091a 100644
--- a/administrator/components/com_categories/src/Model/CategoriesModel.php
+++ b/administrator/components/com_categories/src/Model/CategoriesModel.php
@@ -16,6 +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\Database\DatabaseQuery;
 use Joomla\Database\ParameterType;
 use Joomla\Utilities\ArrayHelper;
@@ -66,6 +67,7 @@ public function __construct($config = [], MVCFactoryInterface $factory = null)
                 'level', 'a.level',
                 'path', 'a.path',
                 'tag',
+                'category_id', 'a.id',
             ];
         }
 
@@ -172,7 +174,7 @@ protected function getListQuery()
                 'a.id, a.title, a.alias, a.note, a.published, a.access' .
                 ', a.checked_out, a.checked_out_time, a.created_user_id' .
                 ', a.path, a.parent_id, a.level, a.lft, a.rgt' .
-                ', a.language'
+                ', a.language, a.description'
             )
         );
         $query->from($db->quoteName('#__categories', 'a'));
@@ -239,8 +241,31 @@ protected function getListQuery()
                 ->bind(':extension', $extension);
         }
 
-        // Filter on the level.
-        if ($level = (int) $this->getState('filter.level')) {
+        // Filter by categories and by level
+        $categoryId = $this->getState('filter.category_id', []);
+        $level      = $this->getState('filter.level');
+
+        if (!is_array($categoryId)) {
+            $categoryId = $categoryId ? [$categoryId] : [];
+        }
+
+        // Case: Using both categories filter and by level filter
+        if (count($categoryId)) {
+            $categoryTable    = Table::getInstance('Category', 'JTable');
+            $subCatItemsWhere = [];
+
+            foreach ($categoryId as $filterCatId) {
+                $categoryTable->load($filterCatId);
+                $subCatItemsWhere[] = '(' .
+                    ($level ? 'a.level <= ' . ((int) $level + (int) $categoryTable->level - 1) . ' AND ' : '') .
+                    'a.lft >= ' . (int) $categoryTable->lft . ' AND ' .
+                    'a.rgt <= ' . (int) $categoryTable->rgt . ')';
+            }
+
+            $query->where('(' . implode(' OR ', $subCatItemsWhere) . ')');
+
+        // Case: Using only the by level filter
+        } elseif ($level) {
             $query->where($db->quoteName('a.level') . ' <= :level')
                 ->bind(':level', $level, ParameterType::INTEGER);
         }
@@ -355,25 +380,25 @@ protected function getListQuery()
 
         // Group by on Categories for \JOIN with component tables to count items
         $query->group('a.id,
-				a.title,
-				a.alias,
-				a.note,
-				a.published,
-				a.access,
-				a.checked_out,
-				a.checked_out_time,
-				a.created_user_id,
-				a.path,
-				a.parent_id,
-				a.level,
-				a.lft,
-				a.rgt,
-				a.language,
-				l.title,
-				l.image,
-				uc.name,
-				ag.title,
-				ua.name');
+                a.title,
+                a.alias,
+                a.note,
+                a.published,
+                a.access,
+                a.checked_out,
+                a.checked_out_time,
+                a.created_user_id,
+                a.path,
+                a.parent_id,
+                a.level,
+                a.lft,
+                a.rgt,
+                a.language,
+                l.title,
+                l.image,
+                uc.name,
+                ag.title,
+                ua.name');
 
         return $query;
     }
diff --git a/administrator/components/com_categories/src/Model/CategoryModel.php b/administrator/components/com_categories/src/Model/CategoryModel.php
index a340ecb2af2e8..af5c51ac3be0c 100644
--- a/administrator/components/com_categories/src/Model/CategoryModel.php
+++ b/administrator/components/com_categories/src/Model/CategoryModel.php
@@ -14,8 +14,8 @@
 use Joomla\CMS\Association\AssociationServiceInterface;
 use Joomla\CMS\Categories\CategoryServiceInterface;
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Event\Model\AfterCategoryChangeStateEvent;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Helper\TagsHelper;
 use Joomla\CMS\Language\Associations;
@@ -29,6 +29,7 @@
 use Joomla\CMS\Versioning\VersionableModelTrait;
 use Joomla\Component\Categories\Administrator\Helper\CategoriesHelper;
 use Joomla\Database\ParameterType;
+use Joomla\Filesystem\Path;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
@@ -365,8 +366,8 @@ protected function loadFormData()
      *
      * @return  array|boolean  Array of filtered data if valid, false otherwise.
      *
-     * @see     JFormRule
-     * @see     JFilterInput
+     * @see     \Joomla\CMS\Form\FormRule
+     * @see     \Joomla\CMS\Filter\InputFilter
      * @since   3.9.23
      */
     public function validate($form, $data, $group = null)
@@ -740,10 +741,14 @@ public function publish(&$pks, $value = 1)
             $extension = Factory::getApplication()->getInput()->get('extension');
 
             // Include the content plugins for the change of category state event.
-            PluginHelper::importPlugin('content');
+            PluginHelper::importPlugin('content', null, true, $this->getDispatcher());
 
             // Trigger the onCategoryChangeState event.
-            Factory::getApplication()->triggerEvent('onCategoryChangeState', [$extension, $pks, $value]);
+            $this->getDispatcher()->dispatch('onCategoryChangeState', new AfterCategoryChangeStateEvent('onCategoryChangeState', [
+                'context' => $extension,
+                'subject' => $pks,
+                'value'   => $value,
+            ]));
 
             return true;
         }
@@ -874,7 +879,7 @@ protected function batchCopy($value, $pks, $contexts)
         $parentId = (int) ArrayHelper::getValue($parts, 0, 1);
 
         $db        = $this->getDatabase();
-        $extension = Factory::getApplication()->input->get('extension', '', 'word');
+        $extension = Factory::getApplication()->getInput()->get('extension', '', 'word');
         $newIds    = [];
 
         // Check that the parent exists
diff --git a/administrator/components/com_categories/src/View/Categories/HtmlView.php b/administrator/components/com_categories/src/View/Categories/HtmlView.php
index 696b3ec6c5d52..f7119a7eb67d0 100644
--- a/administrator/components/com_categories/src/View/Categories/HtmlView.php
+++ b/administrator/components/com_categories/src/View/Categories/HtmlView.php
@@ -12,7 +12,6 @@
 
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
@@ -22,6 +21,7 @@
 use Joomla\CMS\Toolbar\Button\DropdownButton;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -84,6 +84,14 @@ class HtmlView extends BaseHtmlView
      */
     private $isEmptyState = false;
 
+    /**
+     * The ordering list for the categories
+     *
+     * @var    array
+     * @since  4.4.0
+     */
+    protected $ordering = [];
+
     /**
      * Display the view
      *
@@ -138,6 +146,10 @@ public function display($tpl = null)
             }
         }
 
+        // If filter by category is active we need to know the extension name to filter the categories
+        $extensionName = $this->escape($this->state->get('filter.extension'));
+        $this->filterForm->setFieldAttribute('category_id', 'extension', $extensionName, 'filter');
+
         parent::display($tpl);
     }
 
@@ -155,7 +167,7 @@ protected function addToolbar()
         $component  = $this->state->get('filter.component');
         $section    = $this->state->get('filter.section');
         $canDo      = ContentHelper::getActions($component, 'category', $categoryId);
-        $user       = Factory::getApplication()->getIdentity();
+        $user       = $this->getCurrentUser();
         $toolbar    = Toolbar::getInstance();
 
         // Avoid nonsense situation.
@@ -164,7 +176,7 @@ protected function addToolbar()
         }
 
         // Need to load the menu language file as mod_menu hasn't been loaded yet.
-        $lang = Factory::getLanguage();
+        $lang = $this->getLanguage();
         $lang->load($component, JPATH_BASE)
         || $lang->load($component, JPATH_ADMINISTRATOR . '/components/' . $component);
 
@@ -180,7 +192,7 @@ protected function addToolbar()
 
         // Load specific css component
         /** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
-        $wa = $this->document->getWebAssetManager();
+        $wa = $this->getDocument()->getWebAssetManager();
         $wa->getRegistry()->addExtensionRegistryFile($component);
 
         if ($wa->assetExists('style', $component . '.admin-categories')) {
diff --git a/administrator/components/com_categories/src/View/Category/HtmlView.php b/administrator/components/com_categories/src/View/Category/HtmlView.php
index 5d78dbad758ed..7ce5654d43f11 100644
--- a/administrator/components/com_categories/src/View/Category/HtmlView.php
+++ b/administrator/components/com_categories/src/View/Category/HtmlView.php
@@ -18,7 +18,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\Component\Associations\Administrator\Helper\AssociationsHelper;
@@ -51,7 +50,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var  CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $state;
 
@@ -65,7 +64,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The actions the user is authorised to perform
      *
-     * @var  CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $canDo;
 
@@ -118,7 +117,9 @@ public function display($tpl = null)
             $this->form->setFieldAttribute('tags', 'language', '*,' . $forcedLanguage);
         }
 
-        $this->addToolbar();
+        if ($this->getLayout() !== 'modal') {
+            $this->addToolbar();
+        }
 
         parent::display($tpl);
     }
@@ -152,9 +153,9 @@ protected function addToolbar()
         $componentParams = ComponentHelper::getParams($component);
 
         // Need to load the menu language file as mod_menu hasn't been loaded yet.
-        $lang = Factory::getLanguage();
+        $lang = $this->getLanguage();
         $lang->load($component, JPATH_BASE)
-        || $lang->load($component, JPATH_ADMINISTRATOR . '/components/' . $component);
+            || $lang->load($component, JPATH_ADMINISTRATOR . '/components/' . $component);
 
         // Get the results for each action.
         $canDo = $this->canDo;
@@ -173,7 +174,7 @@ protected function addToolbar()
 
         // Load specific css component
         /** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
-        $wa = $this->document->getWebAssetManager();
+        $wa = $this->getDocument()->getWebAssetManager();
         $wa->getRegistry()->addExtensionRegistryFile($component);
 
         if ($wa->assetExists('style', $component . '.admin-categories')) {
@@ -189,15 +190,14 @@ protected function addToolbar()
                 . ' ' . substr($component, 4) . ($section ? "-$section" : '') . '-category-' . ($isNew ? 'add' : 'edit')
         );
 
-        // For new records, check the create permission.
-        if ($isNew && (count($user->getAuthorisedCategories($component, 'core.create')) > 0)) {
+        if ($isNew) {
             $toolbar->apply('category.apply');
             $saveGroup = $toolbar->dropdownButton('save-group');
 
             $saveGroup->configure(
                 function (Toolbar $childBar) {
                     $childBar->save('category.save');
-                    $childBar->save('category.save2new');
+                    $childBar->save2new('category.save2new');
                 }
             );
 
diff --git a/administrator/components/com_categories/tmpl/categories/default.php b/administrator/components/com_categories/tmpl/categories/default.php
index a78db17f79fb5..93f613564c7ed 100644
--- a/administrator/components/com_categories/tmpl/categories/default.php
+++ b/administrator/components/com_categories/tmpl/categories/default.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
@@ -24,7 +23,7 @@
 $wa->useScript('table.columns')
     ->useScript('multiselect');
 
-$user      = Factory::getUser();
+$user      = $this->getCurrentUser();
 $userId    = $user->get('id');
 $extension = $this->escape($this->state->get('filter.extension'));
 $listOrder = $this->escape($this->state->get('list.ordering'));
diff --git a/administrator/components/com_categories/tmpl/categories/emptystate.php b/administrator/components/com_categories/tmpl/categories/emptystate.php
index df600d521a58e..b1e2d247da848 100644
--- a/administrator/components/com_categories/tmpl/categories/emptystate.php
+++ b/administrator/components/com_categories/tmpl/categories/emptystate.php
@@ -42,7 +42,7 @@
     'icon'       => 'icon-folder categories content-categories',
 ];
 
-if (Factory::getApplication()->getIdentity()->authorise('core.create', $extension)) {
+if ($this->getCurrentUser()->authorise('core.create', $extension)) {
     $displayData['createURL'] = 'index.php?option=com_categories&extension=' . $extension . '&task=category.add';
 }
 
diff --git a/administrator/components/com_checkin/src/Controller/DisplayController.php b/administrator/components/com_checkin/src/Controller/DisplayController.php
index 40b1f86f3c46e..5b17d3e84862e 100644
--- a/administrator/components/com_checkin/src/Controller/DisplayController.php
+++ b/administrator/components/com_checkin/src/Controller/DisplayController.php
@@ -37,7 +37,8 @@ class DisplayController extends BaseController
      * Method to display a view.
      *
      * @param   boolean  $cachable   If true, the view output will be cached
-     * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link \JFilterInput::clean()}.
+     * @param   array    $urlparams  An array of safe URL parameters and their variable types.
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  static  A \JControllerLegacy object to support chaining.
      */
diff --git a/administrator/components/com_checkin/src/Model/CheckinModel.php b/administrator/components/com_checkin/src/Model/CheckinModel.php
index ad415724ad659..6221cd717206b 100644
--- a/administrator/components/com_checkin/src/Model/CheckinModel.php
+++ b/administrator/components/com_checkin/src/Model/CheckinModel.php
@@ -10,6 +10,7 @@
 
 namespace Joomla\Component\Checkin\Administrator\Model;
 
+use Joomla\CMS\Event\Checkin\AfterCheckinEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\ListModel;
@@ -128,7 +129,9 @@ public function checkin($ids = [])
 
             if ($db->execute()) {
                 $results = $results + $db->getAffectedRows();
-                $app->triggerEvent('onAfterCheckin', [$tn]);
+                $this->getDispatcher()->dispatch('onAfterCheckin', new AfterCheckinEvent('onAfterCheckin', [
+                    'subject' => $tn,
+                ]));
             }
         }
 
diff --git a/administrator/components/com_checkin/src/View/Checkin/HtmlView.php b/administrator/components/com_checkin/src/View/Checkin/HtmlView.php
index cec62a90a8e20..6554fcfa32c81 100644
--- a/administrator/components/com_checkin/src/View/Checkin/HtmlView.php
+++ b/administrator/components/com_checkin/src/View/Checkin/HtmlView.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Component\Checkin\Administrator\View\Checkin;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
@@ -45,7 +44,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var  \Joomla\CMS\Object\CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $state;
 
@@ -123,7 +122,7 @@ protected function addToolbar()
             $toolbar->checkin('checkin');
         }
 
-        if (Factory::getApplication()->getIdentity()->authorise('core.admin', 'com_checkin')) {
+        if ($this->getCurrentUser()->authorise('core.admin', 'com_checkin')) {
             $toolbar->divider();
             $toolbar->preferences('com_checkin');
             $toolbar->divider();
diff --git a/administrator/components/com_config/src/Controller/DisplayController.php b/administrator/components/com_config/src/Controller/DisplayController.php
index b837e2a2acc7d..39552bfd02b0c 100644
--- a/administrator/components/com_config/src/Controller/DisplayController.php
+++ b/administrator/components/com_config/src/Controller/DisplayController.php
@@ -41,7 +41,8 @@ class DisplayController extends BaseController
      * you will need to override it in your own controllers.
      *
      * @param   boolean  $cachable   If true, the view output will be cached
-     * @param   array    $urlparams  An array of safe url parameters and their variable types, for valid values see {@link InputFilter::clean()}.
+     * @param   array    $urlparams  An array of safe url parameters and their variable types.
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  static  A \JControllerLegacy object to support chaining.
      *
diff --git a/administrator/components/com_config/src/Controller/RequestController.php b/administrator/components/com_config/src/Controller/RequestController.php
index 4ecd25cdeb5ef..889f3282f1b59 100644
--- a/administrator/components/com_config/src/Controller/RequestController.php
+++ b/administrator/components/com_config/src/Controller/RequestController.php
@@ -65,15 +65,12 @@ public function getJson()
 
         try {
             $data = $model->getData();
-            $user = $this->app->getIdentity();
         } catch (\Exception $e) {
             $this->app->enqueueMessage($e->getMessage(), 'error');
 
             return false;
         }
 
-        $this->userIsSuperAdmin = $user->authorise('core.admin');
-
         // Required data
         $requiredData = [
             'sitename'            => null,
diff --git a/administrator/components/com_config/src/Dispatcher/Dispatcher.php b/administrator/components/com_config/src/Dispatcher/Dispatcher.php
index 6874ee33ea6f9..97bfa3b44ca9f 100644
--- a/administrator/components/com_config/src/Dispatcher/Dispatcher.php
+++ b/administrator/components/com_config/src/Dispatcher/Dispatcher.php
@@ -36,8 +36,8 @@ class Dispatcher extends ComponentDispatcher
      */
     protected function checkAccess(): void
     {
-        // sendtestmail expects json response, so we leave the method to handle the permission and send response itself
-        if ($this->input->getCmd('task') === 'application.sendtestmail') {
+        // sendtestmail and store do their own checks, so leave the method to handle the permission and send response itself
+        if (in_array($this->input->getCmd('task'), ['application.sendtestmail', 'application.store'], true)) {
             return;
         }
 
diff --git a/administrator/components/com_config/src/Extension/ConfigComponent.php b/administrator/components/com_config/src/Extension/ConfigComponent.php
index 9e54525f637f2..e201f6eee65a2 100644
--- a/administrator/components/com_config/src/Extension/ConfigComponent.php
+++ b/administrator/components/com_config/src/Extension/ConfigComponent.php
@@ -15,7 +15,7 @@
 use Joomla\CMS\Extension\MVCComponent;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/administrator/components/com_config/src/Model/ApplicationModel.php b/administrator/components/com_config/src/Model/ApplicationModel.php
index 7f311be44c14f..aa84d54205dbb 100644
--- a/administrator/components/com_config/src/Model/ApplicationModel.php
+++ b/administrator/components/com_config/src/Model/ApplicationModel.php
@@ -15,14 +15,16 @@
 use Joomla\CMS\Cache\Exception\CacheConnectingException;
 use Joomla\CMS\Cache\Exception\UnsupportedCacheException;
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Event\Application\AfterSaveConfigurationEvent;
+use Joomla\CMS\Event\Application\BeforeSaveConfigurationEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filesystem\Folder;
-use Joomla\CMS\Filesystem\Path;
-use Joomla\CMS\Filter\OutputFilter;
 use Joomla\CMS\Http\HttpFactory;
 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\FormModel;
 use Joomla\CMS\Table\Asset;
@@ -32,6 +34,8 @@
 use Joomla\Database\DatabaseDriver;
 use Joomla\Database\ParameterType;
 use Joomla\Filesystem\File;
+use Joomla\Filesystem\Path;
+use Joomla\Filter\OutputFilter;
 use Joomla\Registry\Registry;
 use Joomla\Utilities\ArrayHelper;
 use PHPMailer\PHPMailer\Exception as phpMailerException;
@@ -45,8 +49,10 @@
  *
  * @since  3.2
  */
-class ApplicationModel extends FormModel
+class ApplicationModel extends FormModel implements MailerFactoryAwareInterface
 {
+    use MailerFactoryAwareTrait;
+
     /**
      * Array of protected password fields from the configuration.php
      *
@@ -740,7 +746,9 @@ public function save($data)
         // Clear cache of com_config component.
         $this->cleanCache('_system');
 
-        $result = $app->triggerEvent('onApplicationBeforeSave', [$config]);
+        $dispatcher  = $this->getDispatcher();
+        $eventBefore = new BeforeSaveConfigurationEvent('onApplicationBeforeSave', ['subject' => $config]);
+        $result      = $dispatcher->dispatch('onApplicationBeforeSave', $eventBefore)->getArgument('result', []);
 
         // Store the data.
         if (in_array(false, $result, true)) {
@@ -751,7 +759,10 @@ public function save($data)
         $result = $this->writeConfigFile($config);
 
         // Trigger the after save event.
-        $app->triggerEvent('onApplicationAfterSave', [$config]);
+        $this->getDispatcher()->dispatch('onApplicationAfterSave', new AfterSaveConfigurationEvent(
+            'onApplicationAfterSave',
+            ['subject' => $config]
+        ));
 
         return $result;
     }
@@ -778,7 +789,9 @@ public function removeroot()
         unset($prev['root_user']);
         $config = new Registry($prev);
 
-        $result = $app->triggerEvent('onApplicationBeforeSave', [$config]);
+        $dispatcher  = $this->getDispatcher();
+        $eventBefore = new BeforeSaveConfigurationEvent('onApplicationBeforeSave', ['subject' => $config]);
+        $result      = $dispatcher->dispatch('onApplicationBeforeSave', $eventBefore)->getArgument('result', []);
 
         // Store the data.
         if (in_array(false, $result, true)) {
@@ -789,7 +802,10 @@ public function removeroot()
         $result = $this->writeConfigFile($config);
 
         // Trigger the after save event.
-        $app->triggerEvent('onApplicationAfterSave', [$config]);
+        $this->getDispatcher()->dispatch('onApplicationAfterSave', new AfterSaveConfigurationEvent(
+            'onApplicationAfterSave',
+            ['subject' => $config]
+        ));
 
         return $result;
     }
@@ -1178,22 +1194,23 @@ public function sendTestMail()
         $input    = $app->getInput()->json;
         $smtppass = $input->get('smtppass', null, 'RAW');
 
-        $app->set('smtpauth', $input->get('smtpauth'));
-        $app->set('smtpuser', $input->get('smtpuser', '', 'STRING'));
-        $app->set('smtphost', $input->get('smtphost'));
-        $app->set('smtpsecure', $input->get('smtpsecure'));
-        $app->set('smtpport', $input->get('smtpport'));
-        $app->set('mailfrom', $input->get('mailfrom', '', 'STRING'));
-        $app->set('fromname', $input->get('fromname', '', 'STRING'));
-        $app->set('mailer', $input->get('mailer'));
-        $app->set('mailonline', $input->get('mailonline'));
+        $config = new Registry();
+        $config->set('smtpauth', $input->get('smtpauth'));
+        $config->set('smtpuser', $input->get('smtpuser', '', 'STRING'));
+        $config->set('smtphost', $input->get('smtphost'));
+        $config->set('smtpsecure', $input->get('smtpsecure'));
+        $config->set('smtpport', $input->get('smtpport'));
+        $config->set('mailfrom', $input->get('mailfrom', '', 'STRING'));
+        $config->set('fromname', $input->get('fromname', '', 'STRING'));
+        $config->set('mailer', $input->get('mailer'));
+        $config->set('mailonline', $input->get('mailonline'));
 
         // Use smtppass only if it was submitted
         if ($smtppass !== null) {
-            $app->set('smtppass', $smtppass);
+            $config->set('smtppass', $smtppass);
         }
 
-        $mail = Factory::getMailer();
+        $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);
diff --git a/administrator/components/com_config/src/Model/ComponentModel.php b/administrator/components/com_config/src/Model/ComponentModel.php
index 372c6e9f03b73..d7883279e719b 100644
--- a/administrator/components/com_config/src/Model/ComponentModel.php
+++ b/administrator/components/com_config/src/Model/ComponentModel.php
@@ -14,12 +14,12 @@
 use Joomla\CMS\Access\Rules;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 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\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
diff --git a/administrator/components/com_config/src/View/Application/HtmlView.php b/administrator/components/com_config/src/View/Application/HtmlView.php
index eacd5f6c44e82..06736734f79dc 100644
--- a/administrator/components/com_config/src/View/Application/HtmlView.php
+++ b/administrator/components/com_config/src/View/Application/HtmlView.php
@@ -32,7 +32,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var    \Joomla\CMS\Object\CMSObject
+     * @var   \Joomla\Registry\Registry
      * @since  3.2
      */
     public $state;
diff --git a/administrator/components/com_config/src/View/Component/HtmlView.php b/administrator/components/com_config/src/View/Component/HtmlView.php
index 34f8273bc457a..dae93fc6f6f16 100644
--- a/administrator/components/com_config/src/View/Component/HtmlView.php
+++ b/administrator/components/com_config/src/View/Component/HtmlView.php
@@ -31,7 +31,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var    \Joomla\CMS\Object\CMSObject
+     * @var   \Joomla\Registry\Registry
      * @since  3.2
      */
     public $state;
diff --git a/administrator/components/com_contact/forms/category.xml b/administrator/components/com_contact/forms/category.xml
index 6c6269f721990..c5cad25870d81 100644
--- a/administrator/components/com_contact/forms/category.xml
+++ b/administrator/components/com_contact/forms/category.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form>
-	<help key="Contacts:_New_or_Edit_Category" />
+	<help key="Contacts:_Edit_Category" />
 	<listhelp key="Contacts:_Categories" />
 </form>
diff --git a/administrator/components/com_contact/forms/contact.xml b/administrator/components/com_contact/forms/contact.xml
index 5e69029ead69c..f2cb191bc78c6 100644
--- a/administrator/components/com_contact/forms/contact.xml
+++ b/administrator/components/com_contact/forms/contact.xml
@@ -76,7 +76,7 @@
 			name="misc"
 			type="editor"
 			label="COM_CONTACT_FIELD_INFORMATION_MISC_LABEL"
-			filter="JComponentHelper::filterText"
+			filter="\Joomla\CMS\Component\ComponentHelper::filterText"
 			buttons="true"
 			hide="readmore,pagebreak"
 		/>
diff --git a/administrator/components/com_contact/forms/filter_contacts.xml b/administrator/components/com_contact/forms/filter_contacts.xml
index 614589dde237c..b47a392d13dfb 100644
--- a/administrator/components/com_contact/forms/filter_contacts.xml
+++ b/administrator/components/com_contact/forms/filter_contacts.xml
@@ -107,8 +107,8 @@
 			<option value="a.featured DESC">JFEATURED_DESC</option>
 			<option value="a.published ASC">JSTATUS_ASC</option>
 			<option value="a.published DESC">JSTATUS_DESC</option>
-			<option value="a.name ASC">JGLOBAL_TITLE_ASC</option>
-			<option value="a.name DESC">JGLOBAL_TITLE_DESC</option>
+			<option value="a.name ASC">JGLOBAL_NAME_ASC</option>
+			<option value="a.name DESC">JGLOBAL_NAME_DESC</option>
 			<option value="category_title ASC">JCATEGORY_ASC</option>
 			<option value="category_title DESC">JCATEGORY_DESC</option>
 			<option value="ul.name ASC">COM_CONTACT_FIELD_LINKED_USER_LABEL_ASC</option>
diff --git a/administrator/components/com_contact/src/Controller/DisplayController.php b/administrator/components/com_contact/src/Controller/DisplayController.php
index c48fca0e347ad..0b78a94eab855 100644
--- a/administrator/components/com_contact/src/Controller/DisplayController.php
+++ b/administrator/components/com_contact/src/Controller/DisplayController.php
@@ -37,7 +37,8 @@ class DisplayController extends BaseController
      * Method to display a view.
      *
      * @param   boolean  $cachable   If true, the view output will be cached
-     * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link \JFilterInput::clean()}.
+     * @param   array    $urlparams  An array of safe URL parameters and their variable types.
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  static |boolean  This object to support chaining. False on failure.
      *
diff --git a/administrator/components/com_contact/src/Extension/ContactComponent.php b/administrator/components/com_contact/src/Extension/ContactComponent.php
index 303ad03e9e254..d1886bc435e16 100644
--- a/administrator/components/com_contact/src/Extension/ContactComponent.php
+++ b/administrator/components/com_contact/src/Extension/ContactComponent.php
@@ -23,6 +23,8 @@
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\HTML\HTMLRegistryAwareTrait;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\Schemaorg\SchemaorgServiceInterface;
+use Joomla\CMS\Schemaorg\SchemaorgServiceTrait;
 use Joomla\CMS\Tag\TagServiceInterface;
 use Joomla\CMS\Tag\TagServiceTrait;
 use Joomla\CMS\User\UserFactoryInterface;
@@ -31,7 +33,7 @@
 use Psr\Container\ContainerInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -43,6 +45,7 @@ class ContactComponent extends MVCComponent implements
     BootableExtensionInterface,
     CategoryServiceInterface,
     FieldsServiceInterface,
+    SchemaorgServiceInterface,
     AssociationServiceInterface,
     RouterServiceInterface,
     TagServiceInterface
@@ -50,6 +53,7 @@ class ContactComponent extends MVCComponent implements
     use AssociationServiceTrait;
     use HTMLRegistryAwareTrait;
     use RouterServiceTrait;
+    use SchemaorgServiceTrait;
     use CategoryServiceTrait, TagServiceTrait {
         CategoryServiceTrait::getTableNameForSection insteadof TagServiceTrait;
         CategoryServiceTrait::getStateColumnForSection insteadof TagServiceTrait;
@@ -152,4 +156,22 @@ protected function getStateColumnForSection(string $section = null)
     {
         return 'published';
     }
+
+    /**
+     * Returns valid contexts for schemaorg
+     *
+     * @return  array
+     *
+     * @since  5.0.0
+     */
+    public function getSchemaorgContexts(): array
+    {
+        Factory::getLanguage()->load('com_content', JPATH_ADMINISTRATOR);
+
+        $contexts = [
+            'com_contact.contact' => Text::_('COM_CONTACT'),
+        ];
+
+        return $contexts;
+    }
 }
diff --git a/administrator/components/com_contact/src/Model/ContactsModel.php b/administrator/components/com_contact/src/Model/ContactsModel.php
index 090a9d19ade07..ebe1c11de94bb 100644
--- a/administrator/components/com_contact/src/Model/ContactsModel.php
+++ b/administrator/components/com_contact/src/Model/ContactsModel.php
@@ -323,7 +323,7 @@ protected function getListQuery()
         // Case: Using both categories filter and by level filter
         if (count($categoryId)) {
             $categoryId       = ArrayHelper::toInteger($categoryId);
-            $categoryTable    = Table::getInstance('Category', 'JTable');
+            $categoryTable    = Table::getInstance('Category', '\\Joomla\\CMS\\Table\\');
             $subCatItemsWhere = [];
 
             // @todo: Convert to prepared statement
diff --git a/administrator/components/com_contact/src/Service/HTML/Icon.php b/administrator/components/com_contact/src/Service/HTML/Icon.php
index 5de1515d4e779..69dde75f5f3f5 100644
--- a/administrator/components/com_contact/src/Service/HTML/Icon.php
+++ b/administrator/components/com_contact/src/Service/HTML/Icon.php
@@ -16,6 +16,7 @@
 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\Component\Contact\Site\Helper\RouteHelper;
 use Joomla\Registry\Registry;
@@ -31,14 +32,7 @@
  */
 class Icon
 {
-    /**
-     * The user factory
-     *
-     * @var    UserFactoryInterface
-     *
-     * @since  4.2.0
-     */
-    private $userFactory;
+    use UserFactoryAwareTrait;
 
     /**
      * Service constructor
@@ -49,7 +43,7 @@ class Icon
      */
     public function __construct(UserFactoryInterface $userFactory)
     {
-        $this->userFactory = $userFactory;
+        $this->setUserFactory($userFactory);
     }
 
     /**
@@ -126,7 +120,7 @@ public function edit($contact, $params, $attribs = [], $legacy = false)
             && !is_null($contact->checked_out)
             && $contact->checked_out !== $user->get('id')
         ) {
-            $checkoutUser = $this->userFactory->loadUserById($contact->checked_out);
+            $checkoutUser = $this->getUserFactory()->loadUserById($contact->checked_out);
             $date         = HTMLHelper::_('date', $contact->checked_out_time);
             $tooltip      = Text::sprintf('COM_CONTACT_CHECKED_OUT_BY', $checkoutUser->name)
                 . ' <br> ' . $date;
diff --git a/administrator/components/com_contact/src/Table/ContactTable.php b/administrator/components/com_contact/src/Table/ContactTable.php
index 78bb773421246..a4a020113e844 100644
--- a/administrator/components/com_contact/src/Table/ContactTable.php
+++ b/administrator/components/com_contact/src/Table/ContactTable.php
@@ -18,6 +18,8 @@
 use Joomla\CMS\Table\Table;
 use Joomla\CMS\Tag\TaggableTableInterface;
 use Joomla\CMS\Tag\TaggableTableTrait;
+use Joomla\CMS\User\CurrentUserInterface;
+use Joomla\CMS\User\CurrentUserTrait;
 use Joomla\CMS\Versioning\VersionableTableInterface;
 use Joomla\Database\DatabaseDriver;
 use Joomla\String\StringHelper;
@@ -31,9 +33,10 @@
  *
  * @since  1.0
  */
-class ContactTable extends Table implements VersionableTableInterface, TaggableTableInterface
+class ContactTable extends Table implements VersionableTableInterface, TaggableTableInterface, CurrentUserInterface
 {
     use TaggableTableTrait;
+    use CurrentUserTrait;
 
     /**
      * Indicates that columns fully support the NULL value in the database
@@ -79,7 +82,7 @@ public function __construct(DatabaseDriver $db)
     public function store($updateNulls = true)
     {
         $date   = Factory::getDate()->toSql();
-        $userId = Factory::getUser()->id;
+        $userId = $this->getCurrentUser()->id;
 
         // Set created date if not set.
         if (!(int) $this->created) {
@@ -137,7 +140,7 @@ public function store($updateNulls = true)
      *
      * @return  boolean  True on success, false on failure
      *
-     * @see     \JTable::check
+     * @see     \Joomla\CMS\Table\Table::check
      * @since   1.5
      */
     public function check()
diff --git a/administrator/components/com_contact/src/View/Contact/HtmlView.php b/administrator/components/com_contact/src/View/Contact/HtmlView.php
index 137683bd4bdb9..9c26bc000c449 100644
--- a/administrator/components/com_contact/src/View/Contact/HtmlView.php
+++ b/administrator/components/com_contact/src/View/Contact/HtmlView.php
@@ -48,7 +48,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var  \Joomla\CMS\Object\CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $state;
 
@@ -84,7 +84,9 @@ public function display($tpl = null)
             $this->form->setFieldAttribute('tags', 'language', '*,' . $forcedLanguage);
         }
 
-        $this->addToolbar();
+        if ($this->getLayout() !== 'modal') {
+            $this->addToolbar();
+        }
 
         parent::display($tpl);
     }
@@ -182,6 +184,6 @@ function (Toolbar $childBar) use ($checkedOut, $itemEditable, $canDo, $user) {
         }
 
         $toolbar->divider();
-        $toolbar->help('Contacts:_New_or_Edit');
+        $toolbar->help('Contacts:_Edit');
     }
 }
diff --git a/administrator/components/com_contact/src/View/Contacts/HtmlView.php b/administrator/components/com_contact/src/View/Contacts/HtmlView.php
index 244d95ab3bdd7..6d46155b55aed 100644
--- a/administrator/components/com_contact/src/View/Contacts/HtmlView.php
+++ b/administrator/components/com_contact/src/View/Contacts/HtmlView.php
@@ -48,7 +48,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var  \Joomla\CMS\Object\CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $state;
 
@@ -144,7 +144,7 @@ public function display($tpl = null)
     protected function addToolbar()
     {
         $canDo = ContentHelper::getActions('com_contact', 'category', $this->state->get('filter.category_id'));
-        $user  = Factory::getApplication()->getIdentity();
+        $user  = $this->getCurrentUser();
 
         // Get the toolbar object instance
         $toolbar = Toolbar::getInstance();
diff --git a/administrator/components/com_contact/tmpl/contacts/default.php b/administrator/components/com_contact/tmpl/contacts/default.php
index 849ddc6e34551..c3a5ba73f1ebd 100644
--- a/administrator/components/com_contact/tmpl/contacts/default.php
+++ b/administrator/components/com_contact/tmpl/contacts/default.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Associations;
 use Joomla\CMS\Language\Multilanguage;
@@ -24,7 +23,7 @@
 $wa->useScript('table.columns')
     ->useScript('multiselect');
 
-$user      = Factory::getUser();
+$user      = $this->getCurrentUser();
 $userId    = $user->get('id');
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
@@ -68,7 +67,7 @@
                                     <?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
                                 </th>
                                 <th scope="col">
-                                    <?php echo HTMLHelper::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.name', $listDirn, $listOrder); ?>
+                                    <?php echo HTMLHelper::_('searchtools.sort', 'COM_CONTACT_FIELD_NAME_LABEL', 'a.name', $listDirn, $listOrder); ?>
                                 </th>
                                 <th scope="col" class="w-10 d-none">
                                     <?php echo HTMLHelper::_('searchtools.sort', 'COM_CONTACT_FIELD_LINKED_USER_LABEL', 'ul.name', $listDirn, $listOrder); ?>
diff --git a/administrator/components/com_contact/tmpl/contacts/default_batch_body.php b/administrator/components/com_contact/tmpl/contacts/default_batch_body.php
index 101087e40c57d..b62c65b9bdc7c 100644
--- a/administrator/components/com_contact/tmpl/contacts/default_batch_body.php
+++ b/administrator/components/com_contact/tmpl/contacts/default_batch_body.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Layout\LayoutHelper;
 
-$published = $this->state->get('filter.published');
+$published = (int) $this->state->get('filter.published');
 $noUser    = true;
 ?>
 
diff --git a/administrator/components/com_contact/tmpl/contacts/emptystate.php b/administrator/components/com_contact/tmpl/contacts/emptystate.php
index 5cfb9038c043d..11a3bb866b8e0 100644
--- a/administrator/components/com_contact/tmpl/contacts/emptystate.php
+++ b/administrator/components/com_contact/tmpl/contacts/emptystate.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Layout\LayoutHelper;
 
 $displayData = [
@@ -20,7 +19,7 @@
     'icon'       => 'icon-address-book contact',
 ];
 
-$user = Factory::getApplication()->getIdentity();
+$user = $this->getCurrentUser();
 
 if ($user->authorise('core.create', 'com_contact') || count($user->getAuthorisedCategories('com_contact', 'core.create')) > 0) {
     $displayData['createURL'] = 'index.php?option=com_contact&task=contact.add';
diff --git a/administrator/components/com_content/config.xml b/administrator/components/com_content/config.xml
index d36173adf743c..c037c6e9de367 100644
--- a/administrator/components/com_content/config.xml
+++ b/administrator/components/com_content/config.xml
@@ -261,6 +261,8 @@
 			type="number"
 			label="JGLOBAL_SHOW_READMORE_LIMIT_LABEL"
 			filter="integer"
+			validate="number"
+			min="0"
 			default="100"
 			showon="show_readmore:1[AND]show_readmore_title:1"
 		/>
@@ -416,6 +418,8 @@
 			type="number"
 			label="JGLOBAL_HISTORY_LIMIT_OPTIONS_LABEL"
 			filter="integer"
+			validate="number"
+			min="0"
 			default="10"
 			showon="save_history:1"
 		/>
@@ -505,6 +509,7 @@
 			name="float_intro"
 			type="text"
 			label="COM_CONTENT_IMAGE_INTRO_CLASS_LABEL"
+			validate="CssIdentifier"
 			showon="show_urls_images_backend:1[OR]show_urls_images_frontend:1"
 		/>
 
@@ -512,6 +517,7 @@
 			name="float_fulltext"
 			type="text"
 			label="COM_CONTENT_IMAGE_FULLTEXT_CLASS_LABEL"
+			validate="CssIdentifier"
 			showon="show_urls_images_backend:1[OR]show_urls_images_frontend:1"
 		/>
 	</fieldset>
@@ -723,6 +729,8 @@
 			type="number"
 			label="JGLOBAL_NUM_LEADING_ARTICLES_LABEL"
 			filter="integer"
+			validate="number"
+			min="0"
 			default="1"
 		/>
 
@@ -738,6 +746,8 @@
 			type="number"
 			label="JGLOBAL_NUM_INTRO_ARTICLES_LABEL"
 			filter="integer"
+			validate="number"
+			min="0"
 			default="4"
 		/>
 
@@ -754,6 +764,8 @@
 			type="number"
 			label="JGLOBAL_NUM_COLUMNS_LABEL"
 			filter="integer"
+			validate="number"
+			min="0"
 			default="1"
 		/>
 
@@ -773,6 +785,8 @@
 			type="number"
 			label="JGLOBAL_NUM_LINKS_LABEL"
 			filter="integer"
+			validate="number"
+			min="0"
 			default="4"
 		/>
 
diff --git a/administrator/components/com_content/forms/article.xml b/administrator/components/com_content/forms/article.xml
index b7755b67aa1b7..9e6751c2cfc38 100644
--- a/administrator/components/com_content/forms/article.xml
+++ b/administrator/components/com_content/forms/article.xml
@@ -53,7 +53,7 @@
 			name="articletext"
 			type="editor"
 			label="COM_CONTENT_FIELD_ARTICLETEXT_LABEL"
-			filter="JComponentHelper::filterText"
+			filter="\Joomla\CMS\Component\ComponentHelper::filterText"
 			buttons="true"
 		/>
 
@@ -744,6 +744,7 @@
 				label="COM_CONTENT_FIELD_IMAGE_CLASS_LABEL"
 				description="COM_CONTENT_FIELD_IMAGE_CLASS_DESC"
 				useglobal="true"
+				validate="CssIdentifier"
 			/>
 
 			<field
@@ -780,6 +781,7 @@
 				label="COM_CONTENT_FIELD_IMAGE_CLASS_LABEL"
 				description="COM_CONTENT_FIELD_IMAGE_CLASS_DESC"
 				useglobal="true"
+				validate="CssIdentifier"
 			/>
 
 			<field
@@ -927,13 +929,13 @@
 		<field
 			name="introtext"
 			label="COM_CONTENT_FIELD_INTROTEXT"
-			filter="JComponentHelper::filterText"
+			filter="\Joomla\CMS\Component\ComponentHelper::filterText"
 		/>
 
 		<field
 			name="fulltext"
 			label="COM_CONTENT_FIELD_FULLTEXT"
-			filter="JComponentHelper::filterText"
+			filter="\Joomla\CMS\Component\ComponentHelper::filterText"
 		/>
 	</fields>
 
diff --git a/administrator/components/com_content/forms/category.xml b/administrator/components/com_content/forms/category.xml
index 4f477f26e369c..6afd24909a51d 100644
--- a/administrator/components/com_content/forms/category.xml
+++ b/administrator/components/com_content/forms/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form>
-	<help key="Articles:_New_or_Edit_Category" />
+	<help key="Articles:_Edit_Category" />
 	<listhelp key="Articles:_Categories" />
 	<fields name="params" addfieldprefix="Joomla\Component\Content\Administrator\Field">
 		<fieldset name="workflow" label="COM_CONTENT_WORKFLOW">
diff --git a/administrator/components/com_content/forms/filter_featured.xml b/administrator/components/com_content/forms/filter_featured.xml
index 61b0090510c7e..2ca56d5d7f2b6 100644
--- a/administrator/components/com_content/forms/filter_featured.xml
+++ b/administrator/components/com_content/forms/filter_featured.xml
@@ -16,7 +16,7 @@
 			label="JOPTION_SELECT_STAGE"
 			class="js-select-submit-on-change"
 			activeonly="true"
-			extension="com_content"
+			extension="com_content.article"
 			>
 			<option value="">JOPTION_SELECT_STAGE</option>
 		</field>
diff --git a/administrator/components/com_content/layouts/joomla/form/field/modal-select/extra-buttons.php b/administrator/components/com_content/layouts/joomla/form/field/modal-select/extra-buttons.php
new file mode 100644
index 0000000000000..8c5a1aec048c6
--- /dev/null
+++ b/administrator/components/com_content/layouts/joomla/form/field/modal-select/extra-buttons.php
@@ -0,0 +1,83 @@
+<?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\Language\Text;
+
+extract($displayData);
+
+/**
+ * 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  $repeat          Allows extensions to duplicate elements.
+ * @var   boolean  $required        Is this field required?
+ * @var   integer  $size            Size attribute of the input.
+ * @var   boolean  $spellcheck      Spellcheck state for the form field.
+ * @var   string   $validate        Validation rules to apply.
+ * @var   string   $value           Value attribute of the field.
+ * @var   string   $dataAttribute   Miscellaneous data attributes preprocessed for HTML output
+ * @var   array    $dataAttributes  Miscellaneous data attribute for eg, data-*
+ * @var   string   $valueTitle
+ * @var   array    $canDo
+ * @var   string[] $urls
+ * @var   string[] $modalTitles
+ * @var   string   $language
+ */
+
+// Do nothing when propagate is disabled
+if (empty($canDo['propagate'])) {
+    return;
+}
+
+// Scripts for backward compatibility
+/** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = Factory::getApplication()->getDocument()->getWebAssetManager();
+$wa->useScript('field.modal-fields');
+$wa->addInlineScript(
+    'window.jSelectArticle_' . $id . ' = function (id, title, catid, object, url, language) {
+  window.processModalSelect("Article", "' . $id . '", id, title, catid, object, url, language);
+}',
+    ['name' => 'inline.select_article_' . $id],
+    ['type' => 'module']
+);
+Text::script('JGLOBAL_ASSOCIATIONS_PROPAGATE_FAILED');
+
+// Language propagate callback name
+// Strip off language tag at the end
+$tagLength            = strlen($language);
+$callbackFunctionStem = substr("jSelectArticle_" . $id, 0, -$tagLength);
+
+?>
+
+<button type="button" class="btn btn-primary" <?php echo $value ? '' : 'hidden'; ?>
+        title="<?php echo $this->escape(Text::_('JGLOBAL_ASSOCIATIONS_PROPAGATE_TIP')); ?>"
+        data-show-when-value="1"
+        onclick="Joomla.propagateAssociation('<?php echo $id; ?>', '<?php echo $callbackFunctionStem; ?>')">
+    <span class="icon-sync" aria-hidden="true"></span> <?php echo Text::_('JGLOBAL_ASSOCIATIONS_PROPAGATE_BUTTON'); ?>
+</button>
diff --git a/administrator/components/com_content/src/Controller/AjaxController.php b/administrator/components/com_content/src/Controller/AjaxController.php
index c25348c6aaeac..d0dfb28595784 100644
--- a/administrator/components/com_content/src/Controller/AjaxController.php
+++ b/administrator/components/com_content/src/Controller/AjaxController.php
@@ -61,7 +61,7 @@ public function fetchAssociations()
             unset($associations[$excludeLang]);
 
             // Add the title to each of the associated records
-            $contentTable = Table::getInstance('Content', 'JTable');
+            $contentTable = Table::getInstance('Content', '\\Joomla\\CMS\\Table\\');
 
             foreach ($associations as $lang => $association) {
                 $contentTable->load($association->id);
diff --git a/administrator/components/com_content/src/Controller/ArticleController.php b/administrator/components/com_content/src/Controller/ArticleController.php
index 32d8b6df8c440..daa09753076b5 100644
--- a/administrator/components/com_content/src/Controller/ArticleController.php
+++ b/administrator/components/com_content/src/Controller/ArticleController.php
@@ -56,6 +56,31 @@ public function __construct($config = [], MVCFactoryInterface $factory = null, $
         }
     }
 
+    /**
+     * 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   __DEPLOY_VERSION__
+     */
+    public function cancel($key = null)
+    {
+        $result = parent::cancel($key);
+
+        // When editing in modal then redirect to modalreturn layout
+        if ($result && $this->input->get('layout') === 'modal') {
+            $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;
+    }
+
     /**
      * Function that allows child controller access to model data
      * after the data has been saved.
@@ -90,6 +115,13 @@ protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
             ]);
 
             $this->setRedirect(Route::_('index.php?option=com_menus&view=item&client_id=0&menutype=mainmenu&layout=edit', false));
+        } elseif ($this->input->get('layout') === 'modal' && $this->task === 'save') {
+            // When editing in modal then redirect to modalreturn layout
+            $id     = $model->getState('article.id', '');
+            $return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+                . '&layout=modalreturn&from-task=save';
+
+            $this->setRedirect(Route::_($return, false));
         }
     }
 
diff --git a/administrator/components/com_content/src/Controller/DisplayController.php b/administrator/components/com_content/src/Controller/DisplayController.php
index 16da045d15e8b..158c8f3a17ce3 100644
--- a/administrator/components/com_content/src/Controller/DisplayController.php
+++ b/administrator/components/com_content/src/Controller/DisplayController.php
@@ -37,7 +37,8 @@ class DisplayController extends BaseController
      * Method to display a view.
      *
      * @param   boolean  $cachable   If true, the view output will be cached
-     * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+     * @param   array    $urlparams  An array of safe URL parameters and their variable types.
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  BaseController|boolean  This object to support chaining.
      *
diff --git a/administrator/components/com_content/src/Event/Model/FeatureEvent.php b/administrator/components/com_content/src/Event/Model/FeatureEvent.php
index ca435ace28424..5bd57f193b57a 100644
--- a/administrator/components/com_content/src/Event/Model/FeatureEvent.php
+++ b/administrator/components/com_content/src/Event/Model/FeatureEvent.php
@@ -4,16 +4,15 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\Component\Content\Administrator\Event\Model;
 
-use BadMethodCallException;
 use Joomla\CMS\Event\AbstractImmutableEvent;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -29,22 +28,22 @@ class FeatureEvent extends AbstractImmutableEvent
      * @param   string  $name       The event name.
      * @param   array   $arguments  The event arguments.
      *
-     * @throws  BadMethodCallException
+     * @throws  \BadMethodCallException
      *
      * @since   4.0.0
      */
     public function __construct($name, array $arguments = [])
     {
         if (!isset($arguments['extension'])) {
-            throw new BadMethodCallException("Argument 'extension' of event $this->name is required but has not been provided");
+            throw new \BadMethodCallException("Argument 'extension' of event $this->name is required but has not been provided");
         }
 
         if (!isset($arguments['extension']) || !is_string($arguments['extension'])) {
-            throw new BadMethodCallException("Argument 'extension' of event $this->name is not of type 'string'");
+            throw new \BadMethodCallException("Argument 'extension' of event $this->name is not of type 'string'");
         }
 
         if (strpos($arguments['extension'], '.') === false) {
-            throw new BadMethodCallException("Argument 'extension' of event $this->name has wrong format. Valid format: 'component.section'");
+            throw new \BadMethodCallException("Argument 'extension' of event $this->name has wrong format. Valid format: 'component.section'");
         }
 
         if (!\array_key_exists('extensionName', $arguments) || !\array_key_exists('section', $arguments)) {
@@ -55,17 +54,17 @@ public function __construct($name, array $arguments = [])
         }
 
         if (!isset($arguments['pks']) || !is_array($arguments['pks'])) {
-            throw new BadMethodCallException("Argument 'pks' of event $this->name is not of type 'array'");
+            throw new \BadMethodCallException("Argument 'pks' of event $this->name is not of type 'array'");
         }
 
         if (!isset($arguments['value']) || !is_numeric($arguments['value'])) {
-            throw new BadMethodCallException("Argument 'value' of event $this->name is not of type 'numeric'");
+            throw new \BadMethodCallException("Argument 'value' of event $this->name is not of type 'numeric'");
         }
 
         $arguments['value'] = (int) $arguments['value'];
 
         if ($arguments['value'] !== 0 && $arguments['value'] !== 1) {
-            throw new BadMethodCallException("Argument 'value' of event $this->name is not 0 or 1");
+            throw new \BadMethodCallException("Argument 'value' of event $this->name is not 0 or 1");
         }
 
         parent::__construct($name, $arguments);
diff --git a/administrator/components/com_content/src/Extension/ContentComponent.php b/administrator/components/com_content/src/Extension/ContentComponent.php
index 824ae7487fed6..193a1c9270a6a 100644
--- a/administrator/components/com_content/src/Extension/ContentComponent.php
+++ b/administrator/components/com_content/src/Extension/ContentComponent.php
@@ -24,6 +24,8 @@
 use Joomla\CMS\Helper\ContentHelper as LibraryContentHelper;
 use Joomla\CMS\HTML\HTMLRegistryAwareTrait;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\Schemaorg\SchemaorgServiceInterface;
+use Joomla\CMS\Schemaorg\SchemaorgServiceTrait;
 use Joomla\CMS\Tag\TagServiceInterface;
 use Joomla\CMS\Tag\TagServiceTrait;
 use Joomla\CMS\Workflow\WorkflowServiceInterface;
@@ -34,7 +36,7 @@
 use Psr\Container\ContainerInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -47,6 +49,7 @@ class ContentComponent extends MVCComponent implements
     CategoryServiceInterface,
     FieldsServiceInterface,
     AssociationServiceInterface,
+    SchemaorgServiceInterface,
     WorkflowServiceInterface,
     RouterServiceInterface,
     TagServiceInterface
@@ -55,6 +58,7 @@ class ContentComponent extends MVCComponent implements
     use RouterServiceTrait;
     use HTMLRegistryAwareTrait;
     use WorkflowServiceTrait;
+    use SchemaorgServiceTrait;
     use CategoryServiceTrait, TagServiceTrait {
         CategoryServiceTrait::getTableNameForSection insteadof TagServiceTrait;
         CategoryServiceTrait::getStateColumnForSection insteadof TagServiceTrait;
@@ -180,6 +184,24 @@ public function getContexts(): array
         return $contexts;
     }
 
+    /**
+     * Returns valid contexts for schemaorg
+     *
+     * @return  array
+     *
+     * @since  5.0.0
+     */
+    public function getSchemaorgContexts(): array
+    {
+        Factory::getLanguage()->load('com_content', JPATH_ADMINISTRATOR);
+
+        $contexts = [
+            'com_content.article' => Text::_('COM_CONTENT'),
+        ];
+
+        return $contexts;
+    }
+
     /**
      * Returns valid contexts
      *
diff --git a/administrator/components/com_content/src/Field/Modal/ArticleField.php b/administrator/components/com_content/src/Field/Modal/ArticleField.php
index 51dd6eee61a67..be19fc6e2e660 100644
--- a/administrator/components/com_content/src/Field/Modal/ArticleField.php
+++ b/administrator/components/com_content/src/Field/Modal/ArticleField.php
@@ -11,11 +11,12 @@
 namespace Joomla\Component\Content\Administrator\Field\Modal;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Form\FormField;
-use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Form\Field\ModalSelectField;
 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
@@ -27,7 +28,7 @@
  *
  * @since  1.6
  */
-class ArticleField extends FormField
+class ArticleField extends ModalSelectField
 {
     /**
      * The form field type.
@@ -38,266 +39,145 @@ class ArticleField extends FormField
     protected $type = 'Modal_Article';
 
     /**
-     * Method to get the field input markup.
+     * Method to attach a Form object to the field.
      *
-     * @return  string  The field input markup.
+     * @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.
      *
-     * @since   1.6
+     * @return  boolean  True on success.
+     *
+     * @see     FormField::setup()
+     * @since   __DEPLOY_VERSION__
      */
-    protected function getInput()
+    public function setup(\SimpleXMLElement $element, $value, $group = null)
     {
-        $allowNew       = ((string) $this->element['new'] == 'true');
-        $allowEdit      = ((string) $this->element['edit'] == 'true');
-        $allowClear     = ((string) $this->element['clear'] != 'false');
-        $allowSelect    = ((string) $this->element['select'] != 'false');
-        $allowPropagate = ((string) $this->element['propagate'] == 'true');
-
-        $languages = LanguageHelper::getContentLanguages([0, 1], false);
-
-        // Load language
-        Factory::getLanguage()->load('com_content', JPATH_ADMINISTRATOR);
-
-        // The active article id field.
-        $value = (int) $this->value ?: '';
-
-        // Create the modal id.
-        $modalId = 'Article_' . $this->id;
-
-        /** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
-        $wa = Factory::getApplication()->getDocument()->getWebAssetManager();
+        $result = parent::setup($element, $value, $group);
 
-        // Add the modal field script to the document head.
-        $wa->useScript('field.modal-fields');
+        if (!$result) {
+            return $result;
+        }
 
-        // Script to proxy the select modal function to the modal-fields.js file.
-        if ($allowSelect) {
-            static $scriptSelect = null;
+        Factory::getApplication()->getLanguage()->load('com_content', JPATH_ADMINISTRATOR);
 
-            if (is_null($scriptSelect)) {
-                $scriptSelect = [];
-            }
+        $languages = LanguageHelper::getContentLanguages([0, 1], false);
+        $language  = (string) $this->element['language'];
+
+        // Prepare enabled actions
+        $this->canDo['propagate']  = ((string) $this->element['propagate'] == 'true') && count($languages) > 2;
+
+        // Prepare Urls
+        $linkArticles = (new Uri())->setPath(Uri::base(true) . '/index.php');
+        $linkArticles->setQuery([
+            'option'                => 'com_content',
+            'view'                  => 'articles',
+            'layout'                => 'modal',
+            'tmpl'                  => 'component',
+            Session::getFormToken() => 1,
+        ]);
+        $linkArticle = clone $linkArticles;
+        $linkArticle->setVar('view', 'article');
+        $linkCheckin = (new Uri())->setPath(Uri::base(true) . '/index.php');
+        $linkCheckin->setQuery([
+            'option'                => 'com_content',
+            'task'                  => 'articles.checkin',
+            'format'                => 'json',
+            Session::getFormToken() => 1,
+        ]);
+
+        if ($language) {
+            $linkArticles->setVar('forcedLanguage', $language);
+            $linkArticle->setVar('forcedLanguage', $language);
+
+            $modalTitle = Text::_('COM_CONTENT_SELECT_AN_ARTICLE') . ' &#8212; ' . $this->getTitle();
+
+            $this->dataAttributes['data-language'] = $language;
+        } else {
+            $modalTitle = Text::_('COM_CONTENT_SELECT_AN_ARTICLE');
+        }
 
-            if (!isset($scriptSelect[$this->id])) {
-                $wa->addInlineScript(
-                    "
-				window.jSelectArticle_" . $this->id . " = function (id, title, catid, object, url, language) {
-					window.processModalSelect('Article', '" . $this->id . "', id, title, catid, object, url, language);
-				}",
-                    [],
-                    ['type' => 'module']
-                );
+        $urlSelect = $linkArticles;
+        $urlEdit   = clone $linkArticle;
+        $urlEdit->setVar('task', 'article.edit');
+        $urlNew    = clone $linkArticle;
+        $urlNew->setVar('task', 'article.add');
 
-                Text::script('JGLOBAL_ASSOCIATIONS_PROPAGATE_FAILED');
+        $this->urls['select']  = (string) $urlSelect;
+        $this->urls['new']     = (string) $urlNew;
+        $this->urls['edit']    = (string) $urlEdit;
+        $this->urls['checkin'] = (string) $linkCheckin;
 
-                $scriptSelect[$this->id] = true;
-            }
-        }
+        // Prepare titles
+        $this->modalTitles['select']  = $modalTitle;
+        $this->modalTitles['new']     = Text::_('COM_CONTENT_NEW_ARTICLE');
+        $this->modalTitles['edit']    = Text::_('COM_CONTENT_EDIT_ARTICLE');
 
-        // Setup variables for display.
-        $linkArticles = 'index.php?option=com_content&amp;view=articles&amp;layout=modal&amp;tmpl=component&amp;' . Session::getFormToken() . '=1';
-        $linkArticle  = 'index.php?option=com_content&amp;view=article&amp;layout=modal&amp;tmpl=component&amp;' . Session::getFormToken() . '=1';
+        $this->hint = $this->hint ?: Text::_('COM_CONTENT_SELECT_AN_ARTICLE');
 
-        if (isset($this->element['language'])) {
-            $linkArticles .= '&amp;forcedLanguage=' . $this->element['language'];
-            $linkArticle .= '&amp;forcedLanguage=' . $this->element['language'];
-            $modalTitle    = Text::_('COM_CONTENT_SELECT_AN_ARTICLE') . ' &#8212; ' . $this->element['label'];
-        } else {
-            $modalTitle    = Text::_('COM_CONTENT_SELECT_AN_ARTICLE');
-        }
+        return $result;
+    }
 
-        $urlSelect = $linkArticles . '&amp;function=jSelectArticle_' . $this->id;
-        $urlEdit   = $linkArticle . '&amp;task=article.edit&amp;id=\' + document.getElementById(&quot;' . $this->id . '_id&quot;).value + \'';
-        $urlNew    = $linkArticle . '&amp;task=article.add';
+    /**
+     * Method to retrieve the title of selected item.
+     *
+     * @return string
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    protected function getValueTitle()
+    {
+        $value = (int) $this->value ?: '';
+        $title = '';
 
         if ($value) {
-            $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
-                ->select($db->quoteName('title'))
-                ->from($db->quoteName('#__content'))
-                ->where($db->quoteName('id') . ' = :value')
-                ->bind(':value', $value, ParameterType::INTEGER);
-            $db->setQuery($query);
-
             try {
+                $db    = $this->getDatabase();
+                $query = $db->getQuery(true)
+                    ->select($db->quoteName('title'))
+                    ->from($db->quoteName('#__content'))
+                    ->where($db->quoteName('id') . ' = :value')
+                    ->bind(':value', $value, ParameterType::INTEGER);
+                $db->setQuery($query);
+
                 $title = $db->loadResult();
-            } catch (\RuntimeException $e) {
+            } catch (\Throwable $e) {
                 Factory::getApplication()->enqueueMessage($e->getMessage(), 'error');
             }
-            if (empty($title)) {
-                $value = '';
-            }
         }
 
-        $title = empty($title) ? Text::_('COM_CONTENT_SELECT_AN_ARTICLE') : htmlspecialchars($title, ENT_QUOTES, 'UTF-8');
-
-        // The current article display field.
-        $html  = '';
-
-        if ($allowSelect || $allowNew || $allowEdit || $allowClear) {
-            $html .= '<span class="input-group">';
-        }
-
-        $html .= '<input class="form-control" id="' . $this->id . '_name" type="text" value="' . $title . '" readonly size="35">';
-
-        // Select article button
-        if ($allowSelect) {
-            $html .= '<button'
-                . ' class="btn btn-primary' . ($value ? ' hidden' : '') . '"'
-                . ' id="' . $this->id . '_select"'
-                . ' data-bs-toggle="modal"'
-                . ' type="button"'
-                . ' data-bs-target="#ModalSelect' . $modalId . '">'
-                . '<span class="icon-file" aria-hidden="true"></span> ' . Text::_('JSELECT')
-                . '</button>';
-        }
-
-        // New article button
-        if ($allowNew) {
-            $html .= '<button'
-                . ' class="btn btn-secondary' . ($value ? ' hidden' : '') . '"'
-                . ' id="' . $this->id . '_new"'
-                . ' data-bs-toggle="modal"'
-                . ' type="button"'
-                . ' data-bs-target="#ModalNew' . $modalId . '">'
-                . '<span class="icon-plus" aria-hidden="true"></span> ' . Text::_('JACTION_CREATE')
-                . '</button>';
-        }
-
-        // Edit article button
-        if ($allowEdit) {
-            $html .= '<button'
-                . ' class="btn btn-primary' . ($value ? '' : ' hidden') . '"'
-                . ' id="' . $this->id . '_edit"'
-                . ' data-bs-toggle="modal"'
-                . ' type="button"'
-                . ' data-bs-target="#ModalEdit' . $modalId . '">'
-                . '<span class="icon-pen-square" aria-hidden="true"></span> ' . Text::_('JACTION_EDIT')
-                . '</button>';
-        }
-
-        // Clear article button
-        if ($allowClear) {
-            $html .= '<button'
-                . ' class="btn btn-secondary' . ($value ? '' : ' hidden') . '"'
-                . ' id="' . $this->id . '_clear"'
-                . ' type="button"'
-                . ' onclick="window.processModalParent(\'' . $this->id . '\'); return false;">'
-                . '<span class="icon-times" aria-hidden="true"></span> ' . Text::_('JCLEAR')
-                . '</button>';
-        }
-
-        // Propagate article button
-        if ($allowPropagate && count($languages) > 2) {
-            // Strip off language tag at the end
-            $tagLength            = (int) strlen($this->element['language']);
-            $callbackFunctionStem = substr("jSelectArticle_" . $this->id, 0, -$tagLength);
-
-            $html .= '<button'
-            . ' class="btn btn-primary' . ($value ? '' : ' hidden') . '"'
-            . ' type="button"'
-            . ' id="' . $this->id . '_propagate"'
-            . ' title="' . Text::_('JGLOBAL_ASSOCIATIONS_PROPAGATE_TIP') . '"'
-            . ' onclick="Joomla.propagateAssociation(\'' . $this->id . '\', \'' . $callbackFunctionStem . '\');">'
-            . '<span class="icon-sync" aria-hidden="true"></span> ' . Text::_('JGLOBAL_ASSOCIATIONS_PROPAGATE_BUTTON')
-            . '</button>';
-        }
-
-        if ($allowSelect || $allowNew || $allowEdit || $allowClear) {
-            $html .= '</span>';
-        }
-
-        // Select article modal
-        if ($allowSelect) {
-            $html .= HTMLHelper::_(
-                'bootstrap.renderModal',
-                'ModalSelect' . $modalId,
-                [
-                    'title'      => $modalTitle,
-                    'url'        => $urlSelect,
-                    'height'     => '400px',
-                    'width'      => '800px',
-                    'bodyHeight' => 70,
-                    'modalWidth' => 80,
-                    'footer'     => '<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">'
-                                        . Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>',
-                ]
-            );
-        }
-
-        // New article modal
-        if ($allowNew) {
-            $html .= HTMLHelper::_(
-                'bootstrap.renderModal',
-                'ModalNew' . $modalId,
-                [
-                    'title'       => Text::_('COM_CONTENT_NEW_ARTICLE'),
-                    'backdrop'    => 'static',
-                    'keyboard'    => false,
-                    'closeButton' => false,
-                    'url'         => $urlNew,
-                    'height'      => '400px',
-                    'width'       => '800px',
-                    'bodyHeight'  => 70,
-                    'modalWidth'  => 80,
-                    'footer'      => '<button type="button" class="btn btn-secondary"'
-                            . ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'add\', \'article\', \'cancel\', \'item-form\'); return false;">'
-                            . Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>'
-                            . '<button type="button" class="btn btn-primary"'
-                            . ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'add\', \'article\', \'save\', \'item-form\'); return false;">'
-                            . Text::_('JSAVE') . '</button>'
-                            . '<button type="button" class="btn btn-success"'
-                            . ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'add\', \'article\', \'apply\', \'item-form\'); return false;">'
-                            . Text::_('JAPPLY') . '</button>',
-                ]
-            );
-        }
-
-        // Edit article modal
-        if ($allowEdit) {
-            $html .= HTMLHelper::_(
-                'bootstrap.renderModal',
-                'ModalEdit' . $modalId,
-                [
-                    'title'       => Text::_('COM_CONTENT_EDIT_ARTICLE'),
-                    'backdrop'    => 'static',
-                    'keyboard'    => false,
-                    'closeButton' => false,
-                    'url'         => $urlEdit,
-                    'height'      => '400px',
-                    'width'       => '800px',
-                    'bodyHeight'  => 70,
-                    'modalWidth'  => 80,
-                    'footer'      => '<button type="button" class="btn btn-secondary"'
-                            . ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'edit\', \'article\', \'cancel\', \'item-form\'); return false;">'
-                            . Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>'
-                            . '<button type="button" class="btn btn-primary"'
-                            . ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'edit\', \'article\', \'save\', \'item-form\'); return false;">'
-                            . Text::_('JSAVE') . '</button>'
-                            . '<button type="button" class="btn btn-success"'
-                            . ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'edit\', \'article\', \'apply\', \'item-form\'); return false;">'
-                            . Text::_('JAPPLY') . '</button>',
-                ]
-            );
-        }
-
-        // Note: class='required' for client side validation.
-        $class = $this->required ? ' class="required modal-value"' : '';
+        return $title ?: $value;
+    }
 
-        $html .= '<input type="hidden" id="' . $this->id . '_id" ' . $class . ' data-required="' . (int) $this->required . '" name="' . $this->name
-            . '" data-text="' . htmlspecialchars(Text::_('COM_CONTENT_SELECT_AN_ARTICLE'), ENT_COMPAT, 'UTF-8') . '" value="' . $value . '">';
+    /**
+     * Method to get the data to be passed to the layout for rendering.
+     *
+     * @return  array
+     *
+     * @since __DEPLOY_VERSION__
+     */
+    protected function getLayoutData()
+    {
+        $data             = parent::getLayoutData();
+        $data['language'] = (string) $this->element['language'];
 
-        return $html;
+        return $data;
     }
 
     /**
-     * Method to get the field label markup.
+     * Get the renderer
+     *
+     * @param   string  $layoutId  Id to load
      *
-     * @return  string  The field label markup.
+     * @return  FileLayout
      *
-     * @since   3.4
+     * @since   __DEPLOY_VERSION__
      */
-    protected function getLabel()
+    protected function getRenderer($layoutId = 'default')
     {
-        return str_replace($this->id, $this->id . '_name', parent::getLabel());
+        $layout = parent::getRenderer($layoutId);
+        $layout->setComponent('com_content');
+        $layout->setClient(1);
+
+        return $layout;
     }
 }
diff --git a/administrator/components/com_content/src/Model/ArticleModel.php b/administrator/components/com_content/src/Model/ArticleModel.php
index b88f6f94654c9..26ca0913213c5 100644
--- a/administrator/components/com_content/src/Model/ArticleModel.php
+++ b/administrator/components/com_content/src/Model/ArticleModel.php
@@ -14,7 +14,6 @@
 use Joomla\CMS\Event\AbstractEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filter\InputFilter;
-use Joomla\CMS\Filter\OutputFilter;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Form\FormFactoryInterface;
 use Joomla\CMS\Helper\TagsHelper;
@@ -35,6 +34,7 @@
 use Joomla\Component\Categories\Administrator\Helper\CategoriesHelper;
 use Joomla\Component\Fields\Administrator\Helper\FieldsHelper;
 use Joomla\Database\ParameterType;
+use Joomla\Filter\OutputFilter;
 use Joomla\Registry\Registry;
 use Joomla\Utilities\ArrayHelper;
 
@@ -619,7 +619,7 @@ protected function loadFormData()
      * @return  array|boolean  Array of filtered data if valid, false otherwise.
      *
      * @see     \Joomla\CMS\Form\FormRule
-     * @see     JFilterInput
+     * @see     \Joomla\CMS\Filter\InputFilter
      * @since   3.7.0
      */
     public function validate($form, $data, $group = null)
diff --git a/administrator/components/com_content/src/Model/ArticlesModel.php b/administrator/components/com_content/src/Model/ArticlesModel.php
index f8dd2bdf76bb8..f5b0ffd62a913 100644
--- a/administrator/components/com_content/src/Model/ArticlesModel.php
+++ b/administrator/components/com_content/src/Model/ArticlesModel.php
@@ -394,7 +394,7 @@ protected function getListQuery()
         // Case: Using both categories filter and by level filter
         if (count($categoryId)) {
             $categoryId       = ArrayHelper::toInteger($categoryId);
-            $categoryTable    = Table::getInstance('Category', 'JTable');
+            $categoryTable    = Table::getInstance('Category', '\\Joomla\\CMS\\Table\\');
             $subCatItemsWhere = [];
 
             foreach ($categoryId as $key => $filter_catid) {
diff --git a/administrator/components/com_content/src/Table/ArticleTable.php b/administrator/components/com_content/src/Table/ArticleTable.php
index 69f6c9deaba38..8ae718974f259 100644
--- a/administrator/components/com_content/src/Table/ArticleTable.php
+++ b/administrator/components/com_content/src/Table/ArticleTable.php
@@ -11,7 +11,7 @@
 namespace Joomla\Component\Content\Administrator\Table;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/administrator/components/com_content/src/View/Article/HtmlView.php b/administrator/components/com_content/src/View/Article/HtmlView.php
index 88a63951296be..ee34812900107 100644
--- a/administrator/components/com_content/src/View/Article/HtmlView.php
+++ b/administrator/components/com_content/src/View/Article/HtmlView.php
@@ -58,7 +58,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The actions the user is authorised to perform
      *
-     * @var  \Joomla\CMS\Object\CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $canDo;
 
@@ -93,6 +93,12 @@ public function display($tpl = null)
         $this->state = $this->get('State');
         $this->canDo = ContentHelper::getActions('com_content', 'article', $this->item->id);
 
+        if ($this->getLayout() === 'modalreturn') {
+            parent::display($tpl);
+
+            return;
+        }
+
         // Check for errors.
         if (count($errors = $this->get('Errors'))) {
             throw new GenericDataException(implode("\n", $errors), 500);
@@ -111,7 +117,11 @@ public function display($tpl = null)
             $this->form->setFieldAttribute('tags', 'language', '*,' . $forcedLanguage);
         }
 
-        $this->addToolbar();
+        if ($this->getLayout() !== 'modal') {
+            $this->addToolbar();
+        } else {
+            $this->addModalToolbar();
+        }
 
         parent::display($tpl);
     }
@@ -226,4 +236,41 @@ function (Toolbar $childBar) use ($checkedOut, $itemEditable, $canDo, $user) {
         $toolbar->inlinehelp();
         $toolbar->help('Articles:_Edit');
     }
+
+    /**
+     * Add the modal toolbar.
+     *
+     * @return  void
+     *
+     * @since   __DEPLOY_VERSION__
+     *
+     * @throws  \Exception
+     */
+    protected function addModalToolbar()
+    {
+        $user       = $this->getCurrentUser();
+        $userId     = $user->id;
+        $isNew      = ($this->item->id == 0);
+        $checkedOut = !(is_null($this->item->checked_out) || $this->item->checked_out == $userId);
+        $toolbar    = Toolbar::getInstance();
+
+        // Build 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'
+        );
+
+        $canCreate = $isNew && (count($user->getAuthorisedCategories('com_content', 'core.create')) > 0);
+        $canEdit   = $canDo->get('core.edit') || ($canDo->get('core.edit.own') && $this->item->created_by == $userId);
+
+        // For new records, check the create permission.
+        if ($canCreate || $canEdit) {
+            $toolbar->apply('article.apply');
+            $toolbar->save('article.save');
+        }
+
+        $toolbar->cancel('article.cancel');
+    }
 }
diff --git a/administrator/components/com_content/src/View/Articles/HtmlView.php b/administrator/components/com_content/src/View/Articles/HtmlView.php
index 597138b4aec3f..1db0b7d7e20be 100644
--- a/administrator/components/com_content/src/View/Articles/HtmlView.php
+++ b/administrator/components/com_content/src/View/Articles/HtmlView.php
@@ -51,7 +51,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var   \Joomla\CMS\Object\CMSObject
+     * @var   \Joomla\Registry\Registry
      */
     protected $state;
 
@@ -84,6 +84,22 @@ class HtmlView extends BaseHtmlView
      */
     private $isEmptyState = false;
 
+    /**
+     * Is the vote plugin enabled on the site
+     *
+     * @var   boolean
+     * @since 4.4.0
+     */
+    protected $vote = false;
+
+    /**
+     * Are hits being recorded on the site?
+     *
+     * @var   boolean
+     * @since 4.4.0
+     */
+    protected $hits = false;
+
     /**
      * Display the view
      *
@@ -99,7 +115,7 @@ public function display($tpl = null)
         $this->filterForm    = $this->get('FilterForm');
         $this->activeFilters = $this->get('ActiveFilters');
         $this->vote          = PluginHelper::isEnabled('content', 'vote');
-        $this->hits          = ComponentHelper::getParams('com_content')->get('record_hits', 1);
+        $this->hits          = ComponentHelper::getParams('com_content')->get('record_hits', 1) == 1;
 
         if (!\count($this->items) && $this->isEmptyState = $this->get('IsEmptyState')) {
             $this->setLayout('emptystate');
diff --git a/administrator/components/com_content/src/View/Featured/HtmlView.php b/administrator/components/com_content/src/View/Featured/HtmlView.php
index 8ecb7a5510a1d..9406564b24ad3 100644
--- a/administrator/components/com_content/src/View/Featured/HtmlView.php
+++ b/administrator/components/com_content/src/View/Featured/HtmlView.php
@@ -11,7 +11,6 @@
 namespace Joomla\Component\Content\Administrator\View\Featured;
 
 use Joomla\CMS\Component\ComponentHelper;
-use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
@@ -51,7 +50,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var  \Joomla\CMS\Object\CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $state;
 
@@ -137,7 +136,7 @@ public function display($tpl = null)
     protected function addToolbar()
     {
         $canDo   = ContentHelper::getActions('com_content', 'category', $this->state->get('filter.category_id'));
-        $user    = Factory::getApplication()->getIdentity();
+        $user    = $this->getCurrentUser();
         $toolbar = Toolbar::getInstance();
 
         ToolbarHelper::title(Text::_('COM_CONTENT_FEATURED_TITLE'), 'star featured');
diff --git a/administrator/components/com_content/tmpl/article/edit.php b/administrator/components/com_content/tmpl/article/edit.php
index 11884dc570cf4..84caa25f31a4f 100644
--- a/administrator/components/com_content/tmpl/article/edit.php
+++ b/administrator/components/com_content/tmpl/article/edit.php
@@ -55,7 +55,8 @@
 // In case of modal
 $isModal = $input->get('layout') === 'modal';
 $layout  = $isModal ? 'modal' : 'edit';
-$tmpl    = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=component' : '';
+$tmpl    = $input->get('tmpl');
+$tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 ?>
 <form action="<?php echo Route::_('index.php?option=com_content&layout=' . $layout . $tmpl . '&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="item-form" aria-label="<?php echo Text::_('COM_CONTENT_FORM_TITLE_' . ((int) $this->item->id === 0 ? 'NEW' : 'EDIT'), true); ?>" class="form-validate">
     <?php echo LayoutHelper::render('joomla.edit.title_alias', $this); ?>
diff --git a/administrator/components/com_content/tmpl/article/modalreturn.php b/administrator/components/com_content/tmpl/article/modalreturn.php
new file mode 100644
index 0000000000000..02dc6cbe04cdf
--- /dev/null
+++ b/administrator/components/com_content/tmpl/article/modalreturn.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @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\Component\Content\Site\Helper\RouteHelper;
+
+$icon     = 'icon-check';
+$title    = $this->item ? $this->item->title : '';
+$content  = $this->item ? $this->item->alias : '';
+$data     = ['contentType' => 'com_content.article'];
+
+if ($this->item) {
+    $data['id']    = $this->item->id;
+    $data['title'] = $this->item->title;
+    $data['catId'] = $this->item->catid;
+    $data['uri']   = RouteHelper::getArticleRoute($this->item->id, $this->item->catid, $this->item->language);
+}
+
+// Add Content select script
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->document->getWebAssetManager();
+$wa->useScript('modal-content-select');
+
+// The data for Content select script
+$this->document->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 $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_content/tmpl/articles/default.php b/administrator/components/com_content/tmpl/articles/default.php
index ced3aba5a0635..9600cd0834b84 100644
--- a/administrator/components/com_content/tmpl/articles/default.php
+++ b/administrator/components/com_content/tmpl/articles/default.php
@@ -31,7 +31,7 @@
     ->useScript('multiselect');
 
 $app       = Factory::getApplication();
-$user      = Factory::getUser();
+$user      = $this->getCurrentUser();
 $userId    = $user->get('id');
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
@@ -261,7 +261,7 @@
                                                     echo ' &#187; ';
                                                 endif;
                                             endif;
-                                            if (Factory::getLanguage()->isRtl()) {
+                                            if ($this->getLanguage()->isRtl()) {
                                                 if ($canEditCat || $canEditOwnCat) :
                                                     echo '<a href="' . $CurrentCatUrl . '" title="' . $EditCatTxt . '">';
                                                 endif;
diff --git a/administrator/components/com_content/tmpl/articles/default.xml b/administrator/components/com_content/tmpl/articles/default.xml
index aa3356a94a4c5..a8f618eb70da6 100644
--- a/administrator/components/com_content/tmpl/articles/default.xml
+++ b/administrator/components/com_content/tmpl/articles/default.xml
@@ -8,7 +8,8 @@
 		<!-- Add fields to the request variables for the layout. -->
 	<fields name="request">
 		<fieldset
-			name="request"
+			name="filter"
+			label="COM_MENUS_ADMIN_FILTER_LABEL"
 			addfieldprefix="Joomla\Component\Categories\Administrator\Field"
 			>
 			<field
diff --git a/administrator/components/com_content/tmpl/articles/default_batch_body.php b/administrator/components/com_content/tmpl/articles/default_batch_body.php
index 0f838accf462c..afa5759419c76 100644
--- a/administrator/components/com_content/tmpl/articles/default_batch_body.php
+++ b/administrator/components/com_content/tmpl/articles/default_batch_body.php
@@ -11,7 +11,6 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Component\ComponentHelper;
-use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Layout\LayoutHelper;
 
@@ -19,7 +18,7 @@
 
 $published = (int) $this->state->get('filter.published');
 
-$user = Factory::getUser();
+$user = $this->getCurrentUser();
 ?>
 
 <div class="p-3">
diff --git a/administrator/components/com_content/tmpl/articles/emptystate.php b/administrator/components/com_content/tmpl/articles/emptystate.php
index 331fd161984ba..85b5364a9e5e8 100644
--- a/administrator/components/com_content/tmpl/articles/emptystate.php
+++ b/administrator/components/com_content/tmpl/articles/emptystate.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Layout\LayoutHelper;
 
 $displayData = [
@@ -20,7 +19,7 @@
     'icon'       => 'icon-copy article',
 ];
 
-$user = Factory::getApplication()->getIdentity();
+$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';
diff --git a/administrator/components/com_content/tmpl/articles/modal.php b/administrator/components/com_content/tmpl/articles/modal.php
index b0054a7af4779..86c704918c23c 100644
--- a/administrator/components/com_content/tmpl/articles/modal.php
+++ b/administrator/components/com_content/tmpl/articles/modal.php
@@ -29,8 +29,10 @@
 $wa = $this->document->getWebAssetManager();
 $wa->useScript('core')
     ->useScript('multiselect')
+    ->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.
 $function  = $app->getInput()->getCmd('function', 'jSelectArticle');
 $editor    = $app->getInput()->getCmd('editor', '');
 $listOrder = $this->escape($this->state->get('list.ordering'));
@@ -95,18 +97,19 @@
                 ];
                 ?>
                 <?php foreach ($this->items as $i => $item) : ?>
-                    <?php if ($item->language && $multilang) {
+                    <?php
+                    $lang = '';
+                    if ($item->language && $multilang) {
                         $tag = strlen($item->language);
                         if ($tag == 5) {
                             $lang = substr($item->language, 0, 2);
                         } elseif ($tag == 6) {
                             $lang = substr($item->language, 0, 3);
-                        } else {
-                            $lang = '';
                         }
-                    } elseif (!$multilang) {
-                        $lang = '';
                     }
+
+                    $link     = RouteHelper::getArticleRoute($item->id, $item->catid, $item->language);
+                    $itemHtml = '<a href="' . $this->escape($link) . '"' . ($lang ? ' hreflang="' . $lang . '"' : '') . '>' . $item->title . '</a>';
                     ?>
                     <tr class="row<?php echo $i % 2; ?>">
                         <td class="text-center">
@@ -115,12 +118,14 @@
                             </span>
                         </td>
                         <th scope="row">
-                            <?php $attribs = 'data-function="' . $this->escape($onclick) . '"'
+                            <?php $attribs = 'data-content-select data-content-type="com_content.article"'
+                                . 'data-function="' . $this->escape($onclick) . '"'
                                 . ' data-id="' . $item->id . '"'
                                 . ' data-title="' . $this->escape($item->title) . '"'
                                 . ' data-cat-id="' . $this->escape($item->catid) . '"'
-                                . ' data-uri="' . $this->escape(RouteHelper::getArticleRoute($item->id, $item->catid, $item->language)) . '"'
-                                . ' data-language="' . $this->escape($lang) . '"';
+                                . ' data-uri="' . $this->escape($link) . '"'
+                                . ' data-language="' . $this->escape($lang) . '"'
+                                . ' data-html="' . $this->escape($itemHtml) . '"';
                             ?>
                             <a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
                                 <?php echo $this->escape($item->title); ?>
diff --git a/administrator/components/com_content/tmpl/featured/default.php b/administrator/components/com_content/tmpl/featured/default.php
index 4f6ce814814d8..7dbb6a4660ae7 100644
--- a/administrator/components/com_content/tmpl/featured/default.php
+++ b/administrator/components/com_content/tmpl/featured/default.php
@@ -31,7 +31,7 @@
     ->useScript('multiselect');
 
 $app       = Factory::getApplication();
-$user      = Factory::getUser();
+$user      = $this->getCurrentUser();
 $userId    = $user->get('id');
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
@@ -265,7 +265,7 @@
                                                     echo ' &#187; ';
                                                 endif;
                                             endif;
-                                            if (Factory::getLanguage()->isRtl()) {
+                                            if ($this->getLanguage()->isRtl()) {
                                                 if ($canEditCat || $canEditOwnCat) :
                                                     echo '<a href="' . $CurrentCatUrl . '" title="' . $EditCatTxt . '">';
                                                 endif;
diff --git a/administrator/components/com_content/tmpl/featured/emptystate.php b/administrator/components/com_content/tmpl/featured/emptystate.php
index 83748e92eacc7..8bb37e54864ab 100644
--- a/administrator/components/com_content/tmpl/featured/emptystate.php
+++ b/administrator/components/com_content/tmpl/featured/emptystate.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Layout\LayoutHelper;
 
 $displayData = [
@@ -19,7 +18,7 @@
     'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Adding_a_new_article',
 ];
 
-$user = Factory::getApplication()->getIdentity();
+$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';
diff --git a/administrator/components/com_contenthistory/src/Helper/ContenthistoryHelper.php b/administrator/components/com_contenthistory/src/Helper/ContenthistoryHelper.php
index e9e55de8b1255..41db6b4b7e9af 100644
--- a/administrator/components/com_contenthistory/src/Helper/ContenthistoryHelper.php
+++ b/administrator/components/com_contenthistory/src/Helper/ContenthistoryHelper.php
@@ -13,12 +13,12 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filesystem\File;
 use Joomla\CMS\Filesystem\Folder;
-use Joomla\CMS\Filesystem\Path;
 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\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
diff --git a/administrator/components/com_contenthistory/src/View/Compare/HtmlView.php b/administrator/components/com_contenthistory/src/View/Compare/HtmlView.php
index 220cd463fe46f..b137ee0568c92 100644
--- a/administrator/components/com_contenthistory/src/View/Compare/HtmlView.php
+++ b/administrator/components/com_contenthistory/src/View/Compare/HtmlView.php
@@ -34,7 +34,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var  \Joomla\CMS\Object\CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $state;
 
diff --git a/administrator/components/com_contenthistory/src/View/History/HtmlView.php b/administrator/components/com_contenthistory/src/View/History/HtmlView.php
index 331479595f0cc..8862f3ec84ec7 100644
--- a/administrator/components/com_contenthistory/src/View/History/HtmlView.php
+++ b/administrator/components/com_contenthistory/src/View/History/HtmlView.php
@@ -48,7 +48,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var  \Joomla\CMS\Object\CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $state;
 
diff --git a/administrator/components/com_contenthistory/src/View/Preview/HtmlView.php b/administrator/components/com_contenthistory/src/View/Preview/HtmlView.php
index b53a9f8caf4a4..d206aa4e7fc53 100644
--- a/administrator/components/com_contenthistory/src/View/Preview/HtmlView.php
+++ b/administrator/components/com_contenthistory/src/View/Preview/HtmlView.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Component\Contenthistory\Administrator\View\Preview;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
@@ -36,7 +35,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var  \Joomla\CMS\Object\CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $state;
 
@@ -55,7 +54,7 @@ public function display($tpl = null)
         $this->item  = $this->get('Item');
 
         if (false === $this->item) {
-            Factory::getLanguage()->load('com_content', JPATH_SITE, null, true);
+            $this->getLanguage()->load('com_content', JPATH_SITE, null, true);
 
             throw new \Exception(Text::_('COM_CONTENT_ERROR_ARTICLE_NOT_FOUND'), 404);
         }
diff --git a/administrator/components/com_cpanel/src/Controller/DisplayController.php b/administrator/components/com_cpanel/src/Controller/DisplayController.php
index 8cbdda47ef726..b9ede3f88e7a4 100644
--- a/administrator/components/com_cpanel/src/Controller/DisplayController.php
+++ b/administrator/components/com_cpanel/src/Controller/DisplayController.php
@@ -39,7 +39,8 @@ class DisplayController extends BaseController
      * you will need to override it in your own controllers.
      *
      * @param   boolean  $cachable   If true, the view output will be cached
-     * @param   array    $urlparams  An array of safe url parameters and their variable types, for valid values see {@link \JFilterInput::clean()}.
+     * @param   array    $urlparams  An array of safe url parameters and their variable types.
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  static  An instance of the current object to support chaining.
      *
diff --git a/administrator/components/com_cpanel/src/View/Cpanel/HtmlView.php b/administrator/components/com_cpanel/src/View/Cpanel/HtmlView.php
index 197e555b38ee0..01fdc3cc46521 100644
--- a/administrator/components/com_cpanel/src/View/Cpanel/HtmlView.php
+++ b/administrator/components/com_cpanel/src/View/Cpanel/HtmlView.php
@@ -11,12 +11,12 @@
 namespace Joomla\Component\Cpanel\Administrator\View\Cpanel;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filter\OutputFilter;
 use Joomla\CMS\Helper\ModuleHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
+use Joomla\Filter\OutputFilter;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -75,7 +75,7 @@ public function display($tpl = null)
             }
 
             // Need to load the language file
-            $lang = Factory::getLanguage();
+            $lang = $this->getLanguage();
             $lang->load($component, JPATH_BASE)
             || $lang->load($component, JPATH_ADMINISTRATOR . '/components/' . $component);
             $lang->load($component);
diff --git a/administrator/components/com_cpanel/tmpl/cpanel/default.php b/administrator/components/com_cpanel/tmpl/cpanel/default.php
index d3601723f5c18..3eaca29a4efcf 100644
--- a/administrator/components/com_cpanel/tmpl/cpanel/default.php
+++ b/administrator/components/com_cpanel/tmpl/cpanel/default.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ModuleHelper;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
@@ -30,7 +29,7 @@
 $wa->useScript('com_cpanel.admin-cpanel')
     ->useScript('com_cpanel.admin-addmodule');
 
-$user = Factory::getUser();
+$user = $this->getCurrentUser();
 
 // Set up the bootstrap modal that will be used for all module editors
 echo HTMLHelper::_(
diff --git a/administrator/components/com_fields/forms/field.xml b/administrator/components/com_fields/forms/field.xml
index 98e9d563f01fe..e688ff6eae965 100644
--- a/administrator/components/com_fields/forms/field.xml
+++ b/administrator/components/com_fields/forms/field.xml
@@ -251,6 +251,7 @@
 					type="text"
 					label="COM_FIELDS_FIELD_SHOWON_LABEL"
 					description="COM_FIELDS_FIELD_SHOWON_DESC"
+					validate="ShowOn"
 				/>
 
 			</fieldset>
@@ -270,6 +271,7 @@
 					label="COM_FIELDS_FIELD_VALUE_RENDER_CLASS_LABEL"
 					description="COM_FIELDS_FIELD_VALUE_RENDER_CLASS_DESC"
 					size="40"
+					validate="CssIdentifier"
 				/>
 
 				<field
@@ -335,6 +337,20 @@
 					<option value="0">JNO</option>
 				</field>
 			</fieldset>
+			<fieldset name="smartsearchoptions" label="COM_FIELDS_FIELD_SMARTSEARCHOPTIONS_HEADING">
+				<field
+					name="searchindex"
+					type="list"
+					label="COM_FIELDS_FIELD_SEARCHINDEX_LABEL"
+					default="0"
+					validate="options"
+					>
+					<option value="0">COM_FIELDS_FIELD_SEARCHINDEX_DONT</option>
+					<option value="1">COM_FIELDS_FIELD_SEARCHINDEX_SEARCHABLE</option>
+					<option value="2">COM_FIELDS_FIELD_SEARCHINDEX_TAXONOMY</option>
+					<option value="3">COM_FIELDS_FIELD_SEARCHINDEX_BOTH</option>
+				</field>
+			</fieldset>
 		</fieldset>
 	</fields>
 </form>
diff --git a/administrator/components/com_fields/src/Controller/DisplayController.php b/administrator/components/com_fields/src/Controller/DisplayController.php
index 95be7bf092fb0..d35845b3d6c81 100644
--- a/administrator/components/com_fields/src/Controller/DisplayController.php
+++ b/administrator/components/com_fields/src/Controller/DisplayController.php
@@ -41,7 +41,8 @@ class DisplayController extends BaseController
      * you will need to override it in your own controllers.
      *
      * @param   boolean     $cachable   If true, the view output will be cached
-     * @param   array|bool  $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link \JFilterInput::clean()}
+     * @param   array|bool  $urlparams  An array of safe URL parameters and their variable types.
+     *                      @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  BaseController|boolean  A Controller object to support chaining.
      *
diff --git a/administrator/components/com_fields/src/Extension/FieldsComponent.php b/administrator/components/com_fields/src/Extension/FieldsComponent.php
index 5027972e40304..f95d4fabcc0d1 100644
--- a/administrator/components/com_fields/src/Extension/FieldsComponent.php
+++ b/administrator/components/com_fields/src/Extension/FieldsComponent.php
@@ -15,7 +15,7 @@
 use Joomla\CMS\Extension\MVCComponent;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/administrator/components/com_fields/src/Field/FieldLayoutField.php b/administrator/components/com_fields/src/Field/FieldLayoutField.php
index 7d652577131e2..f8350f89cc9fd 100644
--- a/administrator/components/com_fields/src/Field/FieldLayoutField.php
+++ b/administrator/components/com_fields/src/Field/FieldLayoutField.php
@@ -11,10 +11,10 @@
 namespace Joomla\Component\Fields\Administrator\Field;
 
 use Joomla\CMS\Filesystem\Folder;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Form\FormField;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
diff --git a/administrator/components/com_fields/src/Field/FieldgroupsField.php b/administrator/components/com_fields/src/Field/FieldgroupsField.php
index 873a910e1a043..65e0110c776d0 100644
--- a/administrator/components/com_fields/src/Field/FieldgroupsField.php
+++ b/administrator/components/com_fields/src/Field/FieldgroupsField.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Component\Fields\Administrator\Field;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;
 use Joomla\Utilities\ArrayHelper;
 
@@ -43,7 +42,7 @@ protected function getOptions()
         $states    = $this->element['state'] ?: '0,1';
         $states    = ArrayHelper::toInteger(explode(',', $states));
 
-        $user       = Factory::getUser();
+        $user       = $this->getCurrentUser();
         $viewlevels = ArrayHelper::toInteger($user->getAuthorisedViewLevels());
 
         $db    = $this->getDatabase();
diff --git a/administrator/components/com_fields/src/Helper/FieldsHelper.php b/administrator/components/com_fields/src/Helper/FieldsHelper.php
index f6afbd77637f5..7193de45bf694 100644
--- a/administrator/components/com_fields/src/Helper/FieldsHelper.php
+++ b/administrator/components/com_fields/src/Helper/FieldsHelper.php
@@ -10,6 +10,11 @@
 
 namespace Joomla\Component\Fields\Administrator\Helper;
 
+use Joomla\CMS\Event\CustomFields\AfterPrepareFieldEvent;
+use Joomla\CMS\Event\CustomFields\BeforePrepareFieldEvent;
+use Joomla\CMS\Event\CustomFields\GetTypesEvent;
+use Joomla\CMS\Event\CustomFields\PrepareDomEvent;
+use Joomla\CMS\Event\CustomFields\PrepareFieldEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Fields\FieldsServiceInterface;
 use Joomla\CMS\Form\Form;
@@ -18,9 +23,10 @@
 use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Plugin\PluginHelper;
-use Joomla\Component\Fields\Administrator\Model\FieldsModel;
 use Joomla\Component\Fields\Administrator\Model\FieldModel;
+use Joomla\Component\Fields\Administrator\Model\FieldsModel;
 use Joomla\Database\ParameterType;
+use Joomla\Event\DispatcherInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -165,6 +171,10 @@ public static function getFields(
                     ->getMVCFactory()->createModel('Field', 'Administrator', ['ignore_request' => true]);
             }
 
+            /** @var DispatcherInterface $dispatcher */
+            $dispatcher = Factory::getContainer()->get(DispatcherInterface::class);
+            PluginHelper::importPlugin('fields', null, true, $dispatcher);
+
             $fieldIds = array_map(
                 function ($f) {
                     return $f->id;
@@ -199,16 +209,22 @@ function ($f) {
 
                 // If boolean prepare, if int, it is the event type: 1 - After Title, 2 - Before Display Content, 3 - After Display Content, 0 - Do not prepare
                 if ($prepareValue && (is_bool($prepareValue) || $prepareValue === (int) $field->params->get('display', '2'))) {
-                    PluginHelper::importPlugin('fields');
-
                     /*
                      * On before field prepare
                      * Event allow plugins to modify the output of the field before it is prepared
                      */
-                    Factory::getApplication()->triggerEvent('onCustomFieldsBeforePrepareField', [$context, $item, &$field]);
+                    $dispatcher->dispatch('onCustomFieldsBeforePrepareField', new BeforePrepareFieldEvent('onCustomFieldsBeforePrepareField', [
+                        'context' => $context,
+                        'item'    => $item,
+                        'subject' => $field,
+                    ]));
 
                     // Gathering the value for the field
-                    $value = Factory::getApplication()->triggerEvent('onCustomFieldsPrepareField', [$context, $item, &$field]);
+                    $value = $dispatcher->dispatch('onCustomFieldsPrepareField', new PrepareFieldEvent('onCustomFieldsPrepareField', [
+                        'context' => $context,
+                        'item'    => $item,
+                        'subject' => $field,
+                    ]))->getArgument('result', []);
 
                     if (is_array($value)) {
                         $value = implode(' ', $value);
@@ -218,7 +234,14 @@ function ($f) {
                      * On after field render
                      * Event allows plugins to modify the output of the prepared field
                      */
-                    Factory::getApplication()->triggerEvent('onCustomFieldsAfterPrepareField', [$context, $item, $field, &$value]);
+                    $eventAfter = new AfterPrepareFieldEvent('onCustomFieldsAfterPrepareField', [
+                        'context' => $context,
+                        'item'    => $item,
+                        'subject' => $field,
+                        'value'   => &$value, // TODO: Remove reference in Joomla 6, see AfterPrepareFieldEvent::__constructor()
+                    ]);
+                    $dispatcher->dispatch('onCustomFieldsAfterPrepareField', $eventAfter);
+                    $value = $eventAfter->getValue();
 
                     // Assign the value
                     $field->value = $value;
@@ -379,6 +402,8 @@ public static function prepareForm($context, Form $form, $data)
         $model = Factory::getApplication()->bootComponent('com_fields')
             ->getMVCFactory()->createModel('Groups', 'Administrator', ['ignore_request' => true]);
         $model->setState('filter.context', $context);
+        /** @var DispatcherInterface $dispatcher */
+        $dispatcher = Factory::getContainer()->get(DispatcherInterface::class);
 
         /**
          * $model->getItems() would only return existing groups, but we also
@@ -431,7 +456,11 @@ public static function prepareForm($context, Form $form, $data)
             // Looping through the fields for that context
             foreach ($fieldsPerGroup[$group->id] as $field) {
                 try {
-                    Factory::getApplication()->triggerEvent('onCustomFieldsPrepareDom', [$field, $fieldset, $form]);
+                    $dispatcher->dispatch('onCustomFieldsPrepareDom', new PrepareDomEvent('onCustomFieldsPrepareDom', [
+                        'subject'  => $field,
+                        'fieldset' => $fieldset,
+                        'form'     => $form,
+                    ]));
 
                     /*
                      * If the field belongs to an assigned_cat_id but the assigned_cat_ids in the data
@@ -651,8 +680,10 @@ public static function getFieldsPluginId()
      */
     public static function getFieldTypes()
     {
-        PluginHelper::importPlugin('fields');
-        $eventData = Factory::getApplication()->triggerEvent('onCustomFieldsGetTypes');
+        /** @var DispatcherInterface $dispatcher */
+        $dispatcher = Factory::getContainer()->get(DispatcherInterface::class);
+        PluginHelper::importPlugin('fields', null, true, $dispatcher);
+        $eventData = $dispatcher->dispatch('onCustomFieldsGetTypes', new GetTypesEvent('onCustomFieldsGetTypes'))->getArgument('result', []);
 
         $data = [];
 
diff --git a/administrator/components/com_fields/src/Model/FieldModel.php b/administrator/components/com_fields/src/Model/FieldModel.php
index f274213ac52b2..194c1b1a224af 100644
--- a/administrator/components/com_fields/src/Model/FieldModel.php
+++ b/administrator/components/com_fields/src/Model/FieldModel.php
@@ -13,8 +13,8 @@
 use Joomla\CMS\Categories\CategoryServiceInterface;
 use Joomla\CMS\Categories\SectionNotFoundException;
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Event\CustomFields\PrepareDomEvent;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Form\FormHelper;
 use Joomla\CMS\Language\Text;
@@ -27,6 +27,7 @@
 use Joomla\Database\DatabaseInterface;
 use Joomla\Database\Exception\DatabaseNotFoundException;
 use Joomla\Database\ParameterType;
+use Joomla\Filesystem\Path;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
@@ -115,6 +116,15 @@ public function save($data)
             $field = $this->getItem($data['id']);
         }
 
+        if (
+            isset($data['params']['searchindex'])
+            && ((is_null($field) && $data['params']['searchindex'] > 0)
+                || ($field->params['searchindex'] != $data['params']['searchindex'])
+                || ($data['params']['searchindex'] > 0 && ($field->state != $data['state'] || $field->access != $data['access'])))
+        ) {
+            Factory::getApplication()->enqueueMessage(Text::_('COM_FIELDS_SEARCHINDEX_MIGHT_REQUIRE_REINDEXING'), 'notice');
+        }
+
         if (!isset($data['label']) && isset($data['params']['label'])) {
             $data['label'] = $data['params']['label'];
 
@@ -289,7 +299,11 @@ private function checkDefaultValue($data)
         // Trigger the event to create the field dom node
         $form = new Form($data['context']);
         $form->setDatabase($this->getDatabase());
-        Factory::getApplication()->triggerEvent('onCustomFieldsPrepareDom', [$obj, $node, $form]);
+        $this->getDispatcher()->dispatch('onCustomFieldsPrepareDom', new PrepareDomEvent('onCustomFieldsPrepareDom', [
+            'subject'  => $obj,
+            'fieldset' => $node,
+            'form'     => $form,
+        ]));
 
         // Check if a node is created
         if (!$node->firstChild) {
@@ -860,6 +874,31 @@ protected function populateState()
         $this->setState('params', $params);
     }
 
+    /**
+     * Method to change the published state of one or more records.
+     *
+     * @param   array    &$pks   A list of the primary keys to change.
+     * @param   integer  $value  The value of the published state.
+     *
+     * @return  boolean  True on success.
+     *
+     * @since   5.0.0
+     */
+    public function publish(&$pks, $value = 1)
+    {
+        foreach ($pks as $pk) {
+            $item = $this->getItem($pk);
+
+            if (isset($item->params['searchindex']) && $item->params['searchindex'] > 0) {
+                Factory::getApplication()->enqueueMessage(Text::_('COM_FIELDS_SEARCHINDEX_MIGHT_REQUIRE_REINDEXING'), 'notice');
+
+                break;
+            }
+        }
+
+        return parent::publish($pks, $value);
+    }
+
     /**
      * A protected method to get a set of ordering conditions.
      *
@@ -941,8 +980,8 @@ protected function loadFormData()
      *
      * @return  array|boolean  Array of filtered data if valid, false otherwise.
      *
-     * @see     JFormRule
-     * @see     JFilterInput
+     * @see     \Joomla\CMS\Form\FormRule
+     * @see     \Joomla\CMS\Filter\InputFilter
      * @since   3.9.23
      */
     public function validate($form, $data, $group = null)
diff --git a/administrator/components/com_fields/src/Model/GroupModel.php b/administrator/components/com_fields/src/Model/GroupModel.php
index 4e3c963edee59..69caf97134ff0 100644
--- a/administrator/components/com_fields/src/Model/GroupModel.php
+++ b/administrator/components/com_fields/src/Model/GroupModel.php
@@ -11,12 +11,12 @@
 namespace Joomla\Component\Fields\Administrator\Model;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\CMS\Table\Table;
 use Joomla\Component\Fields\Administrator\Helper\FieldsHelper;
+use Joomla\Filesystem\Path;
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -240,29 +240,30 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
 
         $parts = FieldsHelper::extract($this->state->get('filter.context'));
 
+        // If we don't have a valid context then return early
+        if (!$parts) {
+            return;
+        }
+
         // Extract the component name
         $component = $parts[0];
 
-        // Extract the optional section name
-        $section = (count($parts) > 1) ? $parts[1] : null;
+        // Extract the section name
+        $section = $parts[1];
 
-        if ($parts) {
-            // Set the access control rules field component value.
-            $form->setFieldAttribute('rules', 'component', $component);
-        }
+        // Set the access control rules field component value.
+        $form->setFieldAttribute('rules', 'component', $component);
 
-        if ($section !== null) {
-            // Looking first in the component models/forms folder
-            $path = Path::clean(JPATH_ADMINISTRATOR . '/components/' . $component . '/models/forms/fieldgroup/' . $section . '.xml');
+        // Looking first in the component models/forms folder
+        $path = Path::clean(JPATH_ADMINISTRATOR . '/components/' . $component . '/models/forms/fieldgroup/' . $section . '.xml');
 
-            if (file_exists($path)) {
-                $lang = Factory::getLanguage();
-                $lang->load($component, JPATH_BASE);
-                $lang->load($component, JPATH_BASE . '/components/' . $component);
+        if (file_exists($path)) {
+            $lang = Factory::getLanguage();
+            $lang->load($component, JPATH_BASE);
+            $lang->load($component, JPATH_BASE . '/components/' . $component);
 
-                if (!$form->loadFile($path, false)) {
-                    throw new \Exception(Text::_('JERROR_LOADFILE_FAILED'));
-                }
+            if (!$form->loadFile($path, false)) {
+                throw new \Exception(Text::_('JERROR_LOADFILE_FAILED'));
             }
         }
     }
@@ -276,8 +277,8 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
      *
      * @return  array|boolean  Array of filtered data if valid, false otherwise.
      *
-     * @see     JFormRule
-     * @see     JFilterInput
+     * @see     \Joomla\CMS\Form\FormRule
+     * @see     \Joomla\CMS\Filter\InputFilter
      * @since   3.9.23
      */
     public function validate($form, $data, $group = null)
diff --git a/administrator/components/com_fields/src/Plugin/FieldsPlugin.php b/administrator/components/com_fields/src/Plugin/FieldsPlugin.php
index 52251ea72a16e..d1959d4b90ed5 100644
--- a/administrator/components/com_fields/src/Plugin/FieldsPlugin.php
+++ b/administrator/components/com_fields/src/Plugin/FieldsPlugin.php
@@ -10,6 +10,10 @@
 
 namespace Joomla\Component\Fields\Administrator\Plugin;
 
+use Joomla\CMS\Event\CustomFields\GetTypesEvent;
+use Joomla\CMS\Event\CustomFields\PrepareDomEvent;
+use Joomla\CMS\Event\CustomFields\PrepareFieldEvent;
+use Joomla\CMS\Event\Model\PrepareFormEvent;
 use Joomla\CMS\Filesystem\Folder;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Text;
@@ -44,6 +48,80 @@ abstract class FieldsPlugin extends CMSPlugin
      */
     protected $app;
 
+    /**
+     * Returns an array of events this subscriber will listen to.
+     *
+     * @return  array
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            'onCustomFieldsGetTypes'     => 'getFieldTypes',
+            'onCustomFieldsPrepareField' => 'prepareField',
+            'onCustomFieldsPrepareDom'   => 'prepareDom',
+            'onContentPrepareForm'       => 'prepareForm',
+        ];
+    }
+
+    /**
+     * Returns the custom fields types.
+     *
+     * @return  void
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function getFieldTypes(GetTypesEvent $event)
+    {
+        $result = $this->onCustomFieldsGetTypes();
+
+        if ($result) {
+            $event->addResult($result);
+        }
+    }
+
+    /**
+     * Prepares the field value.
+     *
+     * @return  void
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function prepareField(PrepareFieldEvent $event)
+    {
+        $result = $this->onCustomFieldsPrepareField($event->getContext(), $event->getItem(), $event->getField());
+
+        if ($result) {
+            $event->addResult($result);
+        }
+    }
+
+    /**
+     * Transforms the field into a DOM XML element and appends it as a child on the given parent.
+     *
+     * @return  void
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function prepareDom(PrepareDomEvent $event)
+    {
+        $this->onCustomFieldsPrepareDom($event->getField(), $event->getFieldset(), $event->getForm());
+    }
+
+    /**
+     * 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   __DEPLOY_VERSION__
+     */
+    public function prepareForm(PrepareFormEvent $event)
+    {
+        $this->onContentPrepareForm($event->getForm(), $event->getData());
+    }
+
     /**
      * Returns the custom fields types.
      *
@@ -131,7 +209,7 @@ public function onCustomFieldsPrepareField($context, $item, $field)
     {
         // Check if the field should be processed by us
         if (!$this->isTypeSupported($field->type)) {
-            return;
+            return '';
         }
 
         // Merge the params from the plugin and field which has precedence
diff --git a/administrator/components/com_fields/src/Table/FieldTable.php b/administrator/components/com_fields/src/Table/FieldTable.php
index eb409dc4b45d0..ca9879f57db3c 100644
--- a/administrator/components/com_fields/src/Table/FieldTable.php
+++ b/administrator/components/com_fields/src/Table/FieldTable.php
@@ -15,6 +15,8 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Table\Table;
+use Joomla\CMS\User\CurrentUserInterface;
+use Joomla\CMS\User\CurrentUserTrait;
 use Joomla\Database\DatabaseDriver;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
@@ -28,8 +30,10 @@
  *
  * @since  3.7.0
  */
-class FieldTable extends Table
+class FieldTable extends Table implements CurrentUserInterface
 {
+    use CurrentUserTrait;
+
     /**
      * Indicates that columns fully support the NULL value in the database
      *
@@ -53,11 +57,11 @@ public function __construct($db = null)
     }
 
     /**
-     * Method to bind an associative array or object to the JTable instance.This
+     * Method to bind an associative array or object to the \Joomla\CMS\Table\Table instance.This
      * method only binds properties that are publicly accessible and optionally
      * takes an array of properties to ignore when binding.
      *
-     * @param   mixed  $src     An associative array or object to bind to the JTable instance.
+     * @param   mixed  $src     An associative array or object to bind to the \Joomla\CMS\Table\Table instance.
      * @param   mixed  $ignore  An optional array or space separated list of properties to ignore while binding.
      *
      * @return  boolean  True on success.
@@ -114,7 +118,7 @@ public function bind($src, $ignore = '')
     }
 
     /**
-     * Method to perform sanity checks on the JTable instance properties to ensure
+     * Method to perform sanity checks on the \Joomla\CMS\Table\Table instance properties to ensure
      * they are safe to store in the database.  Child classes should override this
      * method to make sure the data they are storing in the database is safe and
      * as expected before storage.
@@ -165,7 +169,7 @@ public function check()
         }
 
         $date = Factory::getDate()->toSql();
-        $user = Factory::getUser();
+        $user = $this->getCurrentUser();
 
         // Set created date if not set.
         if (!(int) $this->created_time) {
diff --git a/administrator/components/com_fields/src/Table/GroupTable.php b/administrator/components/com_fields/src/Table/GroupTable.php
index 8658dd80621c4..488516d4ebd1c 100644
--- a/administrator/components/com_fields/src/Table/GroupTable.php
+++ b/administrator/components/com_fields/src/Table/GroupTable.php
@@ -14,6 +14,8 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Table\Table;
+use Joomla\CMS\User\CurrentUserInterface;
+use Joomla\CMS\User\CurrentUserTrait;
 use Joomla\Database\DatabaseDriver;
 use Joomla\Registry\Registry;
 
@@ -26,8 +28,10 @@
  *
  * @since  3.7.0
  */
-class GroupTable extends Table
+class GroupTable extends Table implements CurrentUserInterface
 {
+    use CurrentUserTrait;
+
     /**
      * Indicates that columns fully support the NULL value in the database
      *
@@ -51,11 +55,11 @@ public function __construct($db = null)
     }
 
     /**
-     * Method to bind an associative array or object to the JTable instance.This
+     * Method to bind an associative array or object to the \Joomla\CMS\Table\Table instance.This
      * method only binds properties that are publicly accessible and optionally
      * takes an array of properties to ignore when binding.
      *
-     * @param   mixed  $src     An associative array or object to bind to the JTable instance.
+     * @param   mixed  $src     An associative array or object to bind to the \Joomla\CMS\Table\Table instance.
      * @param   mixed  $ignore  An optional array or space separated list of properties to ignore while binding.
      *
      * @return  boolean  True on success.
@@ -81,7 +85,7 @@ public function bind($src, $ignore = '')
     }
 
     /**
-     * Method to perform sanity checks on the JTable instance properties to ensure
+     * Method to perform sanity checks on the \Joomla\CMS\Table\Table instance properties to ensure
      * they are safe to store in the database.  Child classes should override this
      * method to make sure the data they are storing in the database is safe and
      * as expected before storage.
@@ -101,7 +105,7 @@ public function check()
         }
 
         $date = Factory::getDate()->toSql();
-        $user = Factory::getUser();
+        $user = $this->getCurrentUser();
 
         // Set created date if not set.
         if (!(int) $this->created) {
diff --git a/administrator/components/com_fields/src/View/Field/HtmlView.php b/administrator/components/com_fields/src/View/Field/HtmlView.php
index 818d46b180ac9..b5c9e974f38f8 100644
--- a/administrator/components/com_fields/src/View/Field/HtmlView.php
+++ b/administrator/components/com_fields/src/View/Field/HtmlView.php
@@ -11,7 +11,6 @@
 namespace Joomla\Component\Fields\Administrator\View\Field;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
@@ -19,6 +18,7 @@
 use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -46,7 +46,7 @@ class HtmlView extends BaseHtmlView
     protected $item;
 
     /**
-     * @var     CMSObject
+     * @var     \Joomla\Registry\Registry
      *
      * @since   3.7.0
      */
@@ -107,7 +107,7 @@ protected function addToolbar()
         }
 
         // Load component language file
-        $lang = Factory::getLanguage();
+        $lang = $this->getLanguage();
         $lang->load($component, JPATH_ADMINISTRATOR)
         || $lang->load($component, Path::clean(JPATH_ADMINISTRATOR . '/components/' . $component));
 
@@ -162,6 +162,6 @@ function (Toolbar $childBar) use ($checkedOut, $itemEditable, $canDo) {
             $toolbar->cancel('field.cancel');
         }
 
-        $toolbar->help('Component:_New_or_Edit_Field');
+        $toolbar->help('Fields:_Edit');
     }
 }
diff --git a/administrator/components/com_fields/src/View/Fields/HtmlView.php b/administrator/components/com_fields/src/View/Fields/HtmlView.php
index bc04f1b39788a..c8327df983050 100644
--- a/administrator/components/com_fields/src/View/Fields/HtmlView.php
+++ b/administrator/components/com_fields/src/View/Fields/HtmlView.php
@@ -11,7 +11,6 @@
 namespace Joomla\Component\Fields\Administrator\View\Fields;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
@@ -23,6 +22,7 @@
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\Component\Fields\Administrator\Helper\FieldsHelper;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -64,7 +64,7 @@ class HtmlView extends BaseHtmlView
     protected $pagination;
 
     /**
-     * @var    \Joomla\CMS\Object\CMSObject
+     * @var   \Joomla\Registry\Registry
      *
      * @since  3.7.0
      */
@@ -135,7 +135,7 @@ protected function addToolbar()
         }
 
         // Load extension language file
-        $lang = Factory::getLanguage();
+        $lang = $this->getLanguage();
         $lang->load($component, JPATH_ADMINISTRATOR)
         || $lang->load($component, Path::clean(JPATH_ADMINISTRATOR . '/components/' . $component));
 
@@ -190,6 +190,6 @@ protected function addToolbar()
             $toolbar->preferences($component);
         }
 
-        $toolbar->help('Component:_Fields');
+        $toolbar->help('Fields');
     }
 }
diff --git a/administrator/components/com_fields/src/View/Group/HtmlView.php b/administrator/components/com_fields/src/View/Group/HtmlView.php
index c51f2b43b0951..6cbadcf7e6339 100644
--- a/administrator/components/com_fields/src/View/Group/HtmlView.php
+++ b/administrator/components/com_fields/src/View/Group/HtmlView.php
@@ -11,7 +11,6 @@
 namespace Joomla\Component\Fields\Administrator\View\Group;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
@@ -20,6 +19,7 @@
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\Component\Fields\Administrator\Helper\FieldsHelper;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -47,7 +47,7 @@ class HtmlView extends BaseHtmlView
     protected $item;
 
     /**
-     * @var    CMSObject
+     * @var    \Joomla\Registry\Registry
      *
      * @since  3.7.0
      */
@@ -56,7 +56,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The actions the user is authorised to perform
      *
-     * @var    CMSObject
+     * @var    \Joomla\Registry\Registry
      *
      * @since  3.7.0
      */
@@ -127,7 +127,7 @@ protected function addToolbar()
         }
 
         // Load component language file
-        $lang = Factory::getLanguage();
+        $lang = $this->getLanguage();
         $lang->load($component, JPATH_ADMINISTRATOR)
         || $lang->load($component, Path::clean(JPATH_ADMINISTRATOR . '/components/' . $component));
 
@@ -186,6 +186,6 @@ function (Toolbar $childBar) use ($checkedOut, $itemEditable, $canDo) {
             $toolbar->cancel('group.cancel');
         }
 
-        $toolbar->help('Component:_New_or_Edit_Field_Group');
+        $toolbar->help('Field_Groups:_Edit');
     }
 }
diff --git a/administrator/components/com_fields/src/View/Groups/HtmlView.php b/administrator/components/com_fields/src/View/Groups/HtmlView.php
index 8094175b3564a..2ce7af2a04195 100644
--- a/administrator/components/com_fields/src/View/Groups/HtmlView.php
+++ b/administrator/components/com_fields/src/View/Groups/HtmlView.php
@@ -11,7 +11,6 @@
 namespace Joomla\Component\Fields\Administrator\View\Groups;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
@@ -23,6 +22,7 @@
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\Component\Fields\Administrator\Helper\FieldsHelper;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -64,7 +64,7 @@ class HtmlView extends BaseHtmlView
     protected $pagination;
 
     /**
-     * @var    \Joomla\CMS\Object\CMSObject
+     * @var   \Joomla\Registry\Registry
      *
      * @since  3.7.0
      */
@@ -137,7 +137,7 @@ protected function addToolbar()
         }
 
         // Load component language file
-        $lang = Factory::getLanguage();
+        $lang = $this->getLanguage();
         $lang->load($component, JPATH_ADMINISTRATOR)
         || $lang->load($component, Path::clean(JPATH_ADMINISTRATOR . '/components/' . $component));
 
@@ -192,6 +192,6 @@ protected function addToolbar()
             $toolbar->preferences($component);
         }
 
-        $toolbar->help('Component:_Field_Groups');
+        $toolbar->help('Field_Groups');
     }
 }
diff --git a/administrator/components/com_fields/tmpl/field/edit.php b/administrator/components/com_fields/tmpl/field/edit.php
index 439eb45af151c..748011f335d33 100644
--- a/administrator/components/com_fields/tmpl/field/edit.php
+++ b/administrator/components/com_fields/tmpl/field/edit.php
@@ -80,6 +80,7 @@
             <legend><?php echo Text::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></legend>
             <div>
             <?php echo LayoutHelper::render('joomla.edit.publishingdata', $this); ?>
+            <?php echo $this->form->renderField('searchindexing'); ?>
             </div>
         </fieldset>
         <?php echo HTMLHelper::_('uitab.endTab'); ?>
diff --git a/administrator/components/com_fields/tmpl/fields/default.php b/administrator/components/com_fields/tmpl/fields/default.php
index e0f5c4c72062c..020ffc76869b9 100644
--- a/administrator/components/com_fields/tmpl/fields/default.php
+++ b/administrator/components/com_fields/tmpl/fields/default.php
@@ -26,7 +26,7 @@
     ->useScript('multiselect');
 
 $app       = Factory::getApplication();
-$user      = Factory::getUser();
+$user      = $this->getCurrentUser();
 $userId    = $user->get('id');
 $context   = $this->escape($this->state->get('filter.context'));
 $component = $this->state->get('filter.component');
@@ -198,7 +198,7 @@
                     <?php // load the pagination. ?>
                     <?php echo $this->pagination->getListFooter(); ?>
 
-                    <?php //Load the batch processing form. ?>
+                    <?php // Load the batch processing form. ?>
                     <?php
                     if (
                         $user->authorise('core.create', $component)
diff --git a/administrator/components/com_fields/tmpl/fields/modal.php b/administrator/components/com_fields/tmpl/fields/modal.php
index 97f2fdae0c11a..65beea544018d 100644
--- a/administrator/components/com_fields/tmpl/fields/modal.php
+++ b/administrator/components/com_fields/tmpl/fields/modal.php
@@ -23,7 +23,7 @@
 
 /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
 $wa = $this->document->getWebAssetManager();
-$wa->useScript('com_fields.admin-fields-modal');
+$wa->useScript('com_fields.admin-fields-modal')->useScript('modal-content-select');
 
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
@@ -80,6 +80,18 @@
                         2  => 'icon-folder',
                     ];
                     foreach ($this->items as $i => $item) :
+                        $attrs = 'data-content-select data-content-type="com_fields.field"'
+                            . ' data-id="' . ((int) $item->id) . '"'
+                            . ' data-title="' . $this->escape($item->title) . '"'
+                            . ' data-name="' . $this->escape($item->name) . '"'
+                            . ' data-group="' . ((int) $item->group_id) . '"';
+
+                        $attrs1 = $attrs;
+                        $attrs1 .= ' data-html="{field ' . ((int) $item->id) . '}"';
+                        $attrs2 = $attrs;
+                        $attrs2 .= ' data-html="{fieldgroup ' . ((int) $item->group_id) . '}"';
+
+                        // @TODO: Remove onclick="" after full transition to postMessage()
                         ?>
                     <tr class="row<?php echo $i % 2; ?>">
                         <td class="text-center">
@@ -88,10 +100,16 @@
                             </span>
                         </td>
                         <th scope="row" class="has-context">
-                            <a class="btn btn-sm btn-success w-100" href="#" onclick="Joomla.fieldIns('<?php echo $this->escape($item->id); ?>', '<?php echo $this->escape($editor); ?>');"><?php echo $this->escape($item->title); ?></a>
+                            <button type="button" class="btn btn-sm btn-success w-100" <?php echo $attrs1; ?>
+                                    onclick="Joomla.fieldIns('<?php echo $this->escape($item->id); ?>', '<?php echo $this->escape($editor); ?>');">
+                                <?php echo $this->escape($item->title); ?>
+                            </button>
                         </th>
                         <td class="small d-none d-md-table-cell">
-                            <a class="btn btn-sm btn-warning w-100" href="#" onclick="Joomla.fieldgroupIns('<?php echo $this->escape($item->group_id); ?>', '<?php echo $this->escape($editor); ?>');"><?php echo $item->group_id ? $this->escape($item->group_title) : Text::_('JNONE'); ?></a>
+                            <button type="button" class="btn btn-sm btn-warning w-100" <?php echo $item->group_id ? $attrs2 : ''; ?>
+                                    onclick="Joomla.fieldgroupIns('<?php echo $this->escape($item->group_id); ?>', '<?php echo $this->escape($editor); ?>');">
+                                <?php echo $item->group_id ? $this->escape($item->group_title) : Text::_('JNONE'); ?>
+                            </button>
                         </td>
                         <td class="small d-none d-md-table-cell">
                             <?php echo $item->type; ?>
diff --git a/administrator/components/com_fields/tmpl/groups/default.php b/administrator/components/com_fields/tmpl/groups/default.php
index 1bde8e30eb335..d043bc7d3dfb1 100644
--- a/administrator/components/com_fields/tmpl/groups/default.php
+++ b/administrator/components/com_fields/tmpl/groups/default.php
@@ -25,7 +25,7 @@
     ->useScript('multiselect');
 
 $app       = Factory::getApplication();
-$user      = Factory::getUser();
+$user      = $this->getCurrentUser();
 $userId    = $user->get('id');
 
 $component = '';
@@ -166,7 +166,7 @@
                     <?php // load the pagination. ?>
                     <?php echo $this->pagination->getListFooter(); ?>
 
-                    <?php //Load the batch processing form. ?>
+                    <?php // Load the batch processing form. ?>
                     <?php
                     if (
                         $user->authorise('core.create', $component)
diff --git a/administrator/components/com_finder/forms/indexer.xml b/administrator/components/com_finder/forms/indexer.xml
new file mode 100644
index 0000000000000..264387d33fea2
--- /dev/null
+++ b/administrator/components/com_finder/forms/indexer.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form>
+	<fieldset name="form">
+		<field
+			name="plugin"
+			type="plugins"
+			label="COM_FINDER_FIELD_FINDER_PLUGIN_LABEL"
+			folder="finder"
+			required="true"
+		/>
+
+		<field
+			name="id"
+			type="text"
+			label="JGLOBAL_FIELD_ID_LABEL"
+			required="true"
+		/>
+	</fieldset>
+</form>
diff --git a/administrator/components/com_finder/src/Controller/DisplayController.php b/administrator/components/com_finder/src/Controller/DisplayController.php
index 526c8901624c1..a8756a8ddd2c9 100644
--- a/administrator/components/com_finder/src/Controller/DisplayController.php
+++ b/administrator/components/com_finder/src/Controller/DisplayController.php
@@ -40,7 +40,8 @@ class DisplayController extends BaseController
      * Method to display a view.
      *
      * @param   boolean  $cachable   If true, the view output will be cached
-     * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link \JFilterInput::clean()}.
+     * @param   array    $urlparams  An array of safe URL parameters and their variable types
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  static|boolean   A Controller object to support chaining or false on failure.
      *
diff --git a/administrator/components/com_finder/src/Controller/IndexController.php b/administrator/components/com_finder/src/Controller/IndexController.php
index 042253c2f23bc..138983dda93db 100644
--- a/administrator/components/com_finder/src/Controller/IndexController.php
+++ b/administrator/components/com_finder/src/Controller/IndexController.php
@@ -10,6 +10,7 @@
 
 namespace Joomla\Component\Finder\Administrator\Controller;
 
+use Joomla\CMS\Event\Finder\GarbageCollectionEvent;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\CMS\Plugin\PluginHelper;
@@ -53,9 +54,11 @@ public function optimise()
     {
         $this->checkToken();
 
+        $dispatcher = $this->getDispatcher();
+
         // Optimise the index by first running the garbage collection
-        PluginHelper::importPlugin('finder');
-        $this->app->triggerEvent('onFinderGarbageCollection');
+        PluginHelper::importPlugin('finder', null, true, $dispatcher);
+        $dispatcher->dispatch('onFinderGarbageCollection', new GarbageCollectionEvent('onFinderGarbageCollection', []));
 
         // Now run the optimisation method from the indexer
         $indexer = new Indexer();
diff --git a/administrator/components/com_finder/src/Controller/IndexerController.php b/administrator/components/com_finder/src/Controller/IndexerController.php
index 5097500205626..89a59ac241b83 100644
--- a/administrator/components/com_finder/src/Controller/IndexerController.php
+++ b/administrator/components/com_finder/src/Controller/IndexerController.php
@@ -11,12 +11,18 @@
 namespace Joomla\Component\Finder\Administrator\Controller;
 
 use Joomla\CMS\Component\ComponentHelper;
+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\Text;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Session\Session;
+use Joomla\Component\Finder\Administrator\Indexer\Adapter;
+use Joomla\Component\Finder\Administrator\Indexer\DebugAdapter;
+use Joomla\Component\Finder\Administrator\Indexer\DebugIndexer;
 use Joomla\Component\Finder\Administrator\Indexer\Indexer;
 use Joomla\Component\Finder\Administrator\Response\Response;
 
@@ -47,7 +53,8 @@ public function start()
             return;
         }
 
-        $params = ComponentHelper::getParams('com_finder');
+        $params     = ComponentHelper::getParams('com_finder');
+        $dispatcher = $this->getDispatcher();
 
         if ($params->get('enable_logging', '0')) {
             $options['format']    = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}';
@@ -72,7 +79,7 @@ public function start()
         Indexer::resetState();
 
         // Import the finder plugins.
-        PluginHelper::importPlugin('finder');
+        PluginHelper::importPlugin('finder', null, true, $dispatcher);
 
         // Add the indexer language to \JS
         Text::script('COM_FINDER_AN_ERROR_HAS_OCCURRED');
@@ -81,12 +88,18 @@ public function start()
         // Start the indexer.
         try {
             // Trigger the onStartIndex event.
-            $this->app->triggerEvent('onStartIndex');
+            $dispatcher->dispatch('onStartIndex', new StartIndexEvent('onStartIndex', []));
 
             // Get the indexer state.
             $state        = Indexer::getState();
             $state->start = 1;
 
+            $output = ob_get_contents();
+
+            if ($output) {
+                throw new \Exception(Text::_('COM_FINDER_AN_ERROR_HAS_OCCURRED'));
+            }
+
             // Send the response.
             static::sendResponse($state);
         } catch (\Exception $e) {
@@ -111,7 +124,8 @@ public function batch()
             return;
         }
 
-        $params = ComponentHelper::getParams('com_finder');
+        $params     = ComponentHelper::getParams('com_finder');
+        $dispatcher = $this->getDispatcher();
 
         if ($params->get('enable_logging', '0')) {
             $options['format']    = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}';
@@ -145,14 +159,14 @@ public function batch()
         Indexer::setState($state);
 
         // Import the finder plugins.
-        PluginHelper::importPlugin('finder');
+        PluginHelper::importPlugin('finder', null, true, $dispatcher);
 
         /*
          * We are going to swap out the raw document object with an HTML document
          * in order to work around some plugins that don't do proper environment
          * checks before trying to use HTML document functions.
          */
-        $lang = Factory::getLanguage();
+        $lang = $this->app->getLanguage();
 
         // Get the document properties.
         $attributes = [
@@ -166,10 +180,10 @@ public function batch()
         // Start the indexer.
         try {
             // Trigger the onBeforeIndex event.
-            $this->app->triggerEvent('onBeforeIndex');
+            $dispatcher->dispatch('onBeforeIndex', new BeforeIndexEvent('onBeforeIndex', []));
 
             // Trigger the onBuildIndex event.
-            $this->app->triggerEvent('onBuildIndex');
+            $dispatcher->dispatch('onBuildIndex', new BuildIndexEvent('onBuildIndex', []));
 
             // Get the indexer state.
             $state           = Indexer::getState();
@@ -183,6 +197,12 @@ public function batch()
                 // Informational log only
             }
 
+            $output = ob_get_contents();
+
+            if ($output) {
+                throw new \Exception(Text::_('COM_FINDER_INDEXER_ERROR_PLUGIN_FAILURE'));
+            }
+
             // Send the response.
             static::sendResponse($state);
         } catch (\Exception $e) {
@@ -215,7 +235,7 @@ public function optimize()
         ob_start();
 
         // Import the finder plugins.
-        PluginHelper::importPlugin('finder');
+        PluginHelper::importPlugin('finder', null, true, $this->getDispatcher());
 
         try {
             // Optimize the index
@@ -227,6 +247,12 @@ public function optimize()
             $state->start    = 0;
             $state->complete = 1;
 
+            $output = ob_get_contents();
+
+            if ($output) {
+                throw new \Exception(Text::_('COM_FINDER_AN_ERROR_HAS_OCCURRED'));
+            }
+
             // Send the response.
             static::sendResponse($state);
         } catch (\Exception $e) {
@@ -277,8 +303,117 @@ public static function sendResponse($data = null)
             $response->buffer = ob_get_contents();
             $response->memory = memory_get_usage(true);
         }
+        ob_clean();
 
         // Send the JSON response.
         echo json_encode($response);
     }
+
+    /**
+     * Method to call a specific indexing plugin and return debug info
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     * @internal
+     */
+    public function debug()
+    {
+        // Check for a valid token. If invalid, send a 403 with the error message.
+        if (!Session::checkToken('request')) {
+            static::sendResponse(new \Exception(Text::_('JINVALID_TOKEN_NOTICE'), 403));
+
+            return;
+        }
+
+        // We don't want this form to be cached.
+        $this->app->allowCache(false);
+
+        // Put in a buffer to silence noise.
+        ob_start();
+
+        // Remove the script time limit.
+        @set_time_limit(0);
+
+        // Get the indexer state.
+        Indexer::resetState();
+        $state = Indexer::getState();
+
+        // Reset the batch offset.
+        $state->batchOffset = 0;
+
+        // Update the indexer state.
+        Indexer::setState($state);
+
+        // Start the indexer.
+        try {
+            // Import the finder plugins.
+            class_alias(DebugAdapter::class, Adapter::class);
+            $plugin = $this->app->bootPlugin($this->app->getInput()->get('plugin'), 'finder');
+            $plugin->setIndexer(new DebugIndexer());
+            $plugin->debug($this->app->getInput()->get('id'));
+
+            $output = '';
+
+            // Create list of attributes
+            $output .= '<fieldset><legend>' . Text::_('COM_FINDER_INDEXER_FIELDSET_ATTRIBUTES') . '</legend>';
+            $output .= '<dl class="row">';
+
+            foreach (DebugIndexer::$item as $key => $value) {
+                $output .= '<dt class="col-sm-2">' . $key . '</dt><dd class="col-sm-10">' . $value . '</dd>';
+            }
+
+            $output .= '</dl>';
+            $output .= '</fieldset>';
+
+            $output .= '<fieldset><legend>' . Text::_('COM_FINDER_INDEXER_FIELDSET_ELEMENTS') . '</legend>';
+            $output .= '<dl class="row">';
+
+            foreach (DebugIndexer::$item->getElements() as $key => $element) {
+                $output .= '<dt class="col-sm-2">' . $key . '</dt><dd class="col-sm-10">' . $element . '</dd>';
+            }
+
+            $output .= '</dl>';
+            $output .= '</fieldset>';
+
+            $output .= '<fieldset><legend>' . Text::_('COM_FINDER_INDEXER_FIELDSET_INSTRUCTIONS') . '</legend>';
+            $output .= '<dl class="row">';
+            $contexts = [
+                1 => 'Title context',
+                2 => 'Text context',
+                3 => 'Meta context',
+                4 => 'Path context',
+                5 => 'Misc context',
+            ];
+
+            foreach (DebugIndexer::$item->getInstructions() as $key => $element) {
+                $output .= '<dt class="col-sm-2">' . $contexts[$key] . '</dt><dd class="col-sm-10">' . json_encode($element) . '</dd>';
+            }
+
+            $output .= '</dl>';
+            $output .= '</fieldset>';
+
+            $output .= '<fieldset><legend>' . Text::_('COM_FINDER_INDEXER_FIELDSET_TAXONOMIES') . '</legend>';
+            $output .= '<dl class="row">';
+
+            foreach (DebugIndexer::$item->getTaxonomy() as $key => $element) {
+                $output .= '<dt class="col-sm-2">' . $key . '</dt><dd class="col-sm-10">' . json_encode($element) . '</dd>';
+            }
+
+            $output .= '</dl>';
+            $output .= '</fieldset>';
+
+            // Get the indexer state.
+            $state           = Indexer::getState();
+            $state->start    = 0;
+            $state->complete = 0;
+            $state->rendered = $output;
+
+            echo json_encode($state);
+        } catch (\Exception $e) {
+            // Catch an exception and return the response.
+            // Send the response.
+            static::sendResponse($e);
+        }
+    }
 }
diff --git a/administrator/components/com_finder/src/Extension/FinderComponent.php b/administrator/components/com_finder/src/Extension/FinderComponent.php
index 3550ebc9fa547..04a718d2e9d15 100644
--- a/administrator/components/com_finder/src/Extension/FinderComponent.php
+++ b/administrator/components/com_finder/src/Extension/FinderComponent.php
@@ -22,7 +22,7 @@
 use Psr\Container\ContainerInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/administrator/components/com_finder/src/Field/ContentmapField.php b/administrator/components/com_finder/src/Field/ContentmapField.php
index c540e1bd243b4..e35a26205d31a 100644
--- a/administrator/components/com_finder/src/Field/ContentmapField.php
+++ b/administrator/components/com_finder/src/Field/ContentmapField.php
@@ -17,7 +17,7 @@
 use Joomla\Component\Finder\Administrator\Helper\LanguageHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/administrator/components/com_finder/src/Field/TaxonomytypesField.php b/administrator/components/com_finder/src/Field/TaxonomytypesField.php
new file mode 100644
index 0000000000000..114028583ca34
--- /dev/null
+++ b/administrator/components/com_finder/src/Field/TaxonomytypesField.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Component\Finder\Administrator\Field;
+
+use Joomla\CMS\Form\Field\CheckboxesField;
+
+/**
+ * Taxonomy Types field for the Finder package.
+ * This is a helper to allow to save an empty set of
+ * options by having a hidden field with a "none" value.
+ *
+ * @since  5.0.0
+ */
+class TaxonomytypesField extends CheckboxesField
+{
+    /**
+     * The form field type.
+     *
+     * @var    string
+     * @since  5.0.0
+     */
+    protected $type = 'TaxonomyTypes';
+
+    /**
+     * Method to get the field input markup for a generic list.
+     * Use the multiple attribute to enable multiselect.
+     *
+     * @return  string  The field input markup.
+     *
+     * @since   5.0.0
+     */
+    protected function getInput()
+    {
+        $html = parent::getInput();
+
+        $data = $this->getLayoutData();
+        $data['id'] .= '_hidden';
+        $data['value'] = 'none';
+
+        return $html . $this->getRenderer('joomla.form.field.hidden')->render($data);
+    }
+}
diff --git a/administrator/components/com_finder/src/Helper/LanguageHelper.php b/administrator/components/com_finder/src/Helper/LanguageHelper.php
index 7376fab091f20..75fba6301d517 100644
--- a/administrator/components/com_finder/src/Helper/LanguageHelper.php
+++ b/administrator/components/com_finder/src/Helper/LanguageHelper.php
@@ -5,7 +5,7 @@
  * @subpackage  com_finder
  *
  * @copyright   (C) 2017 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\Component\Finder\Administrator\Helper;
diff --git a/administrator/components/com_finder/src/Indexer/Adapter.php b/administrator/components/com_finder/src/Indexer/Adapter.php
index c67bb5e57e1a8..0669d8f4d2555 100644
--- a/administrator/components/com_finder/src/Indexer/Adapter.php
+++ b/administrator/components/com_finder/src/Indexer/Adapter.php
@@ -10,12 +10,12 @@
 
 namespace Joomla\Component\Finder\Administrator\Indexer;
 
-use Exception;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Table\Table;
 use Joomla\Database\DatabaseInterface;
 use Joomla\Database\QueryInterface;
+use Joomla\Event\DispatcherInterface;
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -131,15 +131,15 @@ abstract class Adapter extends CMSPlugin
     /**
      * Method to instantiate the indexer adapter.
      *
-     * @param   object  $subject  The object to observe.
-     * @param   array   $config   An array that holds the plugin configuration.
+     * @param   DispatcherInterface  $dispatcher  The object to observe.
+     * @param   array                $config      An array that holds the plugin configuration.
      *
      * @since   2.5
      */
-    public function __construct(&$subject, $config)
+    public function __construct(DispatcherInterface $dispatcher, array $config)
     {
         // Call the parent constructor.
-        parent::__construct($subject, $config);
+        parent::__construct($dispatcher, $config);
 
         // Get the type id.
         $this->type_id = $this->getTypeId();
@@ -158,13 +158,30 @@ public function __construct(&$subject, $config)
         $this->indexer = new Indexer($this->db);
     }
 
+    /**
+     * Returns an array of events this subscriber will listen to.
+     *
+     * @return  array
+     *
+     * @since   5.0.0
+     */
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            'onBeforeIndex'             => 'onBeforeIndex',
+            'onBuildIndex'              => 'onBuildIndex',
+            'onFinderGarbageCollection' => 'onFinderGarbageCollection',
+            'onStartIndex'              => 'onStartIndex',
+        ];
+    }
+
     /**
      * Method to get the adapter state and push it into the indexer.
      *
      * @return  void
      *
      * @since   2.5
-     * @throws  Exception on error.
+     * @throws  \Exception on error.
      */
     public function onStartIndex()
     {
@@ -192,7 +209,7 @@ public function onStartIndex()
      * @return  boolean  True on success.
      *
      * @since   2.5
-     * @throws  Exception on error.
+     * @throws  \Exception on error.
      */
     public function onBeforeIndex()
     {
@@ -218,7 +235,7 @@ public function onBeforeIndex()
      * @return  boolean  True on success.
      *
      * @since   2.5
-     * @throws  Exception on error.
+     * @throws  \Exception on error.
      */
     public function onBuildIndex()
     {
@@ -300,7 +317,7 @@ public function onFinderGarbageCollection()
      * @return  boolean  True on success.
      *
      * @since   2.5
-     * @throws  Exception on database error.
+     * @throws  \Exception on database error.
      */
     protected function change($id, $property, $value)
     {
@@ -331,7 +348,7 @@ protected function change($id, $property, $value)
      * @return  boolean  True on success.
      *
      * @since   2.5
-     * @throws  Exception on database error.
+     * @throws  \Exception on database error.
      */
     abstract protected function index(Result $item);
 
@@ -343,7 +360,7 @@ abstract protected function index(Result $item);
      * @return  void
      *
      * @since   2.5
-     * @throws  Exception on database error.
+     * @throws  \Exception on database error.
      */
     protected function reindex($id)
     {
@@ -368,7 +385,7 @@ protected function reindex($id)
      * @return  boolean  True on success.
      *
      * @since   2.5
-     * @throws  Exception on database error.
+     * @throws  \Exception on database error.
      */
     protected function remove($id, $removeTaxonomies = true)
     {
@@ -404,7 +421,7 @@ protected function remove($id, $removeTaxonomies = true)
      * @return  boolean  True on success, false on failure.
      *
      * @since   2.5
-     * @throws  Exception on database error.
+     * @throws  \Exception on database error.
      */
     abstract protected function setup();
 
@@ -520,7 +537,7 @@ protected function checkItemAccess($row)
      * @return  integer  The number of content items available to index.
      *
      * @since   2.5
-     * @throws  Exception on database error.
+     * @throws  \Exception on database error.
      */
     protected function getContentCount()
     {
@@ -556,7 +573,7 @@ protected function getContentCount()
      * @return  Result  A Result object.
      *
      * @since   2.5
-     * @throws  Exception on database error.
+     * @throws  \Exception on database error.
      */
     protected function getItem($id)
     {
@@ -590,7 +607,7 @@ protected function getItem($id)
      * @return  Result[]  An array of Result objects.
      *
      * @since   2.5
-     * @throws  Exception on database error.
+     * @throws  \Exception on database error.
      */
     protected function getItems($offset, $limit, $query = null)
     {
@@ -718,7 +735,7 @@ protected function getUpdateQueryByIds($ids)
      * @return  integer  The numeric type id for the content.
      *
      * @since   2.5
-     * @throws  Exception on database error.
+     * @throws  \Exception on database error.
      */
     protected function getTypeId()
     {
@@ -758,7 +775,7 @@ protected function getUrl($id, $extension, $view)
      * @return  mixed  The title on success, null if not found.
      *
      * @since   2.5
-     * @throws  Exception on database error.
+     * @throws  \Exception on database error.
      */
     protected function getItemMenuTitle($url)
     {
@@ -902,9 +919,16 @@ protected function translateState($item, $category = null)
 
         // Translate the state
         switch ($item) {
-            // Published and archived items only should return a published state
+            // Published items should always show up in search results
             case 1:
+                return 1;
+
+            // Archived items should only show up when option is enabled
             case 2:
+                if ($this->params->get('search_archived', 1) == 0) {
+                    return 0;
+                }
+
                 return 1;
 
             // All other states should return an unpublished state
diff --git a/administrator/components/com_finder/src/Indexer/DebugAdapter.php b/administrator/components/com_finder/src/Indexer/DebugAdapter.php
new file mode 100644
index 0000000000000..f65302c046801
--- /dev/null
+++ b/administrator/components/com_finder/src/Indexer/DebugAdapter.php
@@ -0,0 +1,952 @@
+<?php
+
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Component\Finder\Administrator\Indexer;
+
+use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\CMS\Table\Table;
+use Joomla\Database\DatabaseInterface;
+use Joomla\Database\QueryInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Prototype debug adapter class for the Finder indexer package.
+ * THIS CLASS IS ONLY TO BE USED FOR DEBUGGING PURPOSES! DON'T
+ * USE IT FOR PRODUCTIVE USE!
+ *
+ * @since  5.0.0
+ * @internal
+ */
+abstract class DebugAdapter extends CMSPlugin
+{
+    /**
+     * The context is somewhat arbitrary but it must be unique or there will be
+     * conflicts when managing plugin/indexer state. A good best practice is to
+     * use the plugin name suffix as the context. For example, if the plugin is
+     * named 'plgFinderContent', the context could be 'Content'.
+     *
+     * @var    string
+     * @since  5.0.0
+     */
+    protected $context;
+
+    /**
+     * The extension name.
+     *
+     * @var    string
+     * @since  5.0.0
+     */
+    protected $extension;
+
+    /**
+     * The sublayout to use when rendering the results.
+     *
+     * @var    string
+     * @since  5.0.0
+     */
+    protected $layout;
+
+    /**
+     * The mime type of the content the adapter indexes.
+     *
+     * @var    string
+     * @since  5.0.0
+     */
+    protected $mime;
+
+    /**
+     * The access level of an item before save.
+     *
+     * @var    integer
+     * @since  5.0.0
+     */
+    protected $old_access;
+
+    /**
+     * The access level of a category before save.
+     *
+     * @var    integer
+     * @since  5.0.0
+     */
+    protected $old_cataccess;
+
+    /**
+     * The type of content the adapter indexes.
+     *
+     * @var    string
+     * @since  5.0.0
+     */
+    protected $type_title;
+
+    /**
+     * The type id of the content.
+     *
+     * @var    integer
+     * @since  5.0.0
+     */
+    protected $type_id;
+
+    /**
+     * The database object.
+     *
+     * @var    DatabaseInterface
+     * @since  5.0.0
+     */
+    protected $db;
+
+    /**
+     * The table name.
+     *
+     * @var    string
+     * @since  5.0.0
+     */
+    protected $table;
+
+    /**
+     * The indexer object.
+     *
+     * @var    Indexer
+     * @since  5.0.0
+     */
+    protected $indexer;
+
+    /**
+     * The field the published state is stored in.
+     *
+     * @var    string
+     * @since  5.0.0
+     */
+    protected $state_field = 'state';
+
+    /**
+     * Method to instantiate the indexer adapter.
+     *
+     * @param   DispatcherInterface  $dispatcher  The object to observe.
+     * @param   array                $config      An array that holds the plugin configuration.
+     *
+     * @since   5.0.0
+     */
+    public function __construct(DispatcherInterface $dispatcher, array $config)
+    {
+        // Call the parent constructor.
+        parent::__construct($dispatcher, $config);
+
+        // Get the type id.
+        $this->type_id = $this->getTypeId();
+
+        // Add the content type if it doesn't exist and is set.
+        if (empty($this->type_id) && !empty($this->type_title)) {
+            $this->type_id = Helper::addContentType($this->type_title, $this->mime);
+        }
+
+        // Check for a layout override.
+        if ($this->params->get('layout')) {
+            $this->layout = $this->params->get('layout');
+        }
+
+        // Get the indexer object
+        $this->indexer = new Indexer($this->db);
+    }
+
+    /**
+     * Method to get the adapter state and push it into the indexer.
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     * @throws  \Exception on error.
+     */
+    public function onStartIndex()
+    {
+        // Get the indexer state.
+        $iState = Indexer::getState();
+
+        // Get the number of content items.
+        $total = (int) $this->getContentCount();
+
+        // Add the content count to the total number of items.
+        $iState->totalItems += $total;
+
+        // Populate the indexer state information for the adapter.
+        $iState->pluginState[$this->context]['total']  = $total;
+        $iState->pluginState[$this->context]['offset'] = 0;
+
+        // Set the indexer state.
+        Indexer::setState($iState);
+    }
+
+    /**
+     * Method to prepare for the indexer to be run. This method will often
+     * be used to include dependencies and things of that nature.
+     *
+     * @return  boolean  True on success.
+     *
+     * @since   5.0.0
+     * @throws  \Exception on error.
+     */
+    public function onBeforeIndex()
+    {
+        // Get the indexer and adapter state.
+        $iState = Indexer::getState();
+        $aState = $iState->pluginState[$this->context];
+
+        // Check the progress of the indexer and the adapter.
+        if ($iState->batchOffset == $iState->batchSize || $aState['offset'] == $aState['total']) {
+            return true;
+        }
+
+        // Run the setup method.
+        return $this->setup();
+    }
+
+    /**
+     * Method to index a batch of content items. This method can be called by
+     * the indexer many times throughout the indexing process depending on how
+     * much content is available for indexing. It is important to track the
+     * progress correctly so we can display it to the user.
+     *
+     * @return  boolean  True on success.
+     *
+     * @since   5.0.0
+     * @throws  \Exception on error.
+     */
+    public function onBuildIndex()
+    {
+        // Get the indexer and adapter state.
+        $iState = Indexer::getState();
+        $aState = $iState->pluginState[$this->context];
+
+        // Check the progress of the indexer and the adapter.
+        if ($iState->batchOffset == $iState->batchSize || $aState['offset'] == $aState['total']) {
+            return true;
+        }
+
+        // Get the batch offset and size.
+        $offset = (int) $aState['offset'];
+        $limit  = (int) ($iState->batchSize - $iState->batchOffset);
+
+        // Get the content items to index.
+        $items = $this->getItems($offset, $limit);
+
+        // Iterate through the items and index them.
+        for ($i = 0, $n = count($items); $i < $n; $i++) {
+            // Index the item.
+            $this->index($items[$i]);
+
+            // Adjust the offsets.
+            $offset++;
+            $iState->batchOffset++;
+            $iState->totalItems--;
+        }
+
+        // Update the indexer state.
+        $aState['offset']                    = $offset;
+        $iState->pluginState[$this->context] = $aState;
+        Indexer::setState($iState);
+
+        return true;
+    }
+
+    /**
+     * Method to remove outdated index entries
+     *
+     * @return  integer
+     *
+     * @since   _5.0.0
+     */
+    public function onFinderGarbageCollection()
+    {
+        $db      = $this->db;
+        $type_id = $this->getTypeId();
+
+        $query    = $db->getQuery(true);
+        $subquery = $db->getQuery(true);
+        $subquery->select('CONCAT(' . $db->quote($this->getUrl('', $this->extension, $this->layout)) . ', id)')
+            ->from($db->quoteName($this->table));
+        $query->select($db->quoteName('l.link_id'))
+            ->from($db->quoteName('#__finder_links', 'l'))
+            ->where($db->quoteName('l.type_id') . ' = ' . $type_id)
+            ->where($db->quoteName('l.url') . ' LIKE ' . $db->quote($this->getUrl('%', $this->extension, $this->layout)))
+            ->where($db->quoteName('l.url') . ' NOT IN (' . $subquery . ')');
+        $db->setQuery($query);
+        $items = $db->loadColumn();
+
+        foreach ($items as $item) {
+            $this->indexer->remove($item);
+        }
+
+        return count($items);
+    }
+
+    /**
+     * Method to change the value of a content item's property in the links
+     * table. This is used to synchronize published and access states that
+     * are changed when not editing an item directly.
+     *
+     * @param   string   $id        The ID of the item to change.
+     * @param   string   $property  The property that is being changed.
+     * @param   integer  $value     The new value of that property.
+     *
+     * @return  boolean  True on success.
+     *
+     * @since   5.0.0
+     * @throws  \Exception on database error.
+     */
+    protected function change($id, $property, $value)
+    {
+        // Check for a property we know how to handle.
+        if ($property !== 'state' && $property !== 'access') {
+            return true;
+        }
+
+        // Get the URL for the content id.
+        $item = $this->db->quote($this->getUrl($id, $this->extension, $this->layout));
+
+        // Update the content items.
+        $query = $this->db->getQuery(true)
+            ->update($this->db->quoteName('#__finder_links'))
+            ->set($this->db->quoteName($property) . ' = ' . (int) $value)
+            ->where($this->db->quoteName('url') . ' = ' . $item);
+        $this->db->setQuery($query);
+        $this->db->execute();
+
+        return true;
+    }
+
+    /**
+     * Method to index an item.
+     *
+     * @param   Result  $item  The item to index as a Result object.
+     *
+     * @return  boolean  True on success.
+     *
+     * @since   5.0.0
+     * @throws  \Exception on database error.
+     */
+    abstract protected function index(Result $item);
+
+    /**
+     * Method to reindex an item.
+     *
+     * @param   integer  $id  The ID of the item to reindex.
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     * @throws  \Exception on database error.
+     */
+    protected function reindex($id)
+    {
+        // Run the setup method.
+        $this->setup();
+
+        // Remove the old item.
+        $this->remove($id, false);
+
+        // Get the item.
+        $item = $this->getItem($id);
+
+        // Index the item.
+        $this->index($item);
+
+        Taxonomy::removeOrphanNodes();
+    }
+
+    /**
+     * Method to remove an item from the index.
+     *
+     * @param   string  $id                The ID of the item to remove.
+     * @param   bool    $removeTaxonomies  Remove empty taxonomies
+     *
+     * @return  boolean  True on success.
+     *
+     * @since   5.0.0
+     * @throws  \Exception on database error.
+     */
+    protected function remove($id, $removeTaxonomies = true)
+    {
+        // Get the item's URL
+        $url = $this->db->quote($this->getUrl($id, $this->extension, $this->layout));
+
+        // Get the link ids for the content items.
+        $query = $this->db->getQuery(true)
+            ->select($this->db->quoteName('link_id'))
+            ->from($this->db->quoteName('#__finder_links'))
+            ->where($this->db->quoteName('url') . ' = ' . $url);
+        $this->db->setQuery($query);
+        $items = $this->db->loadColumn();
+
+        // Check the items.
+        if (empty($items)) {
+            $this->getApplication()->triggerEvent('onFinderIndexAfterDelete', [$id]);
+
+            return true;
+        }
+
+        // Remove the items.
+        foreach ($items as $item) {
+            $this->indexer->remove($item, $removeTaxonomies);
+        }
+
+        return true;
+    }
+
+    /**
+     * Method to setup the adapter before indexing.
+     *
+     * @return  boolean  True on success, false on failure.
+     *
+     * @since   5.0.0
+     * @throws  \Exception on database error.
+     */
+    abstract protected function setup();
+
+    /**
+     * Method to update index data on category access level changes
+     *
+     * @param   Table  $row  A Table object
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    protected function categoryAccessChange($row)
+    {
+        $query = clone $this->getStateQuery();
+        $query->where('c.id = ' . (int) $row->id);
+
+        // Get the access level.
+        $this->db->setQuery($query);
+        $items = $this->db->loadObjectList();
+
+        // Adjust the access level for each item within the category.
+        foreach ($items as $item) {
+            // Set the access level.
+            $temp = max($item->access, $row->access);
+
+            // Update the item.
+            $this->change((int) $item->id, 'access', $temp);
+        }
+    }
+
+    /**
+     * Method to update index data on category access level changes
+     *
+     * @param   array    $pks    A list of primary key ids of the content that has changed state.
+     * @param   integer  $value  The value of the state that the content has been changed to.
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    protected function categoryStateChange($pks, $value)
+    {
+        /*
+         * The item's published state is tied to the category
+         * published state so we need to look up all published states
+         * before we change anything.
+         */
+        foreach ($pks as $pk) {
+            $query = clone $this->getStateQuery();
+            $query->where('c.id = ' . (int) $pk);
+
+            // Get the published states.
+            $this->db->setQuery($query);
+            $items = $this->db->loadObjectList();
+
+            // Adjust the state for each item within the category.
+            foreach ($items as $item) {
+                // Translate the state.
+                $temp = $this->translateState($item->state, $value);
+
+                // Update the item.
+                $this->change($item->id, 'state', $temp);
+            }
+        }
+    }
+
+    /**
+     * Method to check the existing access level for categories
+     *
+     * @param   Table  $row  A Table object
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    protected function checkCategoryAccess($row)
+    {
+        $query = $this->db->getQuery(true)
+            ->select($this->db->quoteName('access'))
+            ->from($this->db->quoteName('#__categories'))
+            ->where($this->db->quoteName('id') . ' = ' . (int) $row->id);
+        $this->db->setQuery($query);
+
+        // Store the access level to determine if it changes
+        $this->old_cataccess = $this->db->loadResult();
+    }
+
+    /**
+     * Method to check the existing access level for items
+     *
+     * @param   Table  $row  A Table object
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    protected function checkItemAccess($row)
+    {
+        $query = $this->db->getQuery(true)
+            ->select($this->db->quoteName('access'))
+            ->from($this->db->quoteName($this->table))
+            ->where($this->db->quoteName('id') . ' = ' . (int) $row->id);
+        $this->db->setQuery($query);
+
+        // Store the access level to determine if it changes
+        $this->old_access = $this->db->loadResult();
+    }
+
+    /**
+     * Method to get the number of content items available to index.
+     *
+     * @return  integer  The number of content items available to index.
+     *
+     * @since   5.0.0
+     * @throws  \Exception on database error.
+     */
+    protected function getContentCount()
+    {
+        $return = 0;
+
+        // Get the list query.
+        $query = $this->getListQuery();
+
+        // Check if the query is valid.
+        if (empty($query)) {
+            return $return;
+        }
+
+        // Tweak the SQL query to make the total lookup faster.
+        if ($query instanceof QueryInterface) {
+            $query = clone $query;
+            $query->clear('select')
+                ->select('COUNT(*)')
+                ->clear('order');
+        }
+
+        // Get the total number of content items to index.
+        $this->db->setQuery($query);
+
+        return (int) $this->db->loadResult();
+    }
+
+    /**
+     * Method to get a content item to index.
+     *
+     * @param   integer  $id  The id of the content item.
+     *
+     * @return  Result  A Result object.
+     *
+     * @since   5.0.0
+     * @throws  \Exception on database error.
+     */
+    protected function getItem($id)
+    {
+        // Get the list query and add the extra WHERE clause.
+        $query = $this->getListQuery();
+        $query->where('a.id = ' . (int) $id);
+
+        // Get the item to index.
+        $this->db->setQuery($query);
+        $item = $this->db->loadAssoc();
+
+        // Convert the item to a result object.
+        $item = ArrayHelper::toObject((array) $item, Result::class);
+
+        // Set the item type.
+        $item->type_id = $this->type_id;
+
+        // Set the item layout.
+        $item->layout = $this->layout;
+
+        return $item;
+    }
+
+    /**
+     * Method to get a list of content items to index.
+     *
+     * @param   integer         $offset  The list offset.
+     * @param   integer         $limit   The list limit.
+     * @param   QueryInterface  $query   A QueryInterface object. [optional]
+     *
+     * @return  Result[]  An array of Result objects.
+     *
+     * @since   5.0.0
+     * @throws  \Exception on database error.
+     */
+    protected function getItems($offset, $limit, $query = null)
+    {
+        // Get the content items to index.
+        $this->db->setQuery($this->getListQuery($query)->setLimit($limit, $offset));
+        $items = $this->db->loadAssocList();
+
+        foreach ($items as &$item) {
+            $item = ArrayHelper::toObject($item, Result::class);
+
+            // Set the item type.
+            $item->type_id = $this->type_id;
+
+            // Set the mime type.
+            $item->mime = $this->mime;
+
+            // Set the item layout.
+            $item->layout = $this->layout;
+        }
+
+        return $items;
+    }
+
+    /**
+     * Method to get the SQL query used to retrieve the list of content items.
+     *
+     * @param   mixed  $query  A QueryInterface object. [optional]
+     *
+     * @return  QueryInterface  A database object.
+     *
+     * @since   5.0.0
+     */
+    protected function getListQuery($query = null)
+    {
+        // Check if we can use the supplied SQL query.
+        return $query instanceof QueryInterface ? $query : $this->db->getQuery(true);
+    }
+
+    /**
+     * Method to get the plugin type
+     *
+     * @param   integer  $id  The plugin ID
+     *
+     * @return  string  The plugin type
+     *
+     * @since   5.0.0
+     */
+    protected function getPluginType($id)
+    {
+        // Prepare the query
+        $query = $this->db->getQuery(true)
+            ->select($this->db->quoteName('element'))
+            ->from($this->db->quoteName('#__extensions'))
+            ->where($this->db->quoteName('extension_id') . ' = ' . (int) $id);
+        $this->db->setQuery($query);
+
+        return $this->db->loadResult();
+    }
+
+    /**
+     * Method to get a SQL query to load the published and access states for
+     * an article and category.
+     *
+     * @return  QueryInterface  A database object.
+     *
+     * @since   5.0.0
+     */
+    protected function getStateQuery()
+    {
+        $query = $this->db->getQuery(true);
+
+        // Item ID
+        $query->select('a.id');
+
+        // Item and category published state
+        $query->select('a.' . $this->state_field . ' AS state, c.published AS cat_state');
+
+        // Item and category access levels
+        $query->select('a.access, c.access AS cat_access')
+            ->from($this->table . ' AS a')
+            ->join('LEFT', '#__categories AS c ON c.id = a.catid');
+
+        return $query;
+    }
+
+    /**
+     * Method to get the query clause for getting items to update by time.
+     *
+     * @param   string  $time  The modified timestamp.
+     *
+     * @return  QueryInterface  A database object.
+     *
+     * @since   5.0.0
+     */
+    protected function getUpdateQueryByTime($time)
+    {
+        // Build an SQL query based on the modified time.
+        $query = $this->db->getQuery(true)
+            ->where('a.modified >= ' . $this->db->quote($time));
+
+        return $query;
+    }
+
+    /**
+     * Method to get the query clause for getting items to update by id.
+     *
+     * @param   array  $ids  The ids to load.
+     *
+     * @return  QueryInterface  A database object.
+     *
+     * @since   5.0.0
+     */
+    protected function getUpdateQueryByIds($ids)
+    {
+        // Build an SQL query based on the item ids.
+        $query = $this->db->getQuery(true)
+            ->where('a.id IN(' . implode(',', $ids) . ')');
+
+        return $query;
+    }
+
+    /**
+     * Method to get the type id for the adapter content.
+     *
+     * @return  integer  The numeric type id for the content.
+     *
+     * @since   5.0.0
+     * @throws  \Exception on database error.
+     */
+    protected function getTypeId()
+    {
+        // Get the type id from the database.
+        $query = $this->db->getQuery(true)
+            ->select($this->db->quoteName('id'))
+            ->from($this->db->quoteName('#__finder_types'))
+            ->where($this->db->quoteName('title') . ' = ' . $this->db->quote($this->type_title));
+        $this->db->setQuery($query);
+
+        return (int) $this->db->loadResult();
+    }
+
+    /**
+     * Method to get the URL for the item. The URL is how we look up the link
+     * in the Finder index.
+     *
+     * @param   integer  $id         The id of the item.
+     * @param   string   $extension  The extension the category is in.
+     * @param   string   $view       The view for the URL.
+     *
+     * @return  string  The URL of the item.
+     *
+     * @since   5.0.0
+     */
+    protected function getUrl($id, $extension, $view)
+    {
+        return 'index.php?option=' . $extension . '&view=' . $view . '&id=' . $id;
+    }
+
+    /**
+     * Method to get the page title of any menu item that is linked to the
+     * content item, if it exists and is set.
+     *
+     * @param   string  $url  The URL of the item.
+     *
+     * @return  mixed  The title on success, null if not found.
+     *
+     * @since   5.0.0
+     * @throws  \Exception on database error.
+     */
+    protected function getItemMenuTitle($url)
+    {
+        $return = null;
+
+        // Set variables
+        $user   = $this->getApplication()->getIdentity();
+        $groups = implode(',', $user->getAuthorisedViewLevels());
+
+        // Build a query to get the menu params.
+        $query = $this->db->getQuery(true)
+            ->select($this->db->quoteName('params'))
+            ->from($this->db->quoteName('#__menu'))
+            ->where($this->db->quoteName('link') . ' = ' . $this->db->quote($url))
+            ->where($this->db->quoteName('published') . ' = 1')
+            ->where($this->db->quoteName('access') . ' IN (' . $groups . ')');
+
+        // Get the menu params from the database.
+        $this->db->setQuery($query);
+        $params = $this->db->loadResult();
+
+        // Check the results.
+        if (empty($params)) {
+            return $return;
+        }
+
+        // Instantiate the params.
+        $params = json_decode($params);
+
+        // Get the page title if it is set.
+        if (isset($params->page_title) && $params->page_title) {
+            $return = $params->page_title;
+        }
+
+        return $return;
+    }
+
+    /**
+     * Method to update index data on access level changes
+     *
+     * @param   Table  $row  A Table object
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    protected function itemAccessChange($row)
+    {
+        $query = clone $this->getStateQuery();
+        $query->where('a.id = ' . (int) $row->id);
+
+        // Get the access level.
+        $this->db->setQuery($query);
+        $item = $this->db->loadObject();
+
+        // Set the access level.
+        $temp = max($row->access, $item->cat_access);
+
+        // Update the item.
+        $this->change((int) $row->id, 'access', $temp);
+    }
+
+    /**
+     * Method to update index data on published state changes
+     *
+     * @param   array    $pks    A list of primary key ids of the content that has changed state.
+     * @param   integer  $value  The value of the state that the content has been changed to.
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    protected function itemStateChange($pks, $value)
+    {
+        /*
+         * The item's published state is tied to the category
+         * published state so we need to look up all published states
+         * before we change anything.
+         */
+        foreach ($pks as $pk) {
+            $query = clone $this->getStateQuery();
+            $query->where('a.id = ' . (int) $pk);
+
+            // Get the published states.
+            $this->db->setQuery($query);
+            $item = $this->db->loadObject();
+
+            // Translate the state.
+            $temp = $this->translateState($value, $item->cat_state);
+
+            // Update the item.
+            $this->change($pk, 'state', $temp);
+        }
+    }
+
+    /**
+     * Method to update index data when a plugin is disabled
+     *
+     * @param   array  $pks  A list of primary key ids of the content that has changed state.
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    protected function pluginDisable($pks)
+    {
+        // Since multiple plugins may be disabled at a time, we need to check first
+        // that we're handling the appropriate one for the context
+        foreach ($pks as $pk) {
+            if ($this->getPluginType($pk) == strtolower($this->context)) {
+                // Get all of the items to unindex them
+                $query = clone $this->getStateQuery();
+                $this->db->setQuery($query);
+                $items = $this->db->loadColumn();
+
+                // Remove each item
+                foreach ($items as $item) {
+                    $this->remove($item);
+                }
+            }
+        }
+    }
+
+    /**
+     * Method to translate the native content states into states that the
+     * indexer can use.
+     *
+     * @param   integer  $item      The item state.
+     * @param   integer  $category  The category state. [optional]
+     *
+     * @return  integer  The translated indexer state.
+     *
+     * @since   5.0.0
+     */
+    protected function translateState($item, $category = null)
+    {
+        // If category is present, factor in its states as well
+        if ($category !== null && $category == 0) {
+            $item = 0;
+        }
+
+        // Translate the state
+        switch ($item) {
+            // Published and archived items only should return a published state
+            case 1:
+            case 2:
+                return 1;
+
+            // All other states should return an unpublished state
+            default:
+                return 0;
+        }
+    }
+
+    /**
+     * Debug method to set the used indexer
+     *
+     * @param   Indexer  $indexer  Indexer object
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function setIndexer(Indexer $indexer)
+    {
+        $this->indexer = $indexer;
+    }
+
+    /**
+     * Debug method to run a specific plugin to prepare a result object.
+     * The object is then stored in the indexer object to debug further.
+     *
+     * @param   mixed  $id  ID to index
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function debug($id)
+    {
+        // Run the setup method.
+        $this->setup();
+
+        // Get the item.
+        $item = $this->getItem($id);
+
+        // Index the item.
+        $this->index($item);
+    }
+}
diff --git a/administrator/components/com_finder/src/Indexer/DebugIndexer.php b/administrator/components/com_finder/src/Indexer/DebugIndexer.php
new file mode 100644
index 0000000000000..5fdb7c70e3ab0
--- /dev/null
+++ b/administrator/components/com_finder/src/Indexer/DebugIndexer.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Component\Finder\Administrator\Indexer;
+
+/**
+ * Debugging indexer class for the Finder indexer package.
+ *
+ * @since  5.0.0
+ * @internal
+ */
+class DebugIndexer extends Indexer
+{
+    /**
+     * The result object from the last call to self::index()
+     *
+     * @var Result
+     *
+     * @since  5.0.0
+     */
+    public static $item;
+
+    /**
+     * Stub for index() in indexer class
+     *
+     * @param   Result  $item    Result object to index
+     * @param   string  $format  Format to index
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function index($item, $format = 'html')
+    {
+        self::$item = $item;
+    }
+}
diff --git a/administrator/components/com_finder/src/Indexer/Helper.php b/administrator/components/com_finder/src/Indexer/Helper.php
index 2256a006ab135..0c965a675a287 100644
--- a/administrator/components/com_finder/src/Indexer/Helper.php
+++ b/administrator/components/com_finder/src/Indexer/Helper.php
@@ -10,12 +10,13 @@
 
 namespace Joomla\Component\Finder\Administrator\Indexer;
 
-use Exception;
 use Joomla\CMS\Component\ComponentHelper;
+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\Component\Fields\Administrator\Helper\FieldsHelper;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 
@@ -30,6 +31,11 @@
  */
 class Helper
 {
+    public const CUSTOMFIELDS_DONT_INDEX      = 0;
+    public const CUSTOMFIELDS_ADD_TO_INDEX    = 1;
+    public const CUSTOMFIELDS_ADD_TO_TAXONOMY = 2;
+    public const CUSTOMFIELDS_ADD_TO_BOTH     = 3;
+
     /**
      * Method to parse input into plain text.
      *
@@ -39,7 +45,7 @@ class Helper
      * @return  string  The parsed input.
      *
      * @since   2.5
-     * @throws  Exception on invalid parser.
+     * @throws  \Exception on invalid parser.
      */
     public static function parse($input, $format = 'html')
     {
@@ -215,7 +221,7 @@ public static function stem($token, $lang)
      * @return  integer  The id of the content type.
      *
      * @since   2.5
-     * @throws  Exception on database error.
+     * @throws  \Exception on database error.
      */
     public static function addContentType($title, $mime = null)
     {
@@ -264,7 +270,7 @@ public static function addContentType($title, $mime = null)
      */
     public static function isCommon($token, $lang)
     {
-        static $data, $default, $multilingual;
+        static $data = [], $default, $multilingual;
 
         if (is_null($multilingual)) {
             $multilingual = Multilanguage::isEnabled();
@@ -300,7 +306,7 @@ public static function isCommon($token, $lang)
      * @return  array  Array of common terms.
      *
      * @since   2.5
-     * @throws  Exception on database error.
+     * @throws  \Exception on database error.
      */
     public static function getCommonWords($lang)
     {
@@ -348,7 +354,7 @@ public static function getDefaultLanguage()
      */
     public static function getPrimaryLanguage($lang)
     {
-        static $data;
+        static $data = [];
 
         // Only parse the identifier if necessary.
         if (!isset($data[$lang])) {
@@ -373,24 +379,69 @@ public static function getPrimaryLanguage($lang)
      * @return  boolean  True on success, false on failure.
      *
      * @since   2.5
-     * @throws  Exception on database error.
+     * @throws  \Exception on database error.
      */
     public static function getContentExtras(Result $item)
     {
+        $dispatcher = Factory::getApplication()->getDispatcher();
+
         // Load the finder plugin group.
-        PluginHelper::importPlugin('finder');
+        PluginHelper::importPlugin('finder', null, true, $dispatcher);
 
-        Factory::getApplication()->triggerEvent('onPrepareFinderContent', [&$item]);
+        $dispatcher->dispatch('onPrepareFinderContent', new PrepareContentEvent('onPrepareFinderContent', [
+            'subject' => $item,
+        ]));
 
         return true;
     }
 
+    /**
+     * Add custom fields for the item to the Result object
+     *
+     * @param   Result  $item     Result object to add the custom fields to
+     * @param   string  $context  Context of the item in the custom fields
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public static function addCustomFields(Result $item, $context)
+    {
+        if (!ComponentHelper::getParams(strstr($context, '.', true))->get('custom_fields_enable', 1)) {
+            return;
+        }
+
+        $obj     = new \stdClass();
+        $obj->id = $item->id;
+
+        $fields = FieldsHelper::getFields($context, $obj, true);
+
+        foreach ($fields as $field) {
+            $searchindex = $field->params->get('searchindex', 0);
+
+            // We want to add this field to the search index
+            if ($searchindex == self::CUSTOMFIELDS_ADD_TO_INDEX || $searchindex == self::CUSTOMFIELDS_ADD_TO_BOTH) {
+                $name        = 'jsfield_' . $field->name;
+                $item->$name = $field->value;
+                $item->addInstruction(Indexer::META_CONTEXT, $name);
+            }
+
+            // We want to add this field as a taxonomy
+            if (
+                ($searchindex == self::CUSTOMFIELDS_ADD_TO_TAXONOMY || $searchindex == self::CUSTOMFIELDS_ADD_TO_BOTH)
+                && $field->value
+            ) {
+                $item->addTaxonomy($field->title, $field->value, $field->state, $field->access, $field->language);
+            }
+        }
+    }
+
     /**
      * Method to process content text using the onContentPrepare event trigger.
      *
      * @param   string    $text    The content to process.
      * @param   Registry  $params  The parameters object. [optional]
-     * @param   Result    $item    The item which get prepared. [optional]
+     * @param   ?Result   $item    The item which get prepared. [optional]
      *
      * @return  string  The processed content.
      *
diff --git a/administrator/components/com_finder/src/Indexer/Indexer.php b/administrator/components/com_finder/src/Indexer/Indexer.php
index 902df94a3d672..98c46ba586fd2 100644
--- a/administrator/components/com_finder/src/Indexer/Indexer.php
+++ b/administrator/components/com_finder/src/Indexer/Indexer.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Component\Finder\Administrator\Indexer;
 
-use Exception;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Object\CMSObject;
@@ -116,7 +115,7 @@ class Indexer
     /**
      * Indexer constructor.
      *
-     * @param  DatabaseInterface  $db  The database
+     * @param  ?DatabaseInterface  $db  The database
      *
      * @since  3.8.0
      */
@@ -147,7 +146,7 @@ public function __construct(DatabaseInterface $db = null)
     /**
      * Method to get the indexer state.
      *
-     * @return  object  The indexer state object.
+     * @return  CMSObject  The indexer state object.
      *
      * @since   2.5
      */
@@ -187,7 +186,7 @@ public static function getState()
                      */
                     $memory_table_limit = (int) ($heapsize->Value / 800);
                     $data->options->set('memory_table_limit', $memory_table_limit);
-                } catch (Exception $e) {
+                } catch (\Exception $e) {
                     // Something failed. We fall back to a reasonable guess.
                     $data->options->set('memory_table_limit', 7500);
                 }
@@ -459,6 +458,10 @@ public function index($item, $format = 'html')
                     $nodeId = Taxonomy::addNode($branch, $node->title, $node->state, $node->access, $node->language);
                 }
 
+                if (!$nodeId) {
+                    continue;
+                }
+
                 // Add the link => node map.
                 Taxonomy::addMap($linkId, $nodeId);
                 $node->id = $nodeId;
@@ -643,7 +646,7 @@ public function index($item, $format = 'html')
      * @return  boolean  True on success.
      *
      * @since   2.5
-     * @throws  Exception on database error.
+     * @throws  \Exception on database error.
      */
     public function remove($linkId, $removeTaxonomies = true)
     {
@@ -701,7 +704,7 @@ public function remove($linkId, $removeTaxonomies = true)
      * @return  boolean  True on success.
      *
      * @since   2.5
-     * @throws  Exception on database error.
+     * @throws  \Exception on database error.
      */
     public function optimize()
     {
@@ -776,7 +779,7 @@ public function optimize()
     /**
      * Method to get a content item's signature.
      *
-     * @param   object  $item  The content item to index.
+     * @param   Result  $item  The content item to index.
      *
      * @return  string  The content item's signature.
      *
@@ -800,12 +803,12 @@ protected static function getSignature($item)
     /**
      * Method to parse input, tokenize it, and then add it to the database.
      *
-     * @param   mixed    $input    String or resource to use as input. A resource input will automatically be chunked to conserve
-     *                             memory. Strings will be chunked if longer than 2K in size.
-     * @param   integer  $context  The context of the input. See context constants.
-     * @param   string   $lang     The language of the input.
-     * @param   string   $format   The format of the input.
-     * @param   integer  $count    Number of words indexed so far.
+     * @param   string|resource  $input    String or resource to use as input. A resource input will automatically be chunked to conserve
+     *                                     memory. Strings will be chunked if longer than 2K in size.
+     * @param   integer          $context  The context of the input. See context constants.
+     * @param   string           $lang     The language of the input.
+     * @param   string           $format   The format of the input.
+     * @param   integer          $count    Number of terms indexed so far.
      *
      * @return  integer  The number of tokens extracted from the input.
      *
@@ -962,11 +965,19 @@ private function tokenizeToDbShort($input, $context, $lang, $format, $count)
      * @return  boolean  True on success.
      *
      * @since   2.5
-     * @throws  Exception on database error.
+     * @throws  \Exception on database error.
      */
     protected function toggleTables($memory)
     {
+        static $supported = true;
+
+        if (!$supported) {
+            return true;
+        }
+
         if (strtolower($this->db->getServerType()) != 'mysql') {
+            $supported = false;
+
             return true;
         }
 
@@ -977,13 +988,19 @@ protected function toggleTables($memory)
 
         // Check if we are setting the tables to the Memory engine.
         if ($memory === true && $state !== true) {
-            // Set the tokens table to Memory.
-            $db->setQuery('ALTER TABLE ' . $db->quoteName('#__finder_tokens') . ' ENGINE = MEMORY');
-            $db->execute();
+            try {
+                // Set the tokens table to Memory.
+                $db->setQuery('ALTER TABLE ' . $db->quoteName('#__finder_tokens') . ' ENGINE = MEMORY');
+                $db->execute();
 
-            // Set the tokens aggregate table to Memory.
-            $db->setQuery('ALTER TABLE ' . $db->quoteName('#__finder_tokens_aggregate') . ' ENGINE = MEMORY');
-            $db->execute();
+                // Set the tokens aggregate table to Memory.
+                $db->setQuery('ALTER TABLE ' . $db->quoteName('#__finder_tokens_aggregate') . ' ENGINE = MEMORY');
+                $db->execute();
+            } catch (\RuntimeException $e) {
+                $supported = false;
+
+                return true;
+            }
 
             // Set the internal state.
             $state = $memory;
diff --git a/administrator/components/com_finder/src/Indexer/Language.php b/administrator/components/com_finder/src/Indexer/Language.php
index fac1a702708c2..2b6756a18c5df 100644
--- a/administrator/components/com_finder/src/Indexer/Language.php
+++ b/administrator/components/com_finder/src/Indexer/Language.php
@@ -75,7 +75,12 @@ public function __construct($locale = null)
         }
 
         try {
-            $this->stemmer = StemmerFactory::create($this->language);
+            foreach (StemmerFactory::LANGS as $classname => $isoCodes) {
+                if (in_array($this->language, $isoCodes)) {
+                    $this->stemmer = StemmerFactory::create($this->language);
+                    break;
+                }
+            }
         } catch (NotFoundException $e) {
             // We don't have a stemmer for the language
         }
diff --git a/administrator/components/com_finder/src/Indexer/Language/Zh.php b/administrator/components/com_finder/src/Indexer/Language/Zh.php
index bfe598b52721a..5e8217e1d3301 100644
--- a/administrator/components/com_finder/src/Indexer/Language/Zh.php
+++ b/administrator/components/com_finder/src/Indexer/Language/Zh.php
@@ -11,7 +11,6 @@
 namespace Joomla\Component\Finder\Administrator\Indexer\Language;
 
 use Joomla\Component\Finder\Administrator\Indexer\Language;
-use Joomla\String\StringHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -61,26 +60,11 @@ public function __construct($locale = null)
      */
     public function tokenise($input)
     {
-        $terms = parent::tokenise($input);
-
-        // Iterate through the terms and test if they contain Chinese.
-        for ($i = 0, $n = count($terms); $i < $n; $i++) {
-            $charMatches = [];
-            $charCount   = preg_match_all('#[\p{Han}]#mui', $terms[$i], $charMatches);
-
-            // Split apart any groups of Chinese characters.
-            for ($j = 0; $j < $charCount; $j++) {
-                $tSplit = StringHelper::str_ireplace($charMatches[0][$j], '', $terms[$i], false);
+        // We first add whitespace around each Chinese character, so that our later code can easily split on this.
+        $input = preg_replace('#\p{Han}#mui', ' $0 ', $input);
 
-                if (!empty($tSplit)) {
-                    $terms[$i] = $tSplit;
-                } else {
-                    unset($terms[$i]);
-                }
-
-                $terms[] = $charMatches[0][$j];
-            }
-        }
+        // Now we split up the input into individual terms
+        $terms = parent::tokenise($input);
 
         return $terms;
     }
diff --git a/administrator/components/com_finder/src/Indexer/Query.php b/administrator/components/com_finder/src/Indexer/Query.php
index f0b5dbfa680ee..3325fae12ef22 100644
--- a/administrator/components/com_finder/src/Indexer/Query.php
+++ b/administrator/components/com_finder/src/Indexer/Query.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Component\Finder\Administrator\Indexer;
 
-use Exception;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
@@ -203,7 +202,7 @@ class Query
      * @param   array  $options  An array of query options.
      *
      * @since   2.5
-     * @throws  Exception on database error.
+     * @throws  \Exception on database error.
      */
     public function __construct($options, DatabaseInterface $db = null)
     {
@@ -494,7 +493,7 @@ public function getRequiredTermIds()
      * @return  boolean  True on success, false on failure.
      *
      * @since   2.5
-     * @throws  Exception on database error.
+     * @throws  \Exception on database error.
      */
     protected function processStaticTaxonomy($filterId)
     {
@@ -554,7 +553,7 @@ protected function processStaticTaxonomy($filterId)
         $query->clear()
             ->select('t1.id, t1.title, t2.title AS branch')
             ->from($db->quoteName('#__finder_taxonomy') . ' AS t1')
-            ->join('INNER', $db->quoteName('#__finder_taxonomy') . ' AS t2 ON t2.id = t1.parent_id')
+            ->leftJoin($db->quoteName('#__finder_taxonomy') . ' AS t2 ON t2.lft < t1.lft AND t1.rgt < t2.rgt AND t2.level = 1')
             ->where('t1.state = 1')
             ->where('t1.access IN (' . $groups . ')')
             ->where('t1.id IN (' . implode(',', $filters) . ')')
@@ -585,7 +584,7 @@ protected function processStaticTaxonomy($filterId)
      * @return  boolean  True on success.
      *
      * @since   2.5
-     * @throws  Exception on database error.
+     * @throws  \Exception on database error.
      */
     protected function processDynamicTaxonomy($filters)
     {
@@ -618,7 +617,7 @@ protected function processDynamicTaxonomy($filters)
          */
         $query->select('t1.id, t1.title, t2.title AS branch')
             ->from($db->quoteName('#__finder_taxonomy') . ' AS t1')
-            ->join('INNER', $db->quoteName('#__finder_taxonomy') . ' AS t2 ON t2.id = t1.parent_id')
+            ->leftJoin($db->quoteName('#__finder_taxonomy') . ' AS t2 ON t2.lft < t1.lft AND t1.rgt < t2.rgt AND t2.level = 1')
             ->where('t1.state = 1')
             ->where('t1.access IN (' . $groups . ')')
             ->where('t1.id IN (' . implode(',', $filters) . ')')
@@ -729,7 +728,7 @@ protected function processDates($date1, $date2, $when1, $when2)
      * @return  boolean  True on success.
      *
      * @since   2.5
-     * @throws  Exception on database error.
+     * @throws  \Exception on database error.
      */
     protected function processString($input, $lang, $mode)
     {
@@ -1232,7 +1231,7 @@ protected function processString($input, $lang, $mode)
      * @return  Token  A Token object.
      *
      * @since   2.5
-     * @throws  Exception on database error.
+     * @throws  \Exception on database error.
      */
     protected function getTokenData($token)
     {
diff --git a/administrator/components/com_finder/src/Indexer/Taxonomy.php b/administrator/components/com_finder/src/Indexer/Taxonomy.php
index 47fa6cad7e3d1..695913fde2fa0 100644
--- a/administrator/components/com_finder/src/Indexer/Taxonomy.php
+++ b/administrator/components/com_finder/src/Indexer/Taxonomy.php
@@ -65,7 +65,6 @@ public static function addBranch($title, $state = 1, $access = 1)
     {
         $node            = new \stdClass();
         $node->title     = $title;
-        $node->state     = $state;
         $node->access    = $access;
         $node->parent_id = 1;
         $node->language  = '';
@@ -89,12 +88,15 @@ public static function addBranch($title, $state = 1, $access = 1)
      */
     public static function addNode($branch, $title, $state = 1, $access = 1, $language = '')
     {
+        if ($state != 1) {
+            return 0;
+        }
+
         // Get the branch id, insert it if it does not exist.
         $branchId = static::addBranch($branch);
 
         $node            = new \stdClass();
         $node->title     = $title;
-        $node->state     = $state;
         $node->access    = $access;
         $node->parent_id = $branchId;
         $node->language  = $language;
@@ -118,6 +120,10 @@ public static function addNode($branch, $title, $state = 1, $access = 1, $langua
      */
     public static function addNestedNode($branch, NodeInterface $node, $state = 1, $access = 1, $language = '', $branchId = null)
     {
+        if ($state != 1) {
+            return 0;
+        }
+
         if (!$branchId) {
             // Get the branch id, insert it if it does not exist.
             $branchId = static::addBranch($branch);
@@ -125,15 +131,22 @@ public static function addNestedNode($branch, NodeInterface $node, $state = 1, $
 
         $parent = $node->getParent();
 
+        $pstate    = $node->state ?? ($node->published ?? $state);
+        $paccess   = $node->access ?? $access;
+        $planguage = $node->language ?? $language;
+
         if ($parent && $parent->title != 'ROOT') {
-            $parentId = self::addNestedNode($branch, $parent, $state, $access, $language, $branchId);
+            $parentId = self::addNestedNode($branch, $parent, $pstate, $paccess, $planguage, $branchId);
         } else {
             $parentId = $branchId;
         }
 
+        if (!$parentId) {
+            return 0;
+        }
+
         $temp            = new \stdClass();
         $temp->title     = $node->title;
-        $temp->state     = $state;
         $temp->access    = $access;
         $temp->parent_id = $parentId;
         $temp->language  = $language;
@@ -174,7 +187,7 @@ protected static function storeNode($node, $parentId)
         $result = $db->loadObject();
 
         // Check if the database matches the input data.
-        if ((bool) $result && $result->state == $node->state && $result->access == $node->access) {
+        if ((bool) $result && $result->access == $node->access) {
             // The data matches, add the item to the cache.
             static::$nodes[$parentId . ':' . $node->title] = $result;
 
@@ -192,7 +205,6 @@ protected static function storeNode($node, $parentId)
         if (empty($result)) {
             // Prepare the node object.
             $nodeTable->title    = $node->title;
-            $nodeTable->state    = (int) $node->state;
             $nodeTable->access   = (int) $node->access;
             $nodeTable->language = $node->language;
             $nodeTable->setLocation((int) $parentId, 'last-child');
@@ -200,7 +212,6 @@ protected static function storeNode($node, $parentId)
             // Prepare the node object.
             $nodeTable->id       = (int) $result->id;
             $nodeTable->title    = $result->title;
-            $nodeTable->state    = (int) ($node->state > 0 ? $node->state : $result->state);
             $nodeTable->access   = (int) $result->access;
             $nodeTable->language = $node->language;
             $nodeTable->setLocation($result->parent_id, 'last-child');
@@ -440,7 +451,7 @@ public static function removeOrphanNodes()
      *
      * @param   integer  $id  Id of the taxonomy
      *
-     * @return  object|array  A taxonomy object or an array of all taxonomies
+     * @return  object|object[]  A taxonomy object or an array of all taxonomies
      *
      * @since   4.0.0
      */
@@ -474,7 +485,7 @@ public static function getTaxonomy($id = 0)
      *
      * @param   string  $title  Title of the branch
      *
-     * @return  object|array  The object with the branch data or an array of all branches
+     * @return  object|object[]  The object with the branch data or an array of all branches
      *
      * @since   4.0.0
      */
diff --git a/administrator/components/com_finder/src/Model/FilterModel.php b/administrator/components/com_finder/src/Model/FilterModel.php
index ebeec2506a218..f785e07312386 100644
--- a/administrator/components/com_finder/src/Model/FilterModel.php
+++ b/administrator/components/com_finder/src/Model/FilterModel.php
@@ -138,7 +138,7 @@ protected function loadFormData()
     /**
      * Method to get the total indexed items
      *
-     * @return  number the number of indexed items
+     * @return  integer  The count of indexed items
      *
      * @since  3.5
      */
diff --git a/administrator/components/com_finder/src/Model/FiltersModel.php b/administrator/components/com_finder/src/Model/FiltersModel.php
index 23e39b7351449..4c64d31da46d5 100644
--- a/administrator/components/com_finder/src/Model/FiltersModel.php
+++ b/administrator/components/com_finder/src/Model/FiltersModel.php
@@ -28,8 +28,8 @@ class FiltersModel extends ListModel
     /**
      * Constructor.
      *
-     * @param   array                $config   An optional associative array of configuration settings.
-     * @param   MVCFactoryInterface  $factory  The factory.
+     * @param   array                 $config   An optional associative array of configuration settings.
+     * @param   ?MVCFactoryInterface  $factory  The factory.
      *
      * @see     \Joomla\CMS\MVC\Model\BaseDatabaseModel
      * @since   3.7
diff --git a/administrator/components/com_finder/src/Model/IndexModel.php b/administrator/components/com_finder/src/Model/IndexModel.php
index 8a9c9e8679c54..1bd47888c8279 100644
--- a/administrator/components/com_finder/src/Model/IndexModel.php
+++ b/administrator/components/com_finder/src/Model/IndexModel.php
@@ -55,8 +55,8 @@ class IndexModel extends ListModel
     /**
      * Constructor.
      *
-     * @param   array                $config   An optional associative array of configuration settings.
-     * @param   MVCFactoryInterface  $factory  The factory.
+     * @param   array                 $config   An optional associative array of configuration settings.
+     * @param   ?MVCFactoryInterface  $factory  The factory.
      *
      * @see     \Joomla\CMS\MVC\Model\BaseDatabaseModel
      * @since   3.7
diff --git a/administrator/components/com_finder/src/Model/IndexerModel.php b/administrator/components/com_finder/src/Model/IndexerModel.php
index 46e8b6cd0d993..cdef667e77c08 100644
--- a/administrator/components/com_finder/src/Model/IndexerModel.php
+++ b/administrator/components/com_finder/src/Model/IndexerModel.php
@@ -10,7 +10,8 @@
 
 namespace Joomla\Component\Finder\Administrator\Model;
 
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\MVC\Model\FormModel;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -21,6 +22,29 @@
  *
  * @since  2.5
  */
-class IndexerModel extends BaseDatabaseModel
+class IndexerModel extends FormModel
 {
+    /**
+     * Method for getting a 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
+     *
+     * @since   5.0.0
+     *
+     * @throws \Exception
+     */
+    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;
+    }
 }
diff --git a/administrator/components/com_finder/src/Model/ItemModel.php b/administrator/components/com_finder/src/Model/ItemModel.php
new file mode 100644
index 0000000000000..fdb9b268bc054
--- /dev/null
+++ b/administrator/components/com_finder/src/Model/ItemModel.php
@@ -0,0 +1,107 @@
+<?php
+
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Component\Finder\Administrator\Model;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+use Joomla\Database\ParameterType;
+
+/**
+ * Index Item model class for Finder.
+ *
+ * @since  5.0.0
+ */
+class ItemModel extends BaseDatabaseModel
+{
+    /**
+     * Stock method to auto-populate the model state.
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    protected function populateState()
+    {
+        // Get the pk of the record from the request.
+        $pk = Factory::getApplication()->getInput()->getInt('id');
+        $this->setState('item.link_id', $pk);
+    }
+
+    /**
+     * Get a finder link object
+     *
+     * @return  object
+     *
+     * @since   5.0.0
+     */
+    public function getItem()
+    {
+        $link_id = (int) $this->getState('item.link_id');
+        $db      = $this->getDatabase();
+        $query   = $db->getQuery(true)
+            ->select('*')
+            ->from($db->quoteName('#__finder_links', 'l'))
+            ->where($db->quoteName('l.link_id') . ' = :link_id')
+            ->bind(':link_id', $link_id, ParameterType::INTEGER);
+
+        $db->setQuery($query);
+
+        return $db->loadObject();
+    }
+
+    /**
+     * Get terms associated with a finder link
+     *
+     * @return  object[]
+     *
+     * @since   5.0.0
+     */
+    public function getTerms()
+    {
+        $link_id = (int) $this->getState('item.link_id');
+        $db      = $this->getDatabase();
+        $query   = $db->getQuery(true)
+            ->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'))
+            ->where($db->quoteName('l.link_id') . ' = :link_id')
+            ->order('l.weight')
+            ->bind(':link_id', $link_id, ParameterType::INTEGER);
+
+        $db->setQuery($query);
+
+        return $db->loadObjectList();
+    }
+
+    /**
+     * Get taxonomies associated with a finder link
+     *
+     * @return  \stdClass[]
+     *
+     * @since   5.0.0
+     */
+    public function getTaxonomies()
+    {
+        $link_id = (int) $this->getState('item.link_id');
+        $db      = $this->getDatabase();
+        $query   = $db->getQuery(true)
+            ->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'))
+            ->where($db->quoteName('m.link_id') . ' = :link_id')
+            ->order('t.title')
+            ->bind(':link_id', $link_id, ParameterType::INTEGER);
+
+        $db->setQuery($query);
+
+        return $db->loadObjectList();
+    }
+}
diff --git a/administrator/components/com_finder/src/Model/MapsModel.php b/administrator/components/com_finder/src/Model/MapsModel.php
index a66c3cceec461..04a4843f8c7cf 100644
--- a/administrator/components/com_finder/src/Model/MapsModel.php
+++ b/administrator/components/com_finder/src/Model/MapsModel.php
@@ -32,8 +32,8 @@ class MapsModel extends ListModel
     /**
      * Constructor.
      *
-     * @param   array                $config   An optional associative array of configuration settings.
-     * @param   MVCFactoryInterface  $factory  The factory.
+     * @param   array                 $config   An optional associative array of configuration settings.
+     * @param   ?MVCFactoryInterface  $factory  The factory.
      *
      * @see     \Joomla\CMS\MVC\Model\BaseDatabaseModel
      * @since   3.7
diff --git a/administrator/components/com_finder/src/Model/SearchesModel.php b/administrator/components/com_finder/src/Model/SearchesModel.php
index 4d226766e6980..10dd1b9a9d9c8 100644
--- a/administrator/components/com_finder/src/Model/SearchesModel.php
+++ b/administrator/components/com_finder/src/Model/SearchesModel.php
@@ -28,8 +28,8 @@ class SearchesModel extends ListModel
     /**
      * Constructor.
      *
-     * @param   array                $config   An optional associative array of configuration settings.
-     * @param   MVCFactoryInterface  $factory  The factory.
+     * @param   array                 $config   An optional associative array of configuration settings.
+     * @param   ?MVCFactoryInterface  $factory  The factory.
      *
      * @see     \Joomla\CMS\MVC\Model\BaseDatabaseModel
      * @since   4.0.0
diff --git a/administrator/components/com_finder/src/Service/HTML/Filter.php b/administrator/components/com_finder/src/Service/HTML/Filter.php
index 97c92d197b636..188e1d62b8801 100644
--- a/administrator/components/com_finder/src/Service/HTML/Filter.php
+++ b/administrator/components/com_finder/src/Service/HTML/Filter.php
@@ -11,13 +11,13 @@
 namespace Joomla\Component\Finder\Administrator\Service\HTML;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filter\OutputFilter;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
 use Joomla\Component\Finder\Administrator\Helper\LanguageHelper;
 use Joomla\Component\Finder\Administrator\Indexer\Query;
 use Joomla\Database\DatabaseAwareTrait;
+use Joomla\Filter\OutputFilter;
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -198,10 +198,10 @@ public function slider($options = [])
     /**
      * Method to generate filters using select box dropdown controls.
      *
-     * @param   Query  $idxQuery  A Query object.
-     * @param   array  $options   An array of options.
+     * @param   Query     $idxQuery  A Query object.
+     * @param   Registry  $options   An array of options.
      *
-     * @return  mixed  A rendered HTML widget on success, null otherwise.
+     * @return  string|null  A rendered HTML widget on success, null otherwise.
      *
      * @since   2.5
      */
@@ -400,10 +400,10 @@ public function select($idxQuery, $options)
     /**
      * Method to generate fields for filtering dates
      *
-     * @param   Query  $idxQuery  A Query object.
-     * @param   array  $options   An array of options.
+     * @param   Query     $idxQuery  A Query object.
+     * @param   Registry  $options   An array of options.
      *
-     * @return  mixed  A rendered HTML widget on success, null otherwise.
+     * @return  string  A rendered HTML widget.
      *
      * @since   2.5
      */
@@ -440,6 +440,9 @@ public function dates($idxQuery, $options)
             $html .= Text::_('COM_FINDER_FILTER_DATE1');
             $html .= '</label>';
             $html .= '<br>';
+            $html .= '<label for="finder-filter-w1" class="visually-hidden">';
+            $html .= Text::_('COM_FINDER_FILTER_DATE1_OPERATOR');
+            $html .= '</label>';
             $html .= HTMLHelper::_(
                 'select.genericlist',
                 $operators,
@@ -459,6 +462,9 @@ public function dates($idxQuery, $options)
             $html .= Text::_('COM_FINDER_FILTER_DATE2');
             $html .= '</label>';
             $html .= '<br>';
+            $html .= '<label for="finder-filter-w2" class="visually-hidden">';
+            $html .= Text::_('COM_FINDER_FILTER_DATE2_OPERATOR');
+            $html .= '</label>';
             $html .= HTMLHelper::_(
                 'select.genericlist',
                 $operators,
diff --git a/administrator/components/com_finder/src/Table/FilterTable.php b/administrator/components/com_finder/src/Table/FilterTable.php
index decbd8b51da33..287fd9dfd810b 100644
--- a/administrator/components/com_finder/src/Table/FilterTable.php
+++ b/administrator/components/com_finder/src/Table/FilterTable.php
@@ -14,6 +14,8 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Table\Table;
+use Joomla\CMS\User\CurrentUserInterface;
+use Joomla\CMS\User\CurrentUserTrait;
 use Joomla\Database\DatabaseDriver;
 use Joomla\Registry\Registry;
 
@@ -26,8 +28,10 @@
  *
  * @since  2.5
  */
-class FilterTable extends Table
+class FilterTable extends Table implements CurrentUserInterface
 {
+    use CurrentUserTrait;
+
     /**
      * Indicates that columns fully support the NULL value in the database
      *
@@ -59,7 +63,7 @@ public function __construct(DatabaseDriver $db)
     }
 
     /**
-     * Method to perform sanity checks on the \JTable instance properties to ensure
+     * Method to perform sanity checks on the \Joomla\CMS\Table\Table instance properties to ensure
      * they are safe to store in the database.  Child classes should override this
      * method to make sure the data they are storing in the database is safe and
      * as expected before storage.
@@ -105,11 +109,11 @@ public function check()
     }
 
     /**
-     * Method to store a row in the database from the \JTable instance properties.
+     * Method to store a row in the database from the \Joomla\CMS\Table\Table instance properties.
      * If a primary key value is set the row with that primary key value will be
      * updated with the instance property values.  If no primary key value is set
      * a new row will be inserted into the database with the properties from the
-     * \JTable instance.
+     * \Joomla\CMS\Table\Table instance.
      *
      * @param   boolean  $updateNulls  True to update fields even if they are null. [optional]
      *
@@ -120,7 +124,7 @@ public function check()
     public function store($updateNulls = true)
     {
         $date   = Factory::getDate()->toSql();
-        $userId = Factory::getUser()->id;
+        $userId = $this->getCurrentUser()->id;
 
         // Set created date if not set.
         if (!(int) $this->created) {
diff --git a/administrator/components/com_finder/src/View/Filter/HtmlView.php b/administrator/components/com_finder/src/View/Filter/HtmlView.php
index a7af7448c3006..4826106b242a5 100644
--- a/administrator/components/com_finder/src/View/Filter/HtmlView.php
+++ b/administrator/components/com_finder/src/View/Filter/HtmlView.php
@@ -60,7 +60,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var    CMSObject
+     * @var    \Joomla\Registry\Registry
      *
      * @since  3.6.2
      */
diff --git a/administrator/components/com_finder/src/View/Filters/HtmlView.php b/administrator/components/com_finder/src/View/Filters/HtmlView.php
index e8620ed45ffad..f675d361e7c39 100644
--- a/administrator/components/com_finder/src/View/Filters/HtmlView.php
+++ b/administrator/components/com_finder/src/View/Filters/HtmlView.php
@@ -50,7 +50,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var    \Joomla\CMS\Object\CMSObject
+     * @var   \Joomla\Registry\Registry
      *
      * @since  3.6.1
      */
diff --git a/administrator/components/com_finder/src/View/Index/HtmlView.php b/administrator/components/com_finder/src/View/Index/HtmlView.php
index 5cd83861e7bf8..5c611a8607ee0 100644
--- a/administrator/components/com_finder/src/View/Index/HtmlView.php
+++ b/administrator/components/com_finder/src/View/Index/HtmlView.php
@@ -174,13 +174,35 @@ protected function addToolbar()
 
         ToolbarHelper::title(Text::_('COM_FINDER_INDEX_TOOLBAR_TITLE'), 'search-plus finder');
 
-        $toolbar->popupButton('archive', 'COM_FINDER_INDEX')
-            ->url('index.php?option=com_finder&view=indexer&tmpl=component')
-            ->iframeWidth(550)
-            ->iframeHeight(210)
-            ->onclose('window.parent.location.reload()')
-            ->icon('icon-archive')
-            ->title(Text::_('COM_FINDER_HEADING_INDEXER'));
+        if (JDEBUG) {
+            $dropdown = $toolbar->dropdownButton('indexing-group');
+            $dropdown->text('COM_FINDER_INDEX')
+                ->toggleSplit(false)
+                ->icon('icon-archive')
+                ->buttonClass('btn btn-action');
+
+            $childBar = $dropdown->getChildToolbar();
+
+            $childBar->popupButton('index', 'COM_FINDER_INDEX')
+                ->url('index.php?option=com_finder&view=indexer&tmpl=component')
+                ->icon('icon-archive')
+                ->iframeWidth(500)
+                ->iframeHeight(210)
+                ->onclose('window.parent.location.reload()')
+                ->title(Text::_('COM_FINDER_HEADING_INDEXER'));
+
+            $childBar->linkButton('indexdebug', 'COM_FINDER_INDEX_TOOLBAR_INDEX_DEBUGGING')
+                ->url('index.php?option=com_finder&view=indexer&layout=debug')
+                ->icon('icon-tools');
+        } else {
+            $toolbar->popupButton('index', 'COM_FINDER_INDEX')
+                ->url('index.php?option=com_finder&view=indexer&tmpl=component')
+                ->icon('icon-archive')
+                ->iframeWidth(500)
+                ->iframeHeight(210)
+                ->onclose('window.parent.location.reload()')
+                ->title(Text::_('COM_FINDER_HEADING_INDEXER'));
+        }
 
         if (!$this->isEmptyState) {
             if ($canDo->get('core.edit.state')) {
diff --git a/administrator/components/com_finder/src/View/Indexer/HtmlView.php b/administrator/components/com_finder/src/View/Indexer/HtmlView.php
index e13214d3d24c4..7dcd1ba819bc8 100644
--- a/administrator/components/com_finder/src/View/Indexer/HtmlView.php
+++ b/administrator/components/com_finder/src/View/Indexer/HtmlView.php
@@ -10,7 +10,12 @@
 
 namespace Joomla\Component\Finder\Administrator\View\Indexer;
 
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Toolbar\Toolbar;
+use Joomla\CMS\Toolbar\ToolbarHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -23,4 +28,52 @@
  */
 class HtmlView extends BaseHtmlView
 {
+    /**
+     * @var   Form  $form
+     *
+     * @since  5.0.0
+     */
+    public $form;
+
+    /**
+     * Method to display the view.
+     *
+     * @param   string  $tpl  A template file to load. [optional]
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function display($tpl = null)
+    {
+        if ($this->getLayout() == 'debug') {
+            $this->form = $this->get('Form');
+            $this->addToolbar();
+        }
+
+        parent::display($tpl);
+    }
+
+    /**
+     * Method to configure the toolbar for this view.
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    protected function addToolbar()
+    {
+        /** @var Toolbar $toolbar */
+        $toolbar = $this->getDocument()->getToolbar();
+
+        ToolbarHelper::title(Text::_('COM_FINDER_INDEXER_TOOLBAR_TITLE'), 'search-plus finder');
+
+        $toolbar->linkButton('back', 'JTOOLBAR_BACK')
+            ->icon('icon-arrow-' . ($this->getLanguage()->isRtl() ? 'right' : 'left'))
+            ->url(Route::_('index.php?option=com_finder&view=index'));
+
+        $toolbar->standardButton('index', 'COM_FINDER_INDEX')
+            ->icon('icon-play')
+            ->onclick('Joomla.debugIndexing();');
+    }
 }
diff --git a/administrator/components/com_finder/src/View/Item/HtmlView.php b/administrator/components/com_finder/src/View/Item/HtmlView.php
new file mode 100644
index 0000000000000..70b4af4cd8077
--- /dev/null
+++ b/administrator/components/com_finder/src/View/Item/HtmlView.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Component\Finder\Administrator\View\Item;
+
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Toolbar\Toolbar;
+use Joomla\CMS\Toolbar\ToolbarHelper;
+
+/**
+ * Index view class for Finder.
+ *
+ * @since  5.0.0
+ */
+class HtmlView extends BaseHtmlView
+{
+    /**
+     * The indexed item
+     *
+     * @var  object
+     *
+     * @since  5.0.0
+     */
+    protected $item;
+
+    /**
+     * The associated terms
+     *
+     * @var  object[]
+     *
+     * @since  5.0.0
+     */
+    protected $terms;
+
+    /**
+     * The associated taxonomies
+     *
+     * @var  object[]
+     *
+     * @since  5.0.0
+     */
+    protected $taxonomies;
+
+    /**
+     * Method to display the view.
+     *
+     * @param   string  $tpl  A template file to load. [optional]
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function display($tpl = null)
+    {
+        $this->item       = $this->get('Item');
+        $this->terms      = $this->get('Terms');
+        $this->taxonomies = $this->get('Taxonomies');
+
+        // Configure the toolbar.
+        $this->addToolbar();
+
+        parent::display($tpl);
+    }
+
+    /**
+     * Method to configure the toolbar for this view.
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    protected function addToolbar()
+    {
+        /** @var Toolbar $toolbar */
+        $toolbar = $this->getDocument()->getToolbar();
+
+        ToolbarHelper::title(Text::_('COM_FINDER_INDEX_TOOLBAR_TITLE'), 'search-plus finder');
+
+        $toolbar->linkButton('back', 'JTOOLBAR_BACK')
+            ->icon('icon-arrow-' . ($this->getLanguage()->isRtl() ? 'right' : 'left'))
+            ->url(Route::_('index.php?option=com_finder&view=index'));
+    }
+}
diff --git a/administrator/components/com_finder/src/View/Maps/HtmlView.php b/administrator/components/com_finder/src/View/Maps/HtmlView.php
index 70ff993dcfc84..fc2654652a01b 100644
--- a/administrator/components/com_finder/src/View/Maps/HtmlView.php
+++ b/administrator/components/com_finder/src/View/Maps/HtmlView.php
@@ -51,7 +51,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var    \Joomla\CMS\Object\CMSObject
+     * @var   \Joomla\Registry\Registry
      *
      * @since  3.6.1
      */
diff --git a/administrator/components/com_finder/src/View/Searches/HtmlView.php b/administrator/components/com_finder/src/View/Searches/HtmlView.php
index d188c06a55bb1..a366a791aa90b 100644
--- a/administrator/components/com_finder/src/View/Searches/HtmlView.php
+++ b/administrator/components/com_finder/src/View/Searches/HtmlView.php
@@ -56,7 +56,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var  \Joomla\CMS\Object\CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $state;
 
@@ -81,7 +81,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The actions the user is authorised to perform
      *
-     * @var    \Joomla\CMS\Object\CMSObject
+     * @var    \Joomla\Registry\Registry
      *
      * @since  4.0.0
      */
diff --git a/administrator/components/com_finder/tmpl/filters/default.php b/administrator/components/com_finder/tmpl/filters/default.php
index 2710272a74fd0..33f3330b02f3a 100644
--- a/administrator/components/com_finder/tmpl/filters/default.php
+++ b/administrator/components/com_finder/tmpl/filters/default.php
@@ -10,13 +10,12 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Router\Route;
 
-$user      = Factory::getUser();
+$user      = $this->getCurrentUser();
 $userId    = $user->get('id');
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
diff --git a/administrator/components/com_finder/tmpl/filters/emptystate.php b/administrator/components/com_finder/tmpl/filters/emptystate.php
index bea0eab762273..6afe5d41da2e7 100644
--- a/administrator/components/com_finder/tmpl/filters/emptystate.php
+++ b/administrator/components/com_finder/tmpl/filters/emptystate.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
 
@@ -24,7 +23,7 @@
     'title'      => Text::_('COM_FINDER_FILTERS_TOOLBAR_TITLE'),
 ];
 
-if (Factory::getApplication()->getIdentity()->authorise('core.create', 'com_finder')) {
+if ($this->getCurrentUser()->authorise('core.create', 'com_finder')) {
     $displayData['createURL']  = "index.php?option=com_finder&task=filter.add";
 }
 
diff --git a/administrator/components/com_finder/tmpl/index/default.php b/administrator/components/com_finder/tmpl/index/default.php
index c51294871e46c..7c05022b6bd65 100644
--- a/administrator/components/com_finder/tmpl/index/default.php
+++ b/administrator/components/com_finder/tmpl/index/default.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
@@ -20,13 +19,12 @@
 
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
-$lang      = Factory::getLanguage();
+$lang      = $this->getLanguage();
 
 /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
 $wa = $this->document->getWebAssetManager();
 $wa->useScript('multiselect')
     ->useScript('table.columns');
-
 ?>
 <form action="<?php echo Route::_('index.php?option=com_finder&view=index'); ?>" method="post" name="adminForm" id="adminForm">
     <div class="row">
@@ -101,7 +99,7 @@
                             </tr>
                         </thead>
                         <tbody>
-                            <?php $canChange = Factory::getUser()->authorise('core.manage', 'com_finder'); ?>
+                            <?php $canChange = $this->getCurrentUser()->authorise('core.manage', 'com_finder'); ?>
                             <?php foreach ($this->items as $i => $item) : ?>
                             <tr class="row<?php echo $i % 2; ?>">
                                 <td class="text-center">
@@ -111,7 +109,13 @@
                                     <?php echo HTMLHelper::_('jgrid.published', $item->published, $i, 'index.', $canChange, 'cb'); ?>
                                 </td>
                                 <th scope="row">
-                                    <?php echo $this->escape($item->title); ?>
+                                    <?php if (JDEBUG) : ?>
+                                        <a href="index.php?option=com_finder&view=item&id=<?php echo $item->link_id; ?>">
+                                            <?php echo $this->escape($item->title); ?>
+                                        </a>
+                                    <?php else : ?>
+                                        <?php echo $this->escape($item->title); ?>
+                                    <?php endif; ?>
                                 </th>
                                 <td class="small d-none d-md-table-cell">
                                     <?php
diff --git a/administrator/components/com_finder/tmpl/index/emptystate.php b/administrator/components/com_finder/tmpl/index/emptystate.php
index 4aa5f90255b69..6399cf55eff73 100644
--- a/administrator/components/com_finder/tmpl/index/emptystate.php
+++ b/administrator/components/com_finder/tmpl/index/emptystate.php
@@ -22,7 +22,7 @@
     '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-archive')[0].click();",
+    'createURL'  => "javascript:document.getElementsByClassName('button-index')[0].click();",
 ];
 
 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
new file mode 100644
index 0000000000000..b4247b72025e6
--- /dev/null
+++ b/administrator/components/com_finder/tmpl/indexer/debug.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   (C) 2022 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\Router\Route;
+
+/** @var Joomla\Component\Finder\Administrator\View\Indexer\HtmlView $this */
+
+Text::script('COM_FINDER_INDEXER_MESSAGE_COMPLETE', true);
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->document->getWebAssetManager();
+$wa->useScript('keepalive')
+    ->useScript('com_finder.debug');
+
+?>
+
+<form action="<?php echo Route::_('index.php?option=com_finder&layout=debug'); ?>" method="post" name="adminForm" id="debug-form">
+    <div class="form-horizontal">
+        <div class="card mt-3">
+            <div class="card-body">
+                <fieldset class="adminform p-4">
+                    <div class="alert alert-info">
+                        <h2 class="alert-heading"><?php echo Text::_('COM_FINDER_INDEXER_MSG_DEBUGGING_INDEXING'); ?></h2>
+                        <?php echo Text::_('COM_FINDER_INDEXER_MSG_DEBUGGING_INDEXING_TEXT'); ?>
+                    </div>
+                    <?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">
+                </fieldset>
+            </div>
+        </div>
+    </div>
+</form>
+
+<div class="form-horizontal">
+    <div class="card mt-3">
+        <div class="card-body">
+            <fieldset class="adminform">
+                <legend><?php echo Text::_('COM_FINDER_INDEXER_OUTPUT_AREA_TITLE'); ?></legend>
+                <div id="indexer-output" class="border p-3" style="min-height:200px;">
+
+                </div>
+            </fieldset>
+        </div>
+    </div>
+</div>
+
+
+
diff --git a/administrator/components/com_finder/tmpl/item/default.php b/administrator/components/com_finder/tmpl/item/default.php
new file mode 100644
index 0000000000000..c76160c693c09
--- /dev/null
+++ b/administrator/components/com_finder/tmpl/item/default.php
@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   (C) 2022 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 role="main">
+    <h1 class="mb-3"><?php echo $this->item->title; ?></h1>
+    <div class="card mb-3">
+        <div class="card-header"><h2><?php echo Text::_('COM_FINDER_ITEM_FIELDSET_ITEM_TITLE'); ?></h2></div>
+        <div class="card-body">
+            <dl class="row">
+                <?php foreach ($this->item as $key => $value) : ?>
+                <dt class="col-sm-3"><?php echo $key; ?></dt>
+                <dd class="col-sm-9<?php echo $key == 'object' ? ' text-break' : '';?>"><?php echo $value; ?></dd>
+                <?php endforeach; ?>
+            </dl>
+        </div>
+    </div>
+    <div class="card mb-3">
+        <div class="card-header"><h2><?php echo Text::_('COM_FINDER_ITEM_FIELDSET_TERMS_TITLE'); ?></h2></div>
+        <div class="card-body">
+            <table class="table">
+                <caption class="visually-hidden">
+                    <?php echo Text::_('COM_FINDER_ITEM_TERMS_TABLE_CAPTION'); ?>,
+                </caption>
+                <thead>
+                <tr>
+                    <th scope="col">id</th>
+                    <th scope="col">term</th>
+                    <th scope="col">stem</th>
+                    <th scope="col">common</th>
+                    <th scope="col">phrase</th>
+                    <th scope="col">weight</th>
+                    <th scope="col">links</th>
+                    <th scope="col">language</th>
+                </tr>
+                </thead>
+                <tbody>
+                <?php foreach ($this->terms as $term) : ?>
+                    <tr>
+                        <th scope="row"><?php echo $term->term_id; ?></th>
+                        <td><?php echo $term->term; ?></td>
+                        <td><?php echo $term->stem; ?></td>
+                        <td><?php echo $term->common; ?></td>
+                        <td><?php echo $term->phrase; ?></td>
+                        <td><?php echo $term->weight; ?></td>
+                        <td><?php echo $term->links; ?></td>
+                        <td><?php echo $term->language; ?></td>
+                    </tr>
+                <?php endforeach; ?>
+                </tbody>
+            </table>
+        </div>
+    </div>
+    <div class="card mb-3">
+        <div class="card-header"><h2><?php echo Text::_('COM_FINDER_ITEM_FIELDSET_TAXONOMIES_TITLE'); ?></h2></div>
+        <div class="card-body">
+            <table class="table">
+                <caption class="visually-hidden">
+                    <?php echo Text::_('COM_FINDER_ITEM_TAXONOMIES_TABLE_CAPTION'); ?>,
+                </caption>
+                <thead>
+                    <tr>
+                        <th scope="col">id</th>
+                        <th scope="col">title</th>
+                        <th scope="col">alias</th>
+                        <th scope="col">lft</th>
+                        <th scope="col">path</th>
+                        <th scope="col">state</th>
+                        <th scope="col">access</th>
+                        <th scope="col">language</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <?php foreach ($this->taxonomies as $taxonomy) : ?>
+                        <tr>
+                            <th scope="row"><?php echo $taxonomy->id; ?></th>
+                            <td><?php echo $taxonomy->title; ?></td>
+                            <td><?php echo $taxonomy->alias; ?></td>
+                            <td><?php echo $taxonomy->lft; ?></td>
+                            <td><?php echo $taxonomy->path; ?></td>
+                            <td><?php echo $taxonomy->state; ?></td>
+                            <td><?php echo $taxonomy->access; ?></td>
+                            <td><?php echo $taxonomy->language; ?></td>
+                        </tr>
+                    <?php endforeach; ?>
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div>
diff --git a/administrator/components/com_finder/tmpl/maps/default.php b/administrator/components/com_finder/tmpl/maps/default.php
index efd101a87bae8..ae9563c287cb7 100644
--- a/administrator/components/com_finder/tmpl/maps/default.php
+++ b/administrator/components/com_finder/tmpl/maps/default.php
@@ -81,7 +81,7 @@
                         </tr>
                     </thead>
                     <tbody>
-                        <?php $canChange = Factory::getApplication()->getIdentity()->authorise('core.manage', 'com_finder'); ?>
+                        <?php $canChange = $this->getCurrentUser()->authorise('core.manage', 'com_finder'); ?>
                         <?php foreach ($this->items as $i => $item) : ?>
                         <tr class="row<?php echo $i % 2; ?>">
                             <td class="text-center">
diff --git a/administrator/components/com_guidedtours/forms/step.xml b/administrator/components/com_guidedtours/forms/step.xml
index 57f56e364cdf9..e0d1ba212d012 100644
--- a/administrator/components/com_guidedtours/forms/step.xml
+++ b/administrator/components/com_guidedtours/forms/step.xml
@@ -59,7 +59,7 @@
 		name="description"
 		type="editor"
 		label="JGLOBAL_DESCRIPTION"
-		filter="JComponentHelper::filterText"
+		filter="\Joomla\CMS\Component\ComponentHelper::filterText"
 		buttons="true"
 		hide="readmore,pagebreak,module,menu,fields,contact,article"
 	/>
@@ -68,7 +68,7 @@
 		name="description_translation"
 		type="editor"
 		label="JGLOBAL_DESCRIPTION"
-		filter="JComponentHelper::filterText"
+		filter="\Joomla\CMS\Component\ComponentHelper::filterText"
 		buttons="false"
 		readonly="true"
 	/>
diff --git a/administrator/components/com_guidedtours/forms/tour.xml b/administrator/components/com_guidedtours/forms/tour.xml
index 624955e4c6355..dcb10e4aa949c 100644
--- a/administrator/components/com_guidedtours/forms/tour.xml
+++ b/administrator/components/com_guidedtours/forms/tour.xml
@@ -26,11 +26,20 @@
 		readonly="true"
 	/>
 
+	<field
+		name="uid"
+		type="text"
+		label="COM_GUIDEDTOURS_TOUR_UID_LABEL"
+		description="COM_GUIDEDTOURS_TOUR_UID_DESC"
+		hint="COM_GUIDEDTOURS_TOUR_UID_HINT"
+		required="false"
+	/>
+
 	<field
 		name="description"
 		type="editor"
 		label="JGLOBAL_DESCRIPTION"
-		filter="JComponentHelper::filterText"
+		filter="\Joomla\CMS\Component\ComponentHelper::filterText"
 		buttons="true"
 		hide="readmore,pagebreak,module,menu,fields,contact,article"
 	/>
@@ -39,7 +48,7 @@
 		name="description_translation"
 		type="editor"
 		label="JGLOBAL_DESCRIPTION"
-		filter="JComponentHelper::filterText"
+		filter="\Joomla\CMS\Component\ComponentHelper::filterText"
 		buttons="false"
 		readonly="true"
 	/>
diff --git a/administrator/components/com_guidedtours/src/Controller/DisplayController.php b/administrator/components/com_guidedtours/src/Controller/DisplayController.php
index 3f83224df59c0..6ee4d3094284b 100644
--- a/administrator/components/com_guidedtours/src/Controller/DisplayController.php
+++ b/administrator/components/com_guidedtours/src/Controller/DisplayController.php
@@ -12,6 +12,7 @@
 
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
+use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Router\Route;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -36,8 +37,9 @@ class DisplayController extends BaseController
     /**
      * Method to display a view.
      *
-     * @param   boolean $cachable  If true, the view output will be cached
-     * @param   array   $urlparams An array of safe URL parameters and their variable types, for valid values see {@link \JFilterInput::clean()}.
+     * @param   boolean $cachable   If true, the view output will be cached
+     * @param   array   $urlparams  An array of safe URL parameters and their variable types.
+     *                  @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  static |boolean  This object to support chaining. False on failure.
      *
@@ -49,6 +51,11 @@ public function display($cachable = false, $urlparams = [])
         $layout = $this->input->get('layout', 'default');
         $id     = $this->input->getInt('id');
 
+        // Show messages about the disabled plugin
+        if ($view === 'tours' && !PluginHelper::isEnabled('system', 'guidedtours')) {
+            $this->app->enqueueMessage(Text::_('COM_GUIDEDTOURS_PLUGIN_DISABLED'), 'error');
+        }
+
         if ($view === 'tour' && $layout === 'edit' && !$this->checkEditId('com_guidedtours.edit.tour', $id)) {
             $this->setMessage(Text::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id), 'error');
             $this->setRedirect(Route::_('index.php?option=com_guidedtours&view=tours', false));
diff --git a/administrator/components/com_guidedtours/src/Helper/GuidedtoursHelper.php b/administrator/components/com_guidedtours/src/Helper/GuidedtoursHelper.php
new file mode 100644
index 0000000000000..ca60ebc4c90c3
--- /dev/null
+++ b/administrator/components/com_guidedtours/src/Helper/GuidedtoursHelper.php
@@ -0,0 +1,104 @@
+<?php
+
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_actionlogs
+ *
+ * @copyright   (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Component\Guidedtours\Administrator\Helper;
+
+use Joomla\CMS\Factory;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Guidedtours component helper.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class GuidedtoursHelper
+{
+    /**
+     * Load the translation files for an Guided Tour
+     *
+     * @param   string  $uid    Guided Tour Unique Identifier
+     * @param   boolean $steps  Should tour steps language file be loaded
+     *
+     * @return  void
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public static function loadTranslationFiles($uid, bool $steps = false)
+    {
+        static $cache = [];
+        $uid          = strtolower($uid);
+
+        if (isset($cache[$uid])) {
+            return;
+        }
+
+        $lang   = Factory::getLanguage();
+
+        // The uid has an extension separator so we need to check the extension language files
+        if (strpos($uid, '.') > 0) {
+            list($extension, $tourid) = explode('.', $uid, 2);
+
+            $source = '';
+
+            switch (substr($extension, 0, 3)) {
+                case 'com':
+                    $source = JPATH_ADMINISTRATOR . '/components/' . $extension;
+                    break;
+
+                case 'lib':
+                    $source = JPATH_LIBRARIES . '/' . substr($extension, 4);
+                    break;
+
+                case 'mod':
+                    $source = JPATH_SITE . '/modules/' . $extension;
+                    break;
+
+                case 'plg':
+                    $parts = explode('_', $extension, 3);
+
+                    if (\count($parts) > 2) {
+                        $source = JPATH_PLUGINS . '/' . $parts[1] . '/' . $parts[2];
+                    }
+                    break;
+
+                case 'pkg':
+                    $source = JPATH_SITE;
+                    break;
+
+                case 'tpl':
+                    $source = JPATH_BASE . '/templates/' . substr($extension, 4);
+                    break;
+
+                default:
+                    $source = JPATH_ADMINISTRATOR . '/components/com_' . $extension;
+                    break;
+            }
+
+            $lang->load($extension . '.' . str_replace('-', '_', $tourid), JPATH_ADMINISTRATOR)
+                || $lang->load($extension . '.' . str_replace('-', '_', $tourid), $source);
+            if ($steps) {
+                $lang->load($extension . '.' . str_replace('-', '_', $tourid) . '_steps', JPATH_ADMINISTRATOR)
+                    || $lang->load($extension . '.' . str_replace('-', '_', $tourid) . '_steps', JPATH_ADMINISTRATOR);
+            }
+        } else {
+            $lang->load('guidedtours.' . str_replace('-', '_', $uid), JPATH_ADMINISTRATOR);
+            if ($steps) {
+                $lang->load('guidedtours.' . str_replace('-', '_', $uid) . '_steps', JPATH_ADMINISTRATOR);
+            }
+        }
+
+        $cache[$uid] = true;
+
+        return;
+    }
+}
diff --git a/administrator/components/com_guidedtours/src/Model/StepModel.php b/administrator/components/com_guidedtours/src/Model/StepModel.php
index a06d3093133d5..515d934666f63 100644
--- a/administrator/components/com_guidedtours/src/Model/StepModel.php
+++ b/administrator/components/com_guidedtours/src/Model/StepModel.php
@@ -15,6 +15,7 @@
 use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Table\Table;
+use Joomla\Component\Guidedtours\Administrator\Helper\GuidedtoursHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -237,25 +238,28 @@ protected function loadFormData()
      */
     public function getItem($pk = null)
     {
-        Factory::getLanguage()->load('com_guidedtours.sys', JPATH_ADMINISTRATOR);
-
         if ($result = parent::getItem($pk)) {
+            $app = Factory::getApplication();
+
+            /** @var \Joomla\Component\Guidedtours\Administrator\Model\TourModel $tourModel */
+            $tourModel = $app->bootComponent('com_guidedtours')
+            ->getMVCFactory()->createModel('Tour', 'Administrator', ['ignore_request' => true]);
+
             if (!empty($result->id)) {
+                // Editing an existing step
+                $tour = $tourModel->getItem($result->tour_id);
+
+                GuidedtoursHelper::loadTranslationFiles($tour->uid, true);
+
                 $result->title_translation       = Text::_($result->title);
                 $result->description_translation = Text::_($result->description);
             } else {
-                $app    = Factory::getApplication();
+                // Creating a new step so we get the tour id from the session data
                 $tourId = $app->getUserState('com_guidedtours.tour_id');
-
-                /** @var \Joomla\Component\Guidedtours\Administrator\Model\TourModel $tourModel */
-                $tourModel = $app->bootComponent('com_guidedtours')
-                    ->getMVCFactory()->createModel('Tour', 'Administrator', ['ignore_request' => true]);
-
-                $tour         = $tourModel->getItem($tourId);
-                $tourLanguage = !empty($tour->language) ? $tour->language : '*';
+                $tour   = $tourModel->getItem($tourId);
 
                 // Sets step language to parent tour language
-                $result->language = $tourLanguage;
+                $result->language = !empty($tour->language) ? $tour->language : '*';
 
                 // Set the step's tour id
                 $result->tour_id = $tourId;
diff --git a/administrator/components/com_guidedtours/src/Model/StepsModel.php b/administrator/components/com_guidedtours/src/Model/StepsModel.php
index 14c6c3584070a..4e53af860d544 100644
--- a/administrator/components/com_guidedtours/src/Model/StepsModel.php
+++ b/administrator/components/com_guidedtours/src/Model/StepsModel.php
@@ -13,6 +13,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Model\ListModel;
+use Joomla\Component\Guidedtours\Administrator\Helper\GuidedtoursHelper;
 use Joomla\Database\DatabaseQuery;
 use Joomla\Database\ParameterType;
 use Joomla\Utilities\ArrayHelper;
@@ -50,6 +51,7 @@ public function __construct($config = [])
                 'created_by', 'a.created_by',
                 'modified', 'a.modified',
                 'modified_by', 'a.modified_by',
+                'note', 'a.note',
             ];
         }
 
@@ -200,9 +202,10 @@ protected function getListQuery()
                 $search = '%' . str_replace(' ', '%', trim($search)) . '%';
                 $query->where(
                     '(' . $db->quoteName('a.title') . ' LIKE :search1'
-                    . ' OR ' . $db->quoteName('a.description') . ' LIKE :search2)'
+                    . ' OR ' . $db->quoteName('a.description') . ' LIKE :search2'
+                    . ' OR ' . $db->quoteName('a.note') . ' LIKE :search3)'
                 )
-                    ->bind([':search1', ':search2'], $search);
+                    ->bind([':search1', ':search2', ':search3'], $search);
             }
         }
 
@@ -226,9 +229,23 @@ public function getItems()
     {
         $items = parent::getItems();
 
-        Factory::getLanguage()->load('com_guidedtours.sys', JPATH_ADMINISTRATOR);
-
+        $tourLanguageLoaded = false;
         foreach ($items as $item) {
+            if (!$tourLanguageLoaded) {
+                $app    = Factory::getApplication();
+                $tourId = $item->tour_id;
+
+                /** @var \Joomla\Component\Guidedtours\Administrator\Model\TourModel $tourModel */
+                $tourModel = $app->bootComponent('com_guidedtours')
+                                 ->getMVCFactory()->createModel('Tour', 'Administrator', [ 'ignore_request' => true ]);
+
+                $tour = $tourModel->getItem($tourId);
+
+                GuidedtoursHelper::loadTranslationFiles($tour->uid, true);
+
+                $tourLanguageLoaded = true;
+            }
+
             $item->title       = Text::_($item->title);
             $item->description = Text::_($item->description);
         }
diff --git a/administrator/components/com_guidedtours/src/Model/TourModel.php b/administrator/components/com_guidedtours/src/Model/TourModel.php
index 05ea8cf530258..f6c222d6f3cc6 100644
--- a/administrator/components/com_guidedtours/src/Model/TourModel.php
+++ b/administrator/components/com_guidedtours/src/Model/TourModel.php
@@ -16,7 +16,9 @@
 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;
+use Joomla\Registry\Registry;
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -57,7 +59,7 @@ class TourModel extends AdminModel
      */
     public function save($data)
     {
-        $input = Factory::getApplication()->input;
+        $input = Factory::getApplication()->getInput();
 
         // Language keys must include GUIDEDTOUR to prevent save issues
         if (strpos($data['description'], 'GUIDEDTOUR') !== false) {
@@ -77,24 +79,7 @@ public function save($data)
 
         $this->setStepsLanguage($id, $lang);
 
-        $result = parent::save($data);
-
-        // Create default step for new tour
-        if ($result && $input->getCmd('task') !== 'save2copy' && $this->getState($this->getName() . '.new')) {
-            $tourId = (int) $this->getState($this->getName() . '.id');
-
-            $table = $this->getTable('Step');
-
-            $table->id          = 0;
-            $table->title       = 'COM_GUIDEDTOURS_BASIC_STEP';
-            $table->description = '';
-            $table->tour_id     = $tourId;
-            $table->published   = 1;
-
-            $table->store();
-        }
-
-        return $result;
+        return parent::save($data);
     }
 
     /**
@@ -202,9 +187,9 @@ protected function loadFormData()
     }
 
     /**
-     * Method to get a single record.
+     * Method to get a single record by id or uid
      *
-     * @param   integer  $pk  The id of the primary key.
+     * @param   integer|string  $pk  The id or uid of the tour.
      *
      * @return  CMSObject|boolean  Object on success, false on failure.
      *
@@ -212,16 +197,47 @@ protected function loadFormData()
      */
     public function getItem($pk = null)
     {
-        Factory::getLanguage()->load('com_guidedtours.sys', JPATH_ADMINISTRATOR);
+        $pk    = (!empty($pk)) ? $pk : (int) $this->getState($this->getName() . '.id');
 
-        $result = parent::getItem($pk);
+        $table = $this->getTable();
+        if (is_integer($pk)) {
+            $result = $table->load((int) $pk);
+        } else {
+            // Attempt to load the row by uid.
+            $result = $table->load([ 'uid' => $pk ]);
+        }
+
+        // Check for a table object error.
+        if ($result === false) {
+            // If there was no underlying error, then the false means there simply was not a row in the db for this $pk.
+            if (!$table->getError()) {
+                $this->setError(Text::_('JLIB_APPLICATION_ERROR_NOT_EXIST'));
+            } else {
+                $this->setError($table->getError());
+            }
+
+            return false;
+        }
+
+        // Convert to the CMSObject before adding other data.
+        $properties = $table->getProperties(1);
+        $item       = ArrayHelper::toObject($properties, CMSObject::class);
+
+        if (property_exists($item, 'params')) {
+            $registry     = new Registry($item->params);
+            $item->params = $registry->toArray();
+        }
+
+        if (!empty($item->uid)) {
+            GuidedtoursHelper::loadTranslationFiles($item->uid, true);
+        }
 
-        if (!empty($result->id)) {
-            $result->title_translation       = Text::_($result->title);
-            $result->description_translation = Text::_($result->description);
+        if (!empty($item->id)) {
+            $item->title_translation       = Text::_($item->title);
+            $item->description_translation = Text::_($item->description);
         }
 
-        return $result;
+        return $item;
     }
 
     /**
diff --git a/administrator/components/com_guidedtours/src/Model/ToursModel.php b/administrator/components/com_guidedtours/src/Model/ToursModel.php
index 2ee0df9df3953..17ca7b0add9e4 100644
--- a/administrator/components/com_guidedtours/src/Model/ToursModel.php
+++ b/administrator/components/com_guidedtours/src/Model/ToursModel.php
@@ -13,6 +13,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Model\ListModel;
+use Joomla\Component\Guidedtours\Administrator\Helper\GuidedtoursHelper;
 use Joomla\Database\ParameterType;
 use Joomla\Registry\Registry;
 use Joomla\Utilities\ArrayHelper;
@@ -51,6 +52,7 @@ public function __construct($config = [])
                 'created_by', 'a.created_by',
                 'modified', 'a.modified',
                 'modified_by', 'a.modified_by',
+                'note', 'a.note',
             ];
         }
 
@@ -220,9 +222,10 @@ public function getListQuery()
                 $search = '%' . str_replace(' ', '%', trim($search)) . '%';
                 $query->where(
                     '(' . $db->quoteName('a.title') . ' LIKE :search1'
-                    . ' OR ' . $db->quoteName('a.description') . ' LIKE :search2)'
+                    . ' OR ' . $db->quoteName('a.description') . ' LIKE :search2'
+                    . ' OR ' . $db->quoteName('a.note') . ' LIKE :search3)'
                 )
-                    ->bind([':search1', ':search2'], $search);
+                    ->bind([':search1', ':search2', ':search3'], $search);
             }
         }
 
@@ -246,13 +249,15 @@ public function getItems()
     {
         $items = parent::getItems();
 
-        Factory::getLanguage()->load('com_guidedtours.sys', JPATH_ADMINISTRATOR);
-
-        foreach ($items as $item) {
+        foreach ($items as & $item) {
+            if (!empty($item->uid)) {
+                GuidedtoursHelper::loadTranslationFiles($item->uid, false);
+            }
             $item->title       = Text::_($item->title);
             $item->description = Text::_($item->description);
             $item->extensions  = (new Registry($item->extensions))->toArray();
         }
+        unset($item);
 
         return $items;
     }
diff --git a/administrator/components/com_guidedtours/src/Table/StepTable.php b/administrator/components/com_guidedtours/src/Table/StepTable.php
index e5290aa9171df..df31d503587fe 100644
--- a/administrator/components/com_guidedtours/src/Table/StepTable.php
+++ b/administrator/components/com_guidedtours/src/Table/StepTable.php
@@ -12,6 +12,8 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Table\Table;
+use Joomla\CMS\User\CurrentUserInterface;
+use Joomla\CMS\User\CurrentUserTrait;
 use Joomla\Database\DatabaseDriver;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -23,8 +25,10 @@
  *
  * @since 4.3.0
  */
-class StepTable extends Table
+class StepTable extends Table implements CurrentUserInterface
 {
+    use CurrentUserTrait;
+
     /**
      * Indicates that columns fully support the NULL value in the database
      *
@@ -57,7 +61,7 @@ public function __construct(DatabaseDriver $db)
     public function store($updateNulls = true)
     {
         $date   = Factory::getDate()->toSql();
-        $userId = Factory::getUser()->id;
+        $userId = $this->getCurrentUser()->id;
 
         // Set created date if not set.
         if (!(int) $this->created) {
diff --git a/administrator/components/com_guidedtours/src/Table/TourTable.php b/administrator/components/com_guidedtours/src/Table/TourTable.php
index 53869e1910fad..5373c4f0730b8 100644
--- a/administrator/components/com_guidedtours/src/Table/TourTable.php
+++ b/administrator/components/com_guidedtours/src/Table/TourTable.php
@@ -10,9 +10,14 @@
 
 namespace Joomla\Component\Guidedtours\Administrator\Table;
 
+use Joomla\CMS\Application\ApplicationHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Table\Table;
+use Joomla\CMS\Uri\Uri;
+use Joomla\CMS\User\CurrentUserInterface;
+use Joomla\CMS\User\CurrentUserTrait;
 use Joomla\Database\DatabaseDriver;
+use Joomla\String\StringHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -23,8 +28,10 @@
  *
  * @since 4.3.0
  */
-class TourTable extends Table
+class TourTable extends Table implements CurrentUserInterface
 {
+    use CurrentUserTrait;
+
     /**
      * Indicates that columns fully support the NULL value in the database
      *
@@ -65,7 +72,7 @@ public function __construct(DatabaseDriver $db)
     public function store($updateNulls = true)
     {
         $date   = Factory::getDate()->toSql();
-        $userId = Factory::getUser()->id;
+        $userId = $this->getCurrentUser()->id;
 
         // Set created date if not set.
         if (!(int) $this->created) {
@@ -95,6 +102,90 @@ public function store($updateNulls = true)
             $this->extensions = ["*"];
         }
 
+        // set missing Uid
+        if (empty($this->uid)) {
+            $this->setTourUid();
+        }
+
+        // make sure the uid is unique
+        $this->ensureUniqueUid();
+
         return parent::store($updateNulls);
     }
+
+
+    /**
+     * Method to set the uid when empty
+     *
+     * @return  string $uid  Contains the non-empty uid.
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    protected function setTourUid()
+    {
+        // Tour follows Joomla naming convention
+        if (str_starts_with($this->title, 'COM_GUIDEDTOURS_TOUR_') && str_ends_with($this->title, '_TITLE')) {
+            $uidTitle = 'joomla_' . str_replace('COM_GUIDEDTOURS_TOUR_', '', $this->title);
+
+            // Remove the last _TITLE part
+            $pos = strrpos($uidTitle, "_TITLE");
+            if ($pos !== false) {
+                $uidTitle = substr($uidTitle, 0, $pos);
+            }
+        } elseif (preg_match('#COM_(\w+)_TOUR_#', $this->title) && str_ends_with($this->title, '_TITLE')) {
+            // Tour follows component naming pattern
+            $uidTitle = preg_replace('#COM_(\w+)_TOUR_#', '$1.', $this->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, $this->language);
+            $uidTitle = $host . ' ' . str_replace('COM_GUIDEDTOURS_TOUR_', '', $this->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);
+        }, $this->language);
+        $this->uid = implode('.', $uidTitleParts);
+
+        $this->store();
+
+        return $this->uid;
+    }
+
+    /**
+     * Method to change the uid when not unique.
+     *
+     * @return  string $uid  Contains the modified uid.
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    protected function ensureUniqueUid()
+    {
+        $table  = new TourTable($this->_db);
+        $unique = false;
+        // Alter the title & uid
+        while (!$unique) {
+            // Attempt to load the row by uid.
+            $uidItem = $table->load([ 'uid' => $this->uid ]);
+            if ($uidItem && $table->id > 0 && $table->id != $this->id) {
+                $this->uid = StringHelper::increment($this->uid, 'dash');
+            } else {
+                $unique = true;
+            }
+        }
+
+        return $this->uid;
+    }
 }
diff --git a/administrator/components/com_guidedtours/src/View/Step/HtmlView.php b/administrator/components/com_guidedtours/src/View/Step/HtmlView.php
index 8a5b198edfc00..0b884769da0e8 100644
--- a/administrator/components/com_guidedtours/src/View/Step/HtmlView.php
+++ b/administrator/components/com_guidedtours/src/View/Step/HtmlView.php
@@ -91,7 +91,7 @@ public function display($tpl = null)
      */
     protected function addToolbar()
     {
-        Factory::getApplication()->input->set('hidemainmenu', true);
+        Factory::getApplication()->getInput()->set('hidemainmenu', true);
 
         $user       = $this->getCurrentUser();
         $userId     = $user->id;
diff --git a/administrator/components/com_guidedtours/src/View/Steps/HtmlView.php b/administrator/components/com_guidedtours/src/View/Steps/HtmlView.php
index 1ed524747910c..221b1edd2a2f8 100644
--- a/administrator/components/com_guidedtours/src/View/Steps/HtmlView.php
+++ b/administrator/components/com_guidedtours/src/View/Steps/HtmlView.php
@@ -15,9 +15,9 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Router\Route;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
-use Joomla\CMS\Router\Route;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -47,7 +47,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var \Joomla\CMS\Object\CMSObject
+     * @var \Joomla\Registry\Registry
      */
     protected $state;
 
@@ -99,7 +99,12 @@ public function display($tpl = null)
         }
 
         if ($this->state->get('filter.tour_id', -1) < 0) {
-            throw new GenericDataException(implode("\n", $errors), 500);
+            // This arises when you are logged out and return to the steps view after logging back in
+            // We redirect back to the tour lists view
+            $app = Factory::getApplication();
+            $app->enqueueMessage(Text::_('COM_GUIDEDTOURS_STEPS_UNKNOWN_TOUR'), 'notice');
+            $app->redirect(Route::_('index.php?option=com_guidedtours&view=tours', false), 300);
+            return;
         }
 
         // Unset the tour_id field from activeFilters as we don't filter by tour here.
@@ -134,7 +139,7 @@ protected function addToolbar()
         $title = !empty($tour->title) ? $tour->title : '';
 
         ToolbarHelper::title(Text::sprintf('COM_GUIDEDTOURS_STEPS_LIST', Text::_($title)), 'map-signs');
-        $arrow  = Factory::getLanguage()->isRtl() ? 'arrow-right' : 'arrow-left';
+        $arrow  = $this->getLanguage()->isRtl() ? 'arrow-right' : 'arrow-left';
 
         ToolbarHelper::link(
             Route::_('index.php?option=com_guidedtours&view=tours'),
diff --git a/administrator/components/com_guidedtours/src/View/Tour/HtmlView.php b/administrator/components/com_guidedtours/src/View/Tour/HtmlView.php
index b01ee8517ce84..9dae12cde1e47 100644
--- a/administrator/components/com_guidedtours/src/View/Tour/HtmlView.php
+++ b/administrator/components/com_guidedtours/src/View/Tour/HtmlView.php
@@ -53,7 +53,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The actions the user is authorised to perform
      *
-     * @var \Joomla\CMS\Object\CMSObject
+     * @var \Joomla\Registry\Registry
      */
     protected $canDo;
 
@@ -92,9 +92,9 @@ public function display($tpl = null)
      */
     protected function addToolbar()
     {
-        Factory::getApplication()->input->set('hidemainmenu', true);
+        Factory::getApplication()->getInput()->set('hidemainmenu', true);
 
-        $user       = Factory::getApplication()->getIdentity();
+        $user       = $this->getCurrentUser();
         $userId     = $user->id;
         $isNew      = empty($this->item->id);
 
diff --git a/administrator/components/com_guidedtours/src/View/Tours/HtmlView.php b/administrator/components/com_guidedtours/src/View/Tours/HtmlView.php
index 64e5b85784f58..f9f8bdc483b13 100644
--- a/administrator/components/com_guidedtours/src/View/Tours/HtmlView.php
+++ b/administrator/components/com_guidedtours/src/View/Tours/HtmlView.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Component\Guidedtours\Administrator\View\Tours;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
@@ -47,7 +46,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var \Joomla\CMS\Object\CMSObject
+     * @var \Joomla\Registry\Registry
      */
     protected $state;
 
@@ -124,7 +123,7 @@ protected function addToolbar()
         ToolbarHelper::title(Text::_('COM_GUIDEDTOURS_TOURS_LIST'), 'map-signs');
 
         $canDo = ContentHelper::getActions('com_guidedtours');
-        $user  = Factory::getApplication()->getIdentity();
+        $user  = $this->getCurrentUser();
 
         if ($canDo->get('core.create')) {
             $toolbar->addNew('tour.add');
@@ -170,6 +169,6 @@ protected function addToolbar()
             $toolbar->preferences('com_guidedtours');
         }
 
-        ToolbarHelper::help('Guided_Tours:_Tours');
+        ToolbarHelper::help('Guided_Tours');
     }
 }
diff --git a/administrator/components/com_guidedtours/tmpl/step/edit.php b/administrator/components/com_guidedtours/tmpl/step/edit.php
index 4f6b8a87ee0fc..a17b46147074b 100644
--- a/administrator/components/com_guidedtours/tmpl/step/edit.php
+++ b/administrator/components/com_guidedtours/tmpl/step/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;
@@ -26,7 +25,7 @@
     throw new GenericDataException("\nThe Tour id was not set!\n", 500);
 }
 
-$lang = Factory::getLanguage()->getTag();
+$lang = $this->getLanguage()->getTag();
 ?>
 
 <form action="<?php echo Route::_('index.php?option=com_guidedtours&view=step&layout=edit&id=' .
diff --git a/administrator/components/com_guidedtours/tmpl/steps/default.php b/administrator/components/com_guidedtours/tmpl/steps/default.php
index 4cd7fa6f8d630..e3ea2137f5865 100644
--- a/administrator/components/com_guidedtours/tmpl/steps/default.php
+++ b/administrator/components/com_guidedtours/tmpl/steps/default.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\Helpers\StringHelper;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
@@ -27,7 +26,7 @@
 $wa->useScript('table.columns')
     ->useScript('multiselect');
 
-$user      = Factory::getApplication()->getIdentity();
+$user      = $this->getCurrentUser();
 $userId    = $user->get('id');
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
diff --git a/administrator/components/com_guidedtours/tmpl/steps/emptystate.php b/administrator/components/com_guidedtours/tmpl/steps/emptystate.php
index 80055e19ce904..a3ce66a9cb0bc 100644
--- a/administrator/components/com_guidedtours/tmpl/steps/emptystate.php
+++ b/administrator/components/com_guidedtours/tmpl/steps/emptystate.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Layout\LayoutHelper;
 
 $displayData = [
@@ -20,7 +19,7 @@
     'icon'       => 'icon-map-signs',
 ];
 
-$user = Factory::getApplication()->getIdentity();
+$user = $this->getCurrentUser();
 
 if ($user->authorise('core.create', 'com_guidedtours')) {
     $displayData['createURL'] = 'index.php?option=com_guidedtours&task=step.add';
diff --git a/administrator/components/com_guidedtours/tmpl/tour/edit.php b/administrator/components/com_guidedtours/tmpl/tour/edit.php
index 0092c9dd5cb57..dce454a24da0c 100644
--- a/administrator/components/com_guidedtours/tmpl/tour/edit.php
+++ b/administrator/components/com_guidedtours/tmpl/tour/edit.php
@@ -18,8 +18,8 @@
 
 $app   = Factory::getApplication();
 $user  = $app->getIdentity();
-$input = $app->input;
-$lang  = Factory::getLanguage()->getTag();
+$input = $app->getInput();
+$lang  = $this->getLanguage()->getTag();
 
 /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
 $wa = $this->document->getWebAssetManager();
@@ -30,7 +30,14 @@
 <form action="<?php echo Route::_('index.php?option=com_guidedtours&view=tour&layout=edit&id=' .
     (int) $this->item->id); ?>" method="post" name="adminForm" id="guidedtours-form" class="form-validate">
 
-    <?php echo LayoutHelper::render('joomla.edit.title_alias', $this); ?>
+    <div class="row title-alias form-vertical mb-3">
+        <div class="col-12 col-md-6">
+            <?php echo $this->form->renderField('title'); ?>
+        </div>
+        <div class="col-12 col-md-6">
+            <?php echo $this->form->renderField('uid'); ?>
+        </div>
+    </div>
 
     <?php if ($this->item->id != 0 && strpos($this->item->title, 'GUIDEDTOUR') !== false) : ?>
         <div class="row title-alias form-vertical mb-3">
diff --git a/administrator/components/com_guidedtours/tmpl/tours/default.php b/administrator/components/com_guidedtours/tmpl/tours/default.php
index c5f5a831d56bc..bea324c30ad14 100644
--- a/administrator/components/com_guidedtours/tmpl/tours/default.php
+++ b/administrator/components/com_guidedtours/tmpl/tours/default.php
@@ -19,7 +19,6 @@
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use Joomla\Component\Guidedtours\Administrator\View\Tours\HtmlView;
-use Joomla\String\Inflector;
 
 /** @var  HtmlView  $this */
 
diff --git a/administrator/components/com_guidedtours/tmpl/tours/emptystate.php b/administrator/components/com_guidedtours/tmpl/tours/emptystate.php
index 316e4d51554ae..26de064d68c0d 100644
--- a/administrator/components/com_guidedtours/tmpl/tours/emptystate.php
+++ b/administrator/components/com_guidedtours/tmpl/tours/emptystate.php
@@ -10,17 +10,16 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Layout\LayoutHelper;
 
 $displayData = [
     'textPrefix' => 'COM_GUIDEDTOURS_TOURS_LIST',
     'formURL'    => 'index.php?option=com_guidedtours&view=tours',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help4.x:Guided_Tours:_Tours',
+    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help4.x:Guided_Tours',
     'icon'       => 'icon-map-signs',
 ];
 
-$user = Factory::getApplication()->getIdentity();
+$user = $this->getCurrentUser();
 
 if ($user->authorise('core.create', 'com_guidedtours')) {
     $displayData['createURL'] = 'index.php?option=com_guidedtours&task=tour.add';
diff --git a/administrator/components/com_installer/src/Controller/DisplayController.php b/administrator/components/com_installer/src/Controller/DisplayController.php
index 25c306f225e0f..5a7c6fc206280 100644
--- a/administrator/components/com_installer/src/Controller/DisplayController.php
+++ b/administrator/components/com_installer/src/Controller/DisplayController.php
@@ -30,7 +30,8 @@ class DisplayController extends BaseController
      * Method to display a view.
      *
      * @param   boolean  $cachable   If true, the view output will be cached
-     * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link \JFilterInput::clean()}.
+     * @param   array    $urlparams  An array of safe URL parameters and their variable types.
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  static   This object to support chaining.
      *
diff --git a/administrator/components/com_installer/src/Extension/InstallerComponent.php b/administrator/components/com_installer/src/Extension/InstallerComponent.php
index e422e860bb8d8..9c4fcdada5834 100644
--- a/administrator/components/com_installer/src/Extension/InstallerComponent.php
+++ b/administrator/components/com_installer/src/Extension/InstallerComponent.php
@@ -18,7 +18,7 @@
 use Psr\Container\ContainerInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/administrator/components/com_installer/src/Helper/InstallerHelper.php b/administrator/components/com_installer/src/Helper/InstallerHelper.php
index 38170d0a3441e..28ac7c3830d9b 100644
--- a/administrator/components/com_installer/src/Helper/InstallerHelper.php
+++ b/administrator/components/com_installer/src/Helper/InstallerHelper.php
@@ -10,14 +10,12 @@
 
 namespace Joomla\Component\Installer\Administrator\Helper;
 
-use Exception;
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Object\CMSObject;
-use Joomla\Database\DatabaseDriver;
+use Joomla\Database\DatabaseInterface;
 use Joomla\Database\ParameterType;
-use SimpleXMLElement;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -131,8 +129,8 @@ public static function getPackageOptions(): array
     {
         $options = [];
 
-        /** @var DatabaseDriver $db The application's database driver object */
-        $db         = Factory::getContainer()->get(DatabaseDriver::class);
+        /** @var DatabaseInterface $db The application's database driver object */
+        $db         = Factory::getContainer()->get(DatabaseInterface::class);
         $query      = $db->getQuery(true)
             ->select(
                 $db->quoteName(
@@ -185,7 +183,7 @@ function (object $entry): int {
      * @param   integer  $clientId  client_id of an extension
      * @param   string   $folder    folder of an extension
      *
-     * @return  SimpleXMLElement
+     * @return  \SimpleXMLElement
      *
      * @since   4.0.0
      */
@@ -194,7 +192,7 @@ public static function getInstallationXML(
         string $type,
         int $clientId = 1,
         ?string $folder = null
-    ): ?SimpleXMLElement {
+    ): ?\SimpleXMLElement {
         $path = [0 => JPATH_SITE, 1 => JPATH_ADMINISTRATOR, 3 => JPATH_API][$clientId] ?? JPATH_SITE;
 
         switch ($type) {
@@ -304,7 +302,7 @@ public static function getExtensionDownloadKey(
         // Get the database driver. If it fails we cannot report whether the extension supports download keys.
         try {
             $db = Factory::getDbo();
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             return [
                 'supported' => false,
                 'valid'     => false,
@@ -326,7 +324,7 @@ public static function getExtensionDownloadKey(
 
         try {
             $extension = new CMSObject($db->setQuery($query)->loadAssoc());
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             return [
                 'supported' => false,
                 'valid'     => false,
@@ -425,7 +423,7 @@ protected static function getUpdateSitesInformation(bool $onlyEnabled): array
     {
         try {
             $db = Factory::getDbo();
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             return [];
         }
 
@@ -483,7 +481,7 @@ protected static function getUpdateSitesInformation(bool $onlyEnabled): array
             }
 
             return $items;
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             return [];
         }
     }
diff --git a/administrator/components/com_installer/src/Model/InstallModel.php b/administrator/components/com_installer/src/Model/InstallModel.php
index c0f61cd980580..73a17c58959a1 100644
--- a/administrator/components/com_installer/src/Model/InstallModel.php
+++ b/administrator/components/com_installer/src/Model/InstallModel.php
@@ -10,9 +10,11 @@
 
 namespace Joomla\Component\Installer\Administrator\Model;
 
+use Joomla\CMS\Event\Installer\AfterInstallerEvent;
+use Joomla\CMS\Event\Installer\BeforeInstallationEvent;
+use Joomla\CMS\Event\Installer\BeforeInstallerEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filesystem\File;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Installer\Installer;
 use Joomla\CMS\Installer\InstallerHelper;
 use Joomla\CMS\Language\Text;
@@ -21,6 +23,7 @@
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Updater\Update;
 use Joomla\CMS\Uri\Uri;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -82,16 +85,22 @@ public function install()
     {
         $this->setState('action', 'install');
 
-        $app = Factory::getApplication();
+        $app        = Factory::getApplication();
+        $dispatcher = $this->getDispatcher();
 
         // Load installer plugins for assistance if required:
-        PluginHelper::importPlugin('installer');
+        PluginHelper::importPlugin('installer', null, true, $dispatcher);
 
         $package = null;
 
         // This event allows an input pre-treatment, a custom pre-packing or custom installation.
         // (e.g. from a \JSON description).
-        $results = $app->triggerEvent('onInstallerBeforeInstallation', [$this, &$package]);
+        $eventBefore = new BeforeInstallationEvent('onInstallerBeforeInstallation', [
+            'subject' => $this,
+            'package' => &$package, // TODO: Remove reference in Joomla 6, see InstallerEvent::__constructor()
+        ]);
+        $results = $dispatcher->dispatch('onInstallerBeforeInstallation', $eventBefore)->getArgument('result', []);
+        $package = $eventBefore->getPackage();
 
         if (in_array(true, $results, true)) {
             return true;
@@ -128,7 +137,12 @@ public function install()
         }
 
         // This event allows a custom installation of the package or a customization of the package:
-        $results = $app->triggerEvent('onInstallerBeforeInstaller', [$this, &$package]);
+        $eventBeforeInst = new BeforeInstallerEvent('onInstallerBeforeInstaller', [
+            'subject' => $this,
+            'package' => &$package, // TODO: Remove reference in Joomla 6, see InstallerEvent::__constructor()
+        ]);
+        $results = $dispatcher->dispatch('onInstallerBeforeInstaller', $eventBeforeInst)->getArgument('result', []);
+        $package = $eventBeforeInst->getPackage();
 
         if (in_array(true, $results, true)) {
             return true;
@@ -205,7 +219,17 @@ public function install()
         }
 
         // This event allows a custom a post-flight:
-        $app->triggerEvent('onInstallerAfterInstaller', [$this, &$package, $installer, &$result, &$msg]);
+        $eventAfterInst = new AfterInstallerEvent('onInstallerAfterInstaller', [
+            'subject'         => $this,
+            'package'         => &$package, // TODO: Remove reference in Joomla 6, see InstallerEvent::__constructor()
+            'installer'       => $installer,
+            'installerResult' => &$result, // TODO: Remove reference in Joomla 6, see AfterInstallerEvent::__constructor()
+            'message'         => &$msg, // TODO: Remove reference in Joomla 6, see AfterInstallerEvent::__constructor()
+        ]);
+        $dispatcher->dispatch('onInstallerAfterInstaller', $eventAfterInst);
+        $package = $eventAfterInst->getPackage();
+        $result  = $eventAfterInst->getInstallerResult();
+        $msg     = $eventAfterInst->getMessage();
 
         // Set some model state values.
         $app->enqueueMessage($msg, $msgType);
diff --git a/administrator/components/com_installer/src/Model/ManageModel.php b/administrator/components/com_installer/src/Model/ManageModel.php
index 4520c9f4ea20a..d6a5932d8ec6c 100644
--- a/administrator/components/com_installer/src/Model/ManageModel.php
+++ b/administrator/components/com_installer/src/Model/ManageModel.php
@@ -56,6 +56,7 @@ public function __construct($config = [], MVCFactoryInterface $factory = null)
                 'package_id',
                 'extension_id',
                 'creationDate',
+                'core',
             ];
         }
 
diff --git a/administrator/components/com_installer/src/Model/UpdatesiteModel.php b/administrator/components/com_installer/src/Model/UpdatesiteModel.php
index 5dcbd05e5fb3d..4972c47f7558b 100644
--- a/administrator/components/com_installer/src/Model/UpdatesiteModel.php
+++ b/administrator/components/com_installer/src/Model/UpdatesiteModel.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Component\Installer\Administrator\Model;
 
-use Exception;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\CMS\Object\CMSObject;
@@ -44,7 +43,7 @@ class UpdatesiteModel extends AdminModel
      *
      * @return  Form|boolean  A Form object on success, false on failure
      *
-     * @throws  Exception
+     * @throws  \Exception
      *
      * @since   4.0.0
      */
@@ -162,7 +161,7 @@ public function save($data): bool
 
         try {
             $db->setQuery($query)->execute();
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             // No problem if this fails for any reason.
         }
 
diff --git a/administrator/components/com_installer/src/Model/UpdatesitesModel.php b/administrator/components/com_installer/src/Model/UpdatesitesModel.php
index b463d15ac832c..c03dfe20aa32e 100644
--- a/administrator/components/com_installer/src/Model/UpdatesitesModel.php
+++ b/administrator/components/com_installer/src/Model/UpdatesitesModel.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Component\Installer\Administrator\Model;
 
-use Exception;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filesystem\Folder;
 use Joomla\CMS\Installer\Installer;
@@ -22,7 +21,6 @@
 use Joomla\CMS\Table\UpdateSite as UpdateSiteTable;
 use Joomla\Component\Installer\Administrator\Helper\InstallerHelper;
 use Joomla\Database\ParameterType;
-use RuntimeException;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -75,14 +73,14 @@ public function __construct($config = [], MVCFactoryInterface $factory = null)
      *
      * @return  boolean  True on success
      *
-     * @throws  Exception on ACL error
+     * @throws  \Exception on ACL error
      * @since   3.4
      *
      */
     public function publish(&$eid = [], $value = 1)
     {
         if (!$this->getCurrentUser()->authorise('core.edit.state', 'com_installer')) {
-            throw new Exception(Text::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'), 403);
+            throw new \Exception(Text::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'), 403);
         }
 
         $result = true;
@@ -116,14 +114,14 @@ public function publish(&$eid = [], $value = 1)
      *
      * @return  void
      *
-     * @throws  Exception on ACL error
+     * @throws  \Exception on ACL error
      * @since   3.6
      *
      */
     public function delete($ids = [])
     {
         if (!$this->getCurrentUser()->authorise('core.delete', 'com_installer')) {
-            throw new Exception(Text::_('JLIB_APPLICATION_ERROR_DELETE_NOT_PERMITTED'), 403);
+            throw new \Exception(Text::_('JLIB_APPLICATION_ERROR_DELETE_NOT_PERMITTED'), 403);
         }
 
         // Ensure eid is an array of extension ids
@@ -180,7 +178,7 @@ public function delete($ids = [])
                 $db->execute();
 
                 $count++;
-            } catch (RuntimeException $e) {
+            } catch (\RuntimeException $e) {
                 $app->enqueueMessage(
                     Text::sprintf(
                         'COM_INSTALLER_MSG_UPDATESITES_DELETE_ERROR',
@@ -242,14 +240,14 @@ protected function getJoomlaUpdateSitesIds($column = 0)
      *
      * @return  void
      *
-     * @throws  Exception on ACL error
+     * @throws  \Exception on ACL error
      * @since   3.6
      *
      */
     public function rebuild(): void
     {
         if (!$this->getCurrentUser()->authorise('core.admin', 'com_installer')) {
-            throw new Exception(Text::_('COM_INSTALLER_MSG_UPDATESITES_REBUILD_NOT_PERMITTED'), 403);
+            throw new \Exception(Text::_('COM_INSTALLER_MSG_UPDATESITES_REBUILD_NOT_PERMITTED'), 403);
         }
 
         $db  = $this->getDatabase();
diff --git a/administrator/components/com_installer/src/View/Installer/HtmlView.php b/administrator/components/com_installer/src/View/Installer/HtmlView.php
index 6ffc8b7979ea2..600a8dd9952f7 100644
--- a/administrator/components/com_installer/src/View/Installer/HtmlView.php
+++ b/administrator/components/com_installer/src/View/Installer/HtmlView.php
@@ -31,7 +31,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var    \Joomla\CMS\Object\CMSObject
+     * @var   \Joomla\Registry\Registry
      *
      * @since  4.0.0
      */
diff --git a/administrator/components/com_installer/tmpl/install/default.php b/administrator/components/com_installer/tmpl/install/default.php
index 1c2b115aa7477..965be5cd1a8ce 100644
--- a/administrator/components/com_installer/tmpl/install/default.php
+++ b/administrator/components/com_installer/tmpl/install/default.php
@@ -10,6 +10,7 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Event\Installer\AddInstallationTabEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
@@ -29,8 +30,9 @@
     ->usePreset('com_installer.installer')
     ->useScript('webcomponent.core-loader');
 
-$app  = Factory::getApplication();
-$tabs = $app->triggerEvent('onInstallerAddInstallationTab', []);
+$tabs = Factory::getApplication()->getDispatcher()
+    ->dispatch('onInstallerAddInstallationTab', new AddInstallationTabEvent('onInstallerAddInstallationTab', []))
+    ->getArgument('result', []);
 
 ?>
 <div id="installer-install" class="clearfix">
diff --git a/administrator/components/com_installer/tmpl/update/emptystate.php b/administrator/components/com_installer/tmpl/update/emptystate.php
index 172cfd663eaad..a38e217eed776 100644
--- a/administrator/components/com_installer/tmpl/update/emptystate.php
+++ b/administrator/components/com_installer/tmpl/update/emptystate.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Session\Session;
 
@@ -21,7 +20,7 @@
     'icon'       => 'icon-puzzle-piece install',
 ];
 
-$user = Factory::getApplication()->getIdentity();
+$user = $this->getCurrentUser();
 
 if ($user->authorise('core.create', 'com_content') || count($user->getAuthorisedCategories('com_content', 'core.create')) > 0) {
     $displayData['createURL'] = 'index.php?option=com_installer&task=update.find&' . Session::getFormToken() . '=1';
diff --git a/administrator/components/com_installer/tmpl/updatesites/default.php b/administrator/components/com_installer/tmpl/updatesites/default.php
index 895a892706dd1..545dd3b6120bf 100644
--- a/administrator/components/com_installer/tmpl/updatesites/default.php
+++ b/administrator/components/com_installer/tmpl/updatesites/default.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;
@@ -21,7 +20,7 @@
 $wa->useScript('table.columns')
     ->useScript('multiselect');
 
-$user      = Factory::getApplication()->getIdentity();
+$user      = $this->getCurrentUser();
 $userId    = $user->get('id');
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
diff --git a/administrator/components/com_joomlaupdate/extract.php b/administrator/components/com_joomlaupdate/extract.php
index 301003f65795b..f0f97a53e2c32 100644
--- a/administrator/components/com_joomlaupdate/extract.php
+++ b/administrator/components/com_joomlaupdate/extract.php
@@ -1714,7 +1714,7 @@ function clearFileInOPCache(string $file): bool
  * @return  boolean  True if the two strings are identical.
  * @since   4.0.4
  *
- * @see     http://blog.ircmaxell.com/2014/11/its-all-about-time.html
+ * @link    http://blog.ircmaxell.com/2014/11/its-all-about-time.html
  */
 function timingSafeEquals($known, $user)
 {
@@ -1907,7 +1907,7 @@ function setHugeMemoryLimit()
                 $retArray['files']    = $engine->filesProcessed;
                 $retArray['bytesIn']  = $engine->compressedTotal;
                 $retArray['bytesOut'] = $engine->uncompressedTotal;
-                $retArray['percent']  = 100;
+                $retArray['percent']  = 80;
                 $retArray['status']   = true;
                 $retArray['done']     = true;
 
@@ -1916,7 +1916,7 @@ function setHugeMemoryLimit()
                 $retArray['files']    = $engine->filesProcessed;
                 $retArray['bytesIn']  = $engine->compressedTotal;
                 $retArray['bytesOut'] = $engine->uncompressedTotal;
-                $retArray['percent']  = ($engine->totalSize > 0) ? (100 * $engine->compressedTotal / $engine->totalSize) : 0;
+                $retArray['percent']  = ($engine->totalSize > 0) ? (80 * $engine->compressedTotal / $engine->totalSize) : 0;
                 $retArray['status']   = true;
                 $retArray['done']     = false;
                 $retArray['instance'] = ZIPExtraction::getSerialised();
diff --git a/administrator/components/com_joomlaupdate/src/Controller/DisplayController.php b/administrator/components/com_joomlaupdate/src/Controller/DisplayController.php
index c70e53384fb80..f3294eb4b9be9 100644
--- a/administrator/components/com_joomlaupdate/src/Controller/DisplayController.php
+++ b/administrator/components/com_joomlaupdate/src/Controller/DisplayController.php
@@ -30,7 +30,8 @@ class DisplayController extends BaseController
      * Method to display a view.
      *
      * @param   boolean  $cachable   If true, the view output will be cached.
-     * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link \JFilterInput::clean()}.
+     * @param   array    $urlparams  An array of safe URL parameters and their variable types.
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  static   This object to support chaining.
      *
diff --git a/administrator/components/com_joomlaupdate/src/Controller/UpdateController.php b/administrator/components/com_joomlaupdate/src/Controller/UpdateController.php
index 9a3b99a11a9bc..d4d148602c822 100644
--- a/administrator/components/com_joomlaupdate/src/Controller/UpdateController.php
+++ b/administrator/components/com_joomlaupdate/src/Controller/UpdateController.php
@@ -59,7 +59,7 @@ public function download()
         $message     = null;
         $messageType = null;
 
-        // The validation was not successful so abort.
+        // The validation was not successful so stop.
         if ($result['check'] === false) {
             $message     = Text::_('COM_JOOMLAUPDATE_VIEW_UPDATE_CHECKSUM_WRONG');
             $messageType = 'error';
@@ -353,7 +353,8 @@ public function confirm()
      * Method to display a view.
      *
      * @param   boolean  $cachable   If true, the view output will be cached
-     * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link \JFilterInput::clean()}.
+     * @param   array    $urlparams  An array of safe URL parameters and their variable types.
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  static  This object to support chaining.
      *
diff --git a/administrator/components/com_joomlaupdate/src/Dispatcher/Dispatcher.php b/administrator/components/com_joomlaupdate/src/Dispatcher/Dispatcher.php
index e96f052286353..768f4369dce3f 100644
--- a/administrator/components/com_joomlaupdate/src/Dispatcher/Dispatcher.php
+++ b/administrator/components/com_joomlaupdate/src/Dispatcher/Dispatcher.php
@@ -18,7 +18,7 @@
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * ComponentDispatcher class for com_admin
+ * ComponentDispatcher class for com_joomlaupdate
  *
  * @since  4.0.0
  */
diff --git a/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php b/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
index a4850e7adf08b..55b3f89ded4a6 100644
--- a/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
+++ b/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
@@ -479,7 +479,9 @@ protected function downloadPackage($url, $target)
         }
 
         // Make sure the target does not exist.
-        File::delete($target);
+        if (is_file($target)) {
+            File::delete($target);
+        }
 
         // Download the package
         try {
@@ -492,8 +494,15 @@ protected function downloadPackage($url, $target)
             return false;
         }
 
+        // Fix Indirect Modification of Overloaded Property
+        $body = $result->body;
+
         // Write the file to disk
-        File::write($target, $result->body);
+        $result = File::write($target, $body);
+
+        if (!$result) {
+            return false;
+        }
 
         return basename($target);
     }
@@ -574,35 +583,24 @@ public function createUpdateFile($basename = null): bool
         $configpath = JPATH_COMPONENT_ADMINISTRATOR . '/update.php';
 
         if (is_file($configpath)) {
-            if (!File::delete($configpath)) {
-                File::invalidateFileCache($configpath);
-                @unlink($configpath);
-            }
+            File::delete($configpath);
         }
 
         // Write new file. First try with File.
         $result = File::write($configpath, $data);
 
-        // In case File used FTP but direct access could help.
+        // In case File failed but direct access could help.
         if (!$result) {
-            if (function_exists('file_put_contents')) {
-                $result = @file_put_contents($configpath, $data);
+            $fp = @fopen($configpath, 'wt');
+
+            if ($fp !== false) {
+                $result = @fwrite($fp, $data);
 
                 if ($result !== false) {
                     $result = true;
                 }
-            } else {
-                $fp = @fopen($configpath, 'wt');
 
-                if ($fp !== false) {
-                    $result = @fwrite($fp, $data);
-
-                    if ($result !== false) {
-                        $result = true;
-                    }
-
-                    @fclose($fp);
-                }
+                @fclose($fp);
             }
         }
 
diff --git a/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php b/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php
index a2c0157dd892f..7d5d72c584979 100644
--- a/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php
+++ b/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php
@@ -67,7 +67,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var    \Joomla\CMS\Object\CMSObject
+     * @var   \Joomla\Registry\Registry
      *
      * @since  4.0.0
      */
@@ -203,7 +203,7 @@ public function display($tpl = null)
         }
 
         if (in_array($this->getLayout(), ['preupdatecheck', 'update', 'upload'])) {
-            $language = Factory::getLanguage();
+            $language = $this->getLanguage();
             $language->load('com_installer', JPATH_ADMINISTRATOR, 'en-GB', false, true);
             $language->load('com_installer', JPATH_ADMINISTRATOR, null, true);
 
@@ -269,7 +269,7 @@ protected function addToolbar()
         ToolbarHelper::title(Text::_('COM_JOOMLAUPDATE_OVERVIEW'), 'joomla install');
 
         if (in_array($this->getLayout(), ['update', 'complete'])) {
-            $arrow = Factory::getLanguage()->isRtl() ? 'arrow-right' : 'arrow-left';
+            $arrow = $this->getLanguage()->isRtl() ? 'arrow-right' : 'arrow-left';
 
             ToolbarHelper::link('index.php?option=com_joomlaupdate', 'JTOOLBAR_BACK', $arrow);
 
@@ -281,7 +281,7 @@ protected function addToolbar()
         // Add toolbar buttons.
         $currentUser = version_compare(JVERSION, '4.2.0', 'ge')
             ? $this->getCurrentUser()
-            : Factory::getApplication()->getIdentity();
+            : $this->getCurrentUser();
 
         if ($currentUser->authorise('core.admin')) {
             ToolbarHelper::preferences('com_joomlaupdate');
diff --git a/administrator/components/com_joomlaupdate/src/View/Upload/HtmlView.php b/administrator/components/com_joomlaupdate/src/View/Upload/HtmlView.php
index e7d989ae2f8e2..129f0f848f27b 100644
--- a/administrator/components/com_joomlaupdate/src/View/Upload/HtmlView.php
+++ b/administrator/components/com_joomlaupdate/src/View/Upload/HtmlView.php
@@ -11,7 +11,6 @@
 namespace Joomla\Component\Joomlaupdate\Administrator\View\Upload;
 
 use Joomla\CMS\Component\ComponentHelper;
-use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Toolbar\ToolbarHelper;
@@ -74,7 +73,7 @@ class HtmlView extends BaseHtmlView
     public function display($tpl = null)
     {
         // Load com_installer's language
-        $language = Factory::getLanguage();
+        $language = $this->getLanguage();
         $language->load('com_installer', JPATH_ADMINISTRATOR, 'en-GB', false, true);
         $language->load('com_installer', JPATH_ADMINISTRATOR, null, true);
 
@@ -106,7 +105,7 @@ protected function addToolbar()
         // Set the toolbar information.
         ToolbarHelper::title(Text::_('COM_JOOMLAUPDATE_OVERVIEW'), 'sync install');
 
-        $arrow = Factory::getLanguage()->isRtl() ? 'arrow-right' : 'arrow-left';
+        $arrow = $this->getLanguage()->isRtl() ? 'arrow-right' : 'arrow-left';
         ToolbarHelper::link('index.php?option=com_joomlaupdate&' . ($this->getLayout() == 'captive' ? 'view=upload' : ''), 'JTOOLBAR_BACK', $arrow);
         ToolbarHelper::divider();
         ToolbarHelper::help('Joomla_Update');
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/noupdate.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/noupdate.php
index 8a16e3ca46d86..6bfa18ab193db 100644
--- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/noupdate.php
+++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/noupdate.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;
@@ -27,7 +26,7 @@
     'createURL'  => 'index.php?option=com_joomlaupdate&task=update.purge&' . Session::getFormToken() . '=1'
 ];
 
-if (Factory::getApplication()->getIdentity()->authorise('core.admin', 'com_joomlaupdate')) {
+if ($this->getCurrentUser()->authorise('core.admin', 'com_joomlaupdate')) {
     $displayData['formAppend'] = '<div class="text-center"><a href="' . $uploadLink . '" class="btn btn-sm btn-outline-secondary">' . Text::_($displayData['textPrefix'] . '_EMPTYSTATE_APPEND') . '</a></div>';
 }
 
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/preupdatecheck.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/preupdatecheck.php
index 4efa56bbe9e1c..329d555b7e01c 100644
--- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/preupdatecheck.php
+++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/preupdatecheck.php
@@ -361,7 +361,7 @@ class="extension-check upcomp hidden"
         <?php echo HTMLHelper::_('form.token'); ?>
     </form>
 
-    <?php if (Factory::getUser()->authorise('core.admin')) : ?>
+    <?php if ($this->getCurrentUser()->authorise('core.admin')) : ?>
         <div class="text-center">
             <a href="<?php echo Route::_('index.php?option=com_joomlaupdate&view=upload'); ?>" class="btn btn-sm btn-outline-secondary">
                 <?php echo Text::_('COM_JOOMLAUPDATE_EMPTYSTATE_APPEND'); ?>
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/reinstall.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/reinstall.php
index 57a5ed36dc833..5e8e78c3f174f 100644
--- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/reinstall.php
+++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/reinstall.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;
@@ -47,7 +46,7 @@
     );
 endif;
 
-if (Factory::getApplication()->getIdentity()->authorise('core.admin', 'com_joomlaupdate')) :
+if ($this->getCurrentUser()->authorise('core.admin', 'com_joomlaupdate')) :
     $displayData['formAppend'] = '<div class="text-center"><a href="' . $uploadLink . '" class="btn btn-sm btn-outline-secondary">' . Text::_('COM_JOOMLAUPDATE_EMPTYSTATE_APPEND') . '</a></div>';
 endif;
 
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/update.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/update.php
index 1ee49824663b7..e33840295094c 100644
--- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/update.php
+++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/update.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;
@@ -58,7 +57,7 @@
 		</label>
 	</div>';
 
-if (Factory::getApplication()->getIdentity()->authorise('core.admin', 'com_joomlaupdate')) :
+if ($this->getCurrentUser()->authorise('core.admin', 'com_joomlaupdate')) :
     $displayData['formAppend'] = '<div class="text-center"><a href="' . $uploadLink . '" class="btn btn-sm btn-outline-secondary">' . Text::_('COM_JOOMLAUPDATE_EMPTYSTATE_APPEND') . '</a></div>';
 endif;
 
diff --git a/administrator/components/com_joomlaupdate/tmpl/update/default.php b/administrator/components/com_joomlaupdate/tmpl/update/default.php
index 0375bd95a1da6..f084dbdd3d127 100644
--- a/administrator/components/com_joomlaupdate/tmpl/update/default.php
+++ b/administrator/components/com_joomlaupdate/tmpl/update/default.php
@@ -11,7 +11,6 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Help\Help;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Uri\Uri;
@@ -30,6 +29,7 @@
 Text::script('COM_JOOMLAUPDATE_ERRORMODAL_BODY_INVALIDLOGIN');
 Text::script('COM_JOOMLAUPDATE_UPDATING_FAIL');
 Text::script('COM_JOOMLAUPDATE_UPDATING_COMPLETE');
+Text::script('COM_JOOMLAUPDATE_VIEW_UPDATE_ITEMS');
 Text::script('JLIB_SIZE_BYTES');
 Text::script('JLIB_SIZE_KB');
 Text::script('JLIB_SIZE_MB');
@@ -55,7 +55,7 @@
     ]
 );
 
-$helpUrl = Help::createUrl('JHELP_COMPONENTS_JOOMLA_UPDATE', false);
+$helpUrl = 'https://docs.joomla.org/Special:MyLanguage/J4.x:Joomla_Update_Problems';
 ?>
 
 <div class="px-4 py-5 my-5 text-center" id="joomlaupdate-progress">
diff --git a/administrator/components/com_languages/src/Controller/DisplayController.php b/administrator/components/com_languages/src/Controller/DisplayController.php
index a983b76937c1f..31e9156c88edb 100644
--- a/administrator/components/com_languages/src/Controller/DisplayController.php
+++ b/administrator/components/com_languages/src/Controller/DisplayController.php
@@ -35,7 +35,8 @@ class DisplayController extends BaseController
      * Method to display a view.
      *
      * @param   boolean  $cachable   If true, the view output will be cached.
-     * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link \JFilterInput::clean()}.
+     * @param   array    $urlparams  An array of safe URL parameters and their variable types.
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  static|boolean   This object to support chaining or false on failure.
      *
diff --git a/administrator/components/com_languages/src/Controller/InstalledController.php b/administrator/components/com_languages/src/Controller/InstalledController.php
index 421f787394356..d92d01a8d93af 100644
--- a/administrator/components/com_languages/src/Controller/InstalledController.php
+++ b/administrator/components/com_languages/src/Controller/InstalledController.php
@@ -11,8 +11,8 @@
 namespace Joomla\Component\Languages\Administrator\Controller;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Language;
+use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
diff --git a/administrator/components/com_languages/src/Extension/LanguagesComponent.php b/administrator/components/com_languages/src/Extension/LanguagesComponent.php
index 4377fda2729b1..7ef34c7a3b19a 100644
--- a/administrator/components/com_languages/src/Extension/LanguagesComponent.php
+++ b/administrator/components/com_languages/src/Extension/LanguagesComponent.php
@@ -17,7 +17,7 @@
 use Psr\Container\ContainerInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/administrator/components/com_languages/src/Model/OverrideModel.php b/administrator/components/com_languages/src/Model/OverrideModel.php
index 112c630823de0..2a61ab7c2c773 100644
--- a/administrator/components/com_languages/src/Model/OverrideModel.php
+++ b/administrator/components/com_languages/src/Model/OverrideModel.php
@@ -11,11 +11,11 @@
 namespace Joomla\Component\Languages\Administrator\Model;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Language\Language;
 use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Model\AdminModel;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
diff --git a/administrator/components/com_languages/src/Model/StringsModel.php b/administrator/components/com_languages/src/Model/StringsModel.php
index 9c1dd336328c4..41d861a6d30bb 100644
--- a/administrator/components/com_languages/src/Model/StringsModel.php
+++ b/administrator/components/com_languages/src/Model/StringsModel.php
@@ -12,11 +12,11 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filesystem\Folder;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Filter\InputFilter;
 use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 use Joomla\Database\ParameterType;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
diff --git a/administrator/components/com_languages/src/View/Installed/HtmlView.php b/administrator/components/com_languages/src/View/Installed/HtmlView.php
index 074040fcb8e6f..b78c8acfb4759 100644
--- a/administrator/components/com_languages/src/View/Installed/HtmlView.php
+++ b/administrator/components/com_languages/src/View/Installed/HtmlView.php
@@ -52,7 +52,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var    \Joomla\CMS\Object\CMSObject
+     * @var   \Joomla\Registry\Registry
      *
      * @since  4.0.0
      */
diff --git a/administrator/components/com_languages/src/View/Language/HtmlView.php b/administrator/components/com_languages/src/View/Language/HtmlView.php
index 4acc2e1703926..02d53af20baef 100644
--- a/administrator/components/com_languages/src/View/Language/HtmlView.php
+++ b/administrator/components/com_languages/src/View/Language/HtmlView.php
@@ -15,7 +15,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 
@@ -47,14 +46,14 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var  CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     public $state;
 
     /**
      * The actions the user is authorised to perform
      *
-     * @var    CMSObject
+     * @var    \Joomla\Registry\Registry
      *
      * @since  4.0.0
      */
diff --git a/administrator/components/com_languages/src/View/Languages/HtmlView.php b/administrator/components/com_languages/src/View/Languages/HtmlView.php
index de88c053479ee..09b8b5cf2ec34 100644
--- a/administrator/components/com_languages/src/View/Languages/HtmlView.php
+++ b/administrator/components/com_languages/src/View/Languages/HtmlView.php
@@ -46,7 +46,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var    \Joomla\CMS\Object\CMSObject
+     * @var   \Joomla\Registry\Registry
      *
      * @since  4.0.0
      */
diff --git a/administrator/components/com_languages/tmpl/installed/default.php b/administrator/components/com_languages/tmpl/installed/default.php
index fb4156b39a3fc..ec095ad9251b7 100644
--- a/administrator/components/com_languages/tmpl/installed/default.php
+++ b/administrator/components/com_languages/tmpl/installed/default.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;
@@ -22,7 +21,7 @@
 $wa = $this->document->getWebAssetManager();
 $wa->useScript('table.columns');
 
-$user      = Factory::getUser();
+$user      = $this->getCurrentUser();
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
 ?>
diff --git a/administrator/components/com_languages/tmpl/languages/default.php b/administrator/components/com_languages/tmpl/languages/default.php
index 81cb88949b1fb..de0c97154ad95 100644
--- a/administrator/components/com_languages/tmpl/languages/default.php
+++ b/administrator/components/com_languages/tmpl/languages/default.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;
@@ -22,7 +21,7 @@
 $wa->useScript('table.columns')
     ->useScript('multiselect');
 
-$user      = Factory::getUser();
+$user      = $this->getCurrentUser();
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
 $saveOrder = $listOrder == 'a.ordering';
diff --git a/administrator/components/com_languages/tmpl/overrides/default.php b/administrator/components/com_languages/tmpl/overrides/default.php
index 852cc494ee4b8..01b56bcb82919 100644
--- a/administrator/components/com_languages/tmpl/overrides/default.php
+++ b/administrator/components/com_languages/tmpl/overrides/default.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
@@ -71,7 +70,7 @@
                             </tr>
                         </thead>
                         <tbody>
-                        <?php $canEdit = Factory::getUser()->authorise('core.edit', 'com_languages'); ?>
+                        <?php $canEdit = $this->getCurrentUser()->authorise('core.edit', 'com_languages'); ?>
                         <?php $i = 0; ?>
                         <?php foreach ($this->items as $key => $text) : ?>
                             <tr class="row<?php echo $i % 2; ?>" id="overriderrow<?php echo $i; ?>">
diff --git a/administrator/components/com_login/src/Controller/DisplayController.php b/administrator/components/com_login/src/Controller/DisplayController.php
index a3a3c14b179ff..a917f2a07c6a2 100644
--- a/administrator/components/com_login/src/Controller/DisplayController.php
+++ b/administrator/components/com_login/src/Controller/DisplayController.php
@@ -29,7 +29,8 @@ class DisplayController extends BaseController
      * Method to display a view.
      *
      * @param   boolean  $cachable   If true, the view output will be cached
-     * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link \JFilterInput::clean()}.
+     * @param   array    $urlparams  An array of safe URL parameters and their variable types.
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  static   This object to support chaining.
      *
diff --git a/administrator/components/com_mails/forms/template.xml b/administrator/components/com_mails/forms/template.xml
index be2e5c5488dd6..c4181487f6420 100644
--- a/administrator/components/com_mails/forms/template.xml
+++ b/administrator/components/com_mails/forms/template.xml
@@ -22,7 +22,7 @@
 			buttons="false"
 			rows="20"
 			class="form-control"
-			filter="JComponentHelper::filterText"
+			filter="\Joomla\CMS\Component\ComponentHelper::filterText"
 		/>
 		<field
 			name="htmlbody"
@@ -31,7 +31,7 @@
 			buttons="true"
 			hide="fields,pagebreak,readmore,module"
 			class="inputbox"
-			filter="JComponentHelper::filterText"
+			filter="\Joomla\CMS\Component\ComponentHelper::filterText"
 		/>
 	</fieldset>
 	<field
diff --git a/administrator/components/com_mails/src/Controller/DisplayController.php b/administrator/components/com_mails/src/Controller/DisplayController.php
index 80e6c1256794d..369368c447219 100644
--- a/administrator/components/com_mails/src/Controller/DisplayController.php
+++ b/administrator/components/com_mails/src/Controller/DisplayController.php
@@ -37,7 +37,8 @@ class DisplayController extends BaseController
      * Method to display a view.
      *
      * @param   boolean  $cachable   If true, the view output will be cached
-     * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+     * @param   array    $urlparams  An array of safe URL parameters and their variable types.
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  BaseController|boolean  This object to support chaining.
      *
diff --git a/administrator/components/com_mails/src/Controller/TemplateController.php b/administrator/components/com_mails/src/Controller/TemplateController.php
index d170c7bef300c..d3ac98f40f2f5 100644
--- a/administrator/components/com_mails/src/Controller/TemplateController.php
+++ b/administrator/components/com_mails/src/Controller/TemplateController.php
@@ -11,7 +11,7 @@
 namespace Joomla\Component\Mails\Administrator\Controller;
 
 use Joomla\CMS\Application\CMSApplication;
-use Joomla\CMS\Factory;
+use Joomla\CMS\Event\Model;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
@@ -192,9 +192,13 @@ public function save($key = null, $urlVar = null)
 
         // Send an object which can be modified through the plugin event
         $objData = (object) $data;
-        $this->app->triggerEvent(
+        $this->getDispatcher()->dispatch(
             'onContentNormaliseRequestData',
-            [$this->option . '.' . $this->context, $objData, $form]
+            new Model\NormaliseRequestDataEvent('onContentNormaliseRequestData', [
+                'context' => $this->option . '.' . $this->context,
+                'data'    => $objData,
+                'subject' => $form,
+            ])
         );
         $data = (array) $objData;
 
@@ -250,7 +254,7 @@ public function save($key = null, $urlVar = null)
         }
 
         $langKey = $this->text_prefix . ($recordId === 0 && $this->app->isClient('site') ? '_SUBMIT' : '') . '_SAVE_SUCCESS';
-        $prefix  = Factory::getLanguage()->hasKey($langKey) ? $this->text_prefix : 'COM_MAILS';
+        $prefix  = $this->app->getLanguage()->hasKey($langKey) ? $this->text_prefix : 'COM_MAILS';
 
         $this->setMessage(Text::_($prefix . ($recordId === 0 && $this->app->isClient('site') ? '_SUBMIT' : '') . '_SAVE_SUCCESS'));
 
diff --git a/administrator/components/com_mails/src/Model/TemplateModel.php b/administrator/components/com_mails/src/Model/TemplateModel.php
index d1fd122c92317..809b56c7424d1 100644
--- a/administrator/components/com_mails/src/Model/TemplateModel.php
+++ b/administrator/components/com_mails/src/Model/TemplateModel.php
@@ -12,13 +12,13 @@
 
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 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\Table\Table;
+use Joomla\Filesystem\Path;
 use Joomla\Registry\Registry;
 use Joomla\Utilities\ArrayHelper;
 
diff --git a/administrator/components/com_mails/src/Model/TemplatesModel.php b/administrator/components/com_mails/src/Model/TemplatesModel.php
index 28817741a9f1e..45173e78fbd85 100644
--- a/administrator/components/com_mails/src/Model/TemplatesModel.php
+++ b/administrator/components/com_mails/src/Model/TemplatesModel.php
@@ -14,7 +14,6 @@
 use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\Database\DatabaseQuery;
-use Joomla\Database\QueryInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
diff --git a/administrator/components/com_mails/src/View/Template/HtmlView.php b/administrator/components/com_mails/src/View/Template/HtmlView.php
index 6a1b4d0fdf4e0..61aed6b95e8d2 100644
--- a/administrator/components/com_mails/src/View/Template/HtmlView.php
+++ b/administrator/components/com_mails/src/View/Template/HtmlView.php
@@ -88,7 +88,7 @@ public function display($tpl = null)
         list($component, $template_id) = explode('.', $this->item->template_id, 2);
         $fields                        = ['subject', 'body', 'htmlbody'];
         $this->templateData            = [];
-        $language                      = Factory::getLanguage();
+        $language                      = $this->getLanguage();
         $language->load($component, JPATH_SITE, $this->item->language, true);
         $language->load($component, JPATH_SITE . '/components/' . $component, $this->item->language, true);
         $language->load($component, JPATH_ADMINISTRATOR, $this->item->language, true);
diff --git a/administrator/components/com_mails/src/View/Templates/HtmlView.php b/administrator/components/com_mails/src/View/Templates/HtmlView.php
index 60f1ada20496a..6e12b040380f7 100644
--- a/administrator/components/com_mails/src/View/Templates/HtmlView.php
+++ b/administrator/components/com_mails/src/View/Templates/HtmlView.php
@@ -15,7 +15,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Pagination\Pagination;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
@@ -63,7 +62,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var  CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $state;
 
diff --git a/administrator/components/com_media/config.xml b/administrator/components/com_media/config.xml
index 9a04b26b2caab..5adbbc172720e 100644
--- a/administrator/components/com_media/config.xml
+++ b/administrator/components/com_media/config.xml
@@ -55,7 +55,7 @@
 			type="textarea"
 			label="COM_MEDIA_FIELD_RESTRICT_UPLOADS_EXTENSIONS_LABEL"
 			description="COM_MEDIA_FIELD_RESTRICT_UPLOADS_EXTENSIONS_DESC"
-			default="bmp,gif,jpg,jpeg,png,webp,ico,mp3,mp4,odg,odp,ods,odt,pdf,png,ppt,txt,xcf,xls,csv"
+			default="bmp,gif,jpg,jpeg,png,webp,avif,ico,mp3,mp4,odg,odp,ods,odt,pdf,png,ppt,txt,xcf,xls,csv"
 			showon="restrict_uploads:1"
 		/>
 
@@ -77,7 +77,7 @@
 			type="textarea"
 			label="COM_MEDIA_FIELD_LEGAL_IMAGE_EXTENSIONS_LABEL"
 			description="COM_MEDIA_FIELD_LEGAL_IMAGE_EXTENSIONS_DESC"
-			default="bmp,gif,jpg,jpeg,png,webp"
+			default="bmp,gif,jpg,jpeg,png,webp,avif"
 		/>
 
 		<field
@@ -116,7 +116,7 @@
 			type="textarea"
 			label="COM_MEDIA_FIELD_LEGAL_MIME_TYPES_LABEL"
 			description="COM_MEDIA_FIELD_LEGAL_MIME_TYPES_DESC"
-			default="image/jpeg,image/gif,image/png,image/bmp,image/webp,audio/ogg,audio/mpeg,audio/mp4,video/mp4,video/mpeg,video/quicktime,video/webm,application/msword,application/excel,application/pdf,application/powerpoint,text/plain,application/x-zip"
+			default="image/jpeg,image/gif,image/png,image/bmp,image/webp,image/avif,audio/ogg,audio/mpeg,audio/mp4,video/mp4,video/mpeg,video/quicktime,video/webm,application/msword,application/excel,application/pdf,application/powerpoint,text/plain,application/x-zip"
 			showon="restrict_uploads:1"
 		/>
 	</fieldset>
diff --git a/administrator/components/com_media/resources/scripts/app/Api.es6.js b/administrator/components/com_media/resources/scripts/app/Api.es6.js
index 0b789ee570cd0..783f46fa5a4a2 100644
--- a/administrator/components/com_media/resources/scripts/app/Api.es6.js
+++ b/administrator/components/com_media/resources/scripts/app/Api.es6.js
@@ -107,35 +107,26 @@ class Api {
 
   /**
      * Get the contents of a directory from the server
-     * @param {string}  dir  The directory path
-     * @param {number}  full whether or not the persistent url should be returned
-     * @param {number}  content whether or not the content should be returned
+     * @param {string}   dir  The directory path
+     * @param {boolean}  full whether or not the persistent url should be returned
+     * @param {boolean}  content whether or not the content should be returned
      * @returns {Promise}
      */
-  getContents(dir, full, content) {
+  getContents(dir, full = false, content = false) {
     // Wrap the ajax call into a real promise
     return new Promise((resolve, reject) => {
-      // Do a check on full
-      if (['0', '1'].indexOf(full) !== -1) {
-        throw Error('Invalid parameter: full');
-      }
-      // Do a check on download
-      if (['0', '1'].indexOf(content) !== -1) {
-        throw Error('Invalid parameter: content');
-      }
-
-      let url = `${this.baseUrl}&task=api.files&path=${encodeURIComponent(dir)}`;
+      const url = new URL(`${this.baseUrl}&task=api.files&path=${encodeURIComponent(dir)}`);
 
       if (full) {
-        url += `&url=${full}`;
+        url.searchParams.append('url', full);
       }
 
       if (content) {
-        url += `&content=${content}`;
+        url.searchParams.append('content', content);
       }
 
       Joomla.request({
-        url,
+        url: url.toString(),
         method: 'GET',
         headers: { 'Content-Type': 'application/json' },
         onSuccess: (response) => {
@@ -157,11 +148,11 @@ class Api {
   createDirectory(name, parent) {
     // Wrap the ajax call into a real promise
     return new Promise((resolve, reject) => {
-      const url = `${this.baseUrl}&task=api.files&path=${encodeURIComponent(parent)}`;
+      const url = new URL(`${this.baseUrl}&task=api.files&path=${encodeURIComponent(parent)}`);
       const data = { [this.csrfToken]: '1', name };
 
       Joomla.request({
-        url,
+        url: url.toString(),
         method: 'POST',
         data: JSON.stringify(data),
         headers: { 'Content-Type': 'application/json' },
@@ -188,7 +179,7 @@ class Api {
   upload(name, parent, content, override) {
     // Wrap the ajax call into a real promise
     return new Promise((resolve, reject) => {
-      const url = `${this.baseUrl}&task=api.files&path=${encodeURIComponent(parent)}`;
+      const url = new URL(`${this.baseUrl}&task=api.files&path=${encodeURIComponent(parent)}`);
       const data = {
         [this.csrfToken]: '1',
         name,
@@ -201,7 +192,7 @@ class Api {
       }
 
       Joomla.request({
-        url,
+        url: url.toString(),
         method: 'POST',
         data: JSON.stringify(data),
         headers: { 'Content-Type': 'application/json' },
@@ -225,14 +216,14 @@ class Api {
   rename(path, newPath) {
     // Wrap the ajax call into a real promise
     return new Promise((resolve, reject) => {
-      const url = `${this.baseUrl}&task=api.files&path=${encodeURIComponent(path)}`;
+      const url = new URL(`${this.baseUrl}&task=api.files&path=${encodeURIComponent(path)}`);
       const data = {
         [this.csrfToken]: '1',
         newPath,
       };
 
       Joomla.request({
-        url,
+        url: url.toString(),
         method: 'PUT',
         data: JSON.stringify(data),
         headers: { 'Content-Type': 'application/json' },
@@ -256,11 +247,11 @@ class Api {
   delete(path) {
     // Wrap the ajax call into a real promise
     return new Promise((resolve, reject) => {
-      const url = `${this.baseUrl}&task=api.files&path=${encodeURIComponent(path)}`;
+      const url = new URL(`${this.baseUrl}&task=api.files&path=${encodeURIComponent(path)}`);
       const data = { [this.csrfToken]: '1' };
 
       Joomla.request({
-        url,
+        url: url.toString(),
         method: 'DELETE',
         data: JSON.stringify(data),
         headers: { 'Content-Type': 'application/json' },
diff --git a/administrator/components/com_media/resources/scripts/components/app.vue b/administrator/components/com_media/resources/scripts/components/app.vue
index ab1a1371717b9..eaf36d36960bb 100644
--- a/administrator/components/com_media/resources/scripts/components/app.vue
+++ b/administrator/components/com_media/resources/scripts/components/app.vue
@@ -3,8 +3,8 @@
     <div class="media-sidebar">
       <MediaDisk
         v-for="(disk, index) in disks"
-        :key="index"
-        :uid="index"
+        :key="index.toString()"
+        :uid="index.toString()"
         :disk="disk"
       />
     </div>
@@ -78,7 +78,7 @@ export default {
     });
 
     // Initial load the data
-    this.$store.dispatch('getContents', this.$store.state.selectedDirectory);
+    this.$store.dispatch('getContents', this.$store.state.selectedDirectory, false, false);
   },
   beforeUnmount() {
     // Remove the global resize event listener
diff --git a/administrator/components/com_media/resources/scripts/components/browser/items/image.vue b/administrator/components/com_media/resources/scripts/components/browser/items/image.vue
index 5c91946511152..f8d1606b22c3a 100644
--- a/administrator/components/com_media/resources/scripts/components/browser/items/image.vue
+++ b/administrator/components/com_media/resources/scripts/components/browser/items/image.vue
@@ -77,7 +77,7 @@ export default {
       }
 
       return this.item.thumb_path.split(Joomla.getOptions('system.paths').rootFull).length > 1
-        ? `${this.item.thumb_path}?${api.mediaVersion}`
+        ? `${this.item.thumb_path}?${this.item.modified_date ? new Date(this.item.modified_date).valueOf() : api.mediaVersion}`
         : `${this.item.thumb_path}`;
     },
     width() {
diff --git a/administrator/components/com_media/resources/scripts/components/browser/items/item.es6.js b/administrator/components/com_media/resources/scripts/components/browser/items/item.es6.js
index 4f5d12e0ebea7..9ca4be5a3b7ad 100644
--- a/administrator/components/com_media/resources/scripts/components/browser/items/item.es6.js
+++ b/administrator/components/com_media/resources/scripts/components/browser/items/item.es6.js
@@ -200,6 +200,7 @@ export default {
         h(this.itemType(), {
           item: this.item,
           onToggleSettings: this.toggleSettings,
+          focused: false,
         }),
       ],
     );
diff --git a/administrator/components/com_media/resources/scripts/mixins/navigable.es6.js b/administrator/components/com_media/resources/scripts/mixins/navigable.es6.js
index 68329c975634a..d45bc02a394d6 100644
--- a/administrator/components/com_media/resources/scripts/mixins/navigable.es6.js
+++ b/administrator/components/com_media/resources/scripts/mixins/navigable.es6.js
@@ -1,7 +1,7 @@
 export default {
   methods: {
     navigateTo(path) {
-      this.$store.dispatch('getContents', path);
+      this.$store.dispatch('getContents', path, false, false);
     },
   },
 };
diff --git a/administrator/components/com_media/resources/scripts/store/actions.es6.js b/administrator/components/com_media/resources/scripts/store/actions.es6.js
index c7fcb7c864980..804ce5e13d617 100644
--- a/administrator/components/com_media/resources/scripts/store/actions.es6.js
+++ b/administrator/components/com_media/resources/scripts/store/actions.es6.js
@@ -30,7 +30,7 @@ export const getContents = (context, payload) => {
   updateUrlPath(payload);
   context.commit(types.SET_IS_LOADING, true);
 
-  api.getContents(payload, 0)
+  api.getContents(payload, false, false)
     .then((contents) => {
       context.commit(types.LOAD_CONTENTS_SUCCESS, contents);
       context.commit(types.UNSELECT_ALL_BROWSER_ITEMS);
@@ -51,7 +51,7 @@ export const getContents = (context, payload) => {
  */
 export const getFullContents = (context, payload) => {
   context.commit(types.SET_IS_LOADING, true);
-  api.getContents(payload.path, 1)
+  api.getContents(payload.path, true, true)
     .then((contents) => {
       context.commit(types.LOAD_FULL_CONTENTS_SUCCESS, contents.files[0]);
       context.commit(types.SET_IS_LOADING, false);
@@ -69,7 +69,7 @@ export const getFullContents = (context, payload) => {
  * @param payload
  */
 export const download = (context, payload) => {
-  api.getContents(payload.path, 0, 1)
+  api.getContents(payload.path, false, true)
     .then((contents) => {
       const file = contents.files[0];
 
diff --git a/administrator/components/com_media/resources/scripts/store/state.es6.js b/administrator/components/com_media/resources/scripts/store/state.es6.js
index 88a83a39ce101..8cb71276175c6 100644
--- a/administrator/components/com_media/resources/scripts/store/state.es6.js
+++ b/administrator/components/com_media/resources/scripts/store/state.es6.js
@@ -28,35 +28,50 @@ if (!defaultDisk) {
   throw new TypeError('No default media drive was found');
 }
 
-let currentPath;
 const storedState = JSON.parse(persistedStateOptions.storage.getItem(persistedStateOptions.key));
 
+function setSession(path) {
+  persistedStateOptions.storage.setItem(
+    persistedStateOptions.key,
+    JSON.stringify({ ...storedState, ...{ selectedDirectory: path } }),
+  );
+}
+
 // Gracefully use the given path, the session storage state or fall back to sensible default
-if (options.currentPath) {
-  let useDrive = false;
-  Object.values(loadedDisks).forEach((drive) => drive.drives.forEach((curDrive) => {
-    if (options.currentPath.indexOf(curDrive.root) === 0) {
-      useDrive = true;
-    }
-  }));
-
-  if (useDrive) {
-    if ((storedState && storedState.selectedDirectory && storedState.selectedDirectory !== options.currentPath)) {
-      storedState.selectedDirectory = options.currentPath;
-      persistedStateOptions.storage.setItem(persistedStateOptions.key, JSON.stringify(storedState));
-      currentPath = options.currentPath;
-    } else {
-      currentPath = options.currentPath;
-    }
-  } else {
-    currentPath = defaultDisk.drives[0].root;
+function getCurrentPath() {
+  let path = options.currentPath;
+
+  // Set the path from the session when available
+  if (!path && storedState && storedState.selectedDirectory) {
+    path = storedState.selectedDirectory;
+  }
+
+  // No path available, use the root of the first drive
+  if (!path) {
+    setSession(defaultDisk.drives[0].root);
+    return defaultDisk.drives[0].root;
+  }
+
+  // Get the fragments
+  const fragment = path.split(':/');
+
+  // Check that we have a drive
+  if (!fragment.length) {
+    setSession(defaultDisk.drives[0].root);
+    return defaultDisk.drives[0].root;
+  }
+
+  const drivesTmp = Object.values(loadedDisks).map((drive) => drive.drives);
+
+  // Drive doesn't exist
+  if (!drivesTmp.flat().find((drive) => drive.root.startsWith(fragment[0]))) {
+    setSession(defaultDisk.drives[0].root);
+    return defaultDisk.drives[0].root;
   }
-} else if (storedState && storedState.selectedDirectory) {
-  currentPath = storedState.selectedDirectory;
-}
 
-if (!currentPath) {
-  currentPath = defaultDisk.drives[0].root;
+  // Session missmatch
+  setSession(path);
+  return path;
 }
 
 // The initial state
@@ -77,7 +92,7 @@ export default {
   files: [],
   // The selected disk. Providers are ordered by plugin ordering, so we set the first provider
   // in the list as the default provider and load first drive on it as default
-  selectedDirectory: currentPath,
+  selectedDirectory: getCurrentPath(),
   // The currently selected items
   selectedItems: [],
   // The state of the infobar
diff --git a/administrator/components/com_media/src/Model/ApiModel.php b/administrator/components/com_media/src/Model/ApiModel.php
index 1608e3d977edf..a36004c9b88f3 100644
--- a/administrator/components/com_media/src/Model/ApiModel.php
+++ b/administrator/components/com_media/src/Model/ApiModel.php
@@ -13,6 +13,7 @@
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filesystem\File;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Plugin\PluginHelper;
@@ -230,7 +231,7 @@ public function createFile($adapter, $name, $path, $data, $override)
 
         // Check if it is a media file
         if (!$this->isMediaFile($path . '/' . $name)) {
-            throw new InvalidPathException();
+            throw new InvalidPathException(Text::_('JLIB_MEDIA_ERROR_WARNFILETYPE'));
         }
 
         $app               = Factory::getApplication();
diff --git a/administrator/components/com_menus/forms/filter_menus.xml b/administrator/components/com_menus/forms/filter_menus.xml
index 3f65394583e5f..ed68dd76aa15b 100644
--- a/administrator/components/com_menus/forms/filter_menus.xml
+++ b/administrator/components/com_menus/forms/filter_menus.xml
@@ -31,6 +31,8 @@
 			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
 			<option value="a.title ASC">JGLOBAL_TITLE_ASC</option>
 			<option value="a.title DESC">JGLOBAL_TITLE_DESC</option>
 			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
diff --git a/administrator/components/com_menus/forms/itemadmin_alias.xml b/administrator/components/com_menus/forms/itemadmin_alias.xml
index e32fdd55529a3..2e4077f90205f 100644
--- a/administrator/components/com_menus/forms/itemadmin_alias.xml
+++ b/administrator/components/com_menus/forms/itemadmin_alias.xml
@@ -27,17 +27,12 @@
 				label="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_LABEL"
 			/>
 
-			<field
-				name="menu-anchor_title"
-				type="text"
-				label="COM_MENUS_ITEM_FIELD_ICON_TITLE_LABEL"
-			/>
-
 			<field
 				name="menu_icon"
 				type="text"
 				label="COM_MENUS_ITEM_FIELD_ICON_TITLE_LABEL"
 				description="COM_MENUS_ITEM_FIELD_ICON_TITLE_DESC"
+				validate="CssIdentifier"
 			/>
 
 			<field
diff --git a/administrator/components/com_menus/forms/itemadmin_component.xml b/administrator/components/com_menus/forms/itemadmin_component.xml
index c2fa2c1007cf3..8724d6401119f 100644
--- a/administrator/components/com_menus/forms/itemadmin_component.xml
+++ b/administrator/components/com_menus/forms/itemadmin_component.xml
@@ -16,6 +16,7 @@
 				type="text"
 				label="COM_MENUS_ITEM_FIELD_ICON_TITLE_LABEL"
 				description="COM_MENUS_ITEM_FIELD_ICON_TITLE_DESC"
+				validate="CssIdentifier"
 			/>
 
 			<field
diff --git a/administrator/components/com_menus/forms/itemadmin_container.xml b/administrator/components/com_menus/forms/itemadmin_container.xml
index 2982b6d1ef754..d6c07c0cdd9ee 100644
--- a/administrator/components/com_menus/forms/itemadmin_container.xml
+++ b/administrator/components/com_menus/forms/itemadmin_container.xml
@@ -29,6 +29,7 @@
 				type="text"
 				label="COM_MENUS_ITEM_FIELD_ICON_TITLE_LABEL"
 				description="COM_MENUS_ITEM_FIELD_ICON_TITLE_DESC"
+				validate="CssIdentifier"
 			/>
 
 			<field
diff --git a/administrator/components/com_menus/forms/itemadmin_heading.xml b/administrator/components/com_menus/forms/itemadmin_heading.xml
index 0a790184f5f23..8aba60deaae8b 100644
--- a/administrator/components/com_menus/forms/itemadmin_heading.xml
+++ b/administrator/components/com_menus/forms/itemadmin_heading.xml
@@ -29,6 +29,7 @@
 				type="text"
 				label="COM_MENUS_ITEM_FIELD_ICON_TITLE_LABEL"
 				description="COM_MENUS_ITEM_FIELD_ICON_TITLE_DESC"
+				validate="CssIdentifier"
 			/>
 
 			<field
diff --git a/administrator/components/com_menus/forms/itemadmin_url.xml b/administrator/components/com_menus/forms/itemadmin_url.xml
index 1a502d482f1b5..3f2b932dc55d8 100644
--- a/administrator/components/com_menus/forms/itemadmin_url.xml
+++ b/administrator/components/com_menus/forms/itemadmin_url.xml
@@ -42,6 +42,7 @@
 				type="text"
 				label="COM_MENUS_ITEM_FIELD_ICON_TITLE_LABEL"
 				description="COM_MENUS_ITEM_FIELD_ICON_TITLE_DESC"
+				validate="CssIdentifier"
 			/>
 
 			<field
diff --git a/administrator/components/com_menus/presets/alternate.xml b/administrator/components/com_menus/presets/alternate.xml
index 7a756985adff7..ab129265fbe52 100644
--- a/administrator/components/com_menus/presets/alternate.xml
+++ b/administrator/components/com_menus/presets/alternate.xml
@@ -349,6 +349,14 @@
 			permission="core.manage;com_joomlaupdate"
 		/>
 
+		<menuitem
+			title="MOD_MENU_MANAGE_GUIDEDTOURS"
+			type="component"
+			element="com_guidedtours"
+			link="index.php?option=com_guidedtours&amp;view=tours"
+			permission="core.manage;com_guidedtours"
+		/>
+
 		<menuitem
 			title="COM_POSTINSTALL"
 			type="component"
diff --git a/administrator/components/com_menus/presets/default.xml b/administrator/components/com_menus/presets/default.xml
index 7e8252caf344a..d67d96b4cebbd 100644
--- a/administrator/components/com_menus/presets/default.xml
+++ b/administrator/components/com_menus/presets/default.xml
@@ -141,7 +141,7 @@
 			sql_where="a.client_id = 0"
 			sql_leftjoin="#__menu AS m ON m.menutype = a.menutype AND m.home = 1 LEFT JOIN #__languages AS l ON l.lang_code = m.language"
 			sql_group="a.id, a.title, a.menutype, m.language, l.lang_code"
-			sql_order="a.id DESC"
+			sql_order="a.ordering ASC"
 			>
 			<menuitem
 				title="{sql:title}"
@@ -162,7 +162,7 @@
 			sql_select="title, menutype"
 			sql_from="#__menu_types"
 			sql_where="client_id = 1"
-			sql_order="id DESC"
+			sql_order="ordering ASC"
 			>
 			<menuitem
 				title="{sql:title}"
diff --git a/administrator/components/com_menus/presets/menus.xml b/administrator/components/com_menus/presets/menus.xml
index 7f76c3abd1efe..d595ac1f11f5d 100644
--- a/administrator/components/com_menus/presets/menus.xml
+++ b/administrator/components/com_menus/presets/menus.xml
@@ -41,7 +41,7 @@
 		sql_where="a.client_id = 0"
 		sql_leftjoin="#__menu AS m ON m.menutype = a.menutype AND m.home = 1 LEFT JOIN #__languages AS l ON l.lang_code = m.language"
 		sql_group="a.id, a.title, a.menutype, m.language, l.lang_code"
-		sql_order="a.id DESC"
+		sql_order="a.ordering ASC"
 		sql_target="self"
 		>
 		<menuitem
@@ -64,7 +64,7 @@
 		sql_select="title, menutype"
 		sql_from="#__menu_types"
 		sql_where="client_id = 1"
-		sql_order="id DESC"
+		sql_order="ordering ASC"
 		sql_target="self"
 		>
 		<menuitem
diff --git a/administrator/components/com_menus/src/Controller/AjaxController.php b/administrator/components/com_menus/src/Controller/AjaxController.php
index 33ab847fc6712..1324cd28a5a81 100644
--- a/administrator/components/com_menus/src/Controller/AjaxController.php
+++ b/administrator/components/com_menus/src/Controller/AjaxController.php
@@ -62,7 +62,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', 'JTable', []);
+            $menuTable = Table::getInstance('Menu', '\\Joomla\\CMS\\Table\\', []);
 
             foreach ($associations as $lang => $association) {
                 $menuTable->load($association->id);
diff --git a/administrator/components/com_menus/src/Controller/DisplayController.php b/administrator/components/com_menus/src/Controller/DisplayController.php
index c64149a696bc7..5eba2c6ef97c5 100644
--- a/administrator/components/com_menus/src/Controller/DisplayController.php
+++ b/administrator/components/com_menus/src/Controller/DisplayController.php
@@ -38,7 +38,8 @@ class DisplayController extends BaseController
      * Method to display a view.
      *
      * @param   boolean        $cachable   If true, the view output will be cached
-     * @param   array|boolean  $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+     * @param   array|boolean  $urlparams  An array of safe URL parameters and their variable types.
+     *                         @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  static    This object to support chaining.
      *
diff --git a/administrator/components/com_menus/src/Controller/MenuController.php b/administrator/components/com_menus/src/Controller/MenuController.php
index e248d91188e42..daf1511784cb8 100644
--- a/administrator/components/com_menus/src/Controller/MenuController.php
+++ b/administrator/components/com_menus/src/Controller/MenuController.php
@@ -32,7 +32,8 @@ class MenuController extends FormController
      * Dummy method to redirect back to standard controller
      *
      * @param   boolean  $cachable   If true, the view output will be cached.
-     * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link \JFilterInput::clean()}.
+     * @param   array    $urlparams  An array of safe URL parameters and their variable types.
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  void
      *
diff --git a/administrator/components/com_menus/src/Controller/MenusController.php b/administrator/components/com_menus/src/Controller/MenusController.php
index 569f87bbed827..3ea9837ad2813 100644
--- a/administrator/components/com_menus/src/Controller/MenusController.php
+++ b/administrator/components/com_menus/src/Controller/MenusController.php
@@ -10,10 +10,8 @@
 
 namespace Joomla\Component\Menus\Administrator\Controller;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\BaseController;
-use Joomla\Database\ParameterType;
+use Joomla\CMS\MVC\Controller\AdminController;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -24,13 +22,14 @@
  *
  * @since  1.6
  */
-class MenusController extends BaseController
+class MenusController extends AdminController
 {
     /**
      * Display the view
      *
      * @param   boolean  $cachable   If true, the view output will be cached.
-     * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link \JFilterInput::clean()}.
+     * @param   array    $urlparams  An array of safe URL parameters and their variable types.
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  void
      *
diff --git a/administrator/components/com_menus/src/Extension/MenusComponent.php b/administrator/components/com_menus/src/Extension/MenusComponent.php
index d799671589b85..084ca80159e66 100644
--- a/administrator/components/com_menus/src/Extension/MenusComponent.php
+++ b/administrator/components/com_menus/src/Extension/MenusComponent.php
@@ -19,7 +19,7 @@
 use Psr\Container\ContainerInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/administrator/components/com_menus/src/Field/MenuItemByTypeField.php b/administrator/components/com_menus/src/Field/MenuItemByTypeField.php
index b0bddc03dbcce..f67517fbdc17e 100644
--- a/administrator/components/com_menus/src/Field/MenuItemByTypeField.php
+++ b/administrator/components/com_menus/src/Field/MenuItemByTypeField.php
@@ -17,7 +17,7 @@
 use Joomla\Component\Menus\Administrator\Helper\MenusHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/administrator/components/com_menus/src/Helper/MenusHelper.php b/administrator/components/com_menus/src/Helper/MenusHelper.php
index d314bf0a06c3c..6d47d29785c22 100644
--- a/administrator/components/com_menus/src/Helper/MenusHelper.php
+++ b/administrator/components/com_menus/src/Helper/MenusHelper.php
@@ -12,6 +12,7 @@
 
 use Joomla\CMS\Application\ApplicationHelper;
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Event\Menu\PreprocessMenuItemsEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filesystem\Folder;
 use Joomla\CMS\Helper\ContentHelper;
@@ -19,6 +20,7 @@
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Menu\AdministratorMenuItem;
+use Joomla\CMS\Proxy\ArrayProxy;
 use Joomla\CMS\Table\Table;
 use Joomla\Database\DatabaseInterface;
 use Joomla\Database\ParameterType;
@@ -445,7 +447,13 @@ protected static function installPresetItems($node, $menutype)
             $components = array_column((array) $components, 'element', 'extension_id');
         }
 
-        Factory::getApplication()->triggerEvent('onPreprocessMenuItems', ['com_menus.administrator.import', &$items, null, true]);
+        $dispatcher = Factory::getApplication()->getDispatcher();
+        $dispatcher->dispatch('onPreprocessMenuItems', new PreprocessMenuItemsEvent('onPreprocessMenuItems', [
+            'context' => 'com_menus.administrator.import',
+            'subject' => new ArrayProxy($items),
+            'params'  => null,
+            'enabled' => true,
+        ]));
 
         foreach ($items as $item) {
             /** @var \Joomla\CMS\Table\Menu $table */
diff --git a/administrator/components/com_menus/src/Model/ItemModel.php b/administrator/components/com_menus/src/Model/ItemModel.php
index 715bb709d2a36..6a039e924fe53 100644
--- a/administrator/components/com_menus/src/Model/ItemModel.php
+++ b/administrator/components/com_menus/src/Model/ItemModel.php
@@ -13,7 +13,6 @@
 use Joomla\CMS\Application\ApplicationHelper;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Associations;
 use Joomla\CMS\Language\LanguageHelper;
@@ -23,6 +22,7 @@
 use Joomla\CMS\Uri\Uri;
 use Joomla\Component\Menus\Administrator\Helper\MenusHelper;
 use Joomla\Database\ParameterType;
+use Joomla\Filesystem\Path;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
diff --git a/administrator/components/com_menus/src/Model/MenuModel.php b/administrator/components/com_menus/src/Model/MenuModel.php
index dbae698216be8..cec6ee678d0ae 100644
--- a/administrator/components/com_menus/src/Model/MenuModel.php
+++ b/administrator/components/com_menus/src/Model/MenuModel.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
-use Joomla\CMS\MVC\Model\FormModel;
+use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Table\Table;
@@ -29,7 +29,7 @@
  *
  * @since  1.6
  */
-class MenuModel extends FormModel
+class MenuModel extends AdminModel
 {
     /**
      * The prefix to use with controller messages.
@@ -85,7 +85,7 @@ protected function canEditState($record)
      *
      * @since   1.6
      */
-    public function getTable($type = 'MenuType', $prefix = '\JTable', $config = [])
+    public function getTable($type = 'MenuType', $prefix = '\\Joomla\\CMS\\Table\\', $config = [])
     {
         return Table::getInstance($type, $prefix, $config);
     }
@@ -210,8 +210,8 @@ protected function loadFormData()
      *
      * @return  array|boolean  Array of filtered data if valid, false otherwise.
      *
-     * @see     JFormRule
-     * @see     JFilterInput
+     * @see     \Joomla\CMS\Form\FormRule
+     * @see     \Joomla\CMS\Filter\InputFilter
      * @since   3.9.23
      */
     public function validate($form, $data, $group = null)
@@ -295,10 +295,10 @@ public function save($data)
      *
      * @since   1.6
      */
-    public function delete($itemIds)
+    public function delete(&$pks)
     {
         // Sanitize the ids.
-        $itemIds = ArrayHelper::toInteger((array) $itemIds);
+        $itemIds = ArrayHelper::toInteger((array) $pks);
 
         // Get a group row instance.
         $table = $this->getTable();
diff --git a/administrator/components/com_menus/src/Model/MenusModel.php b/administrator/components/com_menus/src/Model/MenusModel.php
index 08b2a6cce528e..b8fa0e8c8e608 100644
--- a/administrator/components/com_menus/src/Model/MenusModel.php
+++ b/administrator/components/com_menus/src/Model/MenusModel.php
@@ -45,6 +45,7 @@ public function __construct($config = [], MVCFactoryInterface $factory = null)
                 'title', 'a.title',
                 'menutype', 'a.menutype',
                 'client_id', 'a.client_id',
+                'ordering', 'a.ordering',
             ];
         }
 
@@ -165,6 +166,7 @@ protected function getListQuery()
                     $db->quoteName('a.title'),
                     $db->quoteName('a.description'),
                     $db->quoteName('a.client_id'),
+                    $db->quoteName('a.ordering'),
                 ]
             )
         )
@@ -209,7 +211,7 @@ protected function getListQuery()
      *
      * @since   1.6
      */
-    protected function populateState($ordering = 'a.title', $direction = 'asc')
+    protected function populateState($ordering = 'a.ordering', $direction = 'asc')
     {
         $search   = $this->getUserStateFromRequest($this->context . '.search', 'filter_search');
         $this->setState('filter.search', $search);
diff --git a/administrator/components/com_menus/src/Model/MenutypesModel.php b/administrator/components/com_menus/src/Model/MenutypesModel.php
index 680a79e965585..3d75888e065f4 100644
--- a/administrator/components/com_menus/src/Model/MenutypesModel.php
+++ b/administrator/components/com_menus/src/Model/MenutypesModel.php
@@ -11,10 +11,12 @@
 namespace Joomla\Component\Menus\Administrator\Model;
 
 use Joomla\CMS\Application\ApplicationHelper;
+use Joomla\CMS\Event\Menu\AfterGetMenuTypeOptionsEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filesystem\Folder;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 use Joomla\CMS\Object\CMSObject;
+use Joomla\CMS\Proxy\ArrayProxy;
 use Joomla\Component\Menus\Administrator\Helper\MenusHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -126,7 +128,10 @@ public function getTypeOptions()
         }
 
         // Allow a system plugin to insert dynamic menu types to the list shown in menus:
-        Factory::getApplication()->triggerEvent('onAfterGetMenuTypeOptions', [&$list, $this]);
+        $this->getDispatcher()->dispatch('onAfterGetMenuTypeOptions', new AfterGetMenuTypeOptionsEvent('onAfterGetMenuTypeOptions', [
+            'items'   => new ArrayProxy($list),
+            'subject' => $this,
+        ]));
 
         return $list;
     }
diff --git a/administrator/components/com_menus/src/Table/MenuTable.php b/administrator/components/com_menus/src/Table/MenuTable.php
index 8836a3aaada41..2eae13b5b6d51 100644
--- a/administrator/components/com_menus/src/Table/MenuTable.php
+++ b/administrator/components/com_menus/src/Table/MenuTable.php
@@ -58,7 +58,7 @@ public function delete($pk = null, $children = false)
      *
      * @return  boolean  True on success, false on failure
      *
-     * @see     JTable::check
+     * @see     \Joomla\CMS\Table\Table::check
      * @since   4.0.0
      */
     public function check()
diff --git a/administrator/components/com_menus/src/View/Item/HtmlView.php b/administrator/components/com_menus/src/View/Item/HtmlView.php
index 7e93030d71776..6f7e398d2cab4 100644
--- a/administrator/components/com_menus/src/View/Item/HtmlView.php
+++ b/administrator/components/com_menus/src/View/Item/HtmlView.php
@@ -54,14 +54,14 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var   CMSObject
+     * @var   \Joomla\Registry\Registry
      */
     protected $state;
 
     /**
      * The actions the user is authorised to perform
      *
-     * @var    CMSObject
+     * @var    \Joomla\Registry\Registry
      * @since  3.7.0
      */
     protected $canDo;
@@ -191,7 +191,7 @@ function (Toolbar $childBar) use ($isNew, $checkedOut, $canDo) {
         $toolbar->divider();
 
         // Get the help information for the menu item.
-        $lang = Factory::getLanguage();
+        $lang = $this->getLanguage();
 
         $help = $this->get('Help');
 
diff --git a/administrator/components/com_menus/src/View/Items/HtmlView.php b/administrator/components/com_menus/src/View/Items/HtmlView.php
index 0e5a9e6cae8e4..dfa76d56a6c04 100644
--- a/administrator/components/com_menus/src/View/Items/HtmlView.php
+++ b/administrator/components/com_menus/src/View/Items/HtmlView.php
@@ -10,6 +10,7 @@
 
 namespace Joomla\Component\Menus\Administrator\View\Items;
 
+use Joomla\CMS\Event\Menu\BeforeRenderMenuItemsViewEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\HTML\HTMLHelper;
@@ -56,7 +57,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var  \Joomla\CMS\Object\CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $state;
 
@@ -96,7 +97,7 @@ class HtmlView extends BaseHtmlView
      */
     public function display($tpl = null)
     {
-        $lang                = Factory::getLanguage();
+        $lang                = $this->getLanguage();
         $this->items         = $this->get('Items');
         $this->pagination    = $this->get('Pagination');
         $this->total         = $this->get('Total');
@@ -276,7 +277,9 @@ public function display($tpl = null)
         }
 
         // Allow a system plugin to insert dynamic menu types to the list shown in menus:
-        Factory::getApplication()->triggerEvent('onBeforeRenderMenuItems', [$this]);
+        $this->getDispatcher()->dispatch('onBeforeRenderMenuItems', new BeforeRenderMenuItemsViewEvent('onBeforeRenderMenuItems', [
+            'subject' => $this,
+        ]));
 
         parent::display($tpl);
     }
diff --git a/administrator/components/com_menus/src/View/Menu/HtmlView.php b/administrator/components/com_menus/src/View/Menu/HtmlView.php
index 45f61f23a0e90..52ae32fcd10a1 100644
--- a/administrator/components/com_menus/src/View/Menu/HtmlView.php
+++ b/administrator/components/com_menus/src/View/Menu/HtmlView.php
@@ -15,7 +15,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 
@@ -47,14 +46,14 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var  CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $state;
 
     /**
      * The actions the user is authorised to perform
      *
-     * @var  CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $canDo;
 
diff --git a/administrator/components/com_menus/src/View/Menu/XmlView.php b/administrator/components/com_menus/src/View/Menu/XmlView.php
index e676a100f3fc4..888ff0c5435c5 100644
--- a/administrator/components/com_menus/src/View/Menu/XmlView.php
+++ b/administrator/components/com_menus/src/View/Menu/XmlView.php
@@ -36,7 +36,7 @@ class XmlView extends BaseHtmlView
     protected $items;
 
     /**
-     * @var    \Joomla\CMS\Object\CMSObject
+     * @var   \Joomla\Registry\Registry
      *
      * @since  3.8.0
      */
diff --git a/administrator/components/com_menus/src/View/Menus/HtmlView.php b/administrator/components/com_menus/src/View/Menus/HtmlView.php
index 571f4068f8ab1..4882e76b95db2 100644
--- a/administrator/components/com_menus/src/View/Menus/HtmlView.php
+++ b/administrator/components/com_menus/src/View/Menus/HtmlView.php
@@ -52,7 +52,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var  \Joomla\CMS\Object\CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $state;
 
@@ -73,6 +73,14 @@ class HtmlView extends BaseHtmlView
      */
     public $activeFilters;
 
+    /**
+     * Ordering of the items
+     *
+     * @var    array
+     * @since  __DEPLOY_SINCE__
+     */
+    protected $ordering;
+
     /**
      * Display the view
      *
diff --git a/administrator/components/com_menus/src/View/Menutypes/HtmlView.php b/administrator/components/com_menus/src/View/Menutypes/HtmlView.php
index 7992a364b1de1..f020e3b0af3b7 100644
--- a/administrator/components/com_menus/src/View/Menutypes/HtmlView.php
+++ b/administrator/components/com_menus/src/View/Menutypes/HtmlView.php
@@ -80,7 +80,9 @@ public function display($tpl = null)
 
         $this->types = $sortedTypes;
 
-        $this->addToolbar();
+        if (!$app->getInput()->get('tmpl')) {
+            $this->addToolbar();
+        }
 
         parent::display($tpl);
     }
diff --git a/administrator/components/com_menus/tmpl/item/edit.php b/administrator/components/com_menus/tmpl/item/edit.php
index 9c6eb267bcfa0..3399c9688311b 100644
--- a/administrator/components/com_menus/tmpl/item/edit.php
+++ b/administrator/components/com_menus/tmpl/item/edit.php
@@ -39,11 +39,11 @@
 $layout   = $isModal ? 'modal' : 'edit';
 $tmpl     = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=component' : '';
 $clientId = $this->state->get('item.client_id', 0);
-$lang     = Factory::getLanguage()->getTag();
+$lang     = $this->getLanguage()->getTag();
 
 // Load mod_menu.ini file when client is administrator
 if ($clientId === 1) {
-    Factory::getLanguage()->load('mod_menu', JPATH_ADMINISTRATOR);
+    $this->getLanguage()->load('mod_menu', JPATH_ADMINISTRATOR);
 }
 ?>
 <form action="<?php echo Route::_('index.php?option=com_menus&view=item&client_id=' . $clientId . '&layout=' . $layout . $tmpl . '&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="item-form" aria-label="<?php echo Text::_('COM_MENUS_ITEM_FORM_' . ((int) $this->item->id === 0 ? 'NEW' : 'EDIT'), true); ?>" class="form-validate">
diff --git a/administrator/components/com_menus/tmpl/items/default.php b/administrator/components/com_menus/tmpl/items/default.php
index f4d2ba8fe97ec..8abe15efd93e5 100644
--- a/administrator/components/com_menus/tmpl/items/default.php
+++ b/administrator/components/com_menus/tmpl/items/default.php
@@ -24,7 +24,7 @@
 $wa->useScript('table.columns')
     ->useScript('multiselect');
 
-$user      = Factory::getUser();
+$user      = $this->getCurrentUser();
 $app       = Factory::getApplication();
 $userId    = $user->get('id');
 $listOrder = $this->escape($this->state->get('list.ordering'));
@@ -159,7 +159,14 @@
                                     </td>
                                 <?php endif; ?>
                                 <td class="text-center">
-                                    <?php echo HTMLHelper::_('jgrid.published', $item->published, $i, 'items.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?>
+                                    <?php if ($item->type === 'component' && !$item->enabled) : ?>
+                                        <span class="icon-warning" aria-hidden="true"></span>
+                                        <div role="tooltip" id="warning<?php echo $item->id; ?>">
+                                            <?php echo Text::_($item->enabled === null ? 'JLIB_APPLICATION_ERROR_COMPONENT_NOT_FOUND' : 'COM_MENUS_LABEL_DISABLED'); ?>
+                                        </div>
+                                    <?php else : ?>
+                                        <?php echo HTMLHelper::_('jgrid.published', $item->published, $i, 'items.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?>
+                                    <?php endif; ?>
                                 </td>
                                 <th scope="row">
                                     <?php $prefix = LayoutHelper::render('joomla.html.treeprefix', ['level' => $item->level]); ?>
diff --git a/administrator/components/com_menus/tmpl/menus/default.php b/administrator/components/com_menus/tmpl/menus/default.php
index 053b30313199c..808a6a6661c4f 100644
--- a/administrator/components/com_menus/tmpl/menus/default.php
+++ b/administrator/components/com_menus/tmpl/menus/default.php
@@ -10,11 +10,11 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
 
 /** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
@@ -25,7 +25,7 @@
 
 $uri       = Uri::getInstance();
 $return    = base64_encode($uri);
-$user      = Factory::getUser();
+$user      = $this->getCurrentUser();
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
 $modMenuId = (int) $this->get('ModMenuId');
@@ -37,6 +37,13 @@
     }
 }
 
+$saveOrder = $listOrder == 'a.ordering';
+
+if ($saveOrder) {
+    $saveOrderingUrl = 'index.php?option=com_menus&task=menus.saveOrderAjax&tmpl=component&' . Session::getFormToken() . '=1';
+    HTMLHelper::_('draggablelist.draggable');
+}
+
 $this->document->addScriptOptions('menus-default', ['items' => $itemIds]);
 ?>
 <form action="<?php echo Route::_('index.php?option=com_menus&view=menus'); ?>" method="post" name="adminForm" id="adminForm">
@@ -61,6 +68,9 @@
                                 <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', '', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-sort'); ?>
+                                </th>
                                 <th scope="col">
                                     <?php echo HTMLHelper::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
                                 </th>
@@ -88,15 +98,35 @@
                                 </th>
                             </tr>
                         </thead>
-                        <tbody>
+                        <tbody <?php if ($saveOrder) :
+                            ?> class="js-draggable" data-url="<?php echo $saveOrderingUrl; ?>" data-direction="<?php echo strtolower($listDirn); ?>" data-nested="false"<?php
+                               endif; ?>>
                         <?php foreach ($this->items as $i => $item) :
+                            $ordering       = ($listOrder == 'a.ordering');
                             $canEdit        = $user->authorise('core.edit', 'com_menus.menu.' . (int) $item->id);
                             $canManageItems = $user->authorise('core.manage', 'com_menus.menu.' . (int) $item->id);
+                            $canChange      = $user->authorise('core.edit.state', 'com_menus.menu.' . (int) $item->id);
                             ?>
-                            <tr class="row<?php echo $i % 2; ?>">
+                            <tr class="row<?php echo $i % 2; ?>" data-draggable-group="0">
                                 <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>
                                 <th scope="row">
                                     <div class="name break-word">
                                         <?php if ($canEdit) : ?>
diff --git a/administrator/components/com_messages/forms/message.xml b/administrator/components/com_messages/forms/message.xml
index 74de7c712b9ac..b20c940be14f7 100644
--- a/administrator/components/com_messages/forms/message.xml
+++ b/administrator/components/com_messages/forms/message.xml
@@ -21,7 +21,7 @@
 			type="editor"
 			label="COM_MESSAGES_FIELD_MESSAGE_LABEL"
 			required="true"
-			filter="JComponentHelper::filterText"
+			filter="\Joomla\CMS\Component\ComponentHelper::filterText"
 			buttons="false"
 		/>
 	</fieldset>
diff --git a/administrator/components/com_messages/src/Controller/DisplayController.php b/administrator/components/com_messages/src/Controller/DisplayController.php
index 6d73258f97d11..8d67b5aecde7d 100644
--- a/administrator/components/com_messages/src/Controller/DisplayController.php
+++ b/administrator/components/com_messages/src/Controller/DisplayController.php
@@ -19,7 +19,7 @@
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Messages master display controller.
+ * Messages display controller.
  *
  * @since  1.6
  */
@@ -37,7 +37,8 @@ class DisplayController extends BaseController
      * Method to display a view.
      *
      * @param   boolean  $cachable   If true, the view output will be cached.
-     * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link \JFilterInput::clean()}.
+     * @param   array    $urlparams  An array of safe URL parameters and their variable types.
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  static|boolean   This object to support chaining or false on failure.
      *
diff --git a/administrator/components/com_messages/src/Extension/MessagesComponent.php b/administrator/components/com_messages/src/Extension/MessagesComponent.php
index c35d45d3ed2c6..b394e6713eced 100644
--- a/administrator/components/com_messages/src/Extension/MessagesComponent.php
+++ b/administrator/components/com_messages/src/Extension/MessagesComponent.php
@@ -17,7 +17,7 @@
 use Psr\Container\ContainerInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/administrator/components/com_messages/src/Field/UserMessagesField.php b/administrator/components/com_messages/src/Field/UserMessagesField.php
index 4589cd94e9dda..3deea01fc6ee6 100644
--- a/administrator/components/com_messages/src/Field/UserMessagesField.php
+++ b/administrator/components/com_messages/src/Field/UserMessagesField.php
@@ -84,6 +84,6 @@ protected function getGroups()
      */
     protected function getExcluded()
     {
-        return [Factory::getUser()->id];
+        return [$this->getCurrentUser()->id];
     }
 }
diff --git a/administrator/components/com_messages/src/Model/MessageModel.php b/administrator/components/com_messages/src/Model/MessageModel.php
index 3052cdf0f189e..534a353cf4c8a 100644
--- a/administrator/components/com_messages/src/Model/MessageModel.php
+++ b/administrator/components/com_messages/src/Model/MessageModel.php
@@ -24,6 +24,8 @@
 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;
 use Joomla\Database\ParameterType;
 use PHPMailer\PHPMailer\Exception as phpMailerException;
 
@@ -36,8 +38,10 @@
  *
  * @since  1.6
  */
-class MessageModel extends AdminModel
+class MessageModel extends AdminModel implements UserFactoryAwareInterface
 {
+    use UserFactoryAwareTrait;
+
     /**
      * Message
      *
@@ -311,7 +315,7 @@ public function save($data)
         }
 
         // Load the user details (already valid from table check).
-        $toUser = User::getInstance($table->user_id_to);
+        $toUser = $this->getUserFactory()->loadUserById($table->user_id_to);
 
         // Check if recipient can access com_messages.
         if (!$toUser->authorise('core.login.admin') || !$toUser->authorise('core.manage', 'com_messages')) {
@@ -352,7 +356,7 @@ public function save($data)
         }
 
         if ($config->get('mail_on_new', true)) {
-            $fromUser         = User::getInstance($table->user_id_from);
+            $fromUser         = $this->getUserFactory()->loadUserById($table->user_id_from);
             $debug            = Factory::getApplication()->get('debug_lang');
             $default_language = ComponentHelper::getParams('com_languages')->get('administrator');
             $lang             = Language::getInstance($toUser->getParam('admin_language', $default_language), $debug);
diff --git a/administrator/components/com_messages/src/View/Config/HtmlView.php b/administrator/components/com_messages/src/View/Config/HtmlView.php
index cb066f038b506..e0748e4a6a351 100644
--- a/administrator/components/com_messages/src/View/Config/HtmlView.php
+++ b/administrator/components/com_messages/src/View/Config/HtmlView.php
@@ -45,7 +45,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var  \Joomla\CMS\Object\CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $state;
 
diff --git a/administrator/components/com_messages/src/View/Message/HtmlView.php b/administrator/components/com_messages/src/View/Message/HtmlView.php
index 806bf26a5d14a..bcc95eb08bbd4 100644
--- a/administrator/components/com_messages/src/View/Message/HtmlView.php
+++ b/administrator/components/com_messages/src/View/Message/HtmlView.php
@@ -16,7 +16,8 @@
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
-use Joomla\CMS\User\User;
+use Joomla\CMS\User\UserFactoryAwareInterface;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -27,8 +28,10 @@
  *
  * @since  1.6
  */
-class HtmlView extends BaseHtmlView
+class HtmlView extends BaseHtmlView implements UserFactoryAwareInterface
 {
+    use UserFactoryAwareTrait;
+
     /**
      * The Form object
      *
@@ -46,7 +49,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var  \Joomla\CMS\Object\CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $state;
 
@@ -98,7 +101,7 @@ protected function addToolbar()
             $toolbar->help('Private_Messages:_Write');
         } else {
             ToolbarHelper::title(Text::_('COM_MESSAGES_VIEW_PRIVATE_MESSAGE'), 'envelope inbox');
-            $sender = User::getInstance($this->item->user_id_from);
+            $sender = $this->getUserFactory()->loadUserById($this->item->user_id_from);
 
             if (
                 $sender->id !== $app->getIdentity()->get('id') && ($sender->authorise('core.admin')
diff --git a/administrator/components/com_messages/src/View/Messages/HtmlView.php b/administrator/components/com_messages/src/View/Messages/HtmlView.php
index 780a3f5f1a446..f34074bbcd37c 100644
--- a/administrator/components/com_messages/src/View/Messages/HtmlView.php
+++ b/administrator/components/com_messages/src/View/Messages/HtmlView.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Component\Messages\Administrator\View\Messages;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
@@ -46,7 +45,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var  \Joomla\CMS\Object\CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $state;
 
@@ -117,7 +116,7 @@ protected function addToolbar()
     {
         $state = $this->get('State');
         $canDo = ContentHelper::getActions('com_messages');
-        $user  = Factory::getApplication()->getIdentity();
+        $user  = $this->getCurrentUser();
 
         // Get the toolbar object instance
         $toolbar = Toolbar::getInstance('toolbar');
diff --git a/administrator/components/com_messages/tmpl/messages/default.php b/administrator/components/com_messages/tmpl/messages/default.php
index 27f4196dca822..9c3eae151b8ae 100644
--- a/administrator/components/com_messages/tmpl/messages/default.php
+++ b/administrator/components/com_messages/tmpl/messages/default.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;
@@ -20,7 +19,7 @@
 $wa = $this->document->getWebAssetManager();
 $wa->useScript('multiselect');
 
-$user      = Factory::getUser();
+$user      = $this->getCurrentUser();
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
 ?>
diff --git a/administrator/components/com_messages/tmpl/messages/emptystate.php b/administrator/components/com_messages/tmpl/messages/emptystate.php
index 43a4b1a7a54c4..957b2d88c32aa 100644
--- a/administrator/components/com_messages/tmpl/messages/emptystate.php
+++ b/administrator/components/com_messages/tmpl/messages/emptystate.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Layout\LayoutHelper;
 
 $displayData = [
@@ -21,8 +20,8 @@
 ];
 
 if (
-    Factory::getApplication()->getIdentity()->authorise('core.create', 'com_messages')
-    && Factory::getApplication()->getIdentity()->authorise('core.manage', 'com_users')
+    $this->getCurrentUser()->authorise('core.create', 'com_messages')
+    && $this->getCurrentUser()->authorise('core.manage', 'com_users')
 ) {
     $displayData['createURL'] = 'index.php?option=com_messages&task=message.add';
 }
diff --git a/administrator/components/com_modules/config.xml b/administrator/components/com_modules/config.xml
index 23f13f325c8aa..3d758260108c7 100644
--- a/administrator/components/com_modules/config.xml
+++ b/administrator/components/com_modules/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <config>
-	<help key="Module:_Options"/>
+	<help key="Modules:_Options"/>
 	<inlinehelp button="show"/>
 	<fieldset
 		name="modules"
diff --git a/administrator/components/com_modules/forms/module.xml b/administrator/components/com_modules/forms/module.xml
index 72d3381a176f4..c6a00dea7e40c 100644
--- a/administrator/components/com_modules/forms/module.xml
+++ b/administrator/components/com_modules/forms/module.xml
@@ -112,7 +112,7 @@
 			type="editor"
 			label="COM_MODULES_FIELD_CONTENT_LABEL"
 			buttons="true"
-			filter="JComponentHelper::filterText"
+			filter="\Joomla\CMS\Component\ComponentHelper::filterText"
 			hide="readmore,pagebreak,module"
 		/>
 
diff --git a/administrator/components/com_modules/forms/moduleadmin.xml b/administrator/components/com_modules/forms/moduleadmin.xml
index f7b67ea55beae..41448891f4aad 100644
--- a/administrator/components/com_modules/forms/moduleadmin.xml
+++ b/administrator/components/com_modules/forms/moduleadmin.xml
@@ -122,7 +122,7 @@
 			type="editor"
 			label="COM_MODULES_FIELD_CONTENT_LABEL"
 			buttons="true"
-			filter="JComponentHelper::filterText"
+			filter="\Joomla\CMS\Component\ComponentHelper::filterText"
 			hide="readmore,pagebreak,module,menu,fields,contact,article"
 		/>
 
diff --git a/administrator/components/com_modules/src/Controller/DisplayController.php b/administrator/components/com_modules/src/Controller/DisplayController.php
index 6ea12f68b8a7f..1daa2174005fa 100644
--- a/administrator/components/com_modules/src/Controller/DisplayController.php
+++ b/administrator/components/com_modules/src/Controller/DisplayController.php
@@ -20,7 +20,7 @@
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Modules manager master display controller.
+ * Modules manager display controller.
  *
  * @since  1.6
  */
@@ -38,7 +38,8 @@ class DisplayController extends BaseController
      * Method to display a view.
      *
      * @param   boolean        $cachable   If true, the view output will be cached
-     * @param   array|boolean  $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link \JFilterInput::clean()}
+     * @param   array|boolean  $urlparams  An array of safe URL parameters and their variable types.
+     *                         @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  static|boolean   This object to support chaining or false on failure.
      *
diff --git a/administrator/components/com_modules/src/Extension/ModulesComponent.php b/administrator/components/com_modules/src/Extension/ModulesComponent.php
index b48cd9dd349fd..2fb82863c7921 100644
--- a/administrator/components/com_modules/src/Extension/ModulesComponent.php
+++ b/administrator/components/com_modules/src/Extension/ModulesComponent.php
@@ -17,7 +17,7 @@
 use Psr\Container\ContainerInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/administrator/components/com_modules/src/Model/ModuleModel.php b/administrator/components/com_modules/src/Model/ModuleModel.php
index 769588450a1e6..fcbc2bfb62b4b 100644
--- a/administrator/components/com_modules/src/Model/ModuleModel.php
+++ b/administrator/components/com_modules/src/Model/ModuleModel.php
@@ -14,7 +14,6 @@
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filesystem\Folder;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Helper\ModuleHelper;
 use Joomla\CMS\Language\Text;
@@ -25,6 +24,7 @@
 use Joomla\CMS\Table\Table;
 use Joomla\Component\Modules\Administrator\Helper\ModulesHelper;
 use Joomla\Database\ParameterType;
+use Joomla\Filesystem\Path;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
@@ -751,7 +751,7 @@ public function getHelp()
      *
      * @since   1.6
      */
-    public function getTable($type = 'Module', $prefix = 'JTable', $config = [])
+    public function getTable($type = 'Module', $prefix = '\\Joomla\\CMS\\Table\\', $config = [])
     {
         return Table::getInstance($type, $prefix, $config);
     }
diff --git a/administrator/components/com_modules/src/Model/PositionsModel.php b/administrator/components/com_modules/src/Model/PositionsModel.php
index 4e078a08eed51..7b9959bc0b413 100644
--- a/administrator/components/com_modules/src/Model/PositionsModel.php
+++ b/administrator/components/com_modules/src/Model/PositionsModel.php
@@ -13,10 +13,10 @@
 use Joomla\CMS\Application\ApplicationHelper;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\Component\Modules\Administrator\Helper\ModulesHelper;
 use Joomla\Database\ParameterType;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
diff --git a/administrator/components/com_modules/src/Model/SelectModel.php b/administrator/components/com_modules/src/Model/SelectModel.php
index 39bc13b29da2c..12f4ad72e3e9f 100644
--- a/administrator/components/com_modules/src/Model/SelectModel.php
+++ b/administrator/components/com_modules/src/Model/SelectModel.php
@@ -13,10 +13,10 @@
 use Joomla\CMS\Application\ApplicationHelper;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\Database\ParameterType;
+use Joomla\Filesystem\Path;
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
diff --git a/administrator/components/com_modules/src/View/Module/HtmlView.php b/administrator/components/com_modules/src/View/Module/HtmlView.php
index f39751535c56f..6b3add6c38fc5 100644
--- a/administrator/components/com_modules/src/View/Module/HtmlView.php
+++ b/administrator/components/com_modules/src/View/Module/HtmlView.php
@@ -46,14 +46,14 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var  \Joomla\CMS\Object\CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $state;
 
     /**
      * The actions the user is authorised to perform
      *
-     * @var    \Joomla\CMS\Object\CMSObject
+     * @var    \Joomla\Registry\Registry
      *
      * @since  4.0.0
      */
@@ -116,26 +116,9 @@ function (Toolbar $childBar) {
 
             $toolbar->cancel('module.cancel', 'JTOOLBAR_CANCEL');
         } else {
-            $toolbarButtons = [];
-
             // Can't save the record if it's checked out.
-            if (!$checkedOut) {
-                // Since it's an existing record, check the edit permission.
-                if ($canDo->get('core.edit')) {
-                    $toolbar->apply('module.apply');
-
-                    $toolbarButtons[] = ['save', 'module.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')) {
-                        $toolbarButtons[] = ['save2new', 'module.save2new'];
-                    }
-                }
-            }
-
-            // If checked out, we can still save
-            if ($canDo->get('core.create')) {
-                $toolbarButtons[] = ['save2copy', 'module.save2copy'];
+            if (!$checkedOut && $canDo->get('core.edit')) {
+                $toolbar->apply('module.apply');
             }
 
             $saveGroup = $toolbar->dropdownButton('save-group');
@@ -148,13 +131,13 @@ function (Toolbar $childBar) use ($checkedOut, $canDo) {
 
                         // 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->save('module.save2new');
+                            $childBar->save2new('module.save2new');
                         }
                     }
 
                     // If checked out, we can still save
                     if ($canDo->get('core.create')) {
-                        $childBar->save('module.save2copy');
+                        $childBar->save2copy('module.save2copy');
                     }
                 }
             );
@@ -163,7 +146,7 @@ function (Toolbar $childBar) use ($checkedOut, $canDo) {
         }
 
         // Get the help information for the menu item.
-        $lang = Factory::getLanguage();
+        $lang = $this->getLanguage();
 
         $help = $this->get('Help');
 
diff --git a/administrator/components/com_modules/src/View/Modules/HtmlView.php b/administrator/components/com_modules/src/View/Modules/HtmlView.php
index d5ba10191b43b..bbcaecd92da8e 100644
--- a/administrator/components/com_modules/src/View/Modules/HtmlView.php
+++ b/administrator/components/com_modules/src/View/Modules/HtmlView.php
@@ -49,7 +49,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var  \Joomla\CMS\Object\CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $state;
 
diff --git a/administrator/components/com_modules/src/View/Select/HtmlView.php b/administrator/components/com_modules/src/View/Select/HtmlView.php
index 7f0d0262c8f20..7d55d7a765ff7 100644
--- a/administrator/components/com_modules/src/View/Select/HtmlView.php
+++ b/administrator/components/com_modules/src/View/Select/HtmlView.php
@@ -31,7 +31,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var  \Joomla\CMS\Object\CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $state;
 
diff --git a/administrator/components/com_modules/tmpl/modules/default.php b/administrator/components/com_modules/tmpl/modules/default.php
index 003cf8b9be202..aefc841d067a9 100644
--- a/administrator/components/com_modules/tmpl/modules/default.php
+++ b/administrator/components/com_modules/tmpl/modules/default.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ModuleHelper;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Multilanguage;
@@ -25,7 +24,7 @@
     ->useScript('multiselect');
 
 $clientId  = (int) $this->state->get('client_id', 0);
-$user      = Factory::getUser();
+$user      = $this->getCurrentUser();
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
 $saveOrder = ($listOrder == 'a.ordering');
diff --git a/administrator/components/com_modules/tmpl/modules/emptystate.php b/administrator/components/com_modules/tmpl/modules/emptystate.php
index f0b2b02ed1d2a..3b18a03d0e258 100644
--- a/administrator/components/com_modules/tmpl/modules/emptystate.php
+++ b/administrator/components/com_modules/tmpl/modules/emptystate.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
 
@@ -23,7 +22,7 @@
     'title'      => Text::_('COM_MODULES_EMPTYSTATE_TITLE_' . ($this->clientId ? 'ADMINISTRATOR' : 'SITE')),
 ];
 
-if (Factory::getApplication()->getIdentity()->authorise('core.create', 'com_modules')) {
+if ($this->getCurrentUser()->authorise('core.create', 'com_modules')) {
     $displayData['createURL'] = 'index.php?option=com_modules&view=select&client_id=' . $this->clientId;
 }
 
diff --git a/administrator/components/com_modules/tmpl/modules/modal.php b/administrator/components/com_modules/tmpl/modules/modal.php
index cde52ca966cec..429dbeeb1e9c7 100644
--- a/administrator/components/com_modules/tmpl/modules/modal.php
+++ b/administrator/components/com_modules/tmpl/modules/modal.php
@@ -23,7 +23,7 @@
 
 /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
 $wa = $this->document->getWebAssetManager();
-$wa->useScript('com_modules.admin-modules-modal');
+$wa->useScript('com_modules.admin-modules-modal')->useScript('modal-content-select');
 
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
@@ -84,6 +84,19 @@
                     2  => 'icon-folder',
                 ];
                 foreach ($this->items as $i => $item) :
+                    $attrs = 'data-content-select data-content-type="com_modules.module"'
+                        . ' data-id="' . $item->id . '"'
+                        . ' data-title="' . $this->escape($item->title) . '"'
+                        . ' data-position="' . $this->escape($item->position) . '"'
+                        . ' data-module-element="' . $this->escape($item->module) . '"'
+                        // @TODO: Remove data-editor and data-module after full transition to postMessage()
+                        . ' data-editor="' . $this->escape($editor) . '"'
+                        . ' data-module="' . ((int) $item->id) . '"';
+
+                    $attrs1 = $attrs;
+                    $attrs1 .= ' data-html="{loadmoduleid ' . ((int) $item->id) . '}"';
+                    $attrs2 = $attrs;
+                    $attrs2 .= ' data-html="{loadposition ' . $this->escape($item->position) . '}"';
                     ?>
                 <tr class="row<?php echo $i % 2; ?>">
                     <td class="text-center">
@@ -92,13 +105,13 @@
                         </span>
                     </td>
                     <th scope="row" class="has-context">
-                        <a class="js-module-insert btn btn-sm btn-success w-100" href="#" data-module="<?php echo $item->id; ?>" data-editor="<?php echo $this->escape($editor); ?>">
+                        <button type="button" class="js-module-insert btn btn-sm btn-success w-100" <?php echo $attrs1; ?>>
                             <?php echo $this->escape($item->title); ?>
-                        </a>
+                        </button>
                     </th>
                     <td class="small d-none d-md-table-cell">
                         <?php if ($item->position) : ?>
-                        <a class="js-position-insert btn btn-sm btn-warning w-100" href="#" data-position="<?php echo $this->escape($item->position); ?>" data-editor="<?php echo $this->escape($editor); ?>"><?php echo $this->escape($item->position); ?></a>
+                        <button type="button" class="js-position-insert btn btn-sm btn-warning w-100" <?php echo $attrs2; ?>><?php echo $this->escape($item->position); ?></button>
                         <?php else : ?>
                         <span class="btn btn-sm btn-secondary w-100"><?php echo Text::_('JNONE'); ?></span>
                         <?php endif; ?>
diff --git a/administrator/components/com_newsfeeds/forms/category.xml b/administrator/components/com_newsfeeds/forms/category.xml
index 7e86aa87de9ec..eae41d9e6cb09 100644
--- a/administrator/components/com_newsfeeds/forms/category.xml
+++ b/administrator/components/com_newsfeeds/forms/category.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form>
-	<help key="News_Feeds:_New_or_Edit_Category" />
+	<help key="News_Feeds:_Edit_Category" />
 	<listhelp key="News_Feeds:_Categories" />
 </form>
diff --git a/administrator/components/com_newsfeeds/forms/newsfeed.xml b/administrator/components/com_newsfeeds/forms/newsfeed.xml
index a9f647b9bc0fa..656f852b5107c 100644
--- a/administrator/components/com_newsfeeds/forms/newsfeed.xml
+++ b/administrator/components/com_newsfeeds/forms/newsfeed.xml
@@ -79,7 +79,7 @@
 			label="JGLOBAL_DESCRIPTION"
 			buttons="true"
 			hide="pagebreak,readmore"
-			filter="JComponentHelper::filterText"
+			filter="\Joomla\CMS\Component\ComponentHelper::filterText"
 		/>
 
 		<field
diff --git a/administrator/components/com_newsfeeds/src/Controller/DisplayController.php b/administrator/components/com_newsfeeds/src/Controller/DisplayController.php
index 88fade6b53a28..9b421ab26a260 100644
--- a/administrator/components/com_newsfeeds/src/Controller/DisplayController.php
+++ b/administrator/components/com_newsfeeds/src/Controller/DisplayController.php
@@ -19,7 +19,7 @@
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Newsfeeds master display controller.
+ * Newsfeeds display controller.
  *
  * @since  1.6
  */
@@ -37,7 +37,8 @@ class DisplayController extends BaseController
      * Method to display a view.
      *
      * @param   boolean  $cachable   If true, the view output will be cached
-     * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link \JFilterInput::clean()}.
+     * @param   array    $urlparams  An array of safe URL parameters and their variable types.
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  static|boolean   This object to support chaining.
      *
diff --git a/administrator/components/com_newsfeeds/src/Extension/NewsfeedsComponent.php b/administrator/components/com_newsfeeds/src/Extension/NewsfeedsComponent.php
index 63bd515a131d3..e1cbcad907f57 100644
--- a/administrator/components/com_newsfeeds/src/Extension/NewsfeedsComponent.php
+++ b/administrator/components/com_newsfeeds/src/Extension/NewsfeedsComponent.php
@@ -25,7 +25,7 @@
 use Psr\Container\ContainerInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/administrator/components/com_newsfeeds/src/Table/NewsfeedTable.php b/administrator/components/com_newsfeeds/src/Table/NewsfeedTable.php
index d4f317a638124..e480b1a851d76 100644
--- a/administrator/components/com_newsfeeds/src/Table/NewsfeedTable.php
+++ b/administrator/components/com_newsfeeds/src/Table/NewsfeedTable.php
@@ -17,6 +17,8 @@
 use Joomla\CMS\Table\Table;
 use Joomla\CMS\Tag\TaggableTableInterface;
 use Joomla\CMS\Tag\TaggableTableTrait;
+use Joomla\CMS\User\CurrentUserInterface;
+use Joomla\CMS\User\CurrentUserTrait;
 use Joomla\CMS\Versioning\VersionableTableInterface;
 use Joomla\Database\DatabaseDriver;
 use Joomla\String\StringHelper;
@@ -30,9 +32,10 @@
  *
  * @since  1.6
  */
-class NewsfeedTable extends Table implements VersionableTableInterface, TaggableTableInterface
+class NewsfeedTable extends Table implements VersionableTableInterface, TaggableTableInterface, CurrentUserInterface
 {
     use TaggableTableTrait;
+    use CurrentUserTrait;
 
     /**
      * Indicates that columns fully support the NULL value in the database
@@ -115,7 +118,7 @@ public function check()
             $this->metadesc = StringHelper::str_ireplace($bad_characters, '', $this->metadesc);
         }
 
-        if (is_null($this->hits)) {
+        if (!$this->hits) {
             $this->hits = 0;
         }
 
@@ -123,7 +126,7 @@ public function check()
     }
 
     /**
-     * Overridden \JTable::store to set modified data.
+     * Overridden \Joomla\CMS\Table\Table::store to set modified data.
      *
      * @param   boolean  $updateNulls  True to update fields even if they are null.
      *
@@ -134,7 +137,7 @@ public function check()
     public function store($updateNulls = true)
     {
         $date = Factory::getDate();
-        $user = Factory::getUser();
+        $user = $this->getCurrentUser();
 
         // Set created date if not set.
         if (!(int) $this->created) {
diff --git a/administrator/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php b/administrator/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php
index c36277411c86e..1cac38c86eae6 100644
--- a/administrator/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php
+++ b/administrator/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php
@@ -34,7 +34,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The item object for the newsfeed
      *
-     * @var    \Joomla\CMS\Object\CMSObject
+     * @var    \Joomla\Registry\Registry
      *
      * @since  1.6
      */
@@ -52,7 +52,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state of the newsfeed
      *
-     * @var    \Joomla\CMS\Object\CMSObject
+     * @var   \Joomla\Registry\Registry
      *
      * @since  1.6
      */
@@ -159,6 +159,6 @@ function (Toolbar $childBar) use ($checkedOut, $canDo, $user, $isNew) {
         }
 
         $toolbar->divider();
-        $toolbar->help('News_Feeds:_New_or_Edit');
+        $toolbar->help('News_Feeds:_Edit');
     }
 }
diff --git a/administrator/components/com_newsfeeds/src/View/Newsfeeds/HtmlView.php b/administrator/components/com_newsfeeds/src/View/Newsfeeds/HtmlView.php
index 8c6e81db4856f..e7d4815ef145d 100644
--- a/administrator/components/com_newsfeeds/src/View/Newsfeeds/HtmlView.php
+++ b/administrator/components/com_newsfeeds/src/View/Newsfeeds/HtmlView.php
@@ -53,7 +53,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var    CMSObject
+     * @var    \Joomla\Registry\Registry
      *
      * @since  1.6
      */
@@ -68,6 +68,20 @@ class HtmlView extends BaseHtmlView
      */
     private $isEmptyState = false;
 
+    /**
+     * Form object for search filters
+     *
+     * @var  \Joomla\CMS\Form\Form
+     */
+    public $filterForm;
+
+    /**
+     * The active search filters
+     *
+     * @var  array
+     */
+    public $activeFilters;
+
     /**
      * Execute and display a template script.
      *
@@ -133,7 +147,7 @@ protected function addToolbar()
     {
         $state   = $this->get('State');
         $canDo   = ContentHelper::getActions('com_newsfeeds', 'category', $state->get('filter.category_id'));
-        $user    = Factory::getApplication()->getIdentity();
+        $user    = $this->getCurrentUser();
         $toolbar = Toolbar::getInstance();
 
         ToolbarHelper::title(Text::_('COM_NEWSFEEDS_MANAGER_NEWSFEEDS'), 'rss newsfeeds');
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php b/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php
index 0e3b4719ec077..46b12cdd58e5b 100644
--- a/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php
+++ b/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Associations;
 use Joomla\CMS\Language\Multilanguage;
@@ -24,7 +23,7 @@
 $wa->useScript('table.columns')
     ->useScript('multiselect');
 
-$user      = Factory::getUser();
+$user      = $this->getCurrentUser();
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
 $saveOrder = $listOrder == 'a.ordering';
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeeds/emptystate.php b/administrator/components/com_newsfeeds/tmpl/newsfeeds/emptystate.php
index 234282c353b0e..191e356143511 100644
--- a/administrator/components/com_newsfeeds/tmpl/newsfeeds/emptystate.php
+++ b/administrator/components/com_newsfeeds/tmpl/newsfeeds/emptystate.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Layout\LayoutHelper;
 
 $displayData = [
@@ -20,7 +19,7 @@
     'icon'       => 'icon-rss newsfeeds',
 ];
 
-$user = Factory::getApplication()->getIdentity();
+$user = $this->getCurrentUser();
 
 if ($user->authorise('core.create', 'com_newsfeeds') || count($user->getAuthorisedCategories('com_newsfeeds', 'core.create')) > 0) {
     $displayData['createURL'] = 'index.php?option=com_newsfeeds&task=newsfeed.add';
diff --git a/administrator/components/com_plugins/forms/filter_plugins.xml b/administrator/components/com_plugins/forms/filter_plugins.xml
index 19fcb31a67b79..3f657c7060207 100644
--- a/administrator/components/com_plugins/forms/filter_plugins.xml
+++ b/administrator/components/com_plugins/forms/filter_plugins.xml
@@ -12,7 +12,7 @@
 
 		<field
 			name="enabled"
-			type="plugin_status"
+			type="pluginstatus"
 			label="JSTATUS"
 			class="js-select-submit-on-change"
 			>
diff --git a/administrator/components/com_plugins/src/Controller/DisplayController.php b/administrator/components/com_plugins/src/Controller/DisplayController.php
index a161580f7c94d..7defa67f936e5 100644
--- a/administrator/components/com_plugins/src/Controller/DisplayController.php
+++ b/administrator/components/com_plugins/src/Controller/DisplayController.php
@@ -19,7 +19,7 @@
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Plugins master display controller.
+ * Plugins display controller.
  *
  * @since  1.5
  */
@@ -37,7 +37,8 @@ class DisplayController extends BaseController
      * Method to display a view.
      *
      * @param   boolean  $cachable   If true, the view output will be cached
-     * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link \JFilterInput::clean()}.
+     * @param   array    $urlparams  An array of safe URL parameters and their variable types.
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  static|boolean   This object to support chaining or false on failure.
      *
diff --git a/administrator/components/com_plugins/src/Helper/PluginsHelper.php b/administrator/components/com_plugins/src/Helper/PluginsHelper.php
index a902512b2d125..d55b20f9a06c9 100644
--- a/administrator/components/com_plugins/src/Helper/PluginsHelper.php
+++ b/administrator/components/com_plugins/src/Helper/PluginsHelper.php
@@ -11,10 +11,10 @@
 namespace Joomla\Component\Plugins\Administrator\Helper;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Installer\Installer;
 use Joomla\CMS\Object\CMSObject;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
diff --git a/administrator/components/com_plugins/src/Model/PluginModel.php b/administrator/components/com_plugins/src/Model/PluginModel.php
index 1e53c0a1de7a1..b4284a637c81f 100644
--- a/administrator/components/com_plugins/src/Model/PluginModel.php
+++ b/administrator/components/com_plugins/src/Model/PluginModel.php
@@ -11,7 +11,6 @@
 namespace Joomla\Component\Plugins\Administrator\Model;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
@@ -19,6 +18,7 @@
 use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Table\Table;
+use Joomla\Filesystem\Path;
 use Joomla\Registry\Registry;
 use Joomla\Utilities\ArrayHelper;
 
@@ -207,7 +207,7 @@ public function getItem($pk = null)
      *
      * @return  Table   A database object
      */
-    public function getTable($type = 'Extension', $prefix = 'JTable', $config = [])
+    public function getTable($type = 'Extension', $prefix = '\\Joomla\\CMS\\Table\\', $config = [])
     {
         return Table::getInstance($type, $prefix, $config);
     }
diff --git a/administrator/components/com_plugins/src/View/Plugin/HtmlView.php b/administrator/components/com_plugins/src/View/Plugin/HtmlView.php
index 379c1807d7aa1..893a7a64c01f0 100644
--- a/administrator/components/com_plugins/src/View/Plugin/HtmlView.php
+++ b/administrator/components/com_plugins/src/View/Plugin/HtmlView.php
@@ -47,7 +47,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state of the newsfeed
      *
-     * @var   CMSObject
+     * @var   \Joomla\Registry\Registry
      */
     protected $state;
 
@@ -100,7 +100,7 @@ protected function addToolbar()
         $toolbar->divider();
 
         // Get the help information for the plugin item.
-        $lang = Factory::getLanguage();
+        $lang = $this->getLanguage();
 
         $help = $this->get('Help');
 
diff --git a/administrator/components/com_plugins/src/View/Plugins/HtmlView.php b/administrator/components/com_plugins/src/View/Plugins/HtmlView.php
index e973fd56ef4a7..c47fa676236e8 100644
--- a/administrator/components/com_plugins/src/View/Plugins/HtmlView.php
+++ b/administrator/components/com_plugins/src/View/Plugins/HtmlView.php
@@ -45,7 +45,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var   \Joomla\CMS\Object\CMSObject
+     * @var   \Joomla\Registry\Registry
      */
     protected $state;
 
diff --git a/administrator/components/com_plugins/tmpl/plugins/default.php b/administrator/components/com_plugins/tmpl/plugins/default.php
index 68da30c794581..50fd118d086c3 100644
--- a/administrator/components/com_plugins/tmpl/plugins/default.php
+++ b/administrator/components/com_plugins/tmpl/plugins/default.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;
@@ -22,7 +21,7 @@
 $wa->useScript('table.columns')
     ->useScript('multiselect');
 
-$user      = Factory::getUser();
+$user      = $this->getCurrentUser();
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
 $saveOrder = $listOrder == 'ordering';
diff --git a/administrator/components/com_postinstall/tmpl/messages/default.php b/administrator/components/com_postinstall/tmpl/messages/default.php
index eac28b7bf22fc..a9f054eed18f5 100644
--- a/administrator/components/com_postinstall/tmpl/messages/default.php
+++ b/administrator/components/com_postinstall/tmpl/messages/default.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\Router\Route;
@@ -41,7 +40,7 @@
                         <?php echo Text::_($item->action_key); ?>
                     </a>
                     <?php endif; ?>
-                    <?php if (Factory::getApplication()->getIdentity()->authorise('core.edit.state', 'com_postinstall')) : ?>
+                    <?php if ($this->getCurrentUser()->authorise('core.edit.state', 'com_postinstall')) : ?>
                     <a href="<?php echo Route::_('index.php?option=com_postinstall&view=messages&task=message.unpublish&id=' . $item->postinstall_message_id . '&' . $this->token . '=1'); ?>" class="btn btn-danger btn-sm">
                         <?php echo Text::_('COM_POSTINSTALL_BTN_HIDE'); ?>
                     </a>
@@ -57,7 +56,7 @@
             <div class="card-body">
                 <h3><?php echo Text::_($item->title_key); ?></h3>
                 <div>
-                    <?php if (Factory::getApplication()->getIdentity()->authorise('core.edit.state', 'com_postinstall')) : ?>
+                    <?php if ($this->getCurrentUser()->authorise('core.edit.state', 'com_postinstall')) : ?>
                         <a href="<?php echo Route::_('index.php?option=com_postinstall&view=messages&task=message.unpublish&id=' . $item->postinstall_message_id . '&' . $this->token . '=1'); ?>" class="btn btn-danger btn-sm">
                             <?php echo Text::_('COM_POSTINSTALL_BTN_HIDE'); ?>
                         </a>
diff --git a/administrator/components/com_privacy/src/Controller/DisplayController.php b/administrator/components/com_privacy/src/Controller/DisplayController.php
index 2005caa74c63b..389e50f070f5a 100644
--- a/administrator/components/com_privacy/src/Controller/DisplayController.php
+++ b/administrator/components/com_privacy/src/Controller/DisplayController.php
@@ -40,7 +40,8 @@ class DisplayController extends BaseController
      * Method to display a view.
      *
      * @param   boolean  $cachable   If true, the view output will be cached
-     * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+     * @param   array    $urlparams  An array of safe URL parameters and their variable types.
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  $this
      *
diff --git a/administrator/components/com_privacy/src/Extension/PrivacyComponent.php b/administrator/components/com_privacy/src/Extension/PrivacyComponent.php
index a2e8dc8e29ecf..d93dce6ffd3f3 100644
--- a/administrator/components/com_privacy/src/Extension/PrivacyComponent.php
+++ b/administrator/components/com_privacy/src/Extension/PrivacyComponent.php
@@ -19,7 +19,7 @@
 use Psr\Container\ContainerInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/administrator/components/com_privacy/src/Model/CapabilitiesModel.php b/administrator/components/com_privacy/src/Model/CapabilitiesModel.php
index dc5d8d00f3d85..3da2ba74452d8 100644
--- a/administrator/components/com_privacy/src/Model/CapabilitiesModel.php
+++ b/administrator/components/com_privacy/src/Model/CapabilitiesModel.php
@@ -11,6 +11,7 @@
 namespace Joomla\Component\Privacy\Administrator\Model;
 
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Event\Privacy\CollectCapabilitiesEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Model\BaseModel;
@@ -70,13 +71,18 @@ public function getCapabilities()
          * This is in addition to plugin groups which are imported before this method is triggered, generally this is the system group.
          */
 
-        PluginHelper::importPlugin('authentication');
-        PluginHelper::importPlugin('captcha');
-        PluginHelper::importPlugin('installer');
-        PluginHelper::importPlugin('privacy');
-        PluginHelper::importPlugin('user');
+        $dispatcher = $app->getDispatcher();
 
-        $pluginResults = $app->triggerEvent('onPrivacyCollectAdminCapabilities');
+        PluginHelper::importPlugin('authentication', null, true, $dispatcher);
+        PluginHelper::importPlugin('captcha', null, true, $dispatcher);
+        PluginHelper::importPlugin('installer', null, true, $dispatcher);
+        PluginHelper::importPlugin('privacy', null, true, $dispatcher);
+        PluginHelper::importPlugin('user', null, true, $dispatcher);
+
+        $pluginResults = $dispatcher->dispatch(
+            'onPrivacyCollectAdminCapabilities',
+            new CollectCapabilitiesEvent('onPrivacyCollectAdminCapabilities')
+        )->getArgument('result', []);
 
         // We are going to "cheat" here and include this component's capabilities without using a plugin
         $extensionCapabilities = [
diff --git a/administrator/components/com_privacy/src/Model/ExportModel.php b/administrator/components/com_privacy/src/Model/ExportModel.php
index 5e5d7c6cbfb16..8ae502d1d713b 100644
--- a/administrator/components/com_privacy/src/Model/ExportModel.php
+++ b/administrator/components/com_privacy/src/Model/ExportModel.php
@@ -11,6 +11,7 @@
 namespace Joomla\Component\Privacy\Administrator\Model;
 
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Event\Privacy\ExportRequestEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Language;
 use Joomla\CMS\Language\Text;
@@ -19,7 +20,8 @@
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Table\Table;
 use Joomla\CMS\Uri\Uri;
-use Joomla\CMS\User\User;
+use Joomla\CMS\User\UserFactoryAwareInterface;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\Component\Actionlogs\Administrator\Model\ActionlogModel;
 use Joomla\Component\Privacy\Administrator\Export\Domain;
 use Joomla\Component\Privacy\Administrator\Helper\PrivacyHelper;
@@ -35,8 +37,10 @@
  *
  * @since  3.9.0
  */
-class ExportModel extends BaseDatabaseModel
+class ExportModel extends BaseDatabaseModel implements UserFactoryAwareInterface
 {
+    use UserFactoryAwareTrait;
+
     /**
      * Create the export document for an information request.
      *
@@ -89,14 +93,19 @@ public function collectDataForExportRequest($id = null)
                 ->setLimit(1)
         )->loadResult();
 
-        $user = $userId ? User::getInstance($userId) : null;
+        $user = $userId ? $this->getUserFactory()->loadUserById($userId) : null;
 
         // Log the export
         $this->logExport($table);
 
-        PluginHelper::importPlugin('privacy');
+        $dispatcher = $this->getDispatcher();
+
+        PluginHelper::importPlugin('privacy', null, true, $dispatcher);
 
-        $pluginResults = Factory::getApplication()->triggerEvent('onPrivacyExportRequest', [$table, $user]);
+        $pluginResults = $dispatcher->dispatch('onPrivacyExportRequest', new ExportRequestEvent('onPrivacyExportRequest', [
+            'subject' => $table,
+            'user'    => $user,
+        ]))->getArgument('result', []);
 
         $domains = [];
 
@@ -180,7 +189,7 @@ public function emailDataExport($id = null)
         )->loadResult();
 
         if ($userId) {
-            $receiver = User::getInstance($userId);
+            $receiver = $this->getUserFactory()->loadUserById($userId);
 
             /*
              * We don't know if the user has admin access, so we will check if they have an admin language in their parameters,
diff --git a/administrator/components/com_privacy/src/Model/RemoveModel.php b/administrator/components/com_privacy/src/Model/RemoveModel.php
index 75eed0c787314..864e79a840455 100644
--- a/administrator/components/com_privacy/src/Model/RemoveModel.php
+++ b/administrator/components/com_privacy/src/Model/RemoveModel.php
@@ -11,12 +11,15 @@
 namespace Joomla\Component\Privacy\Administrator\Model;
 
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Event\Privacy\CanRemoveDataEvent;
+use Joomla\CMS\Event\Privacy\RemoveDataEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Table\Table;
-use Joomla\CMS\User\User;
+use Joomla\CMS\User\UserFactoryAwareInterface;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\Component\Actionlogs\Administrator\Model\ActionlogModel;
 use Joomla\Component\Privacy\Administrator\Removal\Status;
 use Joomla\Component\Privacy\Administrator\Table\RequestTable;
@@ -30,8 +33,10 @@
  *
  * @since  3.9.0
  */
-class RemoveModel extends BaseDatabaseModel
+class RemoveModel extends BaseDatabaseModel implements UserFactoryAwareInterface
 {
+    use UserFactoryAwareTrait;
+
     /**
      * Remove the user data.
      *
@@ -84,14 +89,18 @@ public function removeDataForRequest($id = null)
                 ->setLimit(1)
         )->loadResult();
 
-        $user = $userId ? User::getInstance($userId) : null;
+        $user = $userId ? $this->getUserFactory()->loadUserById($userId) : null;
 
-        $canRemove = true;
+        $canRemove  = true;
+        $dispatcher = $this->getDispatcher();
 
-        PluginHelper::importPlugin('privacy');
+        PluginHelper::importPlugin('privacy', null, true, $dispatcher);
 
         /** @var Status[] $pluginResults */
-        $pluginResults = Factory::getApplication()->triggerEvent('onPrivacyCanRemoveData', [$table, $user]);
+        $pluginResults = $dispatcher->dispatch('onPrivacyCanRemoveData', new CanRemoveDataEvent('onPrivacyCanRemoveData', [
+            'subject' => $table,
+            'user'    => $user,
+        ]))->getArgument('result', []);
 
         foreach ($pluginResults as $status) {
             if (!$status->canRemove) {
@@ -110,7 +119,10 @@ public function removeDataForRequest($id = null)
         // Log the removal
         $this->logRemove($table);
 
-        Factory::getApplication()->triggerEvent('onPrivacyRemoveData', [$table, $user]);
+        $dispatcher->dispatch('onPrivacyRemoveData', new RemoveDataEvent('onPrivacyRemoveData', [
+            'subject' => $table,
+            'user'    => $user,
+        ]));
 
         return true;
     }
diff --git a/administrator/components/com_privacy/src/Model/RequestModel.php b/administrator/components/com_privacy/src/Model/RequestModel.php
index 0a3c935f17032..47b531c848b6e 100644
--- a/administrator/components/com_privacy/src/Model/RequestModel.php
+++ b/administrator/components/com_privacy/src/Model/RequestModel.php
@@ -21,7 +21,8 @@
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Table\Table;
 use Joomla\CMS\Uri\Uri;
-use Joomla\CMS\User\User;
+use Joomla\CMS\User\UserFactoryAwareInterface;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\CMS\User\UserHelper;
 use Joomla\Component\Actionlogs\Administrator\Model\ActionlogModel;
 use Joomla\Component\Privacy\Administrator\Table\RequestTable;
@@ -37,8 +38,10 @@
  *
  * @since  3.9.0
  */
-class RequestModel extends AdminModel
+class RequestModel extends AdminModel implements UserFactoryAwareInterface
 {
+    use UserFactoryAwareTrait;
+
     /**
      * Clean the cache
      *
@@ -270,7 +273,7 @@ public function notifyUserAdminCreatedRequest($id)
         )->loadResult();
 
         if ($userId) {
-            $receiver = User::getInstance($userId);
+            $receiver = $this->getUserFactory()->loadUserById($userId);
 
             /*
              * We don't know if the user has admin access, so we will check if they have an admin language in their parameters,
@@ -383,7 +386,7 @@ public function save($data)
      * @return  array|boolean  Array of filtered data if valid, false otherwise.
      *
      * @see     \Joomla\CMS\Form\FormRule
-     * @see     JFilterInput
+     * @see     \Joomla\CMS\Filter\InputFilter
      * @since   3.9.0
      */
     public function validate($form, $data, $group = null)
diff --git a/administrator/components/com_privacy/src/Plugin/PrivacyPlugin.php b/administrator/components/com_privacy/src/Plugin/PrivacyPlugin.php
index 85dfa78589748..e107b58cab640 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  __DEPLOY_VERSION__ will be removed in 6.0 use $this->getDatabase() instead
+     * @deprecated  4.4.0 will be removed in 6.0 use $this->getDatabase() instead
      */
     protected $db;
 
diff --git a/administrator/components/com_privacy/src/View/Capabilities/HtmlView.php b/administrator/components/com_privacy/src/View/Capabilities/HtmlView.php
index 8e7d0a45179f5..d2c226809ba90 100644
--- a/administrator/components/com_privacy/src/View/Capabilities/HtmlView.php
+++ b/administrator/components/com_privacy/src/View/Capabilities/HtmlView.php
@@ -13,7 +13,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 
@@ -39,7 +38,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The state information
      *
-     * @var    CMSObject
+     * @var    \Joomla\Registry\Registry
      * @since  3.9.0
      */
     protected $state;
diff --git a/administrator/components/com_privacy/src/View/Consents/HtmlView.php b/administrator/components/com_privacy/src/View/Consents/HtmlView.php
index 4b288a5908676..102360210ec02 100644
--- a/administrator/components/com_privacy/src/View/Consents/HtmlView.php
+++ b/administrator/components/com_privacy/src/View/Consents/HtmlView.php
@@ -14,7 +14,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Pagination\Pagination;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
@@ -68,7 +67,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The state information
      *
-     * @var    CMSObject
+     * @var    \Joomla\Registry\Registry
      * @since  3.9.0
      */
     protected $state;
diff --git a/administrator/components/com_privacy/src/View/Export/XmlView.php b/administrator/components/com_privacy/src/View/Export/XmlView.php
index 6378732e568bb..0e3d595303b11 100644
--- a/administrator/components/com_privacy/src/View/Export/XmlView.php
+++ b/administrator/components/com_privacy/src/View/Export/XmlView.php
@@ -53,8 +53,8 @@ public function display($tpl = null)
         $requestId = $model->getState($model->getName() . '.request_id');
 
         // This document should always be downloaded
-        $this->document->setDownload(true);
-        $this->document->setName('export-request-' . $requestId);
+        $this->getDocument()->setDownload(true);
+        $this->getDocument()->setName('export-request-' . $requestId);
 
         echo PrivacyHelper::renderDataAsXml($exportData);
     }
diff --git a/administrator/components/com_privacy/src/View/Request/HtmlView.php b/administrator/components/com_privacy/src/View/Request/HtmlView.php
index 038d7401ef30e..baf6b0d6c2005 100644
--- a/administrator/components/com_privacy/src/View/Request/HtmlView.php
+++ b/administrator/components/com_privacy/src/View/Request/HtmlView.php
@@ -60,7 +60,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The state information
      *
-     * @var    CMSObject
+     * @var    \Joomla\Registry\Registry
      * @since  3.9.0
      */
     protected $state;
@@ -91,7 +91,7 @@ public function display($tpl = null)
             $this->actionlogs = $logsModel->getLogsForItem('com_privacy.request', $this->item->id);
 
             // Load the com_actionlogs language strings for use in the layout
-            $lang = Factory::getLanguage();
+            $lang = $this->getLanguage();
             $lang->load('com_actionlogs', JPATH_ADMINISTRATOR)
                 || $lang->load('com_actionlogs', JPATH_ADMINISTRATOR . '/components/com_actionlogs');
         }
diff --git a/administrator/components/com_privacy/src/View/Requests/HtmlView.php b/administrator/components/com_privacy/src/View/Requests/HtmlView.php
index d934ce2f5c3b1..a7190b189183a 100644
--- a/administrator/components/com_privacy/src/View/Requests/HtmlView.php
+++ b/administrator/components/com_privacy/src/View/Requests/HtmlView.php
@@ -16,7 +16,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Pagination\Pagination;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
@@ -78,7 +77,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The state information
      *
-     * @var    CMSObject
+     * @var    \Joomla\Registry\Registry
      * @since  3.9.0
      */
     protected $state;
diff --git a/administrator/components/com_privacy/tmpl/consents/default.php b/administrator/components/com_privacy/tmpl/consents/default.php
index a4eef20c985ad..6a6c6f0adec21 100644
--- a/administrator/components/com_privacy/tmpl/consents/default.php
+++ b/administrator/components/com_privacy/tmpl/consents/default.php
@@ -24,7 +24,7 @@
 $wa->useScript('table.columns')
     ->useScript('multiselect');
 
-$user       = Factory::getUser();
+$user       = $this->getCurrentUser();
 $listOrder  = $this->escape($this->state->get('list.ordering'));
 $listDirn   = $this->escape($this->state->get('list.direction'));
 $now        = Factory::getDate();
diff --git a/administrator/components/com_privacy/tmpl/requests/default.php b/administrator/components/com_privacy/tmpl/requests/default.php
index 382887ec3b79a..5c0252b2f3531 100644
--- a/administrator/components/com_privacy/tmpl/requests/default.php
+++ b/administrator/components/com_privacy/tmpl/requests/default.php
@@ -25,7 +25,7 @@
 $wa->useScript('table.columns')
     ->useScript('multiselect');
 
-$user      = Factory::getUser();
+$user      = $this->getCurrentUser();
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
 $now       = Factory::getDate();
diff --git a/administrator/components/com_redirect/forms/filter_links.xml b/administrator/components/com_redirect/forms/filter_links.xml
index 7ef5efcf94dbe..40de1f717e458 100644
--- a/administrator/components/com_redirect/forms/filter_links.xml
+++ b/administrator/components/com_redirect/forms/filter_links.xml
@@ -11,7 +11,7 @@
 		/>
 		<field
 			name="state"
-			type="redirect_status"
+			type="RedirectStatus"
 			label="JSTATUS"
 			class="js-select-submit-on-change"
 			>
diff --git a/administrator/components/com_redirect/src/Controller/DisplayController.php b/administrator/components/com_redirect/src/Controller/DisplayController.php
index aff1a62be6712..f2caf776e10a9 100644
--- a/administrator/components/com_redirect/src/Controller/DisplayController.php
+++ b/administrator/components/com_redirect/src/Controller/DisplayController.php
@@ -22,7 +22,7 @@
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Redirect master display controller.
+ * Redirect display controller.
  *
  * @since  1.6
  */
@@ -38,7 +38,8 @@ class DisplayController extends BaseController
      * Method to display a view.
      *
      * @param   boolean  $cachable   If true, the view output will be cached.
-     * @param   mixed    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link \JFilterInput::clean()}.
+     * @param   mixed    $urlparams  An array of safe URL parameters and their variable types.
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  static|boolean   This object to support chaining or false on failure.
      *
diff --git a/administrator/components/com_redirect/src/Extension/RedirectComponent.php b/administrator/components/com_redirect/src/Extension/RedirectComponent.php
index ee71626e3d066..a4773ef144f08 100644
--- a/administrator/components/com_redirect/src/Extension/RedirectComponent.php
+++ b/administrator/components/com_redirect/src/Extension/RedirectComponent.php
@@ -17,7 +17,7 @@
 use Psr\Container\ContainerInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/administrator/components/com_redirect/src/View/Link/HtmlView.php b/administrator/components/com_redirect/src/View/Link/HtmlView.php
index 6840f6d94dbd0..f9574242e365f 100644
--- a/administrator/components/com_redirect/src/View/Link/HtmlView.php
+++ b/administrator/components/com_redirect/src/View/Link/HtmlView.php
@@ -46,7 +46,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var   \Joomla\CMS\Object\CMSObject
+     * @var   \Joomla\Registry\Registry
      */
     protected $state;
 
diff --git a/administrator/components/com_redirect/src/View/Links/HtmlView.php b/administrator/components/com_redirect/src/View/Links/HtmlView.php
index 8839b9d694f9b..965dd89325410 100644
--- a/administrator/components/com_redirect/src/View/Links/HtmlView.php
+++ b/administrator/components/com_redirect/src/View/Links/HtmlView.php
@@ -71,7 +71,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var  \Joomla\CMS\Object\CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $state;
 
diff --git a/administrator/components/com_redirect/tmpl/links/default.php b/administrator/components/com_redirect/tmpl/links/default.php
index 72b6310459ebb..46f326d2951fb 100644
--- a/administrator/components/com_redirect/tmpl/links/default.php
+++ b/administrator/components/com_redirect/tmpl/links/default.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;
@@ -22,7 +21,7 @@
 $wa->useScript('table.columns')
     ->useScript('multiselect');
 
-$user      = Factory::getUser();
+$user      = $this->getCurrentUser();
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
 ?>
diff --git a/administrator/components/com_redirect/tmpl/links/emptystate.php b/administrator/components/com_redirect/tmpl/links/emptystate.php
index 9ab616452459a..36b8b04227e7e 100644
--- a/administrator/components/com_redirect/tmpl/links/emptystate.php
+++ b/administrator/components/com_redirect/tmpl/links/emptystate.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;
@@ -23,7 +22,7 @@
     'icon'       => 'icon-map-signs redirect',
 ];
 
-$user = Factory::getApplication()->getIdentity();
+$user = $this->getCurrentUser();
 
 if ($user->authorise('core.create', 'com_redirect')) {
     $displayData['createURL'] = 'index.php?option=com_redirect&task=link.add';
diff --git a/administrator/components/com_scheduler/src/Controller/DisplayController.php b/administrator/components/com_scheduler/src/Controller/DisplayController.php
index 1a17a2292633d..568c2fc18bb27 100644
--- a/administrator/components/com_scheduler/src/Controller/DisplayController.php
+++ b/administrator/components/com_scheduler/src/Controller/DisplayController.php
@@ -33,8 +33,8 @@ class DisplayController extends BaseController
 
     /**
      * @param   boolean  $cachable   If true, the view output will be cached
-     * @param   array    $urlparams  An array of safe url parameters and their variable types, for valid values see
-     *                               {@link InputFilter::clean()}.
+     * @param   array    $urlparams  An array of safe url parameters and their variable types.
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return BaseController|boolean  Returns either a BaseController object to support chaining, or false on failure
      *
diff --git a/administrator/components/com_scheduler/src/Helper/ExecRuleHelper.php b/administrator/components/com_scheduler/src/Helper/ExecRuleHelper.php
index 09b93ceb186fc..a163df8666576 100644
--- a/administrator/components/com_scheduler/src/Helper/ExecRuleHelper.php
+++ b/administrator/components/com_scheduler/src/Helper/ExecRuleHelper.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Date\Date;
 use Joomla\CMS\Factory;
 use Joomla\Component\Scheduler\Administrator\Task\Task;
-use Joomla\Database\DatabaseDriver;
+use Joomla\Database\DatabaseInterface;
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -128,7 +128,7 @@ public function nextExec(bool $string = true, bool $basisNow = false)
     private function dateTimeToSql(\DateTime $dateTime): string
     {
         static $db;
-        $db = $db ?? Factory::getContainer()->get(DatabaseDriver::class);
+        $db = $db ?? Factory::getContainer()->get(DatabaseInterface::class);
 
         return $dateTime->format($db->getDateFormat());
     }
diff --git a/administrator/components/com_scheduler/src/Model/TaskModel.php b/administrator/components/com_scheduler/src/Model/TaskModel.php
index 5fb8feed89c82..68d768dffbb5f 100644
--- a/administrator/components/com_scheduler/src/Model/TaskModel.php
+++ b/administrator/components/com_scheduler/src/Model/TaskModel.php
@@ -664,7 +664,7 @@ public function unlock(array &$pks): bool
         /** @var TaskTable $table */
         $table = $this->getTable();
 
-        $user = Factory::getApplication()->getIdentity();
+        $user = $this->getCurrentUser();
 
         $context = $this->option . '.' . $this->name;
 
diff --git a/administrator/components/com_scheduler/src/Table/TaskTable.php b/administrator/components/com_scheduler/src/Table/TaskTable.php
index 139175a14035b..b7aecb8bee50c 100644
--- a/administrator/components/com_scheduler/src/Table/TaskTable.php
+++ b/administrator/components/com_scheduler/src/Table/TaskTable.php
@@ -16,6 +16,8 @@
 use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\CMS\Table\Asset;
 use Joomla\CMS\Table\Table;
+use Joomla\CMS\User\CurrentUserInterface;
+use Joomla\CMS\User\CurrentUserTrait;
 use Joomla\Database\DatabaseDriver;
 use Joomla\Database\Exception\QueryTypeAlreadyDefinedException;
 
@@ -29,8 +31,10 @@
  *
  * @since  4.1.0
  */
-class TaskTable extends Table
+class TaskTable extends Table implements CurrentUserInterface
 {
+    use CurrentUserTrait;
+
     /**
      * Indicates that columns fully support the NULL value in the database
      *
@@ -139,7 +143,7 @@ public function store($updateNulls = true): bool
 
         // Set `created_by` if not set for a new item.
         if ($isNew && empty($this->created_by)) {
-            $this->created_by = Factory::getApplication()->getIdentity()->id;
+            $this->created_by = $this->getCurrentUser()->id;
         }
 
         // @todo : Should we add modified, modified_by fields? [ ]
diff --git a/administrator/components/com_scheduler/src/Task/Task.php b/administrator/components/com_scheduler/src/Task/Task.php
index 9fd7e91daed36..f5f0279a7033b 100644
--- a/administrator/components/com_scheduler/src/Task/Task.php
+++ b/administrator/components/com_scheduler/src/Task/Task.php
@@ -22,7 +22,6 @@
 use Joomla\Component\Scheduler\Administrator\Helper\SchedulerHelper;
 use Joomla\Component\Scheduler\Administrator\Scheduler\Scheduler;
 use Joomla\Component\Scheduler\Administrator\Table\TaskTable;
-use Joomla\Database\DatabaseDriver;
 use Joomla\Database\DatabaseInterface;
 use Joomla\Database\ParameterType;
 use Joomla\Registry\Registry;
@@ -142,7 +141,7 @@ public function __construct(object $record)
 
         $this->set('taskOption', $taskOption);
         $this->app = Factory::getApplication();
-        $this->db  = Factory::getContainer()->get(DatabaseDriver::class);
+        $this->db  = Factory::getContainer()->get(DatabaseInterface::class);
         $this->setLogger(Log::createDelegatedLogger());
         $this->logCategory = 'task' . $this->get('id');
 
diff --git a/administrator/components/com_scheduler/src/Traits/TaskPluginTrait.php b/administrator/components/com_scheduler/src/Traits/TaskPluginTrait.php
index 4cae94e51bbf9..2de696411a005 100644
--- a/administrator/components/com_scheduler/src/Traits/TaskPluginTrait.php
+++ b/administrator/components/com_scheduler/src/Traits/TaskPluginTrait.php
@@ -10,8 +10,8 @@
 
 namespace Joomla\Component\Scheduler\Administrator\Traits;
 
+use Joomla\CMS\Event\Model;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
@@ -19,6 +19,7 @@
 use Joomla\Component\Scheduler\Administrator\Event\ExecuteTaskEvent;
 use Joomla\Component\Scheduler\Administrator\Task\Status;
 use Joomla\Event\EventInterface;
+use Joomla\Filesystem\Path;
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -97,8 +98,8 @@ protected function endRoutine(ExecuteTaskEvent $event, int $exitCode): void
      * `onContentPrepareForm` event through {@see SubscriberInterface::getSubscribedEvents()} and will take care
      * of injecting the fields without additional logic in the plugin class.
      *
-     * @param   EventInterface|Form  $context  The onContentPrepareForm event or the Form object.
-     * @param   mixed                $data     The form data, required when $context is a {@see Form} instance.
+     * @param   Model\PrepareFormEvent|Form  $context  The onContentPrepareForm event or the Form object.
+     * @param   mixed                        $data     The form data, required when $context is a {@see Form} instance.
      *
      * @return boolean  True if the form was successfully enhanced or the context was not relevant.
      *
@@ -107,10 +108,9 @@ protected function endRoutine(ExecuteTaskEvent $event, int $exitCode): void
      */
     public function enhanceTaskItemForm($context, $data = null): bool
     {
-        if ($context instanceof EventInterface) {
-            /** @var Form $form */
-            $form = $context->getArgument('0');
-            $data = $context->getArgument('1');
+        if ($context instanceof Model\PrepareFormEvent) {
+            $form = $context->getForm();
+            $data = $context->getData();
         } elseif ($context instanceof Form) {
             $form = $context;
         } else {
diff --git a/administrator/components/com_scheduler/src/View/Select/HtmlView.php b/administrator/components/com_scheduler/src/View/Select/HtmlView.php
index bf38cd0b4f36e..eef67bf60f4ff 100644
--- a/administrator/components/com_scheduler/src/View/Select/HtmlView.php
+++ b/administrator/components/com_scheduler/src/View/Select/HtmlView.php
@@ -15,7 +15,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\Component\Scheduler\Administrator\Task\TaskOption;
@@ -41,7 +40,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var  CMSObject
+     * @var  \Joomla\Registry\Registry
      * @since  4.1.0
      */
     protected $state;
@@ -117,6 +116,6 @@ protected function addToolbar(): void
             ->url('index.php?option=com_scheduler')
             ->buttonClass('btn btn-danger')
             ->icon('icon-times')
-            ->text(Text::_('JCANCEL'));
+            ->text('JCANCEL');
     }
 }
diff --git a/administrator/components/com_scheduler/src/View/Task/HtmlView.php b/administrator/components/com_scheduler/src/View/Task/HtmlView.php
index 47fc5fe629d42..101dff18c417a 100644
--- a/administrator/components/com_scheduler/src/View/Task/HtmlView.php
+++ b/administrator/components/com_scheduler/src/View/Task/HtmlView.php
@@ -16,7 +16,6 @@
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 
@@ -56,7 +55,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var CMSObject
+     * @var \Joomla\Registry\Registry
      * @since  4.1.0
      */
     protected $state;
@@ -64,7 +63,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The actions the user is authorised to perform
      *
-     * @var  CMSObject
+     * @var  \Joomla\Registry\Registry
      * @since  4.1.0
      */
     protected $canDo;
diff --git a/administrator/components/com_scheduler/src/View/Tasks/HtmlView.php b/administrator/components/com_scheduler/src/View/Tasks/HtmlView.php
index 77d8da0dbd0d2..0934d91923a5f 100644
--- a/administrator/components/com_scheduler/src/View/Tasks/HtmlView.php
+++ b/administrator/components/com_scheduler/src/View/Tasks/HtmlView.php
@@ -10,13 +10,11 @@
 
 namespace Joomla\Component\Scheduler\Administrator\View\Tasks;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Pagination\Pagination;
 use Joomla\CMS\Toolbar\Button\DropdownButton;
 use Joomla\CMS\Toolbar\Toolbar;
@@ -53,7 +51,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state.
      *
-     * @var    CMSObject
+     * @var    \Joomla\Registry\Registry
      * @since  4.1.0
      */
     protected $state;
@@ -125,7 +123,7 @@ public function display($tpl = null): void
     protected function addToolbar(): void
     {
         $canDo   = ContentHelper::getActions('com_scheduler');
-        $user    = Factory::getApplication()->getIdentity();
+        $user    = $this->getCurrentUser();
         $toolbar = Toolbar::getInstance();
 
         ToolbarHelper::title(Text::_('COM_SCHEDULER_MANAGER_TASKS'), 'clock');
diff --git a/administrator/components/com_scheduler/tmpl/task/edit.php b/administrator/components/com_scheduler/tmpl/task/edit.php
index f0d2327e1156d..2573261ce460c 100644
--- a/administrator/components/com_scheduler/tmpl/task/edit.php
+++ b/administrator/components/com_scheduler/tmpl/task/edit.php
@@ -85,7 +85,7 @@ class="form-validate">
                         </h2>
                         <?php
                             $this->fieldset    = 'description';
-                            $short_description = Text::_($taskOption->desc);
+                            $short_description = $taskOption->desc;
                             $long_description  = LayoutHelper::render('joomla.edit.fieldset', $this);
 
                         if (!$long_description) {
diff --git a/administrator/components/com_scheduler/tmpl/tasks/empty_state.php b/administrator/components/com_scheduler/tmpl/tasks/empty_state.php
index 96e2eb0958ca4..faa671bbee7f4 100644
--- a/administrator/components/com_scheduler/tmpl/tasks/empty_state.php
+++ b/administrator/components/com_scheduler/tmpl/tasks/empty_state.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Layout\LayoutHelper;
 
 $displayData = [
@@ -20,7 +19,7 @@
     'icon' => 'icon-clock clock',
 ];
 
-if (Factory::getApplication()->getIdentity()->authorise('core.create', 'com_scheduler')) {
+if ($this->getCurrentUser()->authorise('core.create', 'com_scheduler')) {
     $displayData['createURL'] = 'index.php?option=com_scheduler&view=select&layout=default';
 }
 
diff --git a/administrator/components/com_tags/forms/tag.xml b/administrator/components/com_tags/forms/tag.xml
index fd016058b53cb..2ed717b6e1bf9 100644
--- a/administrator/components/com_tags/forms/tag.xml
+++ b/administrator/components/com_tags/forms/tag.xml
@@ -77,7 +77,7 @@
 		name="description"
 		type="editor"
 		label="JGLOBAL_DESCRIPTION"
-		filter="JComponentHelper::filterText"
+		filter="\Joomla\CMS\Component\ComponentHelper::filterText"
 		buttons="true"
 		hide="readmore,pagebreak"
 	/>
diff --git a/administrator/components/com_tags/src/Controller/DisplayController.php b/administrator/components/com_tags/src/Controller/DisplayController.php
index 43eb72d6fa07f..c037ac1023a89 100644
--- a/administrator/components/com_tags/src/Controller/DisplayController.php
+++ b/administrator/components/com_tags/src/Controller/DisplayController.php
@@ -37,7 +37,8 @@ class DisplayController extends BaseController
      * Method to display a view.
      *
      * @param   boolean  $cachable   If true, the view output will be cached
-     * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link \JFilterInput::clean()}.
+     * @param   array    $urlparams  An array of safe URL parameters and their variable types.
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  static|boolean   This object to support chaining or false on failure.
      *
diff --git a/administrator/components/com_tags/src/Extension/TagsComponent.php b/administrator/components/com_tags/src/Extension/TagsComponent.php
index 50e2551f045cb..5c63e1f93a304 100644
--- a/administrator/components/com_tags/src/Extension/TagsComponent.php
+++ b/administrator/components/com_tags/src/Extension/TagsComponent.php
@@ -15,7 +15,7 @@
 use Joomla\CMS\Extension\MVCComponent;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/administrator/components/com_tags/src/Table/TagTable.php b/administrator/components/com_tags/src/Table/TagTable.php
index ff77478d9b3c9..4acefc5592d67 100644
--- a/administrator/components/com_tags/src/Table/TagTable.php
+++ b/administrator/components/com_tags/src/Table/TagTable.php
@@ -15,6 +15,8 @@
 use Joomla\CMS\Helper\TagsHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Table\Nested;
+use Joomla\CMS\User\CurrentUserInterface;
+use Joomla\CMS\User\CurrentUserTrait;
 use Joomla\CMS\Versioning\VersionableTableInterface;
 use Joomla\Database\DatabaseDriver;
 use Joomla\String\StringHelper;
@@ -28,8 +30,10 @@
  *
  * @since  3.1
  */
-class TagTable extends Nested implements VersionableTableInterface
+class TagTable extends Nested implements VersionableTableInterface, CurrentUserInterface
 {
+    use CurrentUserTrait;
+
     /**
      * An array of key names to be json encoded in the bind function
      *
@@ -151,7 +155,7 @@ public function check()
     }
 
     /**
-     * Overridden \JTable::store to set modified data and user id.
+     * Overridden \Joomla\CMS\Table\Table::store to set modified data and user id.
      *
      * @param   boolean  $updateNulls  True to update fields even if they are null.
      *
@@ -162,7 +166,7 @@ public function check()
     public function store($updateNulls = true)
     {
         $date = Factory::getDate();
-        $user = Factory::getUser();
+        $user = $this->getCurrentUser();
 
         if ($this->id) {
             // Existing item
diff --git a/administrator/components/com_tags/src/View/Tag/HtmlView.php b/administrator/components/com_tags/src/View/Tag/HtmlView.php
index c40ed9e519e69..cf632f32bfe42 100644
--- a/administrator/components/com_tags/src/View/Tag/HtmlView.php
+++ b/administrator/components/com_tags/src/View/Tag/HtmlView.php
@@ -16,7 +16,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 
@@ -48,7 +47,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var  CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $state;
 
@@ -62,7 +61,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The actions the user is authorised to perform
      *
-     * @var    CMSObject
+     * @var    \Joomla\Registry\Registry
      *
      * @since  4.0.0
      */
diff --git a/administrator/components/com_tags/src/View/Tags/HtmlView.php b/administrator/components/com_tags/src/View/Tags/HtmlView.php
index b58c7b2dd7dce..3ea735fbef7d7 100644
--- a/administrator/components/com_tags/src/View/Tags/HtmlView.php
+++ b/administrator/components/com_tags/src/View/Tags/HtmlView.php
@@ -10,13 +10,11 @@
 
 namespace Joomla\Component\Tags\Administrator\View\Tags;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Toolbar\Button\DropdownButton;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
@@ -49,7 +47,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var   CMSObject
+     * @var   \Joomla\Registry\Registry
      */
     protected $state;
 
@@ -80,6 +78,14 @@ class HtmlView extends BaseHtmlView
      */
     private $isEmptyState = false;
 
+    /**
+     * The ordering list for the tags
+     *
+     * @var    array
+     * @since  4.4.0
+     */
+    protected $ordering = [];
+
     /**
      * Execute and display a template script.
      *
@@ -133,7 +139,7 @@ public function display($tpl = null)
     protected function addToolbar()
     {
         $canDo   = ContentHelper::getActions('com_tags');
-        $user    = Factory::getApplication()->getIdentity();
+        $user    = $this->getCurrentUser();
         $toolbar = Toolbar::getInstance();
 
         ToolbarHelper::title(Text::_('COM_TAGS_MANAGER_TAGS'), 'tags');
diff --git a/administrator/components/com_tags/tmpl/tags/default.php b/administrator/components/com_tags/tmpl/tags/default.php
index 2ce56a90d100f..acb1905feacd5 100644
--- a/administrator/components/com_tags/tmpl/tags/default.php
+++ b/administrator/components/com_tags/tmpl/tags/default.php
@@ -25,7 +25,7 @@
     ->useScript('multiselect');
 
 $app       = Factory::getApplication();
-$user      = Factory::getUser();
+$user      = $this->getCurrentUser();
 $userId    = $user->get('id');
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
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 cffa2753fb27e..e0c8ffc4c0faa 100644
--- a/administrator/components/com_tags/tmpl/tags/default_batch_body.php
+++ b/administrator/components/com_tags/tmpl/tags/default_batch_body.php
@@ -12,8 +12,6 @@
 
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Layout\LayoutHelper;
-
-$published = $this->state->get('filter.published');
 ?>
 
 <div class="p-3">
diff --git a/administrator/components/com_tags/tmpl/tags/emptystate.php b/administrator/components/com_tags/tmpl/tags/emptystate.php
index 2b49d1b63bcda..b8348b5351bbd 100644
--- a/administrator/components/com_tags/tmpl/tags/emptystate.php
+++ b/administrator/components/com_tags/tmpl/tags/emptystate.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Layout\LayoutHelper;
 
 $displayData = [
@@ -20,7 +19,7 @@
     'icon'       => 'icon-tags tags',
 ];
 
-if (Factory::getApplication()->getIdentity()->authorise('core.create', 'com_tags')) {
+if ($this->getCurrentUser()->authorise('core.create', 'com_tags')) {
     $displayData['createURL'] = 'index.php?option=com_tags&task=tag.add';
 }
 
diff --git a/administrator/components/com_templates/src/Controller/DisplayController.php b/administrator/components/com_templates/src/Controller/DisplayController.php
index 27494044f2be7..146cffcdaef39 100644
--- a/administrator/components/com_templates/src/Controller/DisplayController.php
+++ b/administrator/components/com_templates/src/Controller/DisplayController.php
@@ -19,7 +19,7 @@
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Templates manager master display controller.
+ * Templates manager display controller.
  *
  * @since  1.6
  */
@@ -35,7 +35,8 @@ class DisplayController extends BaseController
      * Method to display a view.
      *
      * @param   boolean  $cachable   If true, the view output will be cached
-     * @param   boolean  $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link \JFilterInput::clean()}.
+     * @param   boolean  $urlparams  An array of safe URL parameters and their variable types.
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  static|boolean   This object to support chaining or false on failure.
      *
diff --git a/administrator/components/com_templates/src/Controller/TemplateController.php b/administrator/components/com_templates/src/Controller/TemplateController.php
index 5d037aeee59ba..4b855f5d24b87 100644
--- a/administrator/components/com_templates/src/Controller/TemplateController.php
+++ b/administrator/components/com_templates/src/Controller/TemplateController.php
@@ -11,7 +11,6 @@
 namespace Joomla\Component\Templates\Administrator\Controller;
 
 use Joomla\CMS\Application\CMSApplication;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Filter\InputFilter;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
@@ -19,6 +18,7 @@
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
+use Joomla\Filesystem\Path;
 use Joomla\Input\Input;
 use Joomla\Utilities\ArrayHelper;
 
diff --git a/administrator/components/com_templates/src/Extension/TemplatesComponent.php b/administrator/components/com_templates/src/Extension/TemplatesComponent.php
index dccb7590e1868..ffd1963b59162 100644
--- a/administrator/components/com_templates/src/Extension/TemplatesComponent.php
+++ b/administrator/components/com_templates/src/Extension/TemplatesComponent.php
@@ -17,7 +17,7 @@
 use Psr\Container\ContainerInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/administrator/components/com_templates/src/Helper/TemplateHelper.php b/administrator/components/com_templates/src/Helper/TemplateHelper.php
index c74e6852bfe54..e62967e4da56a 100644
--- a/administrator/components/com_templates/src/Helper/TemplateHelper.php
+++ b/administrator/components/com_templates/src/Helper/TemplateHelper.php
@@ -91,10 +91,10 @@ public static function canUpload($file, $err = '')
 
         $format = strtolower(File::getExt($file['name']));
 
-        $imageTypes   = explode(',', $params->get('image_formats'));
-        $sourceTypes  = explode(',', $params->get('source_formats'));
-        $fontTypes    = explode(',', $params->get('font_formats'));
-        $archiveTypes = explode(',', $params->get('compressed_formats'));
+        $imageTypes   = explode(',', $params->get('image_formats', 'gif,bmp,jpg,jpeg,png,webp'));
+        $sourceTypes  = explode(',', $params->get('source_formats', 'txt,less,ini,xml,js,php,css,scss,sass,json'));
+        $fontTypes    = explode(',', $params->get('font_formats', 'woff,woff2,ttf,otf'));
+        $archiveTypes = explode(',', $params->get('compressed_formats', 'zip'));
 
         $allowable = array_merge($imageTypes, $sourceTypes, $fontTypes, $archiveTypes);
 
diff --git a/administrator/components/com_templates/src/Helper/TemplatesHelper.php b/administrator/components/com_templates/src/Helper/TemplatesHelper.php
index b09ecadd96611..26206ef71318b 100644
--- a/administrator/components/com_templates/src/Helper/TemplatesHelper.php
+++ b/administrator/components/com_templates/src/Helper/TemplatesHelper.php
@@ -11,12 +11,12 @@
 namespace Joomla\Component\Templates\Administrator\Helper;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 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;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
diff --git a/administrator/components/com_templates/src/Model/StyleModel.php b/administrator/components/com_templates/src/Model/StyleModel.php
index 3bade8432b4f3..bb1eae7444537 100644
--- a/administrator/components/com_templates/src/Model/StyleModel.php
+++ b/administrator/components/com_templates/src/Model/StyleModel.php
@@ -13,7 +13,6 @@
 use Joomla\CMS\Application\ApplicationHelper;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
@@ -23,10 +22,10 @@
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Table\Table;
 use Joomla\Database\ParameterType;
+use Joomla\Filesystem\Path;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
-use stdClass;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -697,11 +696,11 @@ public function getHelp()
      *
      * @param   int  $styleId  The style id
      *
-     * @return  stdClass
+     * @return  \stdClass
      *
      * @since   4.2.0
      */
-    public function getAdminTemplate(int $styleId): stdClass
+    public function getAdminTemplate(int $styleId): \stdClass
     {
         $db    = $this->getDatabase();
         $query = $db->getQuery(true)
diff --git a/administrator/components/com_templates/src/Model/TemplateModel.php b/administrator/components/com_templates/src/Model/TemplateModel.php
index 6bab75f29c746..ec1c4cc0b8b1d 100644
--- a/administrator/components/com_templates/src/Model/TemplateModel.php
+++ b/administrator/components/com_templates/src/Model/TemplateModel.php
@@ -16,7 +16,6 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filesystem\File;
 use Joomla\CMS\Filesystem\Folder;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Image\Image;
 use Joomla\CMS\Language\Text;
@@ -26,6 +25,7 @@
 use Joomla\Component\Templates\Administrator\Helper\TemplateHelper;
 use Joomla\Component\Templates\Administrator\Helper\TemplatesHelper;
 use Joomla\Database\ParameterType;
+use Joomla\Filesystem\Path;
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -430,7 +430,7 @@ public function getDirectoryTree($dir)
             }
         }
 
-        return $result;
+        return !empty($result) ? $result : ['.'];
     }
 
     /**
@@ -627,7 +627,7 @@ public function &getTemplate()
                 $this->template->client_id = (int) $this->template->client_id;
 
                 if (!isset($this->template->xmldata)) {
-                    $this->template->xmldata = TemplatesHelper::parseXMLTemplateFile($this->template->client_id === 0 ? JPATH_ROOT : JPATH_ROOT . '/administrator', $this->template->name);
+                    $this->template->xmldata = TemplatesHelper::parseXMLTemplateFile($this->template->client_id === 0 ? JPATH_ROOT : JPATH_ROOT . '/administrator', $this->template->element);
                 }
             }
         }
@@ -959,7 +959,7 @@ public function save($data)
         $data['source'] = str_replace(["\r\n", "\r"], "\n", $data['source']);
 
         // If the asset file for the template ensure we have valid template so we don't instantly destroy it
-        if ($fileName === '/joomla.asset.json' && json_decode($data['source']) === null) {
+        if (str_ends_with($fileName, '/joomla.asset.json') && json_decode($data['source']) === null) {
             $this->setError(Text::_('COM_TEMPLATES_ERROR_ASSET_FILE_INVALID_JSON'));
 
             return false;
@@ -1774,10 +1774,10 @@ protected function checkFormat($ext)
     {
         if (!isset($this->allowedFormats)) {
             $params       = ComponentHelper::getParams('com_templates');
-            $imageTypes   = explode(',', $params->get('image_formats'));
-            $sourceTypes  = explode(',', $params->get('source_formats'));
-            $fontTypes    = explode(',', $params->get('font_formats'));
-            $archiveTypes = explode(',', $params->get('compressed_formats'));
+            $imageTypes   = explode(',', $params->get('image_formats', 'gif,bmp,jpg,jpeg,png,webp'));
+            $sourceTypes  = explode(',', $params->get('source_formats', 'txt,less,ini,xml,js,php,css,scss,sass,json'));
+            $fontTypes    = explode(',', $params->get('font_formats', 'woff,woff2,ttf,otf'));
+            $archiveTypes = explode(',', $params->get('compressed_formats', 'zip'));
 
             $this->allowedFormats = array_merge($imageTypes, $sourceTypes, $fontTypes, $archiveTypes);
             $this->allowedFormats = array_map('strtolower', $this->allowedFormats);
@@ -1799,7 +1799,7 @@ public function getMediaFiles()
         $template = $this->getTemplate();
 
         if (!isset($template->xmldata)) {
-            $template->xmldata = TemplatesHelper::parseXMLTemplateFile($template->client_id === 0 ? JPATH_ROOT : JPATH_ROOT . '/administrator', $template->name);
+            $template->xmldata = TemplatesHelper::parseXMLTemplateFile($template->client_id === 0 ? JPATH_ROOT : JPATH_ROOT . '/administrator', $template->element);
         }
 
         if (!isset($template->xmldata->inheritable) || (isset($template->xmldata->parent) && $template->xmldata->parent === '')) {
diff --git a/administrator/components/com_templates/src/View/Style/HtmlView.php b/administrator/components/com_templates/src/View/Style/HtmlView.php
index 3dcd548783bc8..7b74f922cc452 100644
--- a/administrator/components/com_templates/src/View/Style/HtmlView.php
+++ b/administrator/components/com_templates/src/View/Style/HtmlView.php
@@ -47,14 +47,14 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var  CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $state;
 
     /**
      * The actions the user is authorised to perform
      *
-     * @var    CMSObject
+     * @var    \Joomla\Registry\Registry
      *
      * @since  4.0.0
      */
@@ -137,7 +137,7 @@ function (Toolbar $childBar) use ($canDo, $isNew) {
         $toolbar->divider();
 
         // Get the help information for the template item.
-        $lang = Factory::getLanguage();
+        $lang = $this->getLanguage();
         $help = $this->get('Help');
 
         if ($lang->hasKey($help->url)) {
diff --git a/administrator/components/com_templates/src/View/Style/JsonView.php b/administrator/components/com_templates/src/View/Style/JsonView.php
index d14f019eda616..e7e3460bbf77c 100644
--- a/administrator/components/com_templates/src/View/Style/JsonView.php
+++ b/administrator/components/com_templates/src/View/Style/JsonView.php
@@ -42,7 +42,7 @@ class JsonView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var   CMSObject
+     * @var   \Joomla\Registry\Registry
      */
     protected $state;
 
diff --git a/administrator/components/com_templates/src/View/Styles/HtmlView.php b/administrator/components/com_templates/src/View/Styles/HtmlView.php
index 9b1ea20580a93..aa79c47ec67d6 100644
--- a/administrator/components/com_templates/src/View/Styles/HtmlView.php
+++ b/administrator/components/com_templates/src/View/Styles/HtmlView.php
@@ -46,7 +46,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var  \Joomla\CMS\Object\CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $state;
 
diff --git a/administrator/components/com_templates/src/View/Template/HtmlView.php b/administrator/components/com_templates/src/View/Template/HtmlView.php
index 126aeb3ca2ba2..aa597e271366c 100644
--- a/administrator/components/com_templates/src/View/Template/HtmlView.php
+++ b/administrator/components/com_templates/src/View/Template/HtmlView.php
@@ -16,7 +16,6 @@
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Toolbar\Button\DropdownButton;
 use Joomla\CMS\Toolbar\Toolbar;
@@ -37,7 +36,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The Model state
      *
-     * @var  CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $state;
 
@@ -175,10 +174,10 @@ public function display($tpl = null)
         $this->stylesHTML  = '';
 
         $params       = ComponentHelper::getParams('com_templates');
-        $imageTypes   = explode(',', $params->get('image_formats'));
-        $sourceTypes  = explode(',', $params->get('source_formats'));
-        $fontTypes    = explode(',', $params->get('font_formats'));
-        $archiveTypes = explode(',', $params->get('compressed_formats'));
+        $imageTypes   = explode(',', $params->get('image_formats', 'gif,bmp,jpg,jpeg,png,webp'));
+        $sourceTypes  = explode(',', $params->get('source_formats', 'txt,less,ini,xml,js,php,css,scss,sass,json'));
+        $fontTypes    = explode(',', $params->get('font_formats', 'woff,woff2,ttf,otf'));
+        $archiveTypes = explode(',', $params->get('compressed_formats', 'zip'));
 
         if (in_array($ext, $sourceTypes)) {
             $this->form   = $this->get('Form');
diff --git a/administrator/components/com_templates/tmpl/style/edit.php b/administrator/components/com_templates/tmpl/style/edit.php
index f40dcbea9675d..b555515a6e5e4 100644
--- a/administrator/components/com_templates/tmpl/style/edit.php
+++ b/administrator/components/com_templates/tmpl/style/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;
@@ -23,7 +22,7 @@
 
 $this->useCoreUI = true;
 
-$user = Factory::getUser();
+$user = $this->getCurrentUser();
 ?>
 
 <form action="<?php echo Route::_('index.php?option=com_templates&layout=edit&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="style-form" aria-label="<?php echo Text::_('COM_TEMPLATES_STYLE_FORM_EDIT'); ?>" class="form-validate">
diff --git a/administrator/components/com_templates/tmpl/style/edit_assignment.php b/administrator/components/com_templates/tmpl/style/edit_assignment.php
index e910bc9539949..86742ae4c2678 100644
--- a/administrator/components/com_templates/tmpl/style/edit_assignment.php
+++ b/administrator/components/com_templates/tmpl/style/edit_assignment.php
@@ -10,14 +10,13 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\Component\Menus\Administrator\Helper\MenusHelper;
 
 // Initialise related data.
 $menuTypes = MenusHelper::getMenuLinks();
-$user      = Factory::getUser();
+$user      = $this->getCurrentUser();
 
 /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
 $wa = $this->document->getWebAssetManager();
diff --git a/administrator/components/com_templates/tmpl/styles/default.php b/administrator/components/com_templates/tmpl/styles/default.php
index 8c2809c4eb626..b8a9271536a2f 100644
--- a/administrator/components/com_templates/tmpl/styles/default.php
+++ b/administrator/components/com_templates/tmpl/styles/default.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;
@@ -22,7 +21,7 @@
 $wa->useScript('table.columns')
     ->useScript('multiselect');
 
-$user      = Factory::getUser();
+$user      = $this->getCurrentUser();
 $clientId = (int) $this->state->get('client_id', 0);
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
@@ -121,7 +120,7 @@
                                     <?php elseif ($item->home != '0' && $item->home != '1') : ?>
                                         <?php echo Text::sprintf('COM_TEMPLATES_STYLES_PAGES_ALL_LANGUAGE', $this->escape($item->language_title)); ?>
                                     <?php elseif ($item->assigned > 0) : ?>
-                                        <?php echo Text::sprintf('COM_TEMPLATES_STYLES_PAGES_SELECTED', $this->escape($item->assigned)); ?>
+                                        <?php echo Text::plural('COM_TEMPLATES_STYLES_PAGES_SELECTED', $this->escape($item->assigned)); ?>
                                     <?php else : ?>
                                         <?php echo Text::_('COM_TEMPLATES_STYLES_PAGES_NONE'); ?>
                                     <?php endif; ?>
diff --git a/administrator/components/com_templates/tmpl/template/default.php b/administrator/components/com_templates/tmpl/template/default.php
index 83f1340c32838..da2525b1673c3 100644
--- a/administrator/components/com_templates/tmpl/template/default.php
+++ b/administrator/components/com_templates/tmpl/template/default.php
@@ -34,7 +34,7 @@
     ->useStyle('com_templates.admin-templates');
 
 // No access if not global SuperUser
-if (!Factory::getUser()->authorise('core.admin')) {
+if (!$this->getCurrentUser()->authorise('core.admin')) {
     Factory::getApplication()->enqueueMessage(Text::_('JERROR_ALERTNOAUTHOR'), 'danger');
 }
 
@@ -149,7 +149,7 @@
                                 $difference = DiffHelper::calculateFiles(
                                     $this->source->coreFile,
                                     $this->source->filePath,
-                                    ComponentHelper::getParams('com_templates')->get('difference', 'SideByside'),
+                                    ComponentHelper::getParams('com_templates')->get('difference', 'SideBySide'),
                                     [
                                         'context' => 1,
                                         'ignoreLineEnding' => true,
diff --git a/administrator/components/com_templates/tmpl/templates/default.php b/administrator/components/com_templates/tmpl/templates/default.php
index 9a012bb58b956..039d97c434dd5 100644
--- a/administrator/components/com_templates/tmpl/templates/default.php
+++ b/administrator/components/com_templates/tmpl/templates/default.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;
@@ -21,7 +20,7 @@
 $wa->useScript('table.columns')
     ->useScript('multiselect');
 
-$user      = Factory::getUser();
+$user      = $this->getCurrentUser();
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
 ?>
diff --git a/administrator/components/com_users/config.xml b/administrator/components/com_users/config.xml
index 7df719e89e223..acf8fd56e2b58 100644
--- a/administrator/components/com_users/config.xml
+++ b/administrator/components/com_users/config.xml
@@ -220,7 +220,7 @@
 	>
 		<field
 			name="allowed_positions_frontend"
-			type="modulesposition"
+			type="ModulesPosition"
 			label="COM_USERS_CONFIG_ALLOWED_POSITIONS_FRONTEND_LABEL"
 			description="COM_USERS_CONFIG_ALLOWED_POSITIONS_FRONTEND_DESC"
 			default=""
@@ -243,7 +243,7 @@
 
 		<field
 			name="allowed_positions_backend"
-			type="modulesposition"
+			type="ModulesPosition"
 			label="COM_USERS_CONFIG_ALLOWED_POSITIONS_BACKEND_LABEL"
 			description="COM_USERS_CONFIG_ALLOWED_POSITIONS_BACKEND_DESC"
 			default=""
@@ -329,6 +329,30 @@
 			default=""
 			showon="mfaredirectonlogin:1"
 		/>
+
+		<field
+			name="mfatrycount"
+			type="number"
+			label="COM_USERS_CONFIG_MFATRYCOUNT_LABEL"
+			filter="integer"
+			min="0"
+			max="20"
+			step="1"
+			default="10"
+			validate="number"
+		/>
+
+		<field
+			name="mfatrytime"
+			type="number"
+			label="COM_USERS_CONFIG_MFATRYTIME_LABEL"
+			filter="integer"
+			min="1"
+			max="24"
+			step="1"
+			default="1"
+			validate="number"
+		/>
 	</fieldset>
 
 	<fieldset
diff --git a/administrator/components/com_users/postinstall/multifactorauth.php b/administrator/components/com_users/postinstall/multifactorauth.php
index f7bc9fac8d9f7..03cb1a1ce5d2d 100644
--- a/administrator/components/com_users/postinstall/multifactorauth.php
+++ b/administrator/components/com_users/postinstall/multifactorauth.php
@@ -10,7 +10,7 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\PluginHelper;
-use Joomla\Database\DatabaseDriver;
+use Joomla\Database\DatabaseInterface;
 use Joomla\Database\ParameterType;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -40,8 +40,8 @@ function com_users_postinstall_mfa_condition(): bool
  */
 function com_users_postinstall_mfa_action(): void
 {
-    /** @var DatabaseDriver $db */
-    $db             = Factory::getContainer()->get('DatabaseDriver');
+    /** @var DatabaseInterface $db */
+    $db             = Factory::getContainer()->get(DatabaseInterface::class);
     $coreMfaPlugins = ['email', 'totp', 'webauthn', 'yubikey'];
 
     $query = $db->getQuery(true)
diff --git a/administrator/components/com_users/src/Controller/CallbackController.php b/administrator/components/com_users/src/Controller/CallbackController.php
index 703b2231700ad..6b7a44fac411d 100644
--- a/administrator/components/com_users/src/Controller/CallbackController.php
+++ b/administrator/components/com_users/src/Controller/CallbackController.php
@@ -17,7 +17,6 @@
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\Input\Input;
-use RuntimeException;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -50,9 +49,9 @@ public function __construct(array $config = [], MVCFactoryInterface $factory = n
     /**
      * Implement a callback feature, typically used for OAuth2 authentication
      *
-     * @param   bool         $cachable    Can this view be cached
-     * @param   array|bool   $urlparams   An array of safe url parameters and their variable types, for valid values see
-     *                                    {@link JFilterInput::clean()}.
+     * @param   bool         $cachable   Can this view be cached
+     * @param   array|bool   $urlparams  An array of safe url parameters and their variable types.
+     *                       @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  void
      * @since 4.2.0
@@ -65,7 +64,7 @@ public function callback($cachable = false, $urlparams = false): void
         $method = $this->input->getCmd('method', '');
 
         if (empty($method)) {
-            throw new RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
+            throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
         }
 
         PluginHelper::importPlugin('multifactorauth');
@@ -77,6 +76,6 @@ public function callback($cachable = false, $urlparams = false): void
          * The first plugin to handle the request should either redirect or close the application. If we are still here
          * no plugin handled the request successfully. Show an error.
          */
-        throw new RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
+        throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
     }
 }
diff --git a/administrator/components/com_users/src/Controller/CaptiveController.php b/administrator/components/com_users/src/Controller/CaptiveController.php
index 6b708d232d0ef..1870c27cded38 100644
--- a/administrator/components/com_users/src/Controller/CaptiveController.php
+++ b/administrator/components/com_users/src/Controller/CaptiveController.php
@@ -10,22 +10,20 @@
 
 namespace Joomla\Component\Users\Administrator\Controller;
 
-use Exception;
 use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Date\Date;
 use Joomla\CMS\Event\MultiFactor\NotifyActionLog;
 use Joomla\CMS\Event\MultiFactor\Validate;
-use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Uri\Uri;
-use Joomla\CMS\User\UserFactoryInterface;
+use Joomla\CMS\User\UserFactoryAwareInterface;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\Component\Users\Administrator\Model\BackupcodesModel;
 use Joomla\Component\Users\Administrator\Model\CaptiveModel;
 use Joomla\Input\Input;
-use RuntimeException;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -36,8 +34,10 @@
  *
  * @since 4.2.0
  */
-class CaptiveController extends BaseController
+class CaptiveController extends BaseController implements UserFactoryAwareInterface
 {
+    use UserFactoryAwareTrait;
+
     /**
      * Public constructor
      *
@@ -62,17 +62,16 @@ public function __construct(array $config = [], MVCFactoryInterface $factory = n
      * @param   boolean|array  $urlparams  Ignored. This page is never cached.
      *
      * @return  void
-     * @throws  Exception
+     * @throws  \Exception
      * @since   4.2.0
      */
     public function display($cachable = false, $urlparams = false): void
     {
-        $user = $this->app->getIdentity()
-            ?: Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById(0);
+        $user = $this->app->getIdentity() ?: $this->getUserFactory()->loadUserById(0);
 
         // Only allow logged in Users
         if ($user->guest) {
-            throw new RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
+            throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
         }
 
         // Get the view object
@@ -108,7 +107,7 @@ public function display($cachable = false, $urlparams = false): void
         try {
             // Suppress all modules on the page except those explicitly allowed
             $model->suppressAllModules();
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             // If we can't kill the modules we can still survive.
         }
 
@@ -127,7 +126,7 @@ public function display($cachable = false, $urlparams = false): void
      * @param   array  $urlparameters    Ignored. This page is never cached.
      *
      * @return  void
-     * @throws  Exception
+     * @throws  \Exception
      * @since   4.2.0
      */
     public function validate($cachable = false, $urlparameters = [])
@@ -149,12 +148,23 @@ public function validate($cachable = false, $urlparameters = [])
             $event = new NotifyActionLog('onComUsersCaptiveValidateInvalidMethod');
             $this->app->getDispatcher()->dispatch($event->getName(), $event);
 
-            throw new RuntimeException(Text::_('COM_USERS_MFA_INVALID_METHOD'), 500);
+            throw new \RuntimeException(Text::_('COM_USERS_MFA_INVALID_METHOD'), 500);
+        }
+
+        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);
+            $message    = Text::_('COM_USERS_MFA_TRY_LIMIT_REACHED');
+            $this->setRedirect($captiveURL, $message, 'error');
+
+            $event = new NotifyActionLog('onComUsersCaptiveValidateTryLimitReached');
+            $this->app->getDispatcher()->dispatch($event->getName(), $event);
+
+            return;
         }
 
         // Validate the code
-        $user = $this->app->getIdentity()
-            ?: Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById(0);
+        $user = $this->app->getIdentity() ?: $this->getUserFactory()->loadUserById(0);
 
         $event   = new Validate($record, $user, $code);
         $results = $this->app
@@ -210,6 +220,8 @@ function (bool $carry, $result) {
         $jNow = Date::getInstance();
 
         $record->last_used = $jNow->toSql();
+        $record->tries     = 0;
+        $record->last_try  = null;
         $record->store();
 
         // Flag the user as fully logged in
diff --git a/administrator/components/com_users/src/Controller/DisplayController.php b/administrator/components/com_users/src/Controller/DisplayController.php
index 04f63414ec041..f4320040368c0 100644
--- a/administrator/components/com_users/src/Controller/DisplayController.php
+++ b/administrator/components/com_users/src/Controller/DisplayController.php
@@ -21,7 +21,7 @@
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Users master display controller.
+ * Users display controller.
  *
  * @since  1.6
  */
@@ -66,8 +66,8 @@ protected function canView($view)
      * Method to display a view.
      *
      * @param   boolean  $cachable   If true, the view output will be cached
-     * @param   array    $urlparams  An array of safe URL parameters and their variable types,
-     *                               for valid values see {@link \Joomla\CMS\Filter\InputFilter::clean()}.
+     * @param   array    $urlparams  An array of safe URL parameters and their variable types.
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  BaseController|boolean  This object to support chaining or false on failure.
      *
diff --git a/administrator/components/com_users/src/Controller/MethodController.php b/administrator/components/com_users/src/Controller/MethodController.php
index bb17c38669939..d8a852ddf270d 100644
--- a/administrator/components/com_users/src/Controller/MethodController.php
+++ b/administrator/components/com_users/src/Controller/MethodController.php
@@ -10,23 +10,22 @@
 
 namespace Joomla\Component\Users\Administrator\Controller;
 
-use Exception;
 use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Event\MultiFactor\NotifyActionLog;
 use Joomla\CMS\Event\MultiFactor\SaveSetup;
-use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController as BaseControllerAlias;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\Router\Route;
+use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\User\User;
-use Joomla\CMS\User\UserFactoryInterface;
+use Joomla\CMS\User\UserFactoryAwareInterface;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\Component\Users\Administrator\Helper\Mfa as MfaHelper;
 use Joomla\Component\Users\Administrator\Model\BackupcodesModel;
 use Joomla\Component\Users\Administrator\Model\MethodModel;
 use Joomla\Component\Users\Administrator\Table\MfaTable;
 use Joomla\Input\Input;
-use RuntimeException;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -37,8 +36,10 @@
  *
  * @since 4.2.0
  */
-class MethodController extends BaseControllerAlias
+class MethodController extends BaseControllerAlias implements UserFactoryAwareInterface
 {
+    use UserFactoryAwareTrait;
+
     /**
      * Public constructor
      *
@@ -66,7 +67,7 @@ public function __construct(array $config = [], MVCFactoryInterface $factory = n
      *
      * @return  mixed   The value returned by the called Method.
      *
-     * @throws  Exception
+     * @throws  \Exception
      * @since   4.2.0
      */
     public function execute($task)
@@ -85,7 +86,7 @@ public function execute($task)
      * @param   boolean|array  $urlparams  Ignored. This page is never cached.
      *
      * @return  void
-     * @throws  Exception
+     * @throws  \Exception
      * @since   4.2.0
      */
     public function add($cachable = false, $urlparams = []): void
@@ -94,7 +95,7 @@ public function add($cachable = false, $urlparams = []): void
 
         // Make sure I am allowed to edit the specified user
         $userId = $this->input->getInt('user_id', null);
-        $user   = Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById($userId);
+        $user   = $this->getUserFactory()->loadUserById($userId);
 
         $this->assertCanEdit($user);
 
@@ -130,7 +131,7 @@ public function add($cachable = false, $urlparams = []): void
      * @param   boolean|array  $urlparams  Ignored. This page is never cached.
      *
      * @return  void
-     * @throws  Exception
+     * @throws  \Exception
      * @since   4.2.0
      */
     public function edit($cachable = false, $urlparams = []): void
@@ -139,7 +140,7 @@ public function edit($cachable = false, $urlparams = []): void
 
         // Make sure I am allowed to edit the specified user
         $userId = $this->input->getInt('user_id', null);
-        $user   = Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById($userId);
+        $user   = $this->getUserFactory()->loadUserById($userId);
 
         $this->assertCanEdit($user);
 
@@ -148,7 +149,7 @@ public function edit($cachable = false, $urlparams = []): void
         $record = $this->assertValidRecordId($id, $user);
 
         if ($id <= 0) {
-            throw new RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
+            throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
         }
 
         /** @var MethodModel $model */
@@ -179,7 +180,7 @@ public function edit($cachable = false, $urlparams = []): void
      * @param   boolean|array  $urlparams  Ignored. This page is never cached.
      *
      * @return  void
-     * @throws Exception
+     * @throws \Exception
      * @since   4.2.0
      */
     public function regenerateBackupCodes($cachable = false, $urlparams = []): void
@@ -190,7 +191,7 @@ public function regenerateBackupCodes($cachable = false, $urlparams = []): void
 
         // Make sure I am allowed to edit the specified user
         $userId = $this->input->getInt('user_id', null);
-        $user   = Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById($userId);
+        $user   = $this->getUserFactory()->loadUserById($userId);
         $this->assertCanEdit($user);
 
         /** @var BackupcodesModel $model */
@@ -203,7 +204,7 @@ public function regenerateBackupCodes($cachable = false, $urlparams = []): void
         $redirectUrl = 'index.php?option=com_users&task=method.edit&user_id=' . $userId . '&id=' . $backupCodesRecord->id;
         $returnURL   = $this->input->getBase64('returnurl');
 
-        if (!empty($returnURL)) {
+        if (!empty($returnURL) && Uri::isInternal(base64_decode($returnURL))) {
             $redirectUrl .= '&returnurl=' . $returnURL;
         }
 
@@ -230,7 +231,7 @@ public function delete($cachable = false, $urlparams = []): void
 
         // Make sure I am allowed to edit the specified user
         $userId  = $this->input->getInt('user_id', null);
-        $user    = Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById($userId);
+        $user    = $this->getUserFactory()->loadUserById($userId);
         $this->assertCanDelete($user);
 
         // Also make sure the Method really does exist
@@ -238,7 +239,7 @@ public function delete($cachable = false, $urlparams = []): void
         $record = $this->assertValidRecordId($id, $user);
 
         if ($id <= 0) {
-            throw new RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
+            throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
         }
 
         $type    = null;
@@ -249,7 +250,7 @@ public function delete($cachable = false, $urlparams = []): void
 
         try {
             $record->delete();
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $message = $e->getMessage();
             $type    = 'error';
         }
@@ -258,7 +259,7 @@ public function delete($cachable = false, $urlparams = []): void
         $url       = Route::_('index.php?option=com_users&task=methods.display&user_id=' . $userId, false);
         $returnURL = $this->input->getBase64('returnurl');
 
-        if (!empty($returnURL)) {
+        if (!empty($returnURL) && Uri::isInternal(base64_decode($returnURL))) {
             $url = base64_decode($returnURL);
         }
 
@@ -282,14 +283,14 @@ public function save($cachable = false, $urlparams = []): void
 
         // Make sure I am allowed to edit the specified user
         $userId = $this->input->getInt('user_id', null);
-        $user   = Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById($userId);
+        $user   = $this->getUserFactory()->loadUserById($userId);
         $this->assertCanEdit($user);
 
         // Redirect
         $url       = Route::_('index.php?option=com_users&task=methods.display&user_id=' . $userId, false);
         $returnURL = $this->input->getBase64('returnurl');
 
-        if (!empty($returnURL)) {
+        if (!empty($returnURL) && Uri::isInternal(base64_decode($returnURL))) {
             $url = base64_decode($returnURL);
         }
 
@@ -324,7 +325,7 @@ public function save($cachable = false, $urlparams = []): void
             foreach ($pluginResults as $pluginResult) {
                 $result = array_merge($result, $pluginResult);
             }
-        } catch (RuntimeException $e) {
+        } catch (\RuntimeException $e) {
             // Go back to the edit page
             $nonSefUrl = 'index.php?option=com_users&task=method.';
 
@@ -401,8 +402,7 @@ public function save($cachable = false, $urlparams = []): void
     private function assertValidRecordId($id, ?User $user = null): MfaTable
     {
         if (is_null($user)) {
-            $user = $this->app->getIdentity()
-                ?: Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById(0);
+            $user = $this->app->getIdentity() ?: $this->getUserFactory()->loadUserById(0);
         }
 
         /** @var MethodModel $model */
@@ -413,7 +413,7 @@ private function assertValidRecordId($id, ?User $user = null): MfaTable
         $record = $model->getRecord($user);
 
         if (is_null($record) || ($record->id != $id) || ($record->user_id != $user->id)) {
-            throw new RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
+            throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
         }
 
         return $record;
@@ -425,13 +425,13 @@ private function assertValidRecordId($id, ?User $user = null): MfaTable
      * @param   User|null  $user  User record. Null to use current user.
      *
      * @return  void
-     * @throws  RuntimeException|Exception
+     * @throws  \RuntimeException|\Exception
      * @since   4.2.0
      */
     private function assertCanEdit(?User $user = null): void
     {
         if (!MfaHelper::canAddEditMethod($user)) {
-            throw new RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
+            throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
         }
     }
 
@@ -441,13 +441,13 @@ private function assertCanEdit(?User $user = null): void
      * @param   User|null  $user  User record. Null to use current user.
      *
      * @return  void
-     * @throws  RuntimeException|Exception
+     * @throws  \RuntimeException|\Exception
      * @since   4.2.0
      */
     private function assertCanDelete(?User $user = null): void
     {
         if (!MfaHelper::canDeleteMethod($user)) {
-            throw new RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
+            throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
         }
     }
 
@@ -465,7 +465,7 @@ private function assertMethodExists(?string $method): void
         $model = $this->getModel('Method');
 
         if (empty($method) || !$model->methodExists($method)) {
-            throw new RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
+            throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
         }
     }
 
@@ -477,11 +477,10 @@ private function assertMethodExists(?string $method): void
      */
     private function assertLoggedInUser(): void
     {
-        $user = $this->app->getIdentity()
-            ?: Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById(0);
+        $user = $this->app->getIdentity() ?: $this->getUserFactory()->loadUserById(0);
 
         if ($user->guest) {
-            throw new RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
+            throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
         }
     }
 }
diff --git a/administrator/components/com_users/src/Controller/MethodsController.php b/administrator/components/com_users/src/Controller/MethodsController.php
index 014c2aa43e92e..4c13aba3c9bd4 100644
--- a/administrator/components/com_users/src/Controller/MethodsController.php
+++ b/administrator/components/com_users/src/Controller/MethodsController.php
@@ -10,20 +10,18 @@
 
 namespace Joomla\Component\Users\Administrator\Controller;
 
-use Exception;
 use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Event\MultiFactor\NotifyActionLog;
-use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Uri\Uri;
-use Joomla\CMS\User\UserFactoryInterface;
+use Joomla\CMS\User\UserFactoryAwareInterface;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\Component\Users\Administrator\Helper\Mfa as MfaHelper;
 use Joomla\Component\Users\Administrator\Model\MethodsModel;
 use Joomla\Input\Input;
-use RuntimeException;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -34,8 +32,10 @@
  *
  * @since 4.2.0
  */
-class MethodsController extends BaseController
+class MethodsController extends BaseController implements UserFactoryAwareInterface
 {
+    use UserFactoryAwareTrait;
+
     /**
      * Public constructor
      *
@@ -57,9 +57,9 @@ public function __construct($config = [], MVCFactoryInterface $factory = null, ?
     /**
      * Disable Multi-factor Authentication for the current user
      *
-     * @param   bool   $cachable     Can this view be cached
-     * @param   array  $urlparams    An array of safe url parameters and their variable types, for valid values see
-     *                               {@link JFilterInput::clean()}.
+     * @param   bool   $cachable   Can this view be cached
+     * @param   array  $urlparams  An array of safe url parameters and their variable types.
+     *                 @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  void
      * @since   4.2.0
@@ -74,11 +74,11 @@ public function disable($cachable = false, $urlparams = []): void
         $userId = $this->input->getInt('user_id', null);
         $user   = ($userId === null)
             ? $this->app->getIdentity()
-            : Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById($userId);
-        $user   = $user ?? Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById(0);
+            : $this->getUserFactory()->loadUserById($userId);
+        $user   = $user ?? $this->getUserFactory()->loadUserById(0);
 
         if (!MfaHelper::canDeleteMethod($user)) {
-            throw new RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
+            throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
         }
 
         // Delete all MFA Methods for the user
@@ -92,7 +92,7 @@ public function disable($cachable = false, $urlparams = []): void
 
         try {
             $model->deleteAll($user);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $message = $e->getMessage();
             $type    = 'error';
         }
@@ -101,7 +101,7 @@ public function disable($cachable = false, $urlparams = []): void
         $url       = Route::_('index.php?option=com_users&task=methods.display&user_id=' . $userId, false);
         $returnURL = $this->input->getBase64('returnurl');
 
-        if (!empty($returnURL)) {
+        if (!empty($returnURL) && Uri::isInternal(base64_decode($returnURL))) {
             $url = base64_decode($returnURL);
         }
 
@@ -111,9 +111,9 @@ public function disable($cachable = false, $urlparams = []): void
     /**
      * List all available Multi-factor Authentication Methods available and guide the user to setting them up
      *
-     * @param   bool   $cachable     Can this view be cached
-     * @param   array  $urlparams    An array of safe url parameters and their variable types, for valid values see
-     *                               {@link JFilterInput::clean()}.
+     * @param   bool   $cachable   Can this view be cached
+     * @param   array  $urlparams  An array of safe url parameters and their variable types.
+     *                 @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  void
      * @since   4.2.0
@@ -126,11 +126,11 @@ public function display($cachable = false, $urlparams = []): void
         $userId = $this->input->getInt('user_id', null);
         $user   = ($userId === null)
             ? $this->app->getIdentity()
-            : Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById($userId);
-        $user   = $user ?? Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById(0);
+            : $this->getUserFactory()->loadUserById($userId);
+        $user   = $user ?? $this->getUserFactory()->loadUserById(0);
 
         if (!MfaHelper::canShowConfigurationInterface($user)) {
-            throw new RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
+            throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
         }
 
         $returnURL  = $this->input->getBase64('returnurl');
@@ -153,9 +153,9 @@ public function display($cachable = false, $urlparams = []): void
     /**
      * Disable Multi-factor Authentication for the current user
      *
-     * @param   bool   $cachable     Can this view be cached
-     * @param   array  $urlparams    An array of safe url parameters and their variable types, for valid values see
-     *                               {@link JFilterInput::clean()}.
+     * @param   bool   $cachable   Can this view be cached
+     * @param   array  $urlparams  An array of safe url parameters and their variable types.
+     *                 @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  void
      * @since   4.2.0
@@ -170,11 +170,11 @@ public function doNotShowThisAgain($cachable = false, $urlparams = []): void
         $userId = $this->input->getInt('user_id', null);
         $user   = ($userId === null)
             ? $this->app->getIdentity()
-            : Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById($userId);
-        $user   = $user ?? Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById(0);
+            : $this->getUserFactory()->loadUserById($userId);
+        $user   = $user ?? $this->getUserFactory()->loadUserById(0);
 
         if (!MfaHelper::canAddEditMethod($user)) {
-            throw new RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
+            throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
         }
 
         $event = new NotifyActionLog('onComUsersControllerMethodsBeforeDoNotShowThisAgain', [$user]);
@@ -188,7 +188,7 @@ public function doNotShowThisAgain($cachable = false, $urlparams = []): void
         $url       = Uri::base();
         $returnURL = $this->input->getBase64('returnurl');
 
-        if (!empty($returnURL)) {
+        if (!empty($returnURL) && Uri::isInternal(base64_decode($returnURL))) {
             $url = base64_decode($returnURL);
         }
 
@@ -203,11 +203,10 @@ public function doNotShowThisAgain($cachable = false, $urlparams = []): void
      */
     private function assertLoggedInUser(): void
     {
-        $user = $this->app->getIdentity()
-            ?: Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById(0);
+        $user = $this->app->getIdentity() ?: $this->getUserFactory()->loadUserById(0);
 
         if ($user->guest) {
-            throw new RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
+            throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
         }
     }
 }
diff --git a/administrator/components/com_users/src/DataShape/CaptiveRenderOptions.php b/administrator/components/com_users/src/DataShape/CaptiveRenderOptions.php
index 3665363c7c67a..e7e84a7312938 100644
--- a/administrator/components/com_users/src/DataShape/CaptiveRenderOptions.php
+++ b/administrator/components/com_users/src/DataShape/CaptiveRenderOptions.php
@@ -10,8 +10,6 @@
 
 namespace Joomla\Component\Users\Administrator\DataShape;
 
-use InvalidArgumentException;
-
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
@@ -164,13 +162,13 @@ class CaptiveRenderOptions extends DataShapeObject
      * @param   string  $value  One of self::FIELD_INPUT, self::FIELD_CUSTOM
      *
      * @since   4.2.0
-     * @throws  InvalidArgumentException
+     * @throws  \InvalidArgumentException
      */
     // phpcs:ignore
     protected function setField_type(string $value)
     {
         if (!in_array($value, [self::FIELD_INPUT, self::FIELD_CUSTOM])) {
-            throw new InvalidArgumentException('Invalid value for property field_type.');
+            throw new \InvalidArgumentException('Invalid value for property field_type.');
         }
 
         $this->field_type = $value;
diff --git a/administrator/components/com_users/src/DataShape/DataShapeObject.php b/administrator/components/com_users/src/DataShape/DataShapeObject.php
index d8e957671c10b..850afde238b9a 100644
--- a/administrator/components/com_users/src/DataShape/DataShapeObject.php
+++ b/administrator/components/com_users/src/DataShape/DataShapeObject.php
@@ -10,8 +10,6 @@
 
 namespace Joomla\Component\Users\Administrator\DataShape;
 
-use InvalidArgumentException;
-
 /**
  * Generic helper for handling data shapes in com_users
  *
@@ -29,7 +27,7 @@ abstract class DataShapeObject implements \ArrayAccess
     public function __construct(array $array = [])
     {
         if (!is_array($array) && !($array instanceof self)) {
-            throw new InvalidArgumentException(sprintf('%s needs an array or a %s object', __METHOD__, __CLASS__));
+            throw new \InvalidArgumentException(sprintf('%s needs an array or a %s object', __METHOD__, __CLASS__));
         }
 
         foreach (($array instanceof self) ? $array->asArray() : $array as $k => $v) {
@@ -61,7 +59,7 @@ public function asArray(): array
     public function merge($newValues): self
     {
         if (!is_array($newValues) && !($newValues instanceof self)) {
-            throw new InvalidArgumentException(sprintf('%s needs an array or a %s object', __METHOD__, __CLASS__));
+            throw new \InvalidArgumentException(sprintf('%s needs an array or a %s object', __METHOD__, __CLASS__));
         }
 
         foreach (($newValues instanceof self) ? $newValues->asArray() : $newValues as $k => $v) {
@@ -96,7 +94,7 @@ public function __get($name)
             return $this->{$name};
         }
 
-        throw new InvalidArgumentException(sprintf('Property %s not found in %s', $name, __CLASS__));
+        throw new \InvalidArgumentException(sprintf('Property %s not found in %s', $name, __CLASS__));
     }
 
     /**
@@ -120,7 +118,7 @@ public function __set($name, $value)
             $this->{$name} = $value;
         }
 
-        throw new InvalidArgumentException(sprintf('Property %s not found in %s', $name, __CLASS__));
+        throw new \InvalidArgumentException(sprintf('Property %s not found in %s', $name, __CLASS__));
     }
 
     /**
diff --git a/administrator/components/com_users/src/DataShape/SetupRenderOptions.php b/administrator/components/com_users/src/DataShape/SetupRenderOptions.php
index 446e828cac292..b33a7fbc204d5 100644
--- a/administrator/components/com_users/src/DataShape/SetupRenderOptions.php
+++ b/administrator/components/com_users/src/DataShape/SetupRenderOptions.php
@@ -10,8 +10,6 @@
 
 namespace Joomla\Component\Users\Administrator\DataShape;
 
-use InvalidArgumentException;
-
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
@@ -207,13 +205,13 @@ class SetupRenderOptions extends DataShapeObject
      * @param   string  $value  One of self::FIELD_INPUT, self::FIELD_CUSTOM
      *
      * @since   4.2.0
-     * @throws  InvalidArgumentException
+     * @throws  \InvalidArgumentException
      */
     // phpcs:ignore
     protected function setField_type($value)
     {
         if (!in_array($value, [self::FIELD_INPUT, self::FIELD_CUSTOM])) {
-            throw new InvalidArgumentException('Invalid value for property field_type.');
+            throw new \InvalidArgumentException('Invalid value for property field_type.');
         }
 
         $this->field_type = $value;
diff --git a/administrator/components/com_users/src/Extension/UsersComponent.php b/administrator/components/com_users/src/Extension/UsersComponent.php
index cb6c18a042417..c4ba15ee78025 100644
--- a/administrator/components/com_users/src/Extension/UsersComponent.php
+++ b/administrator/components/com_users/src/Extension/UsersComponent.php
@@ -21,7 +21,7 @@
 use Psr\Container\ContainerInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/administrator/components/com_users/src/Field/GroupparentField.php b/administrator/components/com_users/src/Field/GroupparentField.php
index c4242a856f49f..ae4a68aae196d 100644
--- a/administrator/components/com_users/src/Field/GroupparentField.php
+++ b/administrator/components/com_users/src/Field/GroupparentField.php
@@ -81,7 +81,7 @@ protected function getOptions()
         }
 
         $options      = array_values($options);
-        $isSuperAdmin = Factory::getUser()->authorise('core.admin');
+        $isSuperAdmin = $this->getCurrentUser()->authorise('core.admin');
 
         // Pad the option text with spaces using depth level as a multiplier.
         for ($i = 0, $n = count($options); $i < $n; $i++) {
diff --git a/administrator/components/com_users/src/Helper/Mfa.php b/administrator/components/com_users/src/Helper/Mfa.php
index ac31402866051..cd867b47c098c 100644
--- a/administrator/components/com_users/src/Helper/Mfa.php
+++ b/administrator/components/com_users/src/Helper/Mfa.php
@@ -26,7 +26,7 @@
 use Joomla\Component\Users\Administrator\Model\MethodsModel;
 use Joomla\Component\Users\Administrator\Table\MfaTable;
 use Joomla\Component\Users\Administrator\View\Methods\HtmlView;
-use Joomla\Database\DatabaseDriver;
+use Joomla\Database\DatabaseInterface;
 use Joomla\Database\ParameterType;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -65,7 +65,7 @@ abstract class Mfa
      * @param   User  $user  The user we are going to show the configuration UI for.
      *
      * @return  string|null  The HTML of the UI; null if we cannot / must not show it.
-     * @throws  Exception
+     * @throws  \Exception
      * @since   4.2.0
      */
     public static function getConfigurationInterface(User $user): ?string
@@ -114,6 +114,7 @@ public static function getConfigurationInterface(User $user): ?string
         $view->returnURL = base64_encode(Uri::getInstance()->toString());
         $view->user      = $user;
         $view->set('forHMVC', true);
+        $view->setLanguage($app->getLanguage());
 
         @ob_start();
 
@@ -189,7 +190,7 @@ public static function getMfaMethods(): array
      * @param   User|null  $user  The user you want to know if we're allowed to edit
      *
      * @return  boolean
-     * @throws  Exception
+     * @throws  \Exception
      * @since 4.2.0
      */
     public static function canAddEditMethod(?User $user = null): bool
@@ -228,7 +229,7 @@ public static function canAddEditMethod(?User $user = null): bool
      * @param   User|null  $user  The user being queried.
      *
      * @return  boolean
-     * @throws  Exception
+     * @throws  \Exception
      * @since   4.2.0
      */
     public static function canDeleteMethod(?User $user = null): bool
@@ -251,7 +252,7 @@ public static function canDeleteMethod(?User $user = null): bool
      * @param   int|null  $userId  User ID. NULL for currently logged in user.
      *
      * @return  MfaTable[]
-     * @throws  Exception
+     * @throws  \Exception
      *
      * @since 4.2.0
      */
@@ -262,8 +263,8 @@ public static function getUserMfaRecords(?int $userId): array
             $userId = $user->id ?: 0;
         }
 
-        /** @var DatabaseDriver $db */
-        $db    = Factory::getContainer()->get('DatabaseDriver');
+        /** @var DatabaseInterface $db */
+        $db    = Factory::getContainer()->get(DatabaseInterface::class);
         $query = $db->getQuery(true)
             ->select($db->quoteName('id'))
             ->from($db->quoteName('#__user_mfa'))
@@ -272,7 +273,7 @@ public static function getUserMfaRecords(?int $userId): array
 
         try {
             $ids = $db->setQuery($query)->loadColumn() ?: [];
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $ids = [];
         }
 
@@ -325,7 +326,7 @@ function ($record) use (&$hasBackupCodes) {
      * @param   User|null  $user  The user to be configured
      *
      * @return  boolean
-     * @throws  Exception
+     * @throws  \Exception
      * @since 4.2.0
      */
     public static function canShowConfigurationInterface(?User $user = null): bool
diff --git a/administrator/components/com_users/src/Model/CaptiveModel.php b/administrator/components/com_users/src/Model/CaptiveModel.php
index 5d8ec666db465..41193e7a40a0a 100644
--- a/administrator/components/com_users/src/Model/CaptiveModel.php
+++ b/administrator/components/com_users/src/Model/CaptiveModel.php
@@ -10,9 +10,10 @@
 
 namespace Joomla\Component\Users\Administrator\Model;
 
-use Exception;
 use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Date\Date;
+use Joomla\CMS\Event\Module;
 use Joomla\CMS\Event\MultiFactor\Captive;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
@@ -21,7 +22,6 @@
 use Joomla\Component\Users\Administrator\DataShape\CaptiveRenderOptions;
 use Joomla\Component\Users\Administrator\Helper\Mfa as MfaHelper;
 use Joomla\Component\Users\Administrator\Table\MfaTable;
-use Joomla\Event\Event;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -56,7 +56,7 @@ class CaptiveModel extends BaseDatabaseModel
      * @param   CMSApplication|null  $app  The CMS application to manipulate
      *
      * @return  void
-     * @throws  Exception
+     * @throws  \Exception
      *
      * @since 4.2.0
      */
@@ -76,7 +76,7 @@ public function suppressAllModules(CMSApplication $app = null): void
      * @param   bool       $includeBackupCodes  Should I include the backup codes record?
      *
      * @return  array
-     * @throws  Exception
+     * @throws  \Exception
      *
      * @since 4.2.0
      */
@@ -161,7 +161,7 @@ private function getActiveMethodNames(): ?array
      * @param   User|null  $user  The user for which to fetch records. Skip to use the current user.
      *
      * @return  MfaTable|null
-     * @throws  Exception
+     * @throws  \Exception
      *
      * @since 4.2.0
      */
@@ -334,24 +334,22 @@ public function getMethodImage(string $name): string
      * the way this event is handled, taking its return into account. For now, we just abuse the mutable event
      * properties - a feature of the event objects we discussed in the Joomla! 4 Working Group back in August 2015.
      *
-     * @param   Event  $event  The Joomla! event object
+     * @param   Module\AfterModuleListEvent  $event  The Joomla! event object
      *
      * @return  void
-     * @throws  Exception
+     * @throws  \Exception
      *
      * @since 4.2.0
      */
-    public function onAfterModuleList(Event $event): void
+    public function onAfterModuleList(Module\AfterModuleListEvent $event): void
     {
-        $modules = $event->getArgument(0);
+        $modules = $event->getModules();
 
         if (empty($modules)) {
             return;
         }
 
         $this->filterModules($modules);
-
-        $event->setArgument(0, $modules);
     }
 
     /**
@@ -362,7 +360,7 @@ public function onAfterModuleList(Event $event): void
      *
      * @return  void  The by-reference value is modified instead.
      * @since 4.2.0
-     * @throws  Exception
+     * @throws  \Exception
      */
     private function filterModules(array &$modules): void
     {
@@ -389,7 +387,7 @@ private function filterModules(array &$modules): void
      * Get a list of module positions we are allowed to display
      *
      * @return  array
-     * @throws  Exception
+     * @throws  \Exception
      *
      * @since 4.2.0
      */
@@ -409,4 +407,43 @@ private function getAllowedModulePositions(): array
 
         return $res;
     }
+
+    /**
+     * Method to check if the mfa method in question has reached it's usage limit
+     *
+     * @param   MfaTable  $method  Mfa method record
+     *
+     * @return  boolean true if user can use the method, false if not
+     *
+     * @since    4.3.2
+     * @throws  \Exception
+     */
+    public function checkTryLimit(MfaTable $method)
+    {
+        $params     = ComponentHelper::getParams('com_users');
+        $jNow       = Date::getInstance();
+        $maxTries   = (int) $params->get('mfatrycount', 10);
+        $blockHours = (int) $params->get('mfatrytime', 1);
+
+        $lastTryTime       = strtotime($method->last_try) ?: 0;
+        $hoursSinceLastTry = (strtotime(Factory::getDate()->toSql()) - $lastTryTime) / 3600;
+
+        if ($method->last_try !== null && $hoursSinceLastTry > $blockHours) {
+            // If it's been long enough, start a new reset count
+            $method->last_try = null;
+            $method->tries    = 0;
+        } elseif ($method->tries < $maxTries) {
+            // If we are under the max count, just increment the counter
+            ++$method->tries;
+            $method->last_try = $jNow->toSql();
+        } else {
+            // At this point, we know we have exceeded the maximum resets for the time period
+            return false;
+        }
+
+        // Store changes to try counter and/or the timestamp
+        $method->store();
+
+        return true;
+    }
 }
diff --git a/administrator/components/com_users/src/Model/DebuguserModel.php b/administrator/components/com_users/src/Model/DebuguserModel.php
index 04876fe1ca146..bbc3664ea981d 100644
--- a/administrator/components/com_users/src/Model/DebuguserModel.php
+++ b/administrator/components/com_users/src/Model/DebuguserModel.php
@@ -15,6 +15,8 @@
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\CMS\User\User;
+use Joomla\CMS\User\UserFactoryAwareInterface;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\Component\Users\Administrator\Helper\DebugHelper;
 use Joomla\Database\DatabaseQuery;
 use Joomla\Database\ParameterType;
@@ -28,8 +30,10 @@
  *
  * @since  1.6
  */
-class DebuguserModel extends ListModel
+class DebuguserModel extends ListModel implements UserFactoryAwareInterface
 {
+    use UserFactoryAwareTrait;
+
     /**
      * Constructor.
      *
@@ -78,7 +82,7 @@ public function getDebugActions()
     public function getItems()
     {
         $userId = $this->getState('user_id');
-        $user   = Factory::getUser($userId);
+        $user   = $this->getUserFactory()->loadUserById($userId);
 
         if (($assets = parent::getItems()) && $userId) {
             $actions = $this->getDebugActions();
@@ -179,7 +183,7 @@ public function getUser()
     {
         $userId = $this->getState('user_id');
 
-        return Factory::getUser($userId);
+        return $this->getUserFactory()->loadUserById($userId);
     }
 
     /**
diff --git a/administrator/components/com_users/src/Model/LevelModel.php b/administrator/components/com_users/src/Model/LevelModel.php
index d6e8c23880de5..3b0b9a3d6a9aa 100644
--- a/administrator/components/com_users/src/Model/LevelModel.php
+++ b/administrator/components/com_users/src/Model/LevelModel.php
@@ -252,7 +252,7 @@ public function save($data)
      * @return  array|boolean  Array of filtered data if valid, false otherwise.
      *
      * @see     \Joomla\CMS\Form\FormRule
-     * @see     \JFilterInput
+     * @see     \Joomla\CMS\Filter\InputFilter
      * @since   3.8.8
      */
     public function validate($form, $data, $group = null)
diff --git a/administrator/components/com_users/src/Model/MethodModel.php b/administrator/components/com_users/src/Model/MethodModel.php
index 7e58be917d858..9011ec5dc2d06 100644
--- a/administrator/components/com_users/src/Model/MethodModel.php
+++ b/administrator/components/com_users/src/Model/MethodModel.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Component\Users\Administrator\Model;
 
-use Exception;
 use Joomla\CMS\Event\MultiFactor\GetSetup;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
@@ -84,14 +83,14 @@ public function methodExists(string $method): bool
      * @param   User|null  $user  The user record. Null to use the currently logged in user.
      *
      * @return  array
-     * @throws  Exception
+     * @throws  \Exception
      *
      * @since 4.2.0
      */
     public function getRenderOptions(?User $user = null): SetupRenderOptions
     {
         if (is_null($user)) {
-            $user = Factory::getApplication()->getIdentity() ?: $this->getCurrentUser();
+            $user = $this->getCurrentUser();
         }
 
         $renderOptions = new SetupRenderOptions();
@@ -123,7 +122,7 @@ public function getRenderOptions(?User $user = null): SetupRenderOptions
      * @param   User|null  $user  The user record. Null to use the currently logged in user.
      *
      * @return  MfaTable
-     * @throws  Exception
+     * @throws  \Exception
      *
      * @since 4.2.0
      */
@@ -188,7 +187,7 @@ public function getPageTitle(): string
      * @param   User|null  $user  The user record. Null to use the current user.
      *
      * @return  MfaTable
-     * @throws  Exception
+     * @throws  \Exception
      *
      * @since 4.2.0
      */
diff --git a/administrator/components/com_users/src/Model/MethodsModel.php b/administrator/components/com_users/src/Model/MethodsModel.php
index be88d040f3161..eb0a45710e335 100644
--- a/administrator/components/com_users/src/Model/MethodsModel.php
+++ b/administrator/components/com_users/src/Model/MethodsModel.php
@@ -10,9 +10,6 @@
 
 namespace Joomla\Component\Users\Administrator\Model;
 
-use DateInterval;
-use DateTimeZone;
-use Exception;
 use Joomla\CMS\Date\Date;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
@@ -20,7 +17,6 @@
 use Joomla\CMS\User\User;
 use Joomla\Component\Users\Administrator\Helper\Mfa as MfaHelper;
 use Joomla\Database\ParameterType;
-use RuntimeException;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -39,7 +35,7 @@ class MethodsModel extends BaseDatabaseModel
      * @param   User|null  $user  The user object. Skip to use the current user.
      *
      * @return  array
-     * @throws  Exception
+     * @throws  \Exception
      *
      * @since 4.2.0
      */
@@ -84,7 +80,7 @@ public function getMethods(?User $user = null): array
      * @param   User|null  $user  The user object to reset MFA for. Null to use the current user.
      *
      * @return  void
-     * @throws  Exception
+     * @throws  \Exception
      *
      * @since 4.2.0
      */
@@ -92,12 +88,12 @@ public function deleteAll(?User $user = null): void
     {
         // Make sure we have a user object
         if (is_null($user)) {
-            $user = Factory::getApplication()->getIdentity() ?: $this->getCurrentUser();
+            $user = $this->getCurrentUser() ?: Factory::getApplication()->getIdentity();
         }
 
-        // If the user object is a guest (who can't have MFA) we abort with an error
+        // If the user object is a guest (who can't have MFA) we stop with an error
         if ($user->guest) {
-            throw new RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
+            throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
         }
 
         $db    = $this->getDatabase();
@@ -117,7 +113,7 @@ public function deleteAll(?User $user = null): void
      * @param   string  $dateTimeText  The database time string to use, e.g. "2017-01-13 13:25:36"
      *
      * @return  string  The formatted, human-readable date
-     * @throws  Exception
+     * @throws  \Exception
      *
      * @since 4.2.0
      */
@@ -128,7 +124,7 @@ public function formatRelative(?string $dateTimeText): string
         }
 
         // The timestamp is given in UTC. Make sure Joomla! parses it as such.
-        $utcTimeZone = new DateTimeZone('UTC');
+        $utcTimeZone = new \DateTimeZone('UTC');
         $jDate       = new Date($dateTimeText, $utcTimeZone);
         $unixStamp   = $jDate->toUnix();
 
@@ -140,7 +136,7 @@ public function formatRelative(?string $dateTimeText): string
         // I need to display the date in the user's local timezone. That's how you do it.
         $user   = $this->getCurrentUser();
         $userTZ = $user->getParam('timezone', 'UTC');
-        $tz     = new DateTimeZone($userTZ);
+        $tz     = new \DateTimeZone($userTZ);
         $jDate->setTimezone($tz);
 
         // Default format string: way in the past, the time of the day is not important
@@ -162,7 +158,7 @@ public function formatRelative(?string $dateTimeText): string
                 // Is this timestamp yesterday?
                 $jYesterday = clone $jNow;
                 $jYesterday->setTime(0, 0, 0);
-                $oneSecond = new DateInterval('PT1S');
+                $oneSecond = new \DateInterval('PT1S');
                 $jYesterday->sub($oneSecond);
                 $checkYesterday = $jYesterday->format('Ymd', true);
 
@@ -200,7 +196,7 @@ public function setFlag(User $user, bool $flag = true): void
 
         try {
             $result = $db->setQuery($query)->loadResult();
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             return;
         }
 
diff --git a/administrator/components/com_users/src/Model/UserModel.php b/administrator/components/com_users/src/Model/UserModel.php
index 3c339da03c552..33592a14bac3f 100644
--- a/administrator/components/com_users/src/Model/UserModel.php
+++ b/administrator/components/com_users/src/Model/UserModel.php
@@ -20,7 +20,8 @@
 use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Table\Table;
-use Joomla\CMS\User\User;
+use Joomla\CMS\User\UserFactoryAwareInterface;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\CMS\User\UserHelper;
 use Joomla\Database\ParameterType;
 use Joomla\Utilities\ArrayHelper;
@@ -34,8 +35,10 @@
  *
  * @since  1.6
  */
-class UserModel extends AdminModel
+class UserModel extends AdminModel implements UserFactoryAwareInterface
 {
+    use UserFactoryAwareTrait;
+
     /**
      * An item.
      *
@@ -222,7 +225,7 @@ protected function preprocessForm(Form $form, $data, $group = 'user')
     public function save($data)
     {
         $pk   = (!empty($data['id'])) ? $data['id'] : (int) $this->getState('user.id');
-        $user = User::getInstance($pk);
+        $user = $this->getUserFactory()->loadUserById($pk);
 
         $my            = $this->getCurrentUser();
         $iAmSuperAdmin = $my->authorise('core.admin');
@@ -327,7 +330,7 @@ public function delete(&$pks)
 
                 if ($allow) {
                     // Get users data for the users to delete.
-                    $user_to_delete = Factory::getUser($pk);
+                    $user_to_delete = $this->getUserFactory()->loadUserById($pk);
 
                     // Fire the before delete event.
                     Factory::getApplication()->triggerEvent($this->event_before_delete, [$table->getProperties()]);
diff --git a/administrator/components/com_users/src/Model/UsersModel.php b/administrator/components/com_users/src/Model/UsersModel.php
index c3695de7b5ddf..657ccdfba653c 100644
--- a/administrator/components/com_users/src/Model/UsersModel.php
+++ b/administrator/components/com_users/src/Model/UsersModel.php
@@ -235,7 +235,7 @@ public function getItems()
                 return false;
             }
 
-            // Second pass: collect the group counts into the master items array.
+            // Second pass: collect the group counts into the main items array.
             foreach ($items as &$item) {
                 if (isset($userGroups[$item->id])) {
                     $item->group_count = $userGroups[$item->id]->group_count;
diff --git a/administrator/components/com_users/src/Service/HTML/Users.php b/administrator/components/com_users/src/Service/HTML/Users.php
index bfaec2621f1b5..3c53a068c73e0 100644
--- a/administrator/components/com_users/src/Service/HTML/Users.php
+++ b/administrator/components/com_users/src/Service/HTML/Users.php
@@ -11,13 +11,13 @@
 namespace Joomla\Component\Users\Administrator\Service\HTML;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Uri\Uri;
 use Joomla\Database\ParameterType;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
diff --git a/administrator/components/com_users/src/Table/MfaTable.php b/administrator/components/com_users/src/Table/MfaTable.php
index 296c620395142..81c967ca5a51f 100644
--- a/administrator/components/com_users/src/Table/MfaTable.php
+++ b/administrator/components/com_users/src/Table/MfaTable.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Component\Users\Administrator\Table;
 
-use Exception;
 use Joomla\CMS\Date\Date;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
@@ -18,15 +17,14 @@
 use Joomla\CMS\Table\Table;
 use Joomla\CMS\User\CurrentUserInterface;
 use Joomla\CMS\User\CurrentUserTrait;
-use Joomla\CMS\User\UserFactoryInterface;
+use Joomla\CMS\User\UserFactoryAwareInterface;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\Component\Users\Administrator\Helper\Mfa as MfaHelper;
 use Joomla\Component\Users\Administrator\Model\BackupcodesModel;
 use Joomla\Component\Users\Administrator\Service\Encrypt;
 use Joomla\Database\DatabaseDriver;
 use Joomla\Database\ParameterType;
 use Joomla\Event\DispatcherInterface;
-use RuntimeException;
-use Throwable;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -43,12 +41,15 @@
  * @property array  $options     Configuration options for the MFA Method.
  * @property string $created_on  Date and time the record was created.
  * @property string $last_used   Date and time the record was last used successfully.
+ * @property int    $tries       Counter for unsuccessful tries
+ * @property string $last_try    Date and time of the last unsuccessful try
  *
  * @since 4.2.0
  */
-class MfaTable extends Table implements CurrentUserInterface
+class MfaTable extends Table implements CurrentUserInterface, UserFactoryAwareInterface
 {
     use CurrentUserTrait;
+    use UserFactoryAwareTrait;
 
     /**
      * Delete flags per ID, set up onBeforeDelete and used onAfterDelete
@@ -167,7 +168,7 @@ function (bool $carry, $record) {
         // Store the record
         try {
             $result = parent::store($updateNulls);
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
             $this->setError($e->getMessage());
 
             $result = false;
@@ -200,7 +201,7 @@ function (bool $carry, $record) {
      *
      * @since 4.2.0
      * @throws  \InvalidArgumentException
-     * @throws  RuntimeException
+     * @throws  \RuntimeException
      * @throws  \UnexpectedValueException
      */
     public function load($keys = null, $reset = true)
@@ -235,7 +236,7 @@ public function delete($pk = null)
 
             if (!$result) {
                 // If the record does not exist I will stomp my feet and deny your request
-                throw new RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
+                throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
             }
         }
 
@@ -243,7 +244,7 @@ public function delete($pk = null)
 
         // The user must be a registered user, not a guest
         if ($user->guest) {
-            throw new RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
+            throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
         }
 
         // Save flags used onAfterDelete
@@ -327,7 +328,7 @@ private function switchDefaultRecord(): void
      * Regenerate backup code is the flag is set.
      *
      * @return void
-     * @throws Exception
+     * @throws \Exception
      * @since 4.2.0
      */
     private function generateBackupCodes(): void
@@ -337,7 +338,7 @@ private function generateBackupCodes(): void
 
         /** @var BackupcodesModel $backupCodes */
         $backupCodes = $factory->createModel('Backupcodes', 'Administrator');
-        $user        = Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById($this->user_id);
+        $user        = $this->getUserFactory()->loadUserById($this->user_id);
         $backupCodes->regenerateBackupCodes($user);
     }
 
diff --git a/administrator/components/com_users/src/Table/NoteTable.php b/administrator/components/com_users/src/Table/NoteTable.php
index 228cfdc62a2bb..1d970ea828c42 100644
--- a/administrator/components/com_users/src/Table/NoteTable.php
+++ b/administrator/components/com_users/src/Table/NoteTable.php
@@ -12,6 +12,8 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Table\Table;
+use Joomla\CMS\User\CurrentUserInterface;
+use Joomla\CMS\User\CurrentUserTrait;
 use Joomla\CMS\Versioning\VersionableTableInterface;
 use Joomla\Database\DatabaseDriver;
 
@@ -24,8 +26,10 @@
  *
  * @since  2.5
  */
-class NoteTable extends Table implements VersionableTableInterface
+class NoteTable extends Table implements VersionableTableInterface, CurrentUserInterface
 {
+    use CurrentUserTrait;
+
     /**
      * Indicates that columns fully support the NULL value in the database
      *
@@ -61,7 +65,7 @@ public function __construct(DatabaseDriver $db)
     public function store($updateNulls = true)
     {
         $date   = Factory::getDate()->toSql();
-        $userId = Factory::getUser()->get('id');
+        $userId = $this->getCurrentUser()->get('id');
 
         if (!((int) $this->review_time)) {
             $this->review_time = null;
diff --git a/administrator/components/com_users/src/View/Captive/HtmlView.php b/administrator/components/com_users/src/View/Captive/HtmlView.php
index 38292dc063aef..d1c56b56670b1 100644
--- a/administrator/components/com_users/src/View/Captive/HtmlView.php
+++ b/administrator/components/com_users/src/View/Captive/HtmlView.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Component\Users\Administrator\View\Captive;
 
-use Exception;
 use Joomla\CMS\Event\MultiFactor\BeforeDisplayMethods;
 use Joomla\CMS\Event\MultiFactor\NotifyActionLog;
 use Joomla\CMS\Factory;
@@ -24,7 +23,6 @@
 use Joomla\Component\Users\Administrator\Model\BackupcodesModel;
 use Joomla\Component\Users\Administrator\Model\CaptiveModel;
 use Joomla\Component\Users\Administrator\View\SiteTemplateTrait;
-use stdClass;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -50,7 +48,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The currently selected MFA Method record against which we'll be authenticating
      *
-     * @var   null|stdClass
+     * @var   null|\stdClass
      * @since 4.2.0
      */
     public $record = null;
@@ -102,7 +100,7 @@ class HtmlView extends BaseHtmlView
      *
      * @return  void  A string if successful, otherwise an Error object.
      *
-     * @throws  Exception
+     * @throws  \Exception
      * @since 4.2.0
      */
     public function display($tpl = null)
diff --git a/administrator/components/com_users/src/View/Debuggroup/HtmlView.php b/administrator/components/com_users/src/View/Debuggroup/HtmlView.php
index 0386e86f07abf..5eeb703798831 100644
--- a/administrator/components/com_users/src/View/Debuggroup/HtmlView.php
+++ b/administrator/components/com_users/src/View/Debuggroup/HtmlView.php
@@ -15,7 +15,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 
@@ -56,7 +55,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state.
      *
-     * @var   CMSObject
+     * @var   \Joomla\Registry\Registry
      * @since 1.6
      */
     protected $state;
diff --git a/administrator/components/com_users/src/View/Debuguser/HtmlView.php b/administrator/components/com_users/src/View/Debuguser/HtmlView.php
index 8431876d75c61..e752a6429a5b4 100644
--- a/administrator/components/com_users/src/View/Debuguser/HtmlView.php
+++ b/administrator/components/com_users/src/View/Debuguser/HtmlView.php
@@ -15,7 +15,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\User\User;
@@ -57,7 +56,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state.
      *
-     * @var   CMSObject
+     * @var   \Joomla\Registry\Registry
      * @since 1.6
      */
     protected $state;
diff --git a/administrator/components/com_users/src/View/Group/HtmlView.php b/administrator/components/com_users/src/View/Group/HtmlView.php
index 277ff9afcc150..004e90cedf412 100644
--- a/administrator/components/com_users/src/View/Group/HtmlView.php
+++ b/administrator/components/com_users/src/View/Group/HtmlView.php
@@ -15,7 +15,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 
@@ -48,7 +47,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state.
      *
-     * @var   CMSObject
+     * @var   \Joomla\Registry\Registry
      * @since 1.6
      */
     protected $state;
diff --git a/administrator/components/com_users/src/View/Groups/HtmlView.php b/administrator/components/com_users/src/View/Groups/HtmlView.php
index f4afd7db68514..6fab461e8d040 100644
--- a/administrator/components/com_users/src/View/Groups/HtmlView.php
+++ b/administrator/components/com_users/src/View/Groups/HtmlView.php
@@ -14,7 +14,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 
@@ -48,7 +47,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state.
      *
-     * @var   CMSObject
+     * @var   \Joomla\Registry\Registry
      * @since 1.6
      */
     protected $state;
diff --git a/administrator/components/com_users/src/View/Level/HtmlView.php b/administrator/components/com_users/src/View/Level/HtmlView.php
index e7f6d6502504d..0841950142309 100644
--- a/administrator/components/com_users/src/View/Level/HtmlView.php
+++ b/administrator/components/com_users/src/View/Level/HtmlView.php
@@ -15,7 +15,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 
@@ -48,7 +47,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state.
      *
-     * @var   CMSObject
+     * @var   \Joomla\Registry\Registry
      * @since 1.6
      */
     protected $state;
diff --git a/administrator/components/com_users/src/View/Levels/HtmlView.php b/administrator/components/com_users/src/View/Levels/HtmlView.php
index 7eb3a1e94248f..ba655a982e3e8 100644
--- a/administrator/components/com_users/src/View/Levels/HtmlView.php
+++ b/administrator/components/com_users/src/View/Levels/HtmlView.php
@@ -14,7 +14,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 
@@ -48,7 +47,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state.
      *
-     * @var   CMSObject
+     * @var   \Joomla\Registry\Registry
      * @since 1.6
      */
     protected $state;
diff --git a/administrator/components/com_users/src/View/Method/HtmlView.php b/administrator/components/com_users/src/View/Method/HtmlView.php
index 9152b33e9d696..5dcc833abd962 100644
--- a/administrator/components/com_users/src/View/Method/HtmlView.php
+++ b/administrator/components/com_users/src/View/Method/HtmlView.php
@@ -17,6 +17,7 @@
 use Joomla\CMS\Toolbar\Button\LinkButton;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
+use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\User\User;
 use Joomla\Component\Users\Administrator\Model\MethodModel;
 
@@ -168,7 +169,9 @@ function ($x) {
         }
 
         $returnUrl = empty($this->returnURL) ? '' : base64_decode($this->returnURL);
-        $returnUrl = $returnUrl ?: Route::_('index.php?option=com_users&task=methods.display&user_id=' . $this->user->id);
+        $returnUrl = ($returnUrl && Uri::isInternal($returnUrl))
+            ? $returnUrl
+            : Route::_('index.php?option=com_users&task=methods.display&user_id=' . $this->user->id);
 
         if ($this->isAdmin && $this->getLayout() === 'edit') {
             $button = (new BasicButton('user-mfa-edit-save'))
diff --git a/administrator/components/com_users/src/View/Methods/HtmlView.php b/administrator/components/com_users/src/View/Methods/HtmlView.php
index e9b5cde01b189..f10a4dd04119c 100644
--- a/administrator/components/com_users/src/View/Methods/HtmlView.php
+++ b/administrator/components/com_users/src/View/Methods/HtmlView.php
@@ -177,7 +177,7 @@ public function display($tpl = null): void
         if ($this->isAdmin) {
             ToolbarHelper::title(Text::_('COM_USERS_MFA_LIST_PAGE_HEAD'), 'users user-lock');
 
-            if (Factory::getApplication()->getIdentity()->authorise('core.manage', 'com_users')) {
+            if ($this->getCurrentUser()->authorise('core.manage', 'com_users')) {
                 $toolbar = Toolbar::getInstance();
                 $arrow   = Factory::getApplication()->getLanguage()->isRtl() ? 'arrow-right' : 'arrow-left';
                 $toolbar->link('JTOOLBAR_BACK', 'index.php?option=com_users')
diff --git a/administrator/components/com_users/src/View/Note/HtmlView.php b/administrator/components/com_users/src/View/Note/HtmlView.php
index c8303e2e67959..0a9e4d7362f42 100644
--- a/administrator/components/com_users/src/View/Note/HtmlView.php
+++ b/administrator/components/com_users/src/View/Note/HtmlView.php
@@ -16,7 +16,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 
@@ -51,7 +50,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state.
      *
-     * @var    CMSObject
+     * @var    \Joomla\Registry\Registry
      * @since  2.5
      */
     protected $state;
diff --git a/administrator/components/com_users/src/View/Notes/HtmlView.php b/administrator/components/com_users/src/View/Notes/HtmlView.php
index 559eb9f0e522a..d0bd160a23bcc 100644
--- a/administrator/components/com_users/src/View/Notes/HtmlView.php
+++ b/administrator/components/com_users/src/View/Notes/HtmlView.php
@@ -14,7 +14,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Toolbar\Button\DropdownButton;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
@@ -51,7 +50,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state.
      *
-     * @var    CMSObject
+     * @var    \Joomla\Registry\Registry
      * @since  2.5
      */
     protected $state;
diff --git a/administrator/components/com_users/src/View/SiteTemplateTrait.php b/administrator/components/com_users/src/View/SiteTemplateTrait.php
index 49ab6f35ec86f..f474139c81eae 100644
--- a/administrator/components/com_users/src/View/SiteTemplateTrait.php
+++ b/administrator/components/com_users/src/View/SiteTemplateTrait.php
@@ -10,11 +10,8 @@
 
 namespace Joomla\Component\Users\Administrator\View;
 
-use Exception;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
-use ReflectionException;
-use ReflectionObject;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -31,7 +28,7 @@ trait SiteTemplateTrait
      * Set a specific site template style in the frontend application
      *
      * @return  void
-     * @throws  Exception
+     * @throws  \Exception
      * @since   4.2.0
      */
     private function setSiteTemplateStyle(): void
@@ -52,11 +49,11 @@ private function setSiteTemplateStyle(): void
         $app->getInput()->set('templateStyle', $templateStyle);
 
         try {
-            $refApp      = new ReflectionObject($app);
+            $refApp      = new \ReflectionObject($app);
             $refTemplate = $refApp->getProperty('template');
             $refTemplate->setAccessible(true);
             $refTemplate->setValue($app, null);
-        } catch (ReflectionException $e) {
+        } catch (\ReflectionException $e) {
             return;
         }
 
diff --git a/administrator/components/com_users/src/View/User/HtmlView.php b/administrator/components/com_users/src/View/User/HtmlView.php
index 26ec9e6d25c45..27dea84c46058 100644
--- a/administrator/components/com_users/src/View/User/HtmlView.php
+++ b/administrator/components/com_users/src/View/User/HtmlView.php
@@ -15,11 +15,10 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
-use Joomla\CMS\User\User;
-use Joomla\CMS\User\UserFactoryInterface;
+use Joomla\CMS\User\UserFactoryAwareInterface;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\Component\Users\Administrator\Helper\Mfa;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -31,8 +30,10 @@
  *
  * @since  1.5
  */
-class HtmlView extends BaseHtmlView
+class HtmlView extends BaseHtmlView implements UserFactoryAwareInterface
 {
+    use UserFactoryAwareTrait;
+
     /**
      * The Form object
      *
@@ -65,7 +66,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var  CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $state;
 
@@ -104,7 +105,7 @@ public function display($tpl = null)
         }
 
         // Prevent user from modifying own group(s)
-        $user = Factory::getApplication()->getIdentity();
+        $user = $this->getCurrentUser();
 
         if ((int) $user->id != (int) $this->item->id || $user->authorise('core.admin')) {
             $this->grouplist = $this->get('Groups');
@@ -114,10 +115,7 @@ public function display($tpl = null)
         $this->form->setValue('password', null);
         $this->form->setValue('password2', null);
 
-        /** @var User $userBeingEdited */
-        $userBeingEdited = Factory::getContainer()
-            ->get(UserFactoryInterface::class)
-            ->loadUserById($this->item->id);
+        $userBeingEdited = $this->getUserFactory()->loadUserById($this->item->id);
 
         if ($this->item->id > 0 && (int) $userBeingEdited->id == (int) $this->item->id) {
             try {
@@ -147,7 +145,7 @@ protected function addToolbar()
     {
         Factory::getApplication()->getInput()->set('hidemainmenu', true);
 
-        $user      = Factory::getApplication()->getIdentity();
+        $user      = $this->getCurrentUser();
         $canDo     = ContentHelper::getActions('com_users');
         $isNew     = ($this->item->id == 0);
         $isProfile = $this->item->id == $user->id;
diff --git a/administrator/components/com_users/src/View/Users/HtmlView.php b/administrator/components/com_users/src/View/Users/HtmlView.php
index e5238f8b1987c..886325cfb62bf 100644
--- a/administrator/components/com_users/src/View/Users/HtmlView.php
+++ b/administrator/components/com_users/src/View/Users/HtmlView.php
@@ -15,7 +15,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Toolbar\Button\DropdownButton;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
@@ -51,7 +50,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state.
      *
-     * @var   CMSObject
+     * @var   \Joomla\Registry\Registry
      * @since 1.6
      */
     protected $state;
@@ -76,7 +75,7 @@ class HtmlView extends BaseHtmlView
     /**
      * An ACL object to verify user rights.
      *
-     * @var    CMSObject
+     * @var    \Joomla\Registry\Registry
      * @since  3.6.3
      */
     protected $canDo;
diff --git a/administrator/components/com_users/tmpl/captive/default.php b/administrator/components/com_users/tmpl/captive/default.php
index 7aef97002bbe3..2c736e15ca8d7 100644
--- a/administrator/components/com_users/tmpl/captive/default.php
+++ b/administrator/components/com_users/tmpl/captive/default.php
@@ -78,12 +78,13 @@ class="form-horizontal"
                 <?php
                 $attributes = array_merge(
                     [
-                        'type'        => $this->renderOptions['input_type'],
-                        'name'        => 'code',
-                        'value'       => '',
-                        'placeholder' => $this->renderOptions['placeholder'] ?? null,
-                        'id'          => 'users-mfa-code',
-                        'class'       => 'form-control'
+                        'type'         => $this->renderOptions['input_type'],
+                        'name'         => 'code',
+                        'value'        => '',
+                        'placeholder'  => $this->renderOptions['placeholder'] ?? null,
+                        'id'           => 'users-mfa-code',
+                        'class'        => 'form-control',
+                        'autocomplete' => $this->renderOptions['autocomplete'] ?? 'one-time-code'
                     ],
                     $this->renderOptions['input_attributes']
                 );
diff --git a/administrator/components/com_users/tmpl/groups/default.php b/administrator/components/com_users/tmpl/groups/default.php
index 4378f295ea0f0..f6509ff90a80a 100644
--- a/administrator/components/com_users/tmpl/groups/default.php
+++ b/administrator/components/com_users/tmpl/groups/default.php
@@ -11,13 +11,12 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Access\Access;
-use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Router\Route;
 
-$user        = Factory::getUser();
+$user        = $this->getCurrentUser();
 $listOrder   = $this->escape($this->state->get('list.ordering'));
 $listDirn    = $this->escape($this->state->get('list.direction'));
 
diff --git a/administrator/components/com_users/tmpl/levels/default.php b/administrator/components/com_users/tmpl/levels/default.php
index 61f830eb07432..79489280a4cb2 100644
--- a/administrator/components/com_users/tmpl/levels/default.php
+++ b/administrator/components/com_users/tmpl/levels/default.php
@@ -11,7 +11,6 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Access\Access;
-use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
@@ -24,7 +23,7 @@
 $wa->useScript('table.columns')
     ->useScript('multiselect');
 
-$user       = Factory::getUser();
+$user       = $this->getCurrentUser();
 $listOrder  = $this->escape($this->state->get('list.ordering'));
 $listDirn   = $this->escape($this->state->get('list.direction'));
 $saveOrder  = $listOrder == 'a.ordering';
@@ -85,7 +84,7 @@
                             $groups = json_decode($item->rules);
 
                             // If this group is super admin and this user is not super admin, $canEdit is false
-                            if (!Factory::getUser()->authorise('core.admin') && $groups && Access::checkGroup($groups[0], 'core.admin')) {
+                            if (!$this->getCurrentUser()->authorise('core.admin') && $groups && Access::checkGroup($groups[0], 'core.admin')) {
                                 $canEdit   = false;
                                 $canChange = false;
                             }
diff --git a/administrator/components/com_users/tmpl/notes/default.php b/administrator/components/com_users/tmpl/notes/default.php
index 8561727b3e8a6..198ffc06a3deb 100644
--- a/administrator/components/com_users/tmpl/notes/default.php
+++ b/administrator/components/com_users/tmpl/notes/default.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;
@@ -21,7 +20,7 @@
 $wa->useScript('table.columns')
     ->useScript('multiselect');
 
-$user       = Factory::getUser();
+$user       = $this->getCurrentUser();
 $listOrder  = $this->escape($this->state->get('list.ordering'));
 $listDirn   = $this->escape($this->state->get('list.direction'));
 
diff --git a/administrator/components/com_users/tmpl/notes/emptystate.php b/administrator/components/com_users/tmpl/notes/emptystate.php
index 0b963fa82243e..22d7d4b808ba3 100644
--- a/administrator/components/com_users/tmpl/notes/emptystate.php
+++ b/administrator/components/com_users/tmpl/notes/emptystate.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Layout\LayoutHelper;
 
 $displayData = [
@@ -20,7 +19,7 @@
     'icon'       => 'icon-users user',
 ];
 
-if (Factory::getApplication()->getIdentity()->authorise('core.create', 'com_users')) {
+if ($this->getCurrentUser()->authorise('core.create', 'com_users')) {
     $displayData['createURL'] = 'index.php?option=com_users&task=note.add';
 }
 
diff --git a/administrator/components/com_users/tmpl/users/default.php b/administrator/components/com_users/tmpl/users/default.php
index d2665a8fb8b08..46e6d8f734b93 100644
--- a/administrator/components/com_users/tmpl/users/default.php
+++ b/administrator/components/com_users/tmpl/users/default.php
@@ -11,7 +11,6 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Access\Access;
-use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
@@ -29,7 +28,7 @@
 
 $listOrder  = $this->escape($this->state->get('list.ordering'));
 $listDirn   = $this->escape($this->state->get('list.direction'));
-$loggeduser = Factory::getUser();
+$loggeduser = $this->getCurrentUser();
 $mfa        = PluginHelper::isEnabled('multifactorauth');
 
 ?>
diff --git a/administrator/components/com_workflow/src/Controller/DisplayController.php b/administrator/components/com_workflow/src/Controller/DisplayController.php
index 297d2cf6c2d32..a1cfef912cdc6 100644
--- a/administrator/components/com_workflow/src/Controller/DisplayController.php
+++ b/administrator/components/com_workflow/src/Controller/DisplayController.php
@@ -90,7 +90,8 @@ public function __construct($config = [], MVCFactoryInterface $factory = null, $
      * Method to display a view.
      *
      * @param   boolean  $cachable   If true, the view output will be cached
-     * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+     * @param   array    $urlparams  An array of safe URL parameters and their variable types.
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  BaseController|boolean  This object to support chaining.
      *
diff --git a/administrator/components/com_workflow/src/Table/StageTable.php b/administrator/components/com_workflow/src/Table/StageTable.php
index b7d8eeb6f6577..0b9599afac0bb 100644
--- a/administrator/components/com_workflow/src/Table/StageTable.php
+++ b/administrator/components/com_workflow/src/Table/StageTable.php
@@ -256,7 +256,7 @@ protected function _getAssetTitle()
      */
     protected function _getAssetParentId(Table $table = null, $id = null)
     {
-        $asset = self::getInstance('Asset', 'JTable', ['dbo' => $this->getDbo()]);
+        $asset = self::getInstance('Asset', '\\Joomla\\CMS\\Table\\', ['dbo' => $this->getDbo()]);
 
         $workflow = new WorkflowTable($this->getDbo());
         $workflow->load($this->workflow_id);
diff --git a/administrator/components/com_workflow/src/Table/TransitionTable.php b/administrator/components/com_workflow/src/Table/TransitionTable.php
index 1a43a380d025b..dda495c933b7b 100644
--- a/administrator/components/com_workflow/src/Table/TransitionTable.php
+++ b/administrator/components/com_workflow/src/Table/TransitionTable.php
@@ -125,7 +125,7 @@ protected function _getAssetTitle()
      */
     protected function _getAssetParentId(Table $table = null, $id = null)
     {
-        $asset = self::getInstance('Asset', 'JTable', ['dbo' => $this->getDbo()]);
+        $asset = self::getInstance('Asset', '\\Joomla\\CMS\\Table\\', ['dbo' => $this->getDbo()]);
 
         $workflow = new WorkflowTable($this->getDbo());
         $workflow->load($this->workflow_id);
diff --git a/administrator/components/com_workflow/src/Table/WorkflowTable.php b/administrator/components/com_workflow/src/Table/WorkflowTable.php
index 06650b5b34070..c5ff156344ffb 100644
--- a/administrator/components/com_workflow/src/Table/WorkflowTable.php
+++ b/administrator/components/com_workflow/src/Table/WorkflowTable.php
@@ -14,6 +14,8 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Table\Table;
+use Joomla\CMS\User\CurrentUserInterface;
+use Joomla\CMS\User\CurrentUserTrait;
 use Joomla\Database\DatabaseDriver;
 use Joomla\Database\ParameterType;
 
@@ -26,8 +28,10 @@
  *
  * @since  4.0.0
  */
-class WorkflowTable extends Table
+class WorkflowTable extends Table implements CurrentUserInterface
 {
+    use CurrentUserTrait;
+
     /**
      * Indicates that columns fully support the NULL value in the database
      *
@@ -173,7 +177,7 @@ public function check()
     public function store($updateNulls = true)
     {
         $date = Factory::getDate();
-        $user = Factory::getUser();
+        $user = $this->getCurrentUser();
 
         $table = new WorkflowTable($this->getDbo());
 
diff --git a/administrator/components/com_workflow/src/View/Stages/HtmlView.php b/administrator/components/com_workflow/src/View/Stages/HtmlView.php
index 9970405a2ac41..96d83424908ee 100644
--- a/administrator/components/com_workflow/src/View/Stages/HtmlView.php
+++ b/administrator/components/com_workflow/src/View/Stages/HtmlView.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Component\Workflow\Administrator\View\Stages;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
@@ -168,7 +167,7 @@ protected function addToolbar()
 
         ToolbarHelper::title(Text::sprintf('COM_WORKFLOW_STAGES_LIST', Text::_($this->state->get('active_workflow', ''))), 'address contact');
 
-        $arrow  = Factory::getLanguage()->isRtl() ? 'arrow-right' : 'arrow-left';
+        $arrow  = $this->getLanguage()->isRtl() ? 'arrow-right' : 'arrow-left';
 
         $toolbar->link(
             'JTOOLBAR_BACK',
diff --git a/administrator/components/com_workflow/src/View/Transitions/HtmlView.php b/administrator/components/com_workflow/src/View/Transitions/HtmlView.php
index 8e1de575e65cf..2229f032ab09c 100644
--- a/administrator/components/com_workflow/src/View/Transitions/HtmlView.php
+++ b/administrator/components/com_workflow/src/View/Transitions/HtmlView.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Component\Workflow\Administrator\View\Transitions;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
@@ -166,7 +165,7 @@ protected function addToolbar()
 
         ToolbarHelper::title(Text::sprintf('COM_WORKFLOW_TRANSITIONS_LIST', Text::_($this->state->get('active_workflow'))), 'address contact');
 
-        $arrow  = Factory::getLanguage()->isRtl() ? 'arrow-right' : 'arrow-left';
+        $arrow  = $this->getLanguage()->isRtl() ? 'arrow-right' : 'arrow-left';
 
         $toolbar->link(
             'JTOOLBAR_BACK',
diff --git a/administrator/components/com_workflow/src/View/Workflows/HtmlView.php b/administrator/components/com_workflow/src/View/Workflows/HtmlView.php
index 71352a9b31846..b4a9d3d0c115e 100644
--- a/administrator/components/com_workflow/src/View/Workflows/HtmlView.php
+++ b/administrator/components/com_workflow/src/View/Workflows/HtmlView.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Component\Workflow\Administrator\View\Workflows;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
@@ -141,7 +140,7 @@ public function display($tpl = null)
     protected function addToolbar()
     {
         $canDo   = ContentHelper::getActions($this->extension, $this->section);
-        $user    = Factory::getApplication()->getIdentity();
+        $user    = $this->getCurrentUser();
         $toolbar = Toolbar::getInstance();
 
         ToolbarHelper::title(Text::_('COM_WORKFLOW_WORKFLOWS_LIST'), 'file-alt contact');
diff --git a/administrator/components/com_workflow/tmpl/stage/edit.php b/administrator/components/com_workflow/tmpl/stage/edit.php
index ac0b645f52a85..baece7842f702 100644
--- a/administrator/components/com_workflow/tmpl/stage/edit.php
+++ b/administrator/components/com_workflow/tmpl/stage/edit.php
@@ -30,7 +30,7 @@
 $layout   = $isModal ? 'modal' : 'edit';
 $tmpl     = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=component' : '';
 $clientId = $this->state->get('item.client_id', 0);
-$lang     = Factory::getLanguage()->getTag();
+$lang     = $this->getLanguage()->getTag();
 
 ?>
 
diff --git a/administrator/components/com_workflow/tmpl/stages/default.php b/administrator/components/com_workflow/tmpl/stages/default.php
index 908f14a9c78ef..0ad92d3dc0b8b 100644
--- a/administrator/components/com_workflow/tmpl/stages/default.php
+++ b/administrator/components/com_workflow/tmpl/stages/default.php
@@ -11,7 +11,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
@@ -23,7 +22,7 @@
 $wa->useScript('table.columns')
     ->useScript('multiselect');
 
-$user      = Factory::getUser();
+$user      = $this->getCurrentUser();
 $userId    = $user->id;
 
 $listOrder = $this->escape($this->state->get('list.ordering'));
diff --git a/administrator/components/com_workflow/tmpl/transitions/default.php b/administrator/components/com_workflow/tmpl/transitions/default.php
index fd52a40be383f..1c56ee69f83ca 100644
--- a/administrator/components/com_workflow/tmpl/transitions/default.php
+++ b/administrator/components/com_workflow/tmpl/transitions/default.php
@@ -11,7 +11,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
@@ -23,7 +22,7 @@
 $wa->useScript('table.columns')
     ->useScript('multiselect');
 
-$user   = Factory::getUser();
+$user   = $this->getCurrentUser();
 
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
diff --git a/administrator/components/com_workflow/tmpl/workflow/edit.php b/administrator/components/com_workflow/tmpl/workflow/edit.php
index 6088266b53388..b4ba5716cbecf 100644
--- a/administrator/components/com_workflow/tmpl/workflow/edit.php
+++ b/administrator/components/com_workflow/tmpl/workflow/edit.php
@@ -30,7 +30,7 @@
 $layout   = $isModal ? 'modal' : 'edit';
 $tmpl     = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=component' : '';
 $clientId = $this->state->get('item.client_id', 0);
-$lang     = Factory::getLanguage()->getTag();
+$lang     = $this->getLanguage()->getTag();
 ?>
 
 <form action="<?php echo Route::_('index.php?option=com_workflow&view=workflow&extension=' . $input->getCmd('extension') . '&layout=' . $layout . $tmpl . '&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="workflow-form" aria-label="<?php echo Text::_('COM_WORKFLOW_FORM_' . ((int) $this->item->id === 0 ? 'NEW' : 'EDIT'), true); ?>" class="form-validate">
diff --git a/administrator/components/com_workflow/tmpl/workflows/default.php b/administrator/components/com_workflow/tmpl/workflows/default.php
index 865f831e2dc17..184f972ea3c5b 100644
--- a/administrator/components/com_workflow/tmpl/workflows/default.php
+++ b/administrator/components/com_workflow/tmpl/workflows/default.php
@@ -11,7 +11,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
@@ -42,7 +41,7 @@
 
 $extension = $this->escape($this->state->get('filter.extension'));
 
-$user = Factory::getUser();
+$user = $this->getCurrentUser();
 $userId = $user->id;
 ?>
 <form action="<?php echo Route::_('index.php?option=com_workflow&view=workflows&extension=' . $extension); ?>" method="post" name="adminForm" id="adminForm">
diff --git a/administrator/components/com_wrapper/src/Extension/WrapperComponent.php b/administrator/components/com_wrapper/src/Extension/WrapperComponent.php
index bba3214dc69f4..66fdc38284417 100644
--- a/administrator/components/com_wrapper/src/Extension/WrapperComponent.php
+++ b/administrator/components/com_wrapper/src/Extension/WrapperComponent.php
@@ -15,7 +15,7 @@
 use Joomla\CMS\Extension\MVCComponent;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/administrator/help/en-GB/toc.json b/administrator/help/en-GB/toc.json
index 9b69c96214073..d9376ef3d2cec 100644
--- a/administrator/help/en-GB/toc.json
+++ b/administrator/help/en-GB/toc.json
@@ -1 +1 @@
-{"Articles":"ARTICLES","Articles:_Categories":"ARTICLES:_CATEGORIES","Articles:_Edit":"ARTICLES:_EDIT","Articles:_Featured":"ARTICLES:_FEATURED","Articles:_New_or_Edit_Category":"ARTICLES:_NEW_OR_EDIT_CATEGORY","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","Component:_Field_Groups":"COMPONENT:_FIELD_GROUPS","Component:_Fields":"COMPONENT:_FIELDS","Component:_New_or_Edit_Field":"COMPONENT:_NEW_OR_EDIT_FIELD","Component:_New_or_Edit_Field_Group":"COMPONENT:_NEW_OR_EDIT_FIELD_GROUP","Contacts":"CONTACTS","Contacts:_Categories":"CONTACTS:_CATEGORIES","Contacts:_New_or_Edit":"CONTACTS:_NEW_OR_EDIT","Contacts:_New_or_Edit_Category":"CONTACTS:_NEW_OR_EDIT_CATEGORY","Extensions:_Discover":"EXTENSIONS:_DISCOVER","Extensions:_Install":"EXTENSIONS:_INSTALL","Extensions:_Languages":"EXTENSIONS:_LANGUAGES","Extensions:_Manage":"EXTENSIONS:_MANAGE","Extensions:_Update":"EXTENSIONS:_UPDATE","Information:_Database":"INFORMATION:_DATABASE","Information:_Warnings":"INFORMATION:_WARNINGS","Languages:_Content":"LANGUAGES:_CONTENT","Languages:_Edit_Content_Language":"LANGUAGES:_EDIT_CONTENT_LANGUAGE","Languages:_Edit_Override":"LANGUAGES:_EDIT_OVERRIDE","Languages:_Installed":"LANGUAGES:_INSTALLED","Languages:_Overrides":"LANGUAGES:_OVERRIDES","Mail_Template:_Edit":"MAIL_TEMPLATE:_EDIT","Mail_Templates":"MAIL_TEMPLATES","Maintenance:_Clear_Cache":"MAINTENANCE:_CLEAR_CACHE","Maintenance:_Global_Check-in":"MAINTENANCE:_GLOBAL_CHECK-IN","Mass_Mail_Users":"MASS_MAIL_USERS","Media":"MEDIA","Menu_Item:_New_Item":"MENU_ITEM:_NEW_ITEM","Menus":"MENUS","Menus:_Edit":"MENUS:_EDIT","Menus:_Items":"MENUS:_ITEMS","Modules":"MODULES","Multilingual_Associations":"MULTILINGUAL_ASSOCIATIONS","Multilingual_Associations:_Edit":"MULTILINGUAL_ASSOCIATIONS:_EDIT","News_Feeds":"NEWS_FEEDS","News_Feeds:_Categories":"NEWS_FEEDS:_CATEGORIES","News_Feeds:_New_or_Edit":"NEWS_FEEDS:_NEW_OR_EDIT","News_Feeds:_New_or_Edit_Category":"NEWS_FEEDS:_NEW_OR_EDIT_CATEGORY","Permissions_for_User":"PERMISSIONS_FOR_USER","Plugins":"PLUGINS","Plugins:_Name_of_Plugin":"PLUGINS:_NAME_OF_PLUGIN","Post-installation_Messages_for_Joomla_CMS":"POST-INSTALLATION_MESSAGES_FOR_JOOMLA_CMS","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","Private_Messages":"PRIVATE_MESSAGES","Private_Messages:_Read":"PRIVATE_MESSAGES:_READ","Private_Messages:_Write":"PRIVATE_MESSAGES:_WRITE","Redirects:_Links":"REDIRECTS:_LINKS","Redirects:_New_or_Edit":"REDIRECTS:_NEW_OR_EDIT","Scheduled_Tasks":"SCHEDULED_TASKS","Scheduled_Tasks:_Edit":"SCHEDULED_TASKS:_EDIT","Site_Global_Configuration":"SITE_GLOBAL_CONFIGURATION","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:_Search_Filters":"SMART_SEARCH:_SEARCH_FILTERS","Start_Here":"START_HERE","Tags":"TAGS","Tags:_New_or_Edit":"TAGS:_NEW_OR_EDIT","Templates:_Customise":"TEMPLATES:_CUSTOMISE","Templates:_Customise_Source":"TEMPLATES:_CUSTOMISE_SOURCE","Templates:_Edit_Style":"TEMPLATES:_EDIT_STYLE","Templates:_Styles":"TEMPLATES:_STYLES","Templates:_Templates":"TEMPLATES:_TEMPLATES","User_Actions_Log":"USER_ACTIONS_LOG","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:_Viewing_Access_Levels":"USERS:_VIEWING_ACCESS_LEVELS"}
\ No newline at end of file
+{"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","Extensions:_Discover":"EXTENSIONS:_DISCOVER","Extensions:_Install":"EXTENSIONS:_INSTALL","Extensions:_Languages":"EXTENSIONS:_LANGUAGES","Extensions:_Manage":"EXTENSIONS:_MANAGE","Extensions:_Update":"EXTENSIONS:_UPDATE","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:_Steps":"GUIDED_TOURS:_STEPS","Information:_Database":"INFORMATION:_DATABASE","Information:_Warnings":"INFORMATION:_WARNINGS","Joomla_Update":"JOOMLA_UPDATE","Languages:_Content":"LANGUAGES:_CONTENT","Languages:_Edit_Content_Language":"LANGUAGES:_EDIT_CONTENT_LANGUAGE","Languages:_Edit_Override":"LANGUAGES:_EDIT_OVERRIDE","Languages:_Installed":"LANGUAGES:_INSTALLED","Languages:_Overrides":"LANGUAGES:_OVERRIDES","Mail_Template:_Edit":"MAIL_TEMPLATE:_EDIT","Mail_Templates":"MAIL_TEMPLATES","Maintenance:_Clear_Cache":"MAINTENANCE:_CLEAR_CACHE","Maintenance:_Global_Check-in":"MAINTENANCE:_GLOBAL_CHECK-IN","Mass_Mail_Users":"MASS_MAIL_USERS","Media":"MEDIA","Menu_Item:_New_Item":"MENU_ITEM:_NEW_ITEM","Menus":"MENUS","Menus:_Edit":"MENUS:_EDIT","Menus:_Items":"MENUS:_ITEMS","Modules":"MODULES","Multilingual_Associations":"MULTILINGUAL_ASSOCIATIONS","Multilingual_Associations:_Edit":"MULTILINGUAL_ASSOCIATIONS:_EDIT","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_User":"PERMISSIONS_FOR_USER","Plugins":"PLUGINS","Plugins:_Name_of_Plugin":"PLUGINS:_NAME_OF_PLUGIN","Post-installation_Messages_for_Joomla_CMS":"POST-INSTALLATION_MESSAGES_FOR_JOOMLA_CMS","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","Private_Messages":"PRIVATE_MESSAGES","Private_Messages:_Read":"PRIVATE_MESSAGES:_READ","Private_Messages:_Write":"PRIVATE_MESSAGES:_WRITE","Redirects:_Links":"REDIRECTS:_LINKS","Redirects:_New_or_Edit":"REDIRECTS:_NEW_OR_EDIT","Scheduled_Tasks":"SCHEDULED_TASKS","Scheduled_Tasks:_Edit":"SCHEDULED_TASKS:_EDIT","Site_Global_Configuration":"SITE_GLOBAL_CONFIGURATION","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:_Search_Filters":"SMART_SEARCH:_SEARCH_FILTERS","Start_Here":"START_HERE","Tags":"TAGS","Tags:_New_or_Edit":"TAGS:_NEW_OR_EDIT","Templates:_Customise":"TEMPLATES:_CUSTOMISE","Templates:_Customise_Source":"TEMPLATES:_CUSTOMISE_SOURCE","Templates:_Edit_Style":"TEMPLATES:_EDIT_STYLE","Templates:_Styles":"TEMPLATES:_STYLES","Templates:_Templates":"TEMPLATES:_TEMPLATES","User_Actions_Log":"USER_ACTIONS_LOG","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:_Viewing_Access_Levels":"USERS:_VIEWING_ACCESS_LEVELS"}
\ No newline at end of file
diff --git a/administrator/includes/app.php b/administrator/includes/app.php
index 2f9ed924ec0cb..161abb4a2f85e 100644
--- a/administrator/includes/app.php
+++ b/administrator/includes/app.php
@@ -22,8 +22,12 @@
     require_once JPATH_BASE . '/includes/defines.php';
 }
 
+if (!defined('JPATH_PUBLIC')) {
+    define('JPATH_PUBLIC', JPATH_ROOT);
+}
+
 // Check for presence of vendor dependencies not included in the git repository
-if (!file_exists(JPATH_LIBRARIES . '/vendor/autoload.php') || !is_dir(JPATH_ROOT . '/media/vendor')) {
+if (!file_exists(JPATH_LIBRARIES . '/vendor/autoload.php') || !is_dir(JPATH_PUBLIC . '/media/vendor')) {
     echo file_get_contents(JPATH_ROOT . '/templates/system/build_incomplete.html');
 
     exit;
diff --git a/administrator/includes/defines.php b/administrator/includes/defines.php
index 3e8a3fe5fb526..ddf7c93e779e5 100644
--- a/administrator/includes/defines.php
+++ b/administrator/includes/defines.php
@@ -16,6 +16,7 @@
 // Defines
 define('JPATH_ROOT', implode(DIRECTORY_SEPARATOR, $parts));
 define('JPATH_SITE', JPATH_ROOT);
+define('JPATH_PUBLIC', JPATH_ROOT);
 define('JPATH_CONFIGURATION', JPATH_ROOT);
 define('JPATH_ADMINISTRATOR', JPATH_ROOT . DIRECTORY_SEPARATOR . 'administrator');
 define('JPATH_LIBRARIES', JPATH_ROOT . DIRECTORY_SEPARATOR . 'libraries');
diff --git a/administrator/includes/framework.php b/administrator/includes/framework.php
index 10c770cfe29af..76e25c9e46619 100644
--- a/administrator/includes/framework.php
+++ b/administrator/includes/framework.php
@@ -15,21 +15,27 @@
 // System includes
 require_once JPATH_LIBRARIES . '/bootstrap.php';
 
-// Installation check, and check on removal of the install directory.
+// Installation check, and check on removal of the install directory
 if (
     !file_exists(JPATH_CONFIGURATION . '/configuration.php')
     || (filesize(JPATH_CONFIGURATION . '/configuration.php') < 10)
     || (file_exists(JPATH_INSTALLATION . '/index.php') && (false === (new Version())->isInDevelopmentState()))
 ) {
-    if (file_exists(JPATH_INSTALLATION . '/index.php')) {
-        header('Location: ../installation/index.php');
-
-        exit();
-    } else {
+    if (!file_exists(JPATH_INSTALLATION . '/index.php')) {
         echo 'No configuration file found and no installation code available. Exiting...';
 
         exit;
     }
+
+    if (JPATH_ROOT === JPATH_PUBLIC) {
+        header('Location: ../installation/index.php');
+
+        exit;
+    }
+
+    echo 'Installation from a public folder is not supported, revert your Server configuration to point at Joomla\'s root folder to continue.';
+
+    exit;
 }
 
 // Pre-Load configuration. Don't remove the Output Buffering due to BOM issues, see JCode 26026
diff --git a/administrator/index.php b/administrator/index.php
index 6aec14a36bb8c..75d1d5fb55a8e 100644
--- a/administrator/index.php
+++ b/administrator/index.php
@@ -17,7 +17,7 @@
         str_replace(
             '{{phpversion}}',
             JOOMLA_MINIMUM_PHP,
-            file_get_contents(dirname(__FILE__) . '/../templates/system/incompatible.html')
+            file_get_contents(dirname(dirname(__FILE__)) . '/includes/incompatible.html')
         )
     );
 }
diff --git a/administrator/language/en-GB/com_admin.ini b/administrator/language/en-GB/com_admin.ini
index 6628084ee8767..ce7445a14db71 100644
--- a/administrator/language/en-GB/com_admin.ini
+++ b/administrator/language/en-GB/com_admin.ini
@@ -4,11 +4,6 @@
 ; Note : All ini files need to be saved as UTF-8
 
 COM_ADMIN="System Information"
-COM_ADMIN_A11Y_SETTINGS_FIELDSET_LABEL="Accessibility Settings"
-COM_ADMIN_A11Y_SETTINGS_FIELD_CONTRAST="High Contrast"
-COM_ADMIN_A11Y_SETTINGS_FIELD_FONTSIZE="Increase Font Size"
-COM_ADMIN_A11Y_SETTINGS_FIELD_HIGHLIGHT="Highlight Links"
-COM_ADMIN_A11Y_SETTINGS_FIELD_MONOCHROME="Monochrome"
 COM_ADMIN_ALPHABETICAL_INDEX="Alphabetical Index"
 COM_ADMIN_CACHE_DIRECTORY="(Cache folder)"
 COM_ADMIN_CONFIGURATION_FILE="Configuration File"
@@ -30,9 +25,9 @@ COM_ADMIN_FILE_UPLOADS="File Uploads"
 COM_ADMIN_GLOSSARY="Glossary"
 COM_ADMIN_HELP="Joomla! Help"
 COM_ADMIN_HELP_ARTICLES:_CATEGORIES="Articles: Categories"
+COM_ADMIN_HELP_ARTICLES:_EDIT_CATEGORY="Articles: Categories - New/Edit"
 COM_ADMIN_HELP_ARTICLES:_EDIT="Articles: New/Edit"
 COM_ADMIN_HELP_ARTICLES:_FEATURED="Articles: Featured"
-COM_ADMIN_HELP_ARTICLES:_NEW_OR_EDIT_CATEGORY="Articles: Categories - New/Edit"
 COM_ADMIN_HELP_ARTICLES="Articles"
 COM_ADMIN_HELP_BANNERS:_CATEGORIES="Banners: Categories"
 COM_ADMIN_HELP_BANNERS:_CLIENTS="Banners: Clients"
@@ -41,24 +36,24 @@ COM_ADMIN_HELP_BANNERS:_NEW_OR_EDIT_CATEGORY="Banners: Categories - New/Edit"
 COM_ADMIN_HELP_BANNERS:_NEW_OR_EDIT_CLIENT="Banners: Clients - New/Edit"
 COM_ADMIN_HELP_BANNERS:_TRACKS="Banners: Tracks"
 COM_ADMIN_HELP_BANNERS="Banners"
-COM_ADMIN_HELP_COMPONENT:_FIELD_GROUPS="Field Groups"
-COM_ADMIN_HELP_COMPONENT:_FIELDS="Fields"
-COM_ADMIN_HELP_COMPONENT:_NEW_OR_EDIT_FIELD_GROUP="Field Groups: New/Edit"
-COM_ADMIN_HELP_COMPONENT:_NEW_OR_EDIT_FIELD="Fields: New/Edit"
 COM_ADMIN_HELP_CONTACTS:_CATEGORIES="Contacts: Categories"
-COM_ADMIN_HELP_CONTACTS:_NEW_OR_EDIT_CATEGORY="Contacts: Categories - New/Edit"
-COM_ADMIN_HELP_CONTACTS:_NEW_OR_EDIT="Contacts: New/Edit"
+COM_ADMIN_HELP_CONTACTS:_EDIT_CATEGORY="Contacts: Categories - New/Edit"
+COM_ADMIN_HELP_CONTACTS:_EDIT="Contacts: New/Edit"
 COM_ADMIN_HELP_CONTACTS="Contacts"
 COM_ADMIN_HELP_EXTENSIONS:_DISCOVER="Extensions: Discover"
 COM_ADMIN_HELP_EXTENSIONS:_INSTALL="Extensions: Install"
 COM_ADMIN_HELP_EXTENSIONS:_LANGUAGES="Extensions: Install Languages"
 COM_ADMIN_HELP_EXTENSIONS:_MANAGE="Extensions: Manage"
 COM_ADMIN_HELP_EXTENSIONS:_UPDATE="Extensions: Update"
+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_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"
 COM_ADMIN_HELP_GUIDED_TOURS:_STEPS="Guided Tours: Steps"
-COM_ADMIN_HELP_GUIDED_TOURS:_TOURS="Guided Tours: Tours"
+COM_ADMIN_HELP_GUIDED_TOURS="Guided Tours"
 COM_ADMIN_HELP_INFORMATION:_DATABASE="Extensions: Check Database"
 COM_ADMIN_HELP_INFORMATION:_WARNINGS="Extensions: Warnings"
 COM_ADMIN_HELP_JOOMLA_UPDATE="Joomla Update"
@@ -81,8 +76,8 @@ COM_ADMIN_HELP_MODULES="Modules"
 COM_ADMIN_HELP_MULTILINGUAL_ASSOCIATIONS:_EDIT="Multilingual Associations: Select"
 COM_ADMIN_HELP_MULTILINGUAL_ASSOCIATIONS="Multilingual Associations"
 COM_ADMIN_HELP_NEWS_FEEDS:_CATEGORIES="News Feeds: Categories"
-COM_ADMIN_HELP_NEWS_FEEDS:_NEW_OR_EDIT_CATEGORY="News Feeds: Categories - New/Edit"
-COM_ADMIN_HELP_NEWS_FEEDS:_NEW_OR_EDIT="News Feeds: New/Edit"
+COM_ADMIN_HELP_NEWS_FEEDS:_EDIT_CATEGORY="News Feeds: Categories - New/Edit"
+COM_ADMIN_HELP_NEWS_FEEDS:_EDIT="News Feeds: New/Edit"
 COM_ADMIN_HELP_NEWS_FEEDS="News Feeds"
 COM_ADMIN_HELP_PERMISSIONS_FOR_USER="Users: Debug Users Permissions"
 COM_ADMIN_HELP_PLUGINS:_NAME_OF_PLUGIN="Plugins: New/Edit"
@@ -124,6 +119,7 @@ COM_ADMIN_HELP_USERS:_GROUPS="Users: Groups"
 COM_ADMIN_HELP_USERS:_NEW_OR_EDIT_GROUP="Users: Groups - New/Edit"
 COM_ADMIN_HELP_USERS:_VIEWING_ACCESS_LEVELS="Users: Access Levels"
 COM_ADMIN_HELP_USERS="Users"
+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)"
diff --git a/administrator/language/en-GB/com_content.ini b/administrator/language/en-GB/com_content.ini
index aa6df5a8776b2..730c0745ca3dc 100644
--- a/administrator/language/en-GB/com_content.ini
+++ b/administrator/language/en-GB/com_content.ini
@@ -28,7 +28,7 @@ COM_CONTENT_CREATE_ARTICLE_CANCEL_REDIRECT_MENU_LABEL="Cancel Redirect"
 COM_CONTENT_CREATE_ARTICLE_CATEGORY_LABEL="Specific Category"
 COM_CONTENT_CREATE_ARTICLE_CUSTOM_CANCEL_REDIRECT_DESC="If set to 'Yes', you can set a redirection page, distinct from above 'Submission/Cancel Redirect', to redirect to when user Cancels article submission.<br>If set to 'No', when user Cancels article submission, the user is redirected to the above 'Submission/Cancel Redirect' page."
 COM_CONTENT_CREATE_ARTICLE_CUSTOM_CANCEL_REDIRECT_LABEL="Custom Redirect on Cancel"
-COM_CONTENT_CREATE_ARTICLE_ERROR="When default category is enabled, a category should be selected."
+COM_CONTENT_CREATE_ARTICLE_ERROR="When specific category is enabled, a category should be selected."
 COM_CONTENT_CREATE_ARTICLE_REDIRECTMENU_DESC="Select the page the user will be redirected to after a successful article submission and after cancel (if not set differently below). The default is to redirect to the home page."
 COM_CONTENT_CREATE_ARTICLE_REDIRECTMENU_LABEL="Submission/Cancel Redirect"
 COM_CONTENT_DASHBOARD_TITLE="Content Dashboard"
diff --git a/administrator/language/en-GB/com_fields.ini b/administrator/language/en-GB/com_fields.ini
index 3ac2b49794bd4..0e8ba00000bee 100644
--- a/administrator/language/en-GB/com_fields.ini
+++ b/administrator/language/en-GB/com_fields.ini
@@ -57,10 +57,16 @@ COM_FIELDS_FIELD_RENDER_CLASS_LABEL="Display Class"
 COM_FIELDS_FIELD_RENDEROPTIONS_HEADING="Display Options"
 COM_FIELDS_FIELD_REQUIRED_LABEL="Required"
 COM_FIELDS_FIELD_SAVE_SUCCESS="Field saved"
+COM_FIELDS_FIELD_SEARCHINDEX_BOTH="Make searchable and add as taxonomy"
+COM_FIELDS_FIELD_SEARCHINDEX_DONT="Don't make searchable"
+COM_FIELDS_FIELD_SEARCHINDEX_LABEL="Search Index"
+COM_FIELDS_FIELD_SEARCHINDEX_SEARCHABLE="Make searchable"
+COM_FIELDS_FIELD_SEARCHINDEX_TAXONOMY="Add as taxonomy"
 COM_FIELDS_FIELD_SHOWLABEL_DESC="Show or Hide the label when the field displays."
 COM_FIELDS_FIELD_SHOWLABEL_LABEL="Label"
 COM_FIELDS_FIELD_SHOWON_DESC="Conditionally show or hide the field depending on the value of other fields."
 COM_FIELDS_FIELD_SHOWON_LABEL="Showon Attribute"
+COM_FIELDS_FIELD_SMARTSEARCHOPTIONS_HEADING="Smart Search"
 COM_FIELDS_FIELD_SUFFIX_LABEL="Suffix"
 COM_FIELDS_FIELD_TYPE_LABEL="Type"
 COM_FIELDS_FIELD_USE_GLOBAL="Use settings from Plugin"
@@ -94,6 +100,7 @@ COM_FIELDS_NO_FIELDS_TO_CREATE_SUBFORM_FIELD_WARNING="You need to create standar
 COM_FIELDS_ONLY_USE_IN_SUBFORM="- Use in Subform -"
 COM_FIELDS_ONLY_USE_IN_SUBFORM_ANY="Any Form"
 COM_FIELDS_ONLY_USE_IN_SUBFORM_SUBFORM="Only in Subform"
+COM_FIELDS_SEARCHINDEX_MIGHT_REQUIRE_REINDEXING="Please note, that your changes in the Custom Fields Manager might require you to rebuild the index of Smart Search."
 COM_FIELDS_SYSTEM_PLUGIN_NOT_ENABLED="The <a href=\"%s\">System - Fields</a> plugin is disabled. Custom fields will not display until you enable this plugin."
 COM_FIELDS_VIEW_FIELD_ADD_TITLE="%s: New Field"
 COM_FIELDS_VIEW_FIELD_EDIT_TITLE="%s: Edit Field"
diff --git a/administrator/language/en-GB/com_finder.ini b/administrator/language/en-GB/com_finder.ini
index 5630de653ae4b..61c5c14e33fb9 100644
--- a/administrator/language/en-GB/com_finder.ini
+++ b/administrator/language/en-GB/com_finder.ini
@@ -72,6 +72,7 @@ COM_FINDER_EMPTYSTATE_CONTENT="No content has been indexed or you have deleted a
 COM_FINDER_EMPTYSTATE_SEARCHES_CONTENT="There are no phrases used for site searching to view yet."
 COM_FINDER_FIELD_CREATED_BY_ALIAS_LABEL="Alias"
 COM_FINDER_FIELD_CREATED_BY_LABEL="Created By"
+COM_FINDER_FIELD_FINDER_PLUGIN_LABEL="Finder Plugin"
 COM_FINDER_FIELDSET_INDEX_OPTIONS_DESCRIPTION="These options influence how the content is indexed. After changing settings here, the index needs to be rebuilt."
 COM_FINDER_FIELDSET_INDEX_OPTIONS_LABEL="Index"
 COM_FINDER_FIELDSET_SEARCH_OPTIONS_LABEL="Smart Search"
@@ -152,11 +153,17 @@ COM_FINDER_INDEX_SEARCH_DESC="Search in title, URL and last updated date."
 COM_FINDER_INDEX_SEARCH_LABEL="Search Indexed Content"
 COM_FINDER_INDEX_TABLE_CAPTION="Indexed Content"
 COM_FINDER_INDEX_TIP="Start the indexer by pressing the button below, or in the toolbar."
+COM_FINDER_INDEX_TOOLBAR_INDEX_DEBUGGING="Index Debugging"
 COM_FINDER_INDEX_TOOLBAR_MAINTENANCE="Maintenance"
 COM_FINDER_INDEX_TOOLBAR_OPTIMISE="Optimise"
 COM_FINDER_INDEX_TOOLBAR_PURGE="Clear Index"
 COM_FINDER_INDEX_TOOLBAR_TITLE="Smart Search: Indexed Content"
 COM_FINDER_INDEX_TYPE_FILTER="Any Type of Content"
+COM_FINDER_INDEXER_ERROR_PLUGIN_FAILURE="A \"finder\" plugin has had an error."
+COM_FINDER_INDEXER_FIELDSET_ATTRIBUTES="Result Object"
+COM_FINDER_INDEXER_FIELDSET_ELEMENTS="Additional Elements"
+COM_FINDER_INDEXER_FIELDSET_INSTRUCTIONS="Instructions"
+COM_FINDER_INDEXER_FIELDSET_TAXONOMIES="Taxonomies"
 COM_FINDER_INDEXER_HEADER_COMPLETE="Indexing Complete"
 COM_FINDER_INDEXER_HEADER_ERROR="An Error Has Occurred"
 COM_FINDER_INDEXER_HEADER_INIT="Starting Indexer"
@@ -169,6 +176,15 @@ COM_FINDER_INDEXER_MESSAGE_COMPLETE="The indexing process is complete. It is now
 COM_FINDER_INDEXER_MESSAGE_INIT="The indexer is starting. Do not close this window."
 COM_FINDER_INDEXER_MESSAGE_OPTIMIZE="The index tables are being optimised for the best possible performance. Do not close this window."
 COM_FINDER_INDEXER_MESSAGE_RUNNING="Your content is being indexed. Do not close this window."
+COM_FINDER_INDEXER_MSG_DEBUGGING_INDEXING="Debugging Smart Search indexing plugins"
+COM_FINDER_INDEXER_MSG_DEBUGGING_INDEXING_TEXT="Select a Smart Search plugin and provide an ID to index. The result of that plugin for that ID will then be displayed in the below area."
+COM_FINDER_INDEXER_OUTPUT_AREA_TITLE="Output"
+COM_FINDER_INDEXER_TOOLBAR_TITLE="Indexer: Debug Mode"
+COM_FINDER_ITEM_FIELDSET_ITEM_TITLE="Item attributes"
+COM_FINDER_ITEM_FIELDSET_TAXONOMIES_TITLE="Taxonomies"
+COM_FINDER_ITEM_FIELDSET_TERMS_TITLE="Terms"
+COM_FINDER_ITEM_TAXONOMIES_TABLE_CAPTION="Table of taxonomies"
+COM_FINDER_ITEM_TERMS_TABLE_CAPTION="Table of terms"
 COM_FINDER_ITEM_X_ONLY="%s Only"
 COM_FINDER_ITEMS="Content"
 COM_FINDER_LOGGING_DISABLED="Gathering of statistics is disabled. Enable it in the %s."
diff --git a/administrator/language/en-GB/com_guidedtours.ini b/administrator/language/en-GB/com_guidedtours.ini
index c32c1c415d446..9b56a8b2627cb 100644
--- a/administrator/language/en-GB/com_guidedtours.ini
+++ b/administrator/language/en-GB/com_guidedtours.ini
@@ -4,6 +4,7 @@
 ; Note : All ini files need to be saved as UTF-8
 
 COM_GUIDEDTOURS="Guided Tours"
+; Deprecated, will be removed with 5.0
 COM_GUIDEDTOURS_BASIC_STEP="Basic Step"
 COM_GUIDEDTOURS_CONFIGURATION="Guided Tours: Options"
 COM_GUIDEDTOURS_DESCRIPTION="Description"
@@ -20,8 +21,8 @@ COM_GUIDEDTOURS_FIELD_VALUE_INTERACTIVESTEP_TYPE_TEXT_FIELD="Text Field"
 COM_GUIDEDTOURS_FIELD_VALUE_STEP_TYPE_INTERACTIVE="Interactive"
 COM_GUIDEDTOURS_FIELD_VALUE_STEP_TYPE_NEXT="Next"
 COM_GUIDEDTOURS_FIELD_VALUE_STEP_TYPE_REDIRECT="Redirect"
-COM_GUIDEDTOURS_FILTER_SEARCH_DESC="Search in title. Prefix with ID: to search for a tour ID or DESCRIPTION: to search in description."
-COM_GUIDEDTOURS_FILTER_SEARCH_LABEL="Search"
+COM_GUIDEDTOURS_FILTER_SEARCH_DESC="Search in title and note. Prefix with ID: to search for a tour ID or DESCRIPTION: to search in description."
+COM_GUIDEDTOURS_FILTER_SEARCH_LABEL="Search Tours"
 COM_GUIDEDTOURS_GUIDEDTOURS_TABLE_CAPTION="Tours"
 COM_GUIDEDTOURS_MANAGER_STEP_EDIT="Guided Tours: Edit Step"
 COM_GUIDEDTOURS_MANAGER_STEP_NEW="Guided Tours: New Step"
@@ -42,10 +43,11 @@ COM_GUIDEDTOURS_N_ITEMS_UNPUBLISHED="%d items unpublished."
 COM_GUIDEDTOURS_NEW_TOUR="New Tour"
 COM_GUIDEDTOURS_ORDER_TYPE_ASC="Type ascending"
 COM_GUIDEDTOURS_ORDER_TYPE_DESC="Type descending"
+COM_GUIDEDTOURS_PLUGIN_DISABLED="The Guided Tours System Plugin is disabled. The Guided Tours module will not be displayed if this is not enabled."
 COM_GUIDEDTOURS_STEP_DESCRIPTION_TRANSLATION="Description (%s)"
 COM_GUIDEDTOURS_STEP_EDIT_STEP="Edit Step"
-COM_GUIDEDTOURS_STEP_FILTER_SEARCH_DESC="Search in title. Prefix with ID: to search for a step ID or DESCRIPTION: to search in description."
-COM_GUIDEDTOURS_STEP_FILTER_SEARCH_LABEL="Search"
+COM_GUIDEDTOURS_STEP_FILTER_SEARCH_DESC="Search in title and note. Prefix with ID: to search for a step ID or DESCRIPTION: to search in description."
+COM_GUIDEDTOURS_STEP_FILTER_SEARCH_LABEL="Search Steps"
 COM_GUIDEDTOURS_STEP_NEW_STEP="New Step"
 COM_GUIDEDTOURS_STEP_POSITION_DESC="Select the position of the step popup, relative to the element it points to."
 COM_GUIDEDTOURS_STEP_POSITION_LABEL="Position"
@@ -62,8 +64,12 @@ COM_GUIDEDTOURS_STEPS_EMPTYSTATE_TITLE="No steps for this tour have been created
 COM_GUIDEDTOURS_STEPS_EMPTYSTATE_BUTTON_ADD="Add your first step"
 COM_GUIDEDTOURS_STEPS_LIST="Guided Tour: %s"
 COM_GUIDEDTOURS_STEPS_TABLE_CAPTION="Steps"
+COM_GUIDEDTOURS_STEPS_UNKNOWN_TOUR="Missing Tour ID"
 COM_GUIDEDTOURS_TITLE="Title"
 COM_GUIDEDTOURS_TITLE_TRANSLATION="Title (%s)"
+COM_GUIDEDTOURS_TOUR_UID_LABEL="Unique Identifier"
+COM_GUIDEDTOURS_TOUR_UID_DESC="The tour unique identifier needs to be unique.<br>We suggest a format such as authorname-tourname, companyname-tourname, or sitedomain-tourname.<br>If no identifier is provided a value will be computed for you."
+COM_GUIDEDTOURS_TOUR_UID_HINT="Unique identifier e.g. author-site-domain-tour-name"
 COM_GUIDEDTOURS_TOURS_DUPLICATED="%d tours duplicated."
 COM_GUIDEDTOURS_TOURS_DUPLICATED_1="Tour duplicated."
 COM_GUIDEDTOURS_TOURS_LIST="Guided Tours"
@@ -73,7 +79,7 @@ COM_GUIDEDTOURS_TOURS_LIST_EMPTYSTATE_TITLE="No tours have been created yet."
 COM_GUIDEDTOURS_TYPE_INTERACTIVE_STEP_DESC="Select <em>Form Submit</em> to submit a form, <em>Text Field</em> for user input, <em>Button</em> for buttons, or <em>Other</em> for any other interaction."
 COM_GUIDEDTOURS_TYPE_INTERACTIVE_STEP_LABEL="Interactive Type"
 COM_GUIDEDTOURS_TYPE_REDIRECT_URL_DESC="Enter the relative URL of the page you want the step to redirect to, eg administrator/index.php?option=com_guidedtours&view=tours for the tours' list page."
-COM_GUIDEDTOURS_TYPE_REDIRECT_URL_LABEL="URL"
-COM_GUIDEDTOURS_URL_LABEL="URL"
+COM_GUIDEDTOURS_TYPE_REDIRECT_URL_LABEL="Relative URL"
+COM_GUIDEDTOURS_URL_LABEL="Relative URL"
 COM_GUIDEDTOURS_URL_DESC="Enter the relative URL of the page from where you want to Start the tour, e.g administrator/index.php?option=com_guidedtours&view=tours for the tours' list page."
 COM_GUIDEDTOURS_XML_DESCRIPTION="Component for managing Guided Tours functionality."
diff --git a/administrator/language/en-GB/com_guidedtours.sys.ini b/administrator/language/en-GB/com_guidedtours.sys.ini
index 5e1ff9d9efa2b..cb3704daec68c 100644
--- a/administrator/language/en-GB/com_guidedtours.sys.ini
+++ b/administrator/language/en-GB/com_guidedtours.sys.ini
@@ -7,369 +7,3 @@ COM_GUIDEDTOURS="Guided Tours"
 COM_GUIDEDTOURS_TOURS_VIEW_DEFAULT_TITLE="List All Guided Tours"
 COM_GUIDEDTOURS_TOURS_VIEW_DEFAULT_DESC="Shows a list of all guided tours."
 COM_GUIDEDTOURS_XML_DESCRIPTION="Component for managing Guided Tours functionality."
-
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_TITLE="How to create a guided tour?"
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_DESCRIPTION="This tour will show you how you can create a guided tour for the backend."
-
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_NEW_TITLE="Select the 'New' button"
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_NEW_DESCRIPTION="Select 'New' to create a new tour."
-
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_TITLE_TITLE="Add a title for the tour"
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_TITLE_DESCRIPTION="Enter a required title for the tour."
-
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_CONTENT_TITLE="Add content"
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_CONTENT_DESCRIPTION="Enter content describing the tour."
-
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_COMPONENT_TITLE="Select a component"
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_COMPONENT_DESCRIPTION="Select the extension(s) where you want to show your tour in priority in the list of possible tours to run. For instance, If you are creating a tour for the 'Users' extension, then select 'Users'. Select 'All' for the tour to appear on every page."
-
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_URL_TITLE="Add a URL"
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_URL_DESCRIPTION="Add the relative URL of the page where the tour must start. For instance, enter <em>administrator/index.php?option=com_users&view=users</em> to start the tour in the Users page."
-
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_SAVECLOSE_TITLE="Select 'Save and Close'"
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_SAVECLOSE_DESCRIPTION="Save and close the tour."
-
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_CONGRATULATIONS_TITLE="Congratulations!"
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_CONGRATULATIONS_DESCRIPTION="You have created a guided tour. You now have to create steps for the tour."
-
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_TITLE="How to add steps to a guided tour?"
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_DESCRIPTION="This tour will show you how you can create a step for a guided tour."
-
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_COUNTER_TITLE="Select the step counter number"
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_COUNTER_DESCRIPTION="Select the number to add a step. The number represents the number of steps created for the tour so far."
-
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_NEW_TITLE="Select the 'New' button"
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_NEW_DESCRIPTION="Select 'New' to create a new step."
-
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_TITLE_TITLE="Add a title for the step"
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_TITLE_DESCRIPTION="Enter a required title for the step. This is usually an action a user must execute."
-
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_DESCRIPTION_TITLE="Add step explanation"
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_DESCRIPTION_DESCRIPTION="The content should give the user an explanation about the step."
-
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_STATUS_TITLE="Select the status"
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_STATUS_DESCRIPTION="Select the published status of the step."
-
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_POSITION_TITLE="Select the position"
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_POSITION_DESCRIPTION="This is the position of the popup relative to the element you target on the page. 'Centered' is used when there is no specific target."
-
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_TARGET_TITLE="Enter the target element"
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_TARGET_DESCRIPTION="This is the element on the page this step targets. It uses the syntax used by CSS to target an element.<br />For instance, <code>#jform_title</code> will target the element with id 'jform_title'"
-
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_TYPE_TITLE="Select the type"
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_TYPE_DESCRIPTION="This is the kind of step you want to create. 'Next' to allow the tour to continue without interaction, 'Redirect' to move to another page, 'Interactive' to request user input."
-
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_SAVECLOSE_TITLE="Select 'Save and Close'"
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_SAVECLOSE_DESCRIPTION="Save and close the step."
-
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_CONGRATULATIONS_TITLE="Congratulations!"
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_CONGRATULATIONS_DESCRIPTION="You have created a step for a guided tour."
-
-COM_GUIDEDTOURS_TOUR_ARTICLES_TITLE="How to create articles?"
-COM_GUIDEDTOURS_TOUR_ARTICLES_DESCRIPTION="This tour will show you how you can create an article."
-
-COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_NEW_TITLE="Select the 'New' button"
-COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_NEW_DESCRIPTION="Select 'New' to create a new article."
-
-COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_TITLE_TITLE="Add a title for the article"
-COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_TITLE_DESCRIPTION="Enter a required title for the article."
-
-COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_ALIAS_TITLE="Enter an alias"
-COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_ALIAS_DESCRIPTION="You can write the internal name of this article. You can leave this blank and a default value in lower case with dashes instead of spaces will be used as part of the URL."
-
-COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_CONTENT_TITLE="Add content"
-COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_CONTENT_DESCRIPTION="Add the content of your article in the editor."
-
-COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_STATUS_TITLE="Select the status"
-COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_STATUS_DESCRIPTION="Select the published status of the article."
-
-COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_CATEGORY_TITLE="Select a category"
-COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_CATEGORY_DESCRIPTION="Select the category for this article. You can also enter a new category by typing the name in the field and pressing enter."
-
-COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_FEATURED_TITLE="Toggle featured"
-COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_FEATURED_DESCRIPTION="Select 'Featured' to feature your article."
-
-COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_ACCESS_TITLE="Set the access level"
-COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_ACCESS_DESCRIPTION="Select the access level for the article."
-
-COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_TAGS_TITLE="Add tags"
-COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_TAGS_DESCRIPTION="Select tags for your article. You can also enter a new tag by typing the name in the field and pressing enter."
-
-COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_NOTE_TITLE="Add a note"
-COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_NOTE_DESCRIPTION="This is normally for administrator use and does not show in the front end."
-
-COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_VERSIONNOTE_TITLE="Add a version note"
-COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_VERSIONNOTE_DESCRIPTION="This is an optional field to identify the version of this article."
-
-COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_SAVECLOSE_TITLE="Select 'Save and Close'"
-COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_SAVECLOSE_DESCRIPTION="Save and close the article."
-
-COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_CONGRATULATIONS_TITLE="Congratulations!"
-COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_CONGRATULATIONS_DESCRIPTION="You have created an article."
-
-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_STEP_NEW_TITLE="Select the 'New' button"
-COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_NEW_DESCRIPTION="Select 'New' to create a new category."
-
-COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_TITLE_TITLE="Add a title for the category"
-COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_TITLE_DESCRIPTION="Enter a required title for the category."
-
-COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_ALIAS_TITLE="Enter an alias"
-COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_ALIAS_DESCRIPTION="You can write the internal name of this category. You can leave this blank and a default value in lower case with dashes instead of spaces will be used as part of the URL."
-
-COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_CONTENT_TITLE="Add content"
-COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_CONTENT_DESCRIPTION="Add the content of your category in the editor."
-
-COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_PARENT_TITLE="Select parent category"
-COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_PARENT_DESCRIPTION="Select or enter the parent of the category."
-
-COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_STATUS_TITLE="Select the status"
-COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_STATUS_DESCRIPTION="Select the published status of the category."
-
-COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_ACCESS_TITLE="Set the access level"
-COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_ACCESS_DESCRIPTION="Select the access level for the category."
-
-COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_TAGS_TITLE="Add tags"
-COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_TAGS_DESCRIPTION="Select tags for your category. You can also enter a new tag by typing the name in the field and pressing enter."
-
-COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_NOTE_TITLE="Add a note"
-COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_NOTE_DESCRIPTION="This is normally for administrator use and does not show in the front end."
-
-COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_VERSIONNOTE_TITLE="Add a version note"
-COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_VERSIONNOTE_DESCRIPTION="This is an optional field to identify the version of this category."
-
-COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_SAVECLOSE_TITLE="Select 'Save and Close'"
-COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_SAVECLOSE_DESCRIPTION="Save and close the category."
-
-COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_CONGRATULATIONS_TITLE="Congratulations!"
-COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_CONGRATULATIONS_DESCRIPTION="You have created a category"
-
-COM_GUIDEDTOURS_TOUR_MENUS_TITLE="How to create menus?"
-COM_GUIDEDTOURS_TOUR_MENUS_DESCRIPTION="This tour will show you how you can create a menu."
-
-COM_GUIDEDTOURS_TOUR_MENUS_STEP_NEW_TITLE="Select the 'New' button"
-COM_GUIDEDTOURS_TOUR_MENUS_STEP_NEW_DESCRIPTION="Select 'New' to create a new menu."
-
-COM_GUIDEDTOURS_TOUR_MENUS_STEP_TITLE_TITLE="Add a title for the menu"
-COM_GUIDEDTOURS_TOUR_MENUS_STEP_TITLE_DESCRIPTION="Enter a required title for the menu."
-
-COM_GUIDEDTOURS_TOUR_MENUS_STEP_UNIQUENAME_TITLE="Add a unique name"
-COM_GUIDEDTOURS_TOUR_MENUS_STEP_UNIQUENAME_DESCRIPTION="Enter a required unique name for the menu."
-
-COM_GUIDEDTOURS_TOUR_MENUS_STEP_DESCRIPTION_TITLE="Add a description"
-COM_GUIDEDTOURS_TOUR_MENUS_STEP_DESCRIPTION_DESCRIPTION="Add a description about the purpose of the menu."
-
-COM_GUIDEDTOURS_TOUR_MENUS_STEP_SAVECLOSE_TITLE="Select 'Save and Close'"
-COM_GUIDEDTOURS_TOUR_MENUS_STEP_SAVECLOSE_DESCRIPTION="Save and close the menu."
-
-COM_GUIDEDTOURS_TOUR_MENUS_STEP_CONGRATULATIONS_TITLE="Congratulations!"
-COM_GUIDEDTOURS_TOUR_MENUS_STEP_CONGRATULATIONS_DESCRIPTION="You have created a menu."
-
-COM_GUIDEDTOURS_TOUR_TAGS_TITLE="How to create tags?"
-COM_GUIDEDTOURS_TOUR_TAGS_DESCRIPTION="This tour will show you how you can create a tag."
-
-COM_GUIDEDTOURS_TOUR_TAGS_STEP_NEW_TITLE="Select the 'New' button"
-COM_GUIDEDTOURS_TOUR_TAGS_STEP_NEW_DESCRIPTION="Select 'New' to create a new tag."
-
-COM_GUIDEDTOURS_TOUR_TAGS_STEP_TITLE_TITLE="Add a title for the tag"
-COM_GUIDEDTOURS_TOUR_TAGS_STEP_TITLE_DESCRIPTION="Enter a required title for the tag."
-
-COM_GUIDEDTOURS_TOUR_TAGS_STEP_ALIAS_TITLE="Enter an alias"
-COM_GUIDEDTOURS_TOUR_TAGS_STEP_ALIAS_DESCRIPTION="You can write the internal name of this tag. You can leave this blank and a default value in lower case with dashes instead of spaces will be used as part of the URL."
-
-COM_GUIDEDTOURS_TOUR_TAGS_STEP_CONTENT_TITLE="Add content"
-COM_GUIDEDTOURS_TOUR_TAGS_STEP_CONTENT_DESCRIPTION="Add the content of your tag in the editor."
-
-COM_GUIDEDTOURS_TOUR_TAGS_STEP_PARENT_TITLE="Select parent tag"
-COM_GUIDEDTOURS_TOUR_TAGS_STEP_PARENT_DESCRIPTION="Select or enter the parent of the tag."
-
-COM_GUIDEDTOURS_TOUR_TAGS_STEP_STATUS_TITLE="Select the status"
-COM_GUIDEDTOURS_TOUR_TAGS_STEP_STATUS_DESCRIPTION="Select the published status of the tag."
-
-COM_GUIDEDTOURS_TOUR_TAGS_STEP_ACCESS_TITLE="Set the access level"
-COM_GUIDEDTOURS_TOUR_TAGS_STEP_ACCESS_DESCRIPTION="Select the access level for the tag."
-
-COM_GUIDEDTOURS_TOUR_TAGS_STEP_NOTE_TITLE="Add a note"
-COM_GUIDEDTOURS_TOUR_TAGS_STEP_NOTE_DESCRIPTION="This is normally for administrator use and does not show in the front end."
-
-COM_GUIDEDTOURS_TOUR_TAGS_STEP_VERSIONNOTE_TITLE="Add a version note"
-COM_GUIDEDTOURS_TOUR_TAGS_STEP_VERSIONNOTE_DESCRIPTION="This is an optional field to identify the version of this tag."
-
-COM_GUIDEDTOURS_TOUR_TAGS_STEP_SAVECLOSE_TITLE="Select 'Save and Close'"
-COM_GUIDEDTOURS_TOUR_TAGS_STEP_SAVECLOSE_DESCRIPTION="Save and close the tag."
-
-COM_GUIDEDTOURS_TOUR_TAGS_STEP_CONGRATULATIONS_TITLE="Congratulations!"
-COM_GUIDEDTOURS_TOUR_TAGS_STEP_CONGRATULATIONS_DESCRIPTION="You have created a tag."
-
-COM_GUIDEDTOURS_TOUR_BANNERS_TITLE="How to create banners?"
-COM_GUIDEDTOURS_TOUR_BANNERS_DESCRIPTION="This tour will show you how you can create a banner."
-
-COM_GUIDEDTOURS_TOUR_BANNERS_STEP_NEW_TITLE="Select the 'New' button"
-COM_GUIDEDTOURS_TOUR_BANNERS_STEP_NEW_DESCRIPTION="Select 'New' to create a new banner."
-
-COM_GUIDEDTOURS_TOUR_BANNERS_STEP_TITLE_TITLE="Add a title for the banner"
-COM_GUIDEDTOURS_TOUR_BANNERS_STEP_TITLE_DESCRIPTION="Enter a required title for the banner."
-
-COM_GUIDEDTOURS_TOUR_BANNERS_STEP_ALIAS_TITLE="Enter an alias"
-COM_GUIDEDTOURS_TOUR_BANNERS_STEP_ALIAS_DESCRIPTION="You can write the internal name of this banner. You can leave this blank and a default value in lower case with dashes instead of spaces will be used as part of the URL."
-
-COM_GUIDEDTOURS_TOUR_BANNERS_STEP_DESCRIPTION_TITLE="Add a description"
-COM_GUIDEDTOURS_TOUR_BANNERS_STEP_DESCRIPTION_DESCRIPTION="Add a description for the banner in the editor."
-
-COM_GUIDEDTOURS_TOUR_BANNERS_STEP_STATUS_TITLE="Select the status"
-COM_GUIDEDTOURS_TOUR_BANNERS_STEP_STATUS_DESCRIPTION="Select the published status of the banner."
-
-COM_GUIDEDTOURS_TOUR_BANNERS_STEP_CATEGORY_TITLE="Select a category"
-COM_GUIDEDTOURS_TOUR_BANNERS_STEP_CATEGORY_DESCRIPTION="Select the category for this banner. You can also enter a new category by typing the name in the field and pressing enter."
-
-COM_GUIDEDTOURS_TOUR_BANNERS_STEP_PINNED_TITLE="Toggle pinned"
-COM_GUIDEDTOURS_TOUR_BANNERS_STEP_PINNED_DESCRIPTION="Select 'Pinned' to give priority to the banner over ones that are not pinned."
-
-COM_GUIDEDTOURS_TOUR_BANNERS_STEP_VERSIONNOTE_TITLE="Add a version note"
-COM_GUIDEDTOURS_TOUR_BANNERS_STEP_VERSIONNOTE_DESCRIPTION="This is an optional field to identify the version of this banner."
-
-COM_GUIDEDTOURS_TOUR_BANNERS_STEP_SAVECLOSE_TITLE="Select 'Save and Close'"
-COM_GUIDEDTOURS_TOUR_BANNERS_STEP_SAVECLOSE_DESCRIPTION="Save and close the banner."
-
-COM_GUIDEDTOURS_TOUR_BANNERS_STEP_CONGRATULATIONS_TITLE="Congratulations!"
-COM_GUIDEDTOURS_TOUR_BANNERS_STEP_CONGRATULATIONS_DESCRIPTION="You have created a banner"
-
-COM_GUIDEDTOURS_TOUR_CONTACTS_TITLE="How to create contacts?"
-COM_GUIDEDTOURS_TOUR_CONTACTS_DESCRIPTION="This tour will show you how you can create a contact."
-
-COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_NEW_TITLE="Select the 'New' button"
-COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_NEW_DESCRIPTION="Select 'New' to create a new contact."
-
-COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_TITLE_TITLE="Add a name"
-COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_TITLE_DESCRIPTION="Enter a required name for the contact."
-
-COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_ALIAS_TITLE="Enter an alias"
-COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_ALIAS_DESCRIPTION="You can write the internal name of this contact. You can leave this blank and a default value in lower case with dashes instead of spaces will be used as part of the URL."
-
-COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_DETAILS_TITLE="Enter detailed information"
-COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_DETAILS_DESCRIPTION="Add the details for the contact here."
-
-COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_STATUS_TITLE="Select the status"
-COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_STATUS_DESCRIPTION="Select the published status of the contact."
-
-COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_CATEGORY_TITLE="Select a category"
-COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_CATEGORY_DESCRIPTION="Select the category for this contact. You can also enter a new category by typing the name in the field and pressing enter."
-
-COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_FEATURED_TITLE="Toggle featured"
-COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_FEATURED_DESCRIPTION="Select 'Featured' to feature your contact."
-
-COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_ACCESS_TITLE="Set the access level"
-COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_ACCESS_DESCRIPTION="Select the access level for the contact."
-
-COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_TAGS_TITLE="Add tags"
-COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_TAGS_DESCRIPTION="Select tags for your contact. You can also enter a new tag by typing the name in the field and pressing enter."
-
-COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_VERSIONNOTE_TITLE="Add a version note"
-COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_VERSIONNOTE_DESCRIPTION="This is an optional field to identify the version of this contact."
-
-COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_SAVECLOSE_TITLE="Select 'Save and Close'"
-COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_SAVECLOSE_DESCRIPTION="Save and close the contact."
-
-COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_CONGRATULATIONS_TITLE="Congratulations!"
-COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_CONGRATULATIONS_DESCRIPTION="You have created a contact."
-
-COM_GUIDEDTOURS_TOUR_NEWSFEEDS_TITLE="How to enter a news feed?"
-COM_GUIDEDTOURS_TOUR_NEWSFEEDS_DESCRIPTION="This tour will show you how you can enter a news feed from another site for display."
-
-COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_NEW_TITLE="Select the 'New' button"
-COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_NEW_DESCRIPTION="Select 'New' to create a new news feed."
-
-COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_TITLE_TITLE="Add a title"
-COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_TITLE_DESCRIPTION="Enter a required title for the news feed."
-
-COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_ALIAS_TITLE="Enter an alias"
-COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_ALIAS_DESCRIPTION="You can write the internal name of this news feed. You can leave this blank and a default value in lower case with dashes instead of spaces will be used as part of the URL."
-
-COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_LINK_TITLE="Enter the link"
-COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_LINK_DESCRIPTION="Add the link to the news feed here."
-
-COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_DESCRIPTION_TITLE="Enter a description"
-COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_DESCRIPTION_DESCRIPTION="Add a description for news feed in the editor."
-
-COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_STATUS_TITLE="Select the status"
-COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_STATUS_DESCRIPTION="Select the published status of the news feed."
-
-COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_CATEGORY_TITLE="Select a category"
-COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_CATEGORY_DESCRIPTION="Select the category for this news feed. You can also enter a new category by typing the name in the field and pressing enter."
-
-COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_ACCESS_TITLE="Set the access level"
-COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_ACCESS_DESCRIPTION="Select the access level for the news feed."
-
-COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_TAGS_TITLE="Add tags"
-COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_TAGS_DESCRIPTION="Select tags for your news feed. You can also enter a new tag by typing the name in the field and pressing enter."
-
-COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_VERSIONNOTE_TITLE="Add a version note"
-COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_VERSIONNOTE_DESCRIPTION="This is an optional field to identify the version of this news feed."
-
-COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_SAVECLOSE_TITLE="Select 'Save and Close'"
-COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_SAVECLOSE_DESCRIPTION="Save and close the news feed."
-
-COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_CONGRATULATIONS_TITLE="Congratulations!"
-COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_CONGRATULATIONS_DESCRIPTION="You have created a news feed."
-
-COM_GUIDEDTOURS_TOUR_SMARTSEARCH_TITLE="How to create smart search filters?"
-COM_GUIDEDTOURS_TOUR_SMARTSEARCH_DESCRIPTION="This tour will show you how you can create a smart search filter."
-
-COM_GUIDEDTOURS_TOUR_SMARTSEARCH_STEP_NEW_TITLE="Select the 'New' button"
-COM_GUIDEDTOURS_TOUR_SMARTSEARCH_STEP_NEW_DESCRIPTION="Select 'New' to create a new smart search filter."
-
-COM_GUIDEDTOURS_TOUR_SMARTSEARCH_STEP_TITLE_TITLE="Add a title"
-COM_GUIDEDTOURS_TOUR_SMARTSEARCH_STEP_TITLE_DESCRIPTION="Enter a required title for the smart search filter."
-
-COM_GUIDEDTOURS_TOUR_SMARTSEARCH_STEP_ALIAS_TITLE="Enter an alias"
-COM_GUIDEDTOURS_TOUR_SMARTSEARCH_STEP_ALIAS_DESCRIPTION="You can write the internal name of this filter. You can leave this blank and a default value in lower case with dashes instead of spaces will be used as part of the URL."
-
-COM_GUIDEDTOURS_TOUR_SMARTSEARCH_STEP_CONTENT_TITLE="Enter content"
-COM_GUIDEDTOURS_TOUR_SMARTSEARCH_STEP_CONTENT_DESCRIPTION="Add the content for the smart search filter here."
-
-COM_GUIDEDTOURS_TOUR_SMARTSEARCH_STEP_STATUS_TITLE="Select the status"
-COM_GUIDEDTOURS_TOUR_SMARTSEARCH_STEP_STATUS_DESCRIPTION="Select the published status of the filter."
-
-COM_GUIDEDTOURS_TOUR_SMARTSEARCH_STEP_SAVECLOSE_TITLE="Select 'Save and Close'"
-COM_GUIDEDTOURS_TOUR_SMARTSEARCH_STEP_SAVECLOSE_DESCRIPTION="Save and close the smart search filter."
-
-COM_GUIDEDTOURS_TOUR_SMARTSEARCH_STEP_CONGRATULATIONS_TITLE="Congratulations!"
-COM_GUIDEDTOURS_TOUR_SMARTSEARCH_STEP_CONGRATULATIONS_DESCRIPTION="You have created a smart search filter."
-
-COM_GUIDEDTOURS_TOUR_USERS_TITLE="How to create users?"
-COM_GUIDEDTOURS_TOUR_USERS_DESCRIPTION="This tour will show you how you can create a user."
-
-COM_GUIDEDTOURS_TOUR_USERS_STEP_NEW_TITLE="Select the 'New' button"
-COM_GUIDEDTOURS_TOUR_USERS_STEP_NEW_DESCRIPTION="Select 'New' to create a new user."
-
-COM_GUIDEDTOURS_TOUR_USERS_STEP_NAME_TITLE="Add a name"
-COM_GUIDEDTOURS_TOUR_USERS_STEP_NAME_DESCRIPTION="Enter a required name for the user."
-
-COM_GUIDEDTOURS_TOUR_USERS_STEP_LOGINNAME_TITLE="Add a login name"
-COM_GUIDEDTOURS_TOUR_USERS_STEP_LOGINNAME_DESCRIPTION="Enter a required login name for the user (username)."
-
-COM_GUIDEDTOURS_TOUR_USERS_STEP_PASSWORD_TITLE="Enter a password"
-COM_GUIDEDTOURS_TOUR_USERS_STEP_PASSWORD_DESCRIPTION="Fill in a (new) password. Although this field is not required, the user will not be able to log in when no password is set."
-
-COM_GUIDEDTOURS_TOUR_USERS_STEP_PASSWORD2_TITLE="Confirm the password"
-COM_GUIDEDTOURS_TOUR_USERS_STEP_PASSWORD2_DESCRIPTION="Fill in the password from the field above again, to verify it. This field is required when you filled in the new password field."
-
-COM_GUIDEDTOURS_TOUR_USERS_STEP_EMAIL_TITLE="Add an email address"
-COM_GUIDEDTOURS_TOUR_USERS_STEP_EMAIL_DESCRIPTION="Enter an email address for the user."
-
-COM_GUIDEDTOURS_TOUR_USERS_STEP_SYSTEMEMAIL_TITLE="Toggle receive system emails"
-COM_GUIDEDTOURS_TOUR_USERS_STEP_SYSTEMEMAIL_DESCRIPTION="Set to yes, if the user needs to receive system emails."
-
-COM_GUIDEDTOURS_TOUR_USERS_STEP_STATUS_TITLE="Toggle status"
-COM_GUIDEDTOURS_TOUR_USERS_STEP_STATUS_DESCRIPTION="Enable or block this user."
-
-COM_GUIDEDTOURS_TOUR_USERS_STEP_PASSWORDRESET_TITLE="Toggle password reset"
-COM_GUIDEDTOURS_TOUR_USERS_STEP_PASSWORDRESET_DESCRIPTION="If set to yes, the user will have to reset their password the next time they log in to the site."
-
-COM_GUIDEDTOURS_TOUR_USERS_STEP_SAVECLOSE_TITLE="Select 'Save and Close'"
-COM_GUIDEDTOURS_TOUR_USERS_STEP_SAVECLOSE_DESCRIPTION="Save and close the user."
-
-COM_GUIDEDTOURS_TOUR_USERS_STEP_CONGRATULATIONS_TITLE="Congratulations!"
-COM_GUIDEDTOURS_TOUR_USERS_STEP_CONGRATULATIONS_DESCRIPTION="You have created a user."
diff --git a/administrator/language/en-GB/com_installer.ini b/administrator/language/en-GB/com_installer.ini
index 2b084ad652dcf..6ea56b52e6d24 100644
--- a/administrator/language/en-GB/com_installer.ini
+++ b/administrator/language/en-GB/com_installer.ini
@@ -89,7 +89,7 @@ COM_INSTALLER_HEADING_UPDATESITE_NAME_DESC="Update Site descending"
 COM_INSTALLER_HEADING_UPDATESITEID="ID"
 COM_INSTALLER_INSTALL_ARIA="Install %s"
 COM_INSTALLER_INSTALL_BUTTON="Install"
-COM_INSTALLER_INSTALL_CHECKSUM_WARNING="No checksum found on the update server."
+COM_INSTALLER_INSTALL_CHECKSUM_WARNING="This extension does not provide a checksum for validation of the integrity of the downloaded file."
 COM_INSTALLER_INSTALL_CHECKSUM_WRONG="The checksum verification failed. Please make sure you are using the correct update server!"
 COM_INSTALLER_INSTALL_DIRECTORY="Install Folder"
 COM_INSTALLER_INSTALL_ERROR="Error installing %s"
@@ -217,7 +217,7 @@ COM_INSTALLER_NO_INSTALL_TYPE_FOUND="No Install Type Found"
 COM_INSTALLER_NO_INSTALLATION_PLUGINS_FOUND="No installation plugin has been enabled. At least one must be enabled to be able to use the installer. Go to the <a href='index.php?option=com_plugins&view=plugins&filter[folder]=installer' title='Plugin Manager'>Plugin Manager</a> to enable the plugins."
 COM_INSTALLER_PACKAGE_DOWNLOAD_FAILED="Failed to download package. Download it and install manually from <a href='%1$s'>%1$s</a>."
 COM_INSTALLER_PACKAGE_FILE="Package File"
-COM_INSTALLER_PREFERENCES_DESCRIPTION="Fine tune how extensions installation and updates work."
+COM_INSTALLER_PREFERENCES_DESCRIPTION="Fine-tune how extensions installation and updates work."
 COM_INSTALLER_PREFERENCES_LABEL="Preferences"
 COM_INSTALLER_REINSTALL_ARIA="Reinstall %s"
 COM_INSTALLER_REINSTALL_BUTTON="Reinstall"
diff --git a/administrator/language/en-GB/com_joomlaupdate.ini b/administrator/language/en-GB/com_joomlaupdate.ini
index a2173af176938..1f9b8612b596f 100644
--- a/administrator/language/en-GB/com_joomlaupdate.ini
+++ b/administrator/language/en-GB/com_joomlaupdate.ini
@@ -157,14 +157,15 @@ COM_JOOMLAUPDATE_VIEW_DEFAULT_TAB_UPLOAD="Upload & Update"
 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_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 (4.x)"
-COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_NEXT="You are on the &quot;%s&quot; update channel. Through this channel you'll receive notifications for all updates of the current Joomla release (4.x) and you will also be notified when the future major release (5.x) will be available. Before upgrading to 5.x you'll need to assess its compatibility with your environment."
+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'll receive notifications for all updates of the current Joomla release (5.x) and you will also 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."
 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_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"
 COM_JOOMLAUPDATE_VIEW_UPDATE_BYTESREAD="Bytes read"
 COM_JOOMLAUPDATE_VIEW_UPDATE_CHECKSUM_WRONG="File Checksum Failed"
 COM_JOOMLAUPDATE_VIEW_UPDATE_DOWNLOADFAILED="Download of update package failed."
+COM_JOOMLAUPDATE_VIEW_UPDATE_ITEMS="items"
 COM_JOOMLAUPDATE_VIEW_UPDATE_FILESEXTRACTED="Files extracted"
 COM_JOOMLAUPDATE_VIEW_UPDATE_FINALISE_CONFIRM_AND_CONTINUE="Confirm & Continue"
 COM_JOOMLAUPDATE_VIEW_UPDATE_FINALISE_HEAD="Joomla Update is finishing and cleaning up"
diff --git a/administrator/language/en-GB/com_menus.ini b/administrator/language/en-GB/com_menus.ini
index 3125fc5a1fdcb..c205c860eda17 100644
--- a/administrator/language/en-GB/com_menus.ini
+++ b/administrator/language/en-GB/com_menus.ini
@@ -12,7 +12,7 @@ COM_MENUS_ADD_MENU_MODULE="Add a module for this menu"
 COM_MENUS_ADMIN_ACCESS_LABEL="Access"
 COM_MENUS_ADMIN_AUTHOR_LABEL="Author"
 COM_MENUS_ADMIN_CATEGORY_LABEL="Category"
-COM_MENUS_ADMIN_FILTER_LABEL="Filter"
+COM_MENUS_ADMIN_FILTER_LABEL="Filters"
 COM_MENUS_ADMIN_LANGUAGE_LABEL="Language"
 COM_MENUS_ADMIN_LEVEL_LABEL="Subcategory Levels"
 COM_MENUS_ADMIN_TAGS_LABEL="Tags"
diff --git a/administrator/language/en-GB/com_newsfeeds.ini b/administrator/language/en-GB/com_newsfeeds.ini
index 9ee18640a2c08..55941aede1a7b 100644
--- a/administrator/language/en-GB/com_newsfeeds.ini
+++ b/administrator/language/en-GB/com_newsfeeds.ini
@@ -89,10 +89,14 @@ COM_NEWSFEEDS_NUM_ARTICLES_HEADING_ASC="# Articles ascending"
 COM_NEWSFEEDS_NUM_ARTICLES_HEADING_DESC="# Articles descending"
 COM_NEWSFEEDS_RIGHT="Right"
 COM_NEWSFEEDS_SAVE_SUCCESS="News feed saved."
+; Deprecated, will be removed with 5.0
 COM_NEWSFEEDS_SEARCH_IN_TITLE="Search"
 COM_NEWSFEEDS_SELECT_A_FEED="Select a News Feed"
+; Deprecated, will be removed with 5.0
 COM_NEWSFEEDS_SELECT_FEED="Select feed"
+; Deprecated, will be removed with 5.0
 COM_NEWSFEEDS_SUBMENU_CATEGORIES="Categories"
+; Deprecated, will be removed with 5.0
 COM_NEWSFEEDS_SUBMENU_NEWSFEEDS="News Feeds"
 COM_NEWSFEEDS_TABLE_CAPTION="News Feeds"
 COM_NEWSFEEDS_TIP_ASSOCIATION="Associated news feeds"
diff --git a/administrator/language/en-GB/com_templates.ini b/administrator/language/en-GB/com_templates.ini
index 14ecda14c70bc..151a2cdbbeebb 100644
--- a/administrator/language/en-GB/com_templates.ini
+++ b/administrator/language/en-GB/com_templates.ini
@@ -51,7 +51,7 @@ COM_TEMPLATES_DIFF_OPTIONS_SIDE="Side-by-Side"
 COM_TEMPLATES_DIFF_OVERRIDE="Override"
 COM_TEMPLATES_DIRECTORY_NOT_WRITABLE="The template folder is not writable. Some features may not work."
 COM_TEMPLATES_ERROR_ASSET_FILE_DELETE="The file joomla.asset.json can't be deleted. Make changes in the editor if you want to change the file."
-COM_TEMPLATES_ERROR_ASSET_FILE_INVALID_JSON="The joomla.asset.json file doesn't contain valid JSON, aborting save."
+COM_TEMPLATES_ERROR_ASSET_FILE_INVALID_JSON="The joomla.asset.json file doesn't contain valid JSON, cancelling save."
 COM_TEMPLATES_ERROR_CANNOT_DELETE_LAST_STYLE="Can't delete the last style of a template. Did you intend to <a href=\"index.php?option=com_installer&view=manage&filter[type]=template\" class=\"alert-link\">uninstall</a> the template?"
 COM_TEMPLATES_ERROR_CANNOT_UNSET_DEFAULT_STYLE="Can't unset default style."
 COM_TEMPLATES_ERROR_COULD_NOT_COPY="Unable to copy template files to temporary folder."
@@ -218,6 +218,7 @@ COM_TEMPLATES_STYLES_FILTER_SEARCH_DESC="Search in style description."
 COM_TEMPLATES_STYLES_PAGES_ALL="Default for all pages"
 COM_TEMPLATES_STYLES_PAGES_ALL_LANGUAGE="Default for %s pages"
 COM_TEMPLATES_STYLES_PAGES_NONE="Not assigned"
+COM_TEMPLATES_STYLES_PAGES_SELECTED_1="Assigned on %s page"
 COM_TEMPLATES_STYLES_PAGES_SELECTED="Assigned on %s pages"
 COM_TEMPLATES_STYLES_TABLE_CAPTION="Template Styles"
 COM_TEMPLATES_STYLE_CANNOT_DELETE_DEFAULT_STYLE="Can't delete default style."
diff --git a/administrator/language/en-GB/com_users.ini b/administrator/language/en-GB/com_users.ini
index 4d866542ef1e2..56bcedadc5b63 100644
--- a/administrator/language/en-GB/com_users.ini
+++ b/administrator/language/en-GB/com_users.ini
@@ -66,21 +66,23 @@ COM_USERS_CONFIG_FRONTEND_SHOW_TITLE_LABEL="Show title in frontend"
 COM_USERS_CONFIG_IMPORT_FAILED="An error was encountered while importing the configuration: %s."
 COM_USERS_CONFIG_INTEGRATION_SETTINGS_DESC="These settings determine how the Users Component will integrate with other extensions."
 COM_USERS_CONFIG_LBL_NOGROUP="( no group )"
-COM_USERS_CONFIG_MFAONSILENT_DESC="Should the user have to go through Multi-factor Authentication after a silent user login? Silent logins are those which do not require a username and password e.g. the Remember Me feature, WebAuthn etc."
+COM_USERS_CONFIG_MFAONSILENT_DESC="Should the user have to go through Multi-factor Authentication after a silent user login? Silent logins are those which do not require a username and password e.g. the Remember Me feature, passkeys etc."
 COM_USERS_CONFIG_MFAONSILENT_LABEL="Multi-factor Authentication after silent login"
 COM_USERS_CONFIG_MULTIFACTORAUTH_SETTINGS_DESC="Configure how Multi-factor Authentication works in Joomla."
 COM_USERS_CONFIG_MULTIFACTORAUTH_SETTINGS_LABEL="Multi-factor Authentication"
 COM_USERS_CONFIG_NEVERMFAUSERGROUPS_DESC="Any user who belongs in <em>any</em> of the selected user groups will be exempt from Multi-factor Authentication. Even if they have set up Multi-factor Authentication methods they will not be asked to use them when they are logging in, nor will they be able to view them, remove them, or change their configuration."
 COM_USERS_CONFIG_NEVERMFAUSERGROUPS_LABEL="Disable Multi-factor Authentication"
 COM_USERS_CONFIG_PASSWORD_OPTIONS="Password Options"
-COM_USERS_CONFIG_REDIRECTONLOGIN_DESC="If the user has not yet set up Multi-factor Authentication and this option is enabled they will be redirected to the Multi-factor Authentication setup page or the custom URL you set up below. This is meant to be a simple way to to let your users know that Multi-factor Authentication is an option on your site."
+COM_USERS_CONFIG_REDIRECTONLOGIN_DESC="If the user has not yet set up Multi-factor Authentication and this option is enabled they will be redirected to the Multi-factor Authentication setup page or the custom URL you set up below. This is meant to be a simple way to let your users know that Multi-factor Authentication is an option on your site."
 COM_USERS_CONFIG_REDIRECTONLOGIN_LABEL="Onboard new users"
 COM_USERS_CONFIG_REDIRECTURL_DESC="If it's not empty redirects to this URL instead of the Multi-factor Authentication setup page when the option above is enabled. WARNING: This must be a URL inside your site. You cannot log in to an external link or to a different subdomain."
 COM_USERS_CONFIG_REDIRECTURL_LABEL="Custom redirection URL"
 COM_USERS_CONFIG_SAVE_FAILED="An error was encountered while saving the configuration: %s."
-COM_USERS_CONFIG_SILENTRESPONSES_DESC="For experts. A comma–separated list of Joomla authentication response types which are considered silent logins. The default is <code>cookie</code> (the Remember Me feature) and <code>passwordless</code> (WebAuthn)."
+COM_USERS_CONFIG_SILENTRESPONSES_DESC="For experts. A comma–separated list of Joomla authentication response types which are considered silent logins. The default is <code>cookie</code> (the Remember Me feature) and <code>passwordless</code> (passkeys)."
 COM_USERS_CONFIG_SILENTRESPONSES_LABEL="Silent login authentication response types (for experts)"
 COM_USERS_CONFIG_USER_OPTIONS="User Options"
+COM_USERS_CONFIG_MFATRYCOUNT_LABEL="Maximum MFA tries"
+COM_USERS_CONFIG_MFATRYTIME_LABEL="MFA limit block time (in hours)"
 COM_USERS_COUNT_DISABLED_USERS="Blocked Users"
 COM_USERS_COUNT_ENABLED_USERS="Enabled Users"
 COM_USERS_DASHBOARD_TITLE="Users Dashboard"
@@ -176,7 +178,7 @@ COM_USERS_HEADING_LEVEL_NAME_DESC="Level Name descending"
 COM_USERS_HEADING_LFT="LFT"
 COM_USERS_HEADING_LFT_ASC="LFT ascending"
 COM_USERS_HEADING_LFT_DESC="LFT descending"
-COM_USERS_HEADING_MFA="Multi-factor Authentication"
+COM_USERS_HEADING_MFA="MFA"
 COM_USERS_HEADING_NAME="Name"
 COM_USERS_HEADING_REGISTRATION_DATE="Registered"
 COM_USERS_HEADING_REGISTRATION_DATE_ASC="Registration date ascending"
@@ -271,6 +273,7 @@ COM_USERS_MFA_FIRSTTIME_NOTINTERESTED="Don't show this again"
 COM_USERS_MFA_FIRSTTIME_PAGE_HEAD="Set up your Multi-factor Authentication"
 COM_USERS_MFA_INVALID_CODE="Multi-factor Authentication failed. Please try again."
 COM_USERS_MFA_INVALID_METHOD="Invalid Multi-factor Authentication method."
+COM_USERS_MFA_TRY_LIMIT_REACHED="You have reached the try limit for the currently selected Authentication method. Please choose a different method or wait."
 COM_USERS_MFA_LBL_CREATEDON="Added: %s"
 COM_USERS_MFA_LBL_DATE_FORMAT_PAST="F d, Y"
 COM_USERS_MFA_LBL_DATE_FORMAT_TODAY="H:i"
@@ -357,7 +360,7 @@ COM_USERS_OPTION_SELECT_LEVEL_END="- Select End Level -"
 COM_USERS_OPTION_SELECT_LEVEL_START="- Select Start Level -"
 COM_USERS_PASSWORD_RESET_REQUIRED="Password Reset Required"
 COM_USERS_POSTINSTALL_MULTIFACTORAUTH_ACTION="Enable the new Multi-factor Authentication plugins"
-COM_USERS_POSTINSTALL_MULTIFACTORAUTH_BODY="<p>Joomla! comes with a drastically improved <a href=\"https://en.wikipedia.org/wiki/Multi-factor_authentication\" target=\"_blank\" rel=\"noopener noreferrer\">Multi-factor Authentication</a> experience to help you secure the logins of your users.</p><p>Unlike the Two Factor Authentication feature in previous versions of Joomla, users <em>no longer have to enter a Security Code with their username and password</em>. The Multi-factor Authentication happens in a separate step after logging into the site. Until they complete their Multi-factor Authentication validation users cannot navigate to other pages or use the site. This makes Multi-factor Authentication <a href=\"https://en.wikipedia.org/wiki/Phishing\" target=\"_blank\" rel=\"noopener noreferrer\">phishing</a>&ndash;resistant. It also allows for interactive validation methods like WebAuthn (including integration with Windows Hello, Apple TouchID / FaceID and Android Biometric Screen Lock), or sending 6-digit authentication codes by email. Both of these interactive, convenient methods are now available as plugins shipped with Joomla! itself.</p>"
+COM_USERS_POSTINSTALL_MULTIFACTORAUTH_BODY="<p>Joomla! comes with a drastically improved <a href=\"https://en.wikipedia.org/wiki/Multi-factor_authentication\" target=\"_blank\" rel=\"noopener noreferrer\">Multi-factor Authentication</a> experience to help you secure the logins of your users.</p><p>Unlike the Two Factor Authentication feature in previous versions of Joomla, users <em>no longer have to enter a Security Code with their username and password</em>. The Multi-factor Authentication happens in a separate step after logging into the site. Until they complete their Multi-factor Authentication validation users cannot navigate to other pages or use the site. This makes Multi-factor Authentication <a href=\"https://en.wikipedia.org/wiki/Phishing\" target=\"_blank\" rel=\"noopener noreferrer\">phishing</a>&ndash;resistant. It also allows for interactive validation methods like passkeys (including integration with Windows Hello, Apple TouchID / FaceID and Android Biometric Screen Lock), or sending 6-digit authentication codes by email. Both of these interactive, convenient methods are now available as plugins shipped with Joomla! itself.</p>"
 COM_USERS_POSTINSTALL_MULTIFACTORAUTH_TITLE="Improved Multi-factor Authentication"
 COM_USERS_REQUIRE_PASSWORD_RESET="Require Password Reset"
 COM_USERS_REVIEW_HEADING="Review Date"
diff --git a/administrator/language/en-GB/com_workflow.ini b/administrator/language/en-GB/com_workflow.ini
index d627a14271efa..f5af1618b4e13 100644
--- a/administrator/language/en-GB/com_workflow.ini
+++ b/administrator/language/en-GB/com_workflow.ini
@@ -3,30 +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
 
-COM_WORKFLOW_ARE_YOU_SURE="Are you sure?"
-COM_WORKFLOW_AUTHOR="Author"
 COM_WORKFLOW_BASIC_STAGE="Basic Stage"
-COM_WORKFLOW_BASIC_TAB="Basic"
 COM_WORKFLOW_BASIC_WORKFLOW="Basic Workflow"
 COM_WORKFLOW_CHOOSE_CONTEXT_LABEL="Context"
-COM_WORKFLOW_CONFIGURATION="Workflow: Options"
 COM_WORKFLOW_COUNT_STAGES="Stages"
 COM_WORKFLOW_COUNT_TRANSITIONS="Transitions"
-COM_WORKFLOW_CREATED_AT_ASC="Date Created ascending"
-COM_WORKFLOW_CREATED_AT_DESC="Date Created descending"
 COM_WORKFLOW_CREATED_LABEL="Date Created"
-COM_WORKFLOW_DATE_CREATED="Date Created"
-COM_WORKFLOW_DATE_MODIFIED="Date Modified"
 COM_WORKFLOW_DEFAULT="Default"
-COM_WORKFLOW_DEFAULT_ITEM="Default option is already set for a different item."
-COM_WORKFLOW_DESC_TAB="Description"
 COM_WORKFLOW_DESCRIPTION="Description"
 COM_WORKFLOW_DISABLE_DEFAULT="The default status cannot be changed."
-COM_WORKFLOW_EDIT="Edit"
-COM_WORKFLOW_EDIT_TAB="Edit"
 COM_WORKFLOW_ERROR_EXTENSION_NOT_SET="Extension not set."
-COM_WORKFLOW_ERROR_UPDATE_STAGE="Error while updating the stage."
-COM_WORKFLOW_FIELD_CATEGORY_LIST_LABEL="Category List"
 COM_WORKFLOW_FIELD_IS_DEFAULT_LABEL="Default"
 COM_WORKFLOW_FIELD_NAME_LABEL="Name"
 COM_WORKFLOW_FILTER_SEARCH_DESC="Search in title and description."
@@ -41,15 +27,13 @@ COM_WORKFLOW_INHERIT_WORKFLOW="Inherit (%s)"
 COM_WORKFLOW_INHERIT_WORKFLOW_NEW="Inherit"
 COM_WORKFLOW_ITEM_MUST_PUBLISHED="Item must be published to set default stage."
 COM_WORKFLOW_ITEM_UNSET_DEFAULT="Default stage unset."
-COM_WORKFLOW_MANAGE="Manage"
-COM_WORKFLOW_MODIFIED_AT_ASC="Date Modified ascending"
-COM_WORKFLOW_MODIFIED_AT_DESC="Date Modified descending"
 COM_WORKFLOW_MODIFIED_LABEL="Date Modified"
 COM_WORKFLOW_MSG_DELETE_IS_DEFAULT="You can't delete the default item."
 COM_WORKFLOW_MSG_DELETE_STAGE_IS_ASSIGNED="This stage is assigned to an item of this component and has to remain in a published state."
 COM_WORKFLOW_MSG_DELETE_WORKFLOW_IS_ASSIGNED="This workflow is in use by the component."
 COM_WORKFLOW_MSG_DISABLE_DEFAULT="The default item has to stay published."
 COM_WORKFLOW_MSG_WORKFLOWS_DELETE_ERROR="There was a problem while deleting the item: %s"
+COM_WORKFLOW_NAME="Name"
 COM_WORKFLOW_N_ITEMS_CHECKED_IN="%d workflows checked in."
 COM_WORKFLOW_N_ITEMS_CHECKED_IN_1="Workflow checked in."
 COM_WORKFLOW_N_ITEMS_DELETED="%d workflows deleted."
@@ -60,24 +44,11 @@ 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_NA="N/A"
-COM_WORKFLOW_NAME="Name"
-COM_WORKFLOW_NEW="New"
-COM_WORKFLOW_PARAMS_TAB="Parameters"
-COM_WORKFLOW_PUBLISHED="Published"
-COM_WORKFLOW_PUBLISHED_DESC="Defines item behaviour."
 COM_WORKFLOW_PUBLISHED_LABEL="Status"
 COM_WORKFLOW_RULES_TAB="Permissions"
 COM_WORKFLOW_SELECT_FROM_STAGE="- Select Current Stage -"
 COM_WORKFLOW_SELECT_TO_STAGE="- Select Target Stage -"
 COM_WORKFLOW_SET_DEFAULT="Workflow set as default."
-COM_WORKFLOW_STAGE="Existing Stages"
-COM_WORKFLOW_STAGE_ADD="Add Stage"
-COM_WORKFLOW_STAGE_EDIT="Edit Stage"
-COM_WORKFLOW_STAGE_FORM_EDIT="Edit Stage"
-COM_WORKFLOW_STAGE_FORM_NEW="Add Stage"
-COM_WORKFLOW_STAGE_NOTE="Note"
-COM_WORKFLOW_STAGE_SET_DEFAULT="Stage set as default."
 COM_WORKFLOW_STAGES="Stages"
 COM_WORKFLOW_STAGES_LIST="Stages: %s"
 COM_WORKFLOW_STAGES_N_ITEMS_CHECKED_IN="%d stages checked in."
@@ -91,22 +62,20 @@ COM_WORKFLOW_STAGES_N_ITEMS_TRASHED_1="Stage trashed."
 COM_WORKFLOW_STAGES_N_ITEMS_UNPUBLISHED="%d stages disabled."
 COM_WORKFLOW_STAGES_N_ITEMS_UNPUBLISHED_1="Stage disabled."
 COM_WORKFLOW_STAGES_TABLE_CAPTION="Workflow Stages"
+COM_WORKFLOW_STAGE_ADD="Add Stage"
+COM_WORKFLOW_STAGE_EDIT="Edit Stage"
+COM_WORKFLOW_STAGE_FORM_EDIT="Edit Stage"
+COM_WORKFLOW_STAGE_FORM_NEW="Add Stage"
+COM_WORKFLOW_STAGE_NOTE="Note"
+COM_WORKFLOW_STAGE_SET_DEFAULT="Stage set as default."
 COM_WORKFLOW_TITLE_TRANSLATION="Name (%s)"
+COM_WORKFLOW_TOOLBAR_DEFAULT="Default"
+COM_WORKFLOW_TOO_MANY_STAGES="Only one stage can be set as the default."
+COM_WORKFLOW_TOO_MANY_WORKFLOWS="Only one workflow can be set as the default."
 COM_WORKFLOW_TO_STAGE="Target Stage"
 COM_WORKFLOW_TO_STAGE_FILTER_ASC="Target Stage ascending"
 COM_WORKFLOW_TO_STAGE_FILTER_DESC="Target Stage descending"
-COM_WORKFLOW_TOO_MANY_STAGES="Only one stage can be set as the default."
-COM_WORKFLOW_TOO_MANY_WORKFLOWS="Only one workflow can be set as the default."
-COM_WORKFLOW_TOOLBAR_DEFAULT="Default"
 COM_WORKFLOW_TRANSITION="Transition"
-COM_WORKFLOW_TRANSITION_ACTIONS_LABEL="Transition Actions"
-COM_WORKFLOW_TRANSITION_ADD="Add Transition"
-COM_WORKFLOW_TRANSITION_DUPLICATE="This transition already exists."
-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_TRANSITION_THE_SAME_STAGE="Current stage and target stage are the same."
 COM_WORKFLOW_TRANSITIONS="Transitions"
 COM_WORKFLOW_TRANSITIONS_LIST="Transitions: %s"
 COM_WORKFLOW_TRANSITIONS_N_ITEMS_CHECKED_IN="%d transitions checked in."
@@ -120,16 +89,18 @@ COM_WORKFLOW_TRANSITIONS_N_ITEMS_TRASHED_1="Transition trashed."
 COM_WORKFLOW_TRANSITIONS_N_ITEMS_UNPUBLISHED="%d transitions disabled."
 COM_WORKFLOW_TRANSITIONS_N_ITEMS_UNPUBLISHED_1="Transition disabled."
 COM_WORKFLOW_TRANSITIONS_TABLE_CAPTION="Workflow Transitions"
-COM_WORKFLOW_TRASHED="Trashed"
+COM_WORKFLOW_TRANSITION_ACTIONS_LABEL="Transition Actions"
+COM_WORKFLOW_TRANSITION_ADD="Add Transition"
+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_UNPUBLISH_DEFAULT_ERROR="The default workflow cannot be disabled."
-COM_WORKFLOW_UNPUBLISHED="Unpublished"
 COM_WORKFLOW_USE_DEFAULT_WORKFLOW="Use default (%s)"
-COM_WORKFLOW_USER_GROUPS="User Group"
-COM_WORKFLOW_USER_GROUPS_DESC="Select user group."
-COM_WORKFLOW_WORKFLOW_NOTE="Note"
 COM_WORKFLOW_WORKFLOWS_ADD="Add Workflow"
 COM_WORKFLOW_WORKFLOWS_EDIT="Edit Workflow"
 COM_WORKFLOW_WORKFLOWS_LIST="Workflows"
 COM_WORKFLOW_WORKFLOWS_TABLE_CAPTION="Workflows"
+COM_WORKFLOW_WORKFLOW_NOTE="Note"
 JLIB_HTML_PUBLISH_ITEM="Enable"
 JLIB_HTML_UNPUBLISH_ITEM="Disable"
diff --git a/administrator/language/en-GB/guidedtours.joomla_articles.ini b/administrator/language/en-GB/guidedtours.joomla_articles.ini
new file mode 100644
index 0000000000000..dcd475831c40a
--- /dev/null
+++ b/administrator/language/en-GB/guidedtours.joomla_articles.ini
@@ -0,0 +1,7 @@
+; 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
+
+COM_GUIDEDTOURS_TOUR_ARTICLES_TITLE="How to create articles?"
+COM_GUIDEDTOURS_TOUR_ARTICLES_DESCRIPTION="This tour will show you how you can create an article."
diff --git a/administrator/language/en-GB/guidedtours.joomla_articles_steps.ini b/administrator/language/en-GB/guidedtours.joomla_articles_steps.ini
new file mode 100644
index 0000000000000..28499ff66f18c
--- /dev/null
+++ b/administrator/language/en-GB/guidedtours.joomla_articles_steps.ini
@@ -0,0 +1,43 @@
+; 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
+
+COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_NEW_TITLE="Select the 'New' button"
+COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_NEW_DESCRIPTION="Select 'New' to create a new article."
+
+COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_TITLE_TITLE="Add a title for the article"
+COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_TITLE_DESCRIPTION="Enter a required title for the article."
+
+COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_ALIAS_TITLE="Enter an alias"
+COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_ALIAS_DESCRIPTION="You can write the internal name of this article. You can leave this blank and a default value in lower case with dashes instead of spaces will be used as part of the URL."
+
+COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_CONTENT_TITLE="Add content"
+COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_CONTENT_DESCRIPTION="Add the content of your article in the editor."
+
+COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_STATUS_TITLE="Select the status"
+COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_STATUS_DESCRIPTION="Select the published status of the article."
+
+COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_CATEGORY_TITLE="Select a category"
+COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_CATEGORY_DESCRIPTION="Select the category for this article. You can also enter a new category by typing the name in the field and pressing enter."
+
+COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_FEATURED_TITLE="Toggle featured"
+COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_FEATURED_DESCRIPTION="Select 'Featured' to feature your article."
+
+COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_ACCESS_TITLE="Set the access level"
+COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_ACCESS_DESCRIPTION="Select the access level for the article."
+
+COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_TAGS_TITLE="Add tags"
+COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_TAGS_DESCRIPTION="Select tags for your article. You can also enter a new tag by typing the name in the field and pressing enter."
+
+COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_NOTE_TITLE="Add a note"
+COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_NOTE_DESCRIPTION="This is normally for administrator use and does not show in the front end."
+
+COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_VERSIONNOTE_TITLE="Add a version note"
+COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_VERSIONNOTE_DESCRIPTION="This is an optional field to identify the version of this article."
+
+COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_SAVECLOSE_TITLE="Select 'Save and Close'"
+COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_SAVECLOSE_DESCRIPTION="Save and close the article."
+
+COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_CONGRATULATIONS_TITLE="Congratulations!"
+COM_GUIDEDTOURS_TOUR_ARTICLES_STEP_CONGRATULATIONS_DESCRIPTION="You have created an article."
diff --git a/administrator/language/en-GB/guidedtours.joomla_banners.ini b/administrator/language/en-GB/guidedtours.joomla_banners.ini
new file mode 100644
index 0000000000000..83c5006cef7e6
--- /dev/null
+++ b/administrator/language/en-GB/guidedtours.joomla_banners.ini
@@ -0,0 +1,7 @@
+; 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
+
+COM_GUIDEDTOURS_TOUR_BANNERS_TITLE="How to create banners?"
+COM_GUIDEDTOURS_TOUR_BANNERS_DESCRIPTION="This tour will show you how you can create a banner."
diff --git a/administrator/language/en-GB/guidedtours.joomla_banners_steps.ini b/administrator/language/en-GB/guidedtours.joomla_banners_steps.ini
new file mode 100644
index 0000000000000..1fecdb04fca94
--- /dev/null
+++ b/administrator/language/en-GB/guidedtours.joomla_banners_steps.ini
@@ -0,0 +1,34 @@
+; 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
+
+COM_GUIDEDTOURS_TOUR_BANNERS_STEP_NEW_TITLE="Select the 'New' button"
+COM_GUIDEDTOURS_TOUR_BANNERS_STEP_NEW_DESCRIPTION="Select 'New' to create a new banner."
+
+COM_GUIDEDTOURS_TOUR_BANNERS_STEP_TITLE_TITLE="Add a title for the banner"
+COM_GUIDEDTOURS_TOUR_BANNERS_STEP_TITLE_DESCRIPTION="Enter a required title for the banner."
+
+COM_GUIDEDTOURS_TOUR_BANNERS_STEP_ALIAS_TITLE="Enter an alias"
+COM_GUIDEDTOURS_TOUR_BANNERS_STEP_ALIAS_DESCRIPTION="You can write the internal name of this banner. You can leave this blank and a default value in lower case with dashes instead of spaces will be used as part of the URL."
+
+COM_GUIDEDTOURS_TOUR_BANNERS_STEP_DETAILS_TITLE="Enter detailed information"
+COM_GUIDEDTOURS_TOUR_BANNERS_STEP_DETAILS_DESCRIPTION="Add the details for the banner here."
+
+COM_GUIDEDTOURS_TOUR_BANNERS_STEP_STATUS_TITLE="Select the status"
+COM_GUIDEDTOURS_TOUR_BANNERS_STEP_STATUS_DESCRIPTION="Select the published status of the banner."
+
+COM_GUIDEDTOURS_TOUR_BANNERS_STEP_CATEGORY_TITLE="Select a category"
+COM_GUIDEDTOURS_TOUR_BANNERS_STEP_CATEGORY_DESCRIPTION="Select the category for this banner. You can also enter a new category by typing the name in the field and pressing enter."
+
+COM_GUIDEDTOURS_TOUR_BANNERS_STEP_PINNED_TITLE="Toggle pinned"
+COM_GUIDEDTOURS_TOUR_BANNERS_STEP_PINNED_DESCRIPTION="Select 'Pinned' to give priority to the banner over ones that are not pinned."
+
+COM_GUIDEDTOURS_TOUR_BANNERS_STEP_VERSIONNOTE_TITLE="Add a version note"
+COM_GUIDEDTOURS_TOUR_BANNERS_STEP_VERSIONNOTE_DESCRIPTION="This is an optional field to identify the version of this banner."
+
+COM_GUIDEDTOURS_TOUR_BANNERS_STEP_SAVECLOSE_TITLE="Select 'Save and Close'"
+COM_GUIDEDTOURS_TOUR_BANNERS_STEP_SAVECLOSE_DESCRIPTION="Save and close the banner."
+
+COM_GUIDEDTOURS_TOUR_BANNERS_STEP_CONGRATULATIONS_TITLE="Congratulations!"
+COM_GUIDEDTOURS_TOUR_BANNERS_STEP_CONGRATULATIONS_DESCRIPTION="You have created a banner."
diff --git a/administrator/language/en-GB/guidedtours.joomla_categories.ini b/administrator/language/en-GB/guidedtours.joomla_categories.ini
new file mode 100644
index 0000000000000..999c5695cd374
--- /dev/null
+++ b/administrator/language/en-GB/guidedtours.joomla_categories.ini
@@ -0,0 +1,7 @@
+; 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
+
+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."
diff --git a/administrator/language/en-GB/guidedtours.joomla_categories_steps.ini b/administrator/language/en-GB/guidedtours.joomla_categories_steps.ini
new file mode 100644
index 0000000000000..70b78625d1655
--- /dev/null
+++ b/administrator/language/en-GB/guidedtours.joomla_categories_steps.ini
@@ -0,0 +1,40 @@
+; 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
+
+COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_NEW_TITLE="Select the 'New' button"
+COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_NEW_DESCRIPTION="Select 'New' to create a new category."
+
+COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_TITLE_TITLE="Add a title for the category"
+COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_TITLE_DESCRIPTION="Enter a required title for the category."
+
+COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_ALIAS_TITLE="Enter an alias"
+COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_ALIAS_DESCRIPTION="You can write the internal name of this category. You can leave this blank and a default value in lower case with dashes instead of spaces will be used as part of the URL."
+
+COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_CONTENT_TITLE="Add content"
+COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_CONTENT_DESCRIPTION="Add the content of your category in the editor."
+
+COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_PARENT_TITLE="Select parent category"
+COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_PARENT_DESCRIPTION="Select or enter the parent of the category."
+
+COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_STATUS_TITLE="Select the status"
+COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_STATUS_DESCRIPTION="Select the published status of the category."
+
+COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_ACCESS_TITLE="Set the access level"
+COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_ACCESS_DESCRIPTION="Select the access level for the category."
+
+COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_TAGS_TITLE="Add tags"
+COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_TAGS_DESCRIPTION="Select tags for your category. You can also enter a new tag by typing the name in the field and pressing enter."
+
+COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_NOTE_TITLE="Add a note"
+COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_NOTE_DESCRIPTION="This is normally for administrator use and does not show in the front end."
+
+COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_VERSIONNOTE_TITLE="Add a version note"
+COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_VERSIONNOTE_DESCRIPTION="This is an optional field to identify the version of this category."
+
+COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_SAVECLOSE_TITLE="Select 'Save and Close'"
+COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_SAVECLOSE_DESCRIPTION="Save and close the category."
+
+COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_CONGRATULATIONS_TITLE="Congratulations!"
+COM_GUIDEDTOURS_TOUR_CATEGORIES_STEP_CONGRATULATIONS_DESCRIPTION="You have created a category"
diff --git a/administrator/language/en-GB/guidedtours.joomla_contacts.ini b/administrator/language/en-GB/guidedtours.joomla_contacts.ini
new file mode 100644
index 0000000000000..0461fc589ea57
--- /dev/null
+++ b/administrator/language/en-GB/guidedtours.joomla_contacts.ini
@@ -0,0 +1,7 @@
+; 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
+
+COM_GUIDEDTOURS_TOUR_CONTACTS_TITLE="How to create contacts?"
+COM_GUIDEDTOURS_TOUR_CONTACTS_DESCRIPTION="This tour will show you how you can create a contact."
diff --git a/administrator/language/en-GB/guidedtours.joomla_contacts_steps.ini b/administrator/language/en-GB/guidedtours.joomla_contacts_steps.ini
new file mode 100644
index 0000000000000..65ed4f34dc1eb
--- /dev/null
+++ b/administrator/language/en-GB/guidedtours.joomla_contacts_steps.ini
@@ -0,0 +1,40 @@
+; 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
+
+COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_NEW_TITLE="Select the 'New' button"
+COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_NEW_DESCRIPTION="Select 'New' to create a new contact."
+
+COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_TITLE_TITLE="Add a name"
+COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_TITLE_DESCRIPTION="Enter a required name for the contact."
+
+COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_ALIAS_TITLE="Enter an alias"
+COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_ALIAS_DESCRIPTION="You can write the internal name of this contact. You can leave this blank and a default value in lower case with dashes instead of spaces will be used as part of the URL."
+
+COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_DETAILS_TITLE="Enter detailed information"
+COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_DETAILS_DESCRIPTION="Add the details for the contact here."
+
+COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_STATUS_TITLE="Select the status"
+COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_STATUS_DESCRIPTION="Select the published status of the contact."
+
+COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_CATEGORY_TITLE="Select a category"
+COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_CATEGORY_DESCRIPTION="Select the category for this contact. You can also enter a new category by typing the name in the field and pressing enter."
+
+COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_FEATURED_TITLE="Toggle featured"
+COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_FEATURED_DESCRIPTION="Select 'Featured' to feature your contact."
+
+COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_ACCESS_TITLE="Set the access level"
+COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_ACCESS_DESCRIPTION="Select the access level for the contact."
+
+COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_TAGS_TITLE="Add tags"
+COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_TAGS_DESCRIPTION="Select tags for your contact. You can also enter a new tag by typing the name in the field and pressing enter."
+
+COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_VERSIONNOTE_TITLE="Add a version note"
+COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_VERSIONNOTE_DESCRIPTION="This is an optional field to identify the version of this contact."
+
+COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_SAVECLOSE_TITLE="Select 'Save and Close'"
+COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_SAVECLOSE_DESCRIPTION="Save and close the contact."
+
+COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_CONGRATULATIONS_TITLE="Congratulations!"
+COM_GUIDEDTOURS_TOUR_CONTACTS_STEP_CONGRATULATIONS_DESCRIPTION="You have created a contact."
diff --git a/administrator/language/en-GB/guidedtours.joomla_guidedtours.ini b/administrator/language/en-GB/guidedtours.joomla_guidedtours.ini
new file mode 100644
index 0000000000000..1bdb33ab33e69
--- /dev/null
+++ b/administrator/language/en-GB/guidedtours.joomla_guidedtours.ini
@@ -0,0 +1,7 @@
+; 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
+
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_TITLE="How to create a guided tour?"
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_DESCRIPTION="This tour will show you how you can create a guided tour for the backend."
diff --git a/administrator/language/en-GB/guidedtours.joomla_guidedtours_steps.ini b/administrator/language/en-GB/guidedtours.joomla_guidedtours_steps.ini
new file mode 100644
index 0000000000000..32537321a75cc
--- /dev/null
+++ b/administrator/language/en-GB/guidedtours.joomla_guidedtours_steps.ini
@@ -0,0 +1,25 @@
+; 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
+
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_NEW_TITLE="Select the 'New' button"
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_NEW_DESCRIPTION="Select 'New' to create a new tour."
+
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_TITLE_TITLE="Add a title for the tour"
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_TITLE_DESCRIPTION="Enter a required title for the tour."
+
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_CONTENT_TITLE="Add content"
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_CONTENT_DESCRIPTION="Enter content describing the tour."
+
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_COMPONENT_TITLE="Select a component"
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_COMPONENT_DESCRIPTION="Select the extension(s) where you want to show your tour in priority in the list of possible tours to run. For instance, If you are creating a tour for the 'Users' extension, then select 'Users'. Select 'All' for the tour to appear on every page."
+
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_URL_TITLE="Add a URL"
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_URL_DESCRIPTION="Add the relative URL of the page where the tour must start. For instance, enter <em>administrator/index.php?option=com_users&view=users</em> to start the tour in the Users page."
+
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_SAVECLOSE_TITLE="Select 'Save and Close'"
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_SAVECLOSE_DESCRIPTION="Save and close the tour."
+
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_CONGRATULATIONS_TITLE="Congratulations!"
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_CONGRATULATIONS_DESCRIPTION="You have created a guided tour. You now have to create steps for the tour."
diff --git a/administrator/language/en-GB/guidedtours.joomla_guidedtoursteps.ini b/administrator/language/en-GB/guidedtours.joomla_guidedtoursteps.ini
new file mode 100644
index 0000000000000..0e7ae9cbe7c89
--- /dev/null
+++ b/administrator/language/en-GB/guidedtours.joomla_guidedtoursteps.ini
@@ -0,0 +1,7 @@
+; 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
+
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_TITLE="How to add steps to a guided tour?"
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_DESCRIPTION="This tour will show you how you can create a step for a guided tour."
diff --git a/administrator/language/en-GB/guidedtours.joomla_guidedtoursteps_steps.ini b/administrator/language/en-GB/guidedtours.joomla_guidedtoursteps_steps.ini
new file mode 100644
index 0000000000000..70863646f7215
--- /dev/null
+++ b/administrator/language/en-GB/guidedtours.joomla_guidedtoursteps_steps.ini
@@ -0,0 +1,34 @@
+; 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
+
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_COUNTER_TITLE="Select the step counter number"
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_COUNTER_DESCRIPTION="Select the number to add a step. The number represents the number of steps created for the tour so far."
+
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_NEW_TITLE="Select the 'New' button"
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_NEW_DESCRIPTION="Select 'New' to create a new step."
+
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_TITLE_TITLE="Add a title for the step"
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_TITLE_DESCRIPTION="Enter a required title for the step. This is usually an action a user must execute."
+
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_DESCRIPTION_TITLE="Add step explanation"
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_DESCRIPTION_DESCRIPTION="The content should give the user an explanation about the step."
+
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_STATUS_TITLE="Select the status"
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_STATUS_DESCRIPTION="Select the published status of the step."
+
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_POSITION_TITLE="Select the position"
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_POSITION_DESCRIPTION="This is the position of the popup relative to the element you target on the page. 'Centered' is used when there is no specific target."
+
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_TARGET_TITLE="Enter the target element"
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_TARGET_DESCRIPTION="This is the element on the page this step targets. It uses the syntax used by CSS to target an element.<br />For instance, <code>#jform_title</code> will target the element with id 'jform_title'"
+
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_TYPE_TITLE="Select the type"
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_TYPE_DESCRIPTION="This is the kind of step you want to create. 'Next' to allow the tour to continue without interaction, 'Redirect' to move to another page, 'Interactive' to request user input."
+
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_SAVECLOSE_TITLE="Select 'Save and Close'"
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_SAVECLOSE_DESCRIPTION="Save and close the step."
+
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_CONGRATULATIONS_TITLE="Congratulations!"
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_CONGRATULATIONS_DESCRIPTION="You have created a step for a guided tour."
diff --git a/administrator/language/en-GB/guidedtours.joomla_menus.ini b/administrator/language/en-GB/guidedtours.joomla_menus.ini
new file mode 100644
index 0000000000000..d28746bbaa3e5
--- /dev/null
+++ b/administrator/language/en-GB/guidedtours.joomla_menus.ini
@@ -0,0 +1,7 @@
+; 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
+
+COM_GUIDEDTOURS_TOUR_MENUS_TITLE="How to create menus?"
+COM_GUIDEDTOURS_TOUR_MENUS_DESCRIPTION="This tour will show you how you can create a menu."
diff --git a/administrator/language/en-GB/guidedtours.joomla_menus_steps.ini b/administrator/language/en-GB/guidedtours.joomla_menus_steps.ini
new file mode 100644
index 0000000000000..24df344874dc4
--- /dev/null
+++ b/administrator/language/en-GB/guidedtours.joomla_menus_steps.ini
@@ -0,0 +1,22 @@
+; 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
+
+COM_GUIDEDTOURS_TOUR_MENUS_STEP_NEW_TITLE="Select the 'New' button"
+COM_GUIDEDTOURS_TOUR_MENUS_STEP_NEW_DESCRIPTION="Select 'New' to create a new menu."
+
+COM_GUIDEDTOURS_TOUR_MENUS_STEP_TITLE_TITLE="Add a title for the menu"
+COM_GUIDEDTOURS_TOUR_MENUS_STEP_TITLE_DESCRIPTION="Enter a required title for the menu."
+
+COM_GUIDEDTOURS_TOUR_MENUS_STEP_UNIQUENAME_TITLE="Add a unique name"
+COM_GUIDEDTOURS_TOUR_MENUS_STEP_UNIQUENAME_DESCRIPTION="Enter a required unique name for the menu."
+
+COM_GUIDEDTOURS_TOUR_MENUS_STEP_DESCRIPTION_TITLE="Add a description"
+COM_GUIDEDTOURS_TOUR_MENUS_STEP_DESCRIPTION_DESCRIPTION="Add a description about the purpose of the menu."
+
+COM_GUIDEDTOURS_TOUR_MENUS_STEP_SAVECLOSE_TITLE="Select 'Save and Close'"
+COM_GUIDEDTOURS_TOUR_MENUS_STEP_SAVECLOSE_DESCRIPTION="Save and close the menu."
+
+COM_GUIDEDTOURS_TOUR_MENUS_STEP_CONGRATULATIONS_TITLE="Congratulations!"
+COM_GUIDEDTOURS_TOUR_MENUS_STEP_CONGRATULATIONS_DESCRIPTION="You have created a menu."
diff --git a/administrator/language/en-GB/guidedtours.joomla_newsfeeds.ini b/administrator/language/en-GB/guidedtours.joomla_newsfeeds.ini
new file mode 100644
index 0000000000000..1c7c60efba44a
--- /dev/null
+++ b/administrator/language/en-GB/guidedtours.joomla_newsfeeds.ini
@@ -0,0 +1,7 @@
+; 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
+
+COM_GUIDEDTOURS_TOUR_NEWSFEEDS_TITLE="How to enter a news feed?"
+COM_GUIDEDTOURS_TOUR_NEWSFEEDS_DESCRIPTION="This tour will show you how you can enter a news feed from another site for display."
diff --git a/administrator/language/en-GB/guidedtours.joomla_newsfeeds_steps.ini b/administrator/language/en-GB/guidedtours.joomla_newsfeeds_steps.ini
new file mode 100644
index 0000000000000..554b5e52261c5
--- /dev/null
+++ b/administrator/language/en-GB/guidedtours.joomla_newsfeeds_steps.ini
@@ -0,0 +1,40 @@
+; 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
+
+COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_NEW_TITLE="Select the 'New' button"
+COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_NEW_DESCRIPTION="Select 'New' to create a new news feed."
+
+COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_TITLE_TITLE="Add a title"
+COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_TITLE_DESCRIPTION="Enter a required title for the news feed."
+
+COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_ALIAS_TITLE="Enter an alias"
+COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_ALIAS_DESCRIPTION="You can write the internal name of this news feed. You can leave this blank and a default value in lower case with dashes instead of spaces will be used as part of the URL."
+
+COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_LINK_TITLE="Enter the link"
+COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_LINK_DESCRIPTION="Add the link to the news feed here."
+
+COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_DESCRIPTION_TITLE="Enter a description"
+COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_DESCRIPTION_DESCRIPTION="Add a description for news feed in the editor."
+
+COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_STATUS_TITLE="Select the status"
+COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_STATUS_DESCRIPTION="Select the published status of the news feed."
+
+COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_CATEGORY_TITLE="Select a category"
+COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_CATEGORY_DESCRIPTION="Select the category for this news feed. You can also enter a new category by typing the name in the field and pressing enter."
+
+COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_ACCESS_TITLE="Set the access level"
+COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_ACCESS_DESCRIPTION="Select the access level for the news feed."
+
+COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_TAGS_TITLE="Add tags"
+COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_TAGS_DESCRIPTION="Select tags for your news feed. You can also enter a new tag by typing the name in the field and pressing enter."
+
+COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_VERSIONNOTE_TITLE="Add a version note"
+COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_VERSIONNOTE_DESCRIPTION="This is an optional field to identify the version of this news feed."
+
+COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_SAVECLOSE_TITLE="Select 'Save and Close'"
+COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_SAVECLOSE_DESCRIPTION="Save and close the news feed."
+
+COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_CONGRATULATIONS_TITLE="Congratulations!"
+COM_GUIDEDTOURS_TOUR_NEWSFEEDS_STEP_CONGRATULATIONS_DESCRIPTION="You have created a news feed."
diff --git a/administrator/language/en-GB/guidedtours.joomla_smartsearch.ini b/administrator/language/en-GB/guidedtours.joomla_smartsearch.ini
new file mode 100644
index 0000000000000..2ef0c540691e6
--- /dev/null
+++ b/administrator/language/en-GB/guidedtours.joomla_smartsearch.ini
@@ -0,0 +1,7 @@
+; 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
+
+COM_GUIDEDTOURS_TOUR_SMARTSEARCH_TITLE="How to create smart search filters?"
+COM_GUIDEDTOURS_TOUR_SMARTSEARCH_DESCRIPTION="This tour will show you how you can create a smart search filter."
diff --git a/administrator/language/en-GB/guidedtours.joomla_smartsearch_steps.ini b/administrator/language/en-GB/guidedtours.joomla_smartsearch_steps.ini
new file mode 100644
index 0000000000000..d768806b25e44
--- /dev/null
+++ b/administrator/language/en-GB/guidedtours.joomla_smartsearch_steps.ini
@@ -0,0 +1,25 @@
+; 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
+
+COM_GUIDEDTOURS_TOUR_SMARTSEARCH_STEP_NEW_TITLE="Select the 'New' button"
+COM_GUIDEDTOURS_TOUR_SMARTSEARCH_STEP_NEW_DESCRIPTION="Select 'New' to create a new smart search filter."
+
+COM_GUIDEDTOURS_TOUR_SMARTSEARCH_STEP_TITLE_TITLE="Add a title"
+COM_GUIDEDTOURS_TOUR_SMARTSEARCH_STEP_TITLE_DESCRIPTION="Enter a required title for the smart search filter."
+
+COM_GUIDEDTOURS_TOUR_SMARTSEARCH_STEP_ALIAS_TITLE="Enter an alias"
+COM_GUIDEDTOURS_TOUR_SMARTSEARCH_STEP_ALIAS_DESCRIPTION="You can write the internal name of this filter. You can leave this blank and a default value in lower case with dashes instead of spaces will be used as part of the URL."
+
+COM_GUIDEDTOURS_TOUR_SMARTSEARCH_STEP_CONTENT_TITLE="Enter content"
+COM_GUIDEDTOURS_TOUR_SMARTSEARCH_STEP_CONTENT_DESCRIPTION="Add the content for the smart search filter here."
+
+COM_GUIDEDTOURS_TOUR_SMARTSEARCH_STEP_STATUS_TITLE="Select the status"
+COM_GUIDEDTOURS_TOUR_SMARTSEARCH_STEP_STATUS_DESCRIPTION="Select the published status of the filter."
+
+COM_GUIDEDTOURS_TOUR_SMARTSEARCH_STEP_SAVECLOSE_TITLE="Select 'Save and Close'"
+COM_GUIDEDTOURS_TOUR_SMARTSEARCH_STEP_SAVECLOSE_DESCRIPTION="Save and close the smart search filter."
+
+COM_GUIDEDTOURS_TOUR_SMARTSEARCH_STEP_CONGRATULATIONS_TITLE="Congratulations!"
+COM_GUIDEDTOURS_TOUR_SMARTSEARCH_STEP_CONGRATULATIONS_DESCRIPTION="You have created a smart search filter."
diff --git a/administrator/language/en-GB/guidedtours.joomla_tags.ini b/administrator/language/en-GB/guidedtours.joomla_tags.ini
new file mode 100644
index 0000000000000..716b54a4390ff
--- /dev/null
+++ b/administrator/language/en-GB/guidedtours.joomla_tags.ini
@@ -0,0 +1,7 @@
+; 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
+
+COM_GUIDEDTOURS_TOUR_TAGS_TITLE="How to create tags?"
+COM_GUIDEDTOURS_TOUR_TAGS_DESCRIPTION="This tour will show you how you can create a tag."
diff --git a/administrator/language/en-GB/guidedtours.joomla_tags_steps.ini b/administrator/language/en-GB/guidedtours.joomla_tags_steps.ini
new file mode 100644
index 0000000000000..d9f7b93949b67
--- /dev/null
+++ b/administrator/language/en-GB/guidedtours.joomla_tags_steps.ini
@@ -0,0 +1,38 @@
+; 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
+
+COM_GUIDEDTOURS_TOUR_TAGS_STEP_NEW_TITLE="Select the 'New' button"
+COM_GUIDEDTOURS_TOUR_TAGS_STEP_NEW_DESCRIPTION="Select 'New' to create a new tag."
+
+COM_GUIDEDTOURS_TOUR_TAGS_STEP_TITLE_TITLE="Add a title for the tag"
+COM_GUIDEDTOURS_TOUR_TAGS_STEP_TITLE_DESCRIPTION="Enter a required title for the tag."
+
+COM_GUIDEDTOURS_TOUR_TAGS_STEP_ALIAS_TITLE="Enter an alias"
+COM_GUIDEDTOURS_TOUR_TAGS_STEP_ALIAS_DESCRIPTION="You can write the internal name of this tag. You can leave this blank and a default value in lower case with dashes instead of spaces will be used as part of the URL."
+
+COM_GUIDEDTOURS_TOUR_TAGS_STEP_CONTENT_TITLE="Add content"
+COM_GUIDEDTOURS_TOUR_TAGS_STEP_CONTENT_DESCRIPTION="Add the content of your tag in the editor."
+
+COM_GUIDEDTOURS_TOUR_TAGS_STEP_PARENT_TITLE="Select parent tag"
+COM_GUIDEDTOURS_TOUR_TAGS_STEP_PARENT_DESCRIPTION="Select or enter the parent of the tag."
+
+COM_GUIDEDTOURS_TOUR_TAGS_STEP_STATUS_TITLE="Select the status"
+COM_GUIDEDTOURS_TOUR_TAGS_STEP_STATUS_DESCRIPTION="Select the published status of the tag."
+
+COM_GUIDEDTOURS_TOUR_TAGS_STEP_ACCESS_TITLE="Set the access level"
+COM_GUIDEDTOURS_TOUR_TAGS_STEP_ACCESS_DESCRIPTION="Select the access level for the tag."
+
+COM_GUIDEDTOURS_TOUR_TAGS_STEP_NOTE_TITLE="Add a note"
+COM_GUIDEDTOURS_TOUR_TAGS_STEP_NOTE_DESCRIPTION="This is normally for administrator use and does not show in the front end."
+
+COM_GUIDEDTOURS_TOUR_TAGS_STEP_VERSIONNOTE_TITLE="Add a version note"
+COM_GUIDEDTOURS_TOUR_TAGS_STEP_VERSIONNOTE_DESCRIPTION="This is an optional field to identify the version of this tag."
+
+COM_GUIDEDTOURS_TOUR_TAGS_STEP_SAVECLOSE_TITLE="Select 'Save and Close'"
+COM_GUIDEDTOURS_TOUR_TAGS_STEP_SAVECLOSE_DESCRIPTION="Save and close the tag."
+
+COM_GUIDEDTOURS_TOUR_TAGS_STEP_CONGRATULATIONS_TITLE="Congratulations!"
+COM_GUIDEDTOURS_TOUR_TAGS_STEP_CONGRATULATIONS_DESCRIPTION="You have created a tag."
+
diff --git a/administrator/language/en-GB/guidedtours.joomla_users.ini b/administrator/language/en-GB/guidedtours.joomla_users.ini
new file mode 100644
index 0000000000000..942ae7ab0b13b
--- /dev/null
+++ b/administrator/language/en-GB/guidedtours.joomla_users.ini
@@ -0,0 +1,7 @@
+; 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
+
+COM_GUIDEDTOURS_TOUR_USERS_TITLE="How to create users?"
+COM_GUIDEDTOURS_TOUR_USERS_DESCRIPTION="This tour will show you how you can create a user."
diff --git a/administrator/language/en-GB/guidedtours.joomla_users_steps.ini b/administrator/language/en-GB/guidedtours.joomla_users_steps.ini
new file mode 100644
index 0000000000000..ab971126a3556
--- /dev/null
+++ b/administrator/language/en-GB/guidedtours.joomla_users_steps.ini
@@ -0,0 +1,37 @@
+; 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
+
+COM_GUIDEDTOURS_TOUR_USERS_STEP_NEW_TITLE="Select the 'New' button"
+COM_GUIDEDTOURS_TOUR_USERS_STEP_NEW_DESCRIPTION="Select 'New' to create a new user."
+
+COM_GUIDEDTOURS_TOUR_USERS_STEP_NAME_TITLE="Add a name"
+COM_GUIDEDTOURS_TOUR_USERS_STEP_NAME_DESCRIPTION="Enter a required name for the user."
+
+COM_GUIDEDTOURS_TOUR_USERS_STEP_LOGINNAME_TITLE="Add a login name"
+COM_GUIDEDTOURS_TOUR_USERS_STEP_LOGINNAME_DESCRIPTION="Enter a required login name for the user (username)."
+
+COM_GUIDEDTOURS_TOUR_USERS_STEP_PASSWORD_TITLE="Enter a password"
+COM_GUIDEDTOURS_TOUR_USERS_STEP_PASSWORD_DESCRIPTION="Fill in a (new) password. Although this field is not required, the user will not be able to log in when no password is set."
+
+COM_GUIDEDTOURS_TOUR_USERS_STEP_PASSWORD2_TITLE="Confirm the password"
+COM_GUIDEDTOURS_TOUR_USERS_STEP_PASSWORD2_DESCRIPTION="Fill in the password from the field above again, to verify it. This field is required when you filled in the new password field."
+
+COM_GUIDEDTOURS_TOUR_USERS_STEP_EMAIL_TITLE="Add an email address"
+COM_GUIDEDTOURS_TOUR_USERS_STEP_EMAIL_DESCRIPTION="Enter an email address for the user."
+
+COM_GUIDEDTOURS_TOUR_USERS_STEP_SYSTEMEMAIL_TITLE="Toggle receive system emails"
+COM_GUIDEDTOURS_TOUR_USERS_STEP_SYSTEMEMAIL_DESCRIPTION="Set to yes, if the user needs to receive system emails."
+
+COM_GUIDEDTOURS_TOUR_USERS_STEP_STATUS_TITLE="Toggle status"
+COM_GUIDEDTOURS_TOUR_USERS_STEP_STATUS_DESCRIPTION="Enable or block this user."
+
+COM_GUIDEDTOURS_TOUR_USERS_STEP_PASSWORDRESET_TITLE="Toggle password reset"
+COM_GUIDEDTOURS_TOUR_USERS_STEP_PASSWORDRESET_DESCRIPTION="If set to yes, the user will have to reset their password the next time they log in to the site."
+
+COM_GUIDEDTOURS_TOUR_USERS_STEP_SAVECLOSE_TITLE="Select 'Save and Close'"
+COM_GUIDEDTOURS_TOUR_USERS_STEP_SAVECLOSE_DESCRIPTION="Save and close the user."
+
+COM_GUIDEDTOURS_TOUR_USERS_STEP_CONGRATULATIONS_TITLE="Congratulations!"
+COM_GUIDEDTOURS_TOUR_USERS_STEP_CONGRATULATIONS_DESCRIPTION="You have created a user."
diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml
index 2ce47e868d190..97d7472423bb6 100644
--- a/administrator/language/en-GB/install.xml
+++ b/administrator/language/en-GB/install.xml
@@ -3,7 +3,7 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>5.0.0</version>
-	<creationDate>2022-08</creationDate>
+	<creationDate>2023-08</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/language/en-GB/joomla.ini b/administrator/language/en-GB/joomla.ini
index 80c80f351d5e9..aeda60ee07221 100644
--- a/administrator/language/en-GB/joomla.ini
+++ b/administrator/language/en-GB/joomla.ini
@@ -91,7 +91,7 @@ JHIDE="Hide"
 JHIDEPASSWORD="Hide Password"
 JHOMEDASHBOARD="Home Dashboard"
 JINVALID_TOKEN="The most recent request was denied because it had an invalid security token. Please refresh the page and try again."
-JINVALID_TOKEN_NOTICE="The security token did not match. The request was aborted to prevent any security breach. Please try again."
+JINVALID_TOKEN_NOTICE="The security token did not match. The request was cancelled to prevent any security breach. Please try again."
 JLOGIN="Log in"
 JLOGOUT="Log out"
 JMENU_MULTILANG_WARNING_MISSING_MODULES="An administrator menu module for <strong>%s</strong> does not exist. <br>Create a custom administrator menu and module for each administrator language or publish a menu module set to All languages."
@@ -826,6 +826,13 @@ JWARNING_REMOVE_ROOT_USER_ADMIN="The emergency Root User setting is enabled for
 JWARNING_TRASH_MUST_SELECT="You must select at least one item to remove."
 JWARNING_UNPUBLISH_MUST_SELECT="You must select at least one item to unpublish."
 
+; Schemaorg
+JSCHEMAORG_EXTENSION_ALLOWED_DESCRIPTION="Activate this plugin only for listed extensions. If used all other extensions are disabled."
+JSCHEMAORG_EXTENSION_ALLOWED_LABEL="Allowed Extensions"
+JSCHEMAORG_EXTENSION_FORBIDDEN_DESCRIPTION="Disable this plugin for listed extensions."
+JSCHEMAORG_EXTENSION_FORBIDDEN_LABEL="Forbidden Extensions"
+JSCHEMAORG_FIELD_COMPONENT_SECTIONS_TEXT="%2$s"
+
 ; Workflow
 JWORKFLOW="Workflow: %s"
 JWORKFLOW_ENABLED_LABEL="Enable Workflow"
diff --git a/administrator/language/en-GB/langmetadata.xml b/administrator/language/en-GB/langmetadata.xml
index 7b33f1c922bcf..28681896ae5d6 100644
--- a/administrator/language/en-GB/langmetadata.xml
+++ b/administrator/language/en-GB/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="administrator">
 	<name>English (en-GB)</name>
 	<version>5.0.0</version>
-	<creationDate>2022-08</creationDate>
+	<creationDate>2023-08</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/language/en-GB/lib_joomla.ini b/administrator/language/en-GB/lib_joomla.ini
index a961fdbeb6e83..2d6643122e70f 100644
--- a/administrator/language/en-GB/lib_joomla.ini
+++ b/administrator/language/en-GB/lib_joomla.ini
@@ -470,7 +470,7 @@ JLIB_HTML_UNPUBLISH_ITEM="Unpublish Item"
 JLIB_HTML_UNSETDEFAULT_ITEM="Unset default"
 JLIB_HTML_VIEW_ALL="View All"
 
-JLIB_INSTALLER_ABORT="Aborting language installation: %s"
+JLIB_INSTALLER_ABORT="Stopping language installation: %s"
 JLIB_INSTALLER_ABORT_ALREADY_EXISTS="Extension %1$s: Extension %2$s already exists."
 JLIB_INSTALLER_ABORT_ALREADYINSTALLED="Extension is already installed."
 JLIB_INSTALLER_ABORT_COMP_BUILDADMINMENUS_FAILED="Error building Administrator Menus."
@@ -499,7 +499,7 @@ JLIB_INSTALLER_ABORT_FILE_INSTALL_ROLLBACK="Files Install: %s"
 JLIB_INSTALLER_ABORT_FILE_INSTALL_SQL_ERROR="Files %1$s: SQL error file %2$s"
 JLIB_INSTALLER_ABORT_FILE_ROLLBACK="Files Install: %s"
 JLIB_INSTALLER_ABORT_FILE_UPDATE_SQL_ERROR="Files Update: SQL error file %s"
-JLIB_INSTALLER_ABORT_INSTALL_ABORTED="Extension installation aborted."
+JLIB_INSTALLER_ABORT_INSTALL_ABORTED="Extension installation stopped."
 JLIB_INSTALLER_ABORT_INSTALL_CUSTOM_INSTALL_FAILURE="Extension %s: Custom install routine failure."
 JLIB_INSTALLER_ABORT_LIB_COPY_FILES="Library %s: Could not copy files from the source."
 JLIB_INSTALLER_ABORT_LIB_INSTALL_ALREADY_INSTALLED="Library Install: Library already installed."
@@ -662,7 +662,7 @@ JLIB_INSTALLER_UPDATE="Update"
 JLIB_INSTALLER_UPDATE_LOG_QUERY="Ran query from file %1$s. Query text: %2$s."
 JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Unable to create a content language for %s language: %s"
 
-JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="A connection abort has occurred while fetching the JSON data."
+JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="A connection error has occurred 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 %s 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/administrator/language/en-GB/mod_guidedtours.ini b/administrator/language/en-GB/mod_guidedtours.ini
index 938898b00fd55..3cd1084db55d2 100644
--- a/administrator/language/en-GB/mod_guidedtours.ini
+++ b/administrator/language/en-GB/mod_guidedtours.ini
@@ -4,9 +4,10 @@
 ; Note : All ini files need to be saved as UTF-8
 
 MOD_GUIDEDTOURS="Guided Tours"
+MOD_GUIDEDTOURS_FIELD_CONTEXT_TOUR_COUNT_DESC="The maximum number of tours to show in the dropdown when related to a page."
+MOD_GUIDEDTOURS_FIELD_CONTEXT_TOUR_COUNT_LABEL="Contextual Tour Count"
 MOD_GUIDEDTOURS_FIELD_TOUR_COUNT_DESC="The maximum number of tours to show in the dropdown."
 MOD_GUIDEDTOURS_FIELD_TOUR_COUNT_LABEL="Tour Count"
-MOD_GUIDEDTOURS_GENERIC_TOUR="Generic"
 MOD_GUIDEDTOURS_MENU="Take a Tour"
 MOD_GUIDEDTOURS_SHOW_ALL="Show all tours"
 MOD_GUIDEDTOURS_START_TOUR="Start Tour"
diff --git a/administrator/language/en-GB/mod_toolbar.ini b/administrator/language/en-GB/mod_toolbar.ini
index 880c42614dad2..aec2f9d4d4a1a 100644
--- a/administrator/language/en-GB/mod_toolbar.ini
+++ b/administrator/language/en-GB/mod_toolbar.ini
@@ -4,4 +4,6 @@
 ; Note : All ini files need to be saved as UTF-8
 
 MOD_TOOLBAR="Toolbar"
-MOD_TOOLBAR_XML_DESCRIPTION="This module shows the toolbar icons used to control actions throughout the Administrator area."
\ No newline at end of file
+MOD_TOOLBAR_FIELD_TOOLBAR_LABEL="Toolbar Identifier"
+MOD_TOOLBAR_FIELD_TOOLBAR_DESCRIPTION="The default toolbar in the administrator is called 'toolbar', if you have an extension that generate own toolbars you can create an own module with it's toolbar identifier. The default toolbar should never be removed!"
+MOD_TOOLBAR_XML_DESCRIPTION="This module shows the toolbar icons used to control actions throughout the Administrator area."
diff --git a/administrator/language/en-GB/plg_behaviour_compat.ini b/administrator/language/en-GB/plg_behaviour_compat.ini
new file mode 100644
index 0000000000000..04a5b91735be7
--- /dev/null
+++ b/administrator/language/en-GB/plg_behaviour_compat.ini
@@ -0,0 +1,11 @@
+; 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_LABEL="ES5 Assets"
+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_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
new file mode 100644
index 0000000000000..405d5a6c97b0d
--- /dev/null
+++ b/administrator/language/en-GB/plg_behaviour_compat.sys.ini
@@ -0,0 +1,7 @@
+; 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_captcha_recaptcha.ini b/administrator/language/en-GB/plg_captcha_recaptcha.ini
deleted file mode 100644
index 7a58d08416895..0000000000000
--- a/administrator/language/en-GB/plg_captcha_recaptcha.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-; Joomla! Project
-; (C) 2011 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_RECAPTCHA="CAPTCHA - reCAPTCHA"
-PLG_CAPTCHA_RECAPTCHA_XML_DESCRIPTION="This CAPTCHA plugin uses the reCAPTCHA service to prevent spammers while it helps to digitize books, newspapers and old radio shows. To get a site and secret key for your domain, go to <a href=\"https://www.google.com/recaptcha\" target=\"_blank\" rel=\"noopener noreferrer\">https://www.google.com/recaptcha</a>. To use this for new account registration, go to Options in the User Manager and select CAPTCHA - reCAPTCHA as the CAPTCHA."
-PLG_RECAPTCHA_CALLBACK_DESC="(Optional) JavaScript callback, executed after successful reCAPTCHA response."
-PLG_RECAPTCHA_CALLBACK_LABEL="Callback"
-PLG_RECAPTCHA_ERROR_CALLBACK_DESC="(Optional) JavaScript callback, executed when the reCAPTCHA encounters an error."
-PLG_RECAPTCHA_ERROR_CALLBACK_LABEL="Error Callback"
-PLG_RECAPTCHA_ERROR_EMPTY_SOLUTION="Please complete the CAPTCHA."
-PLG_RECAPTCHA_ERROR_NO_IP="For security reasons, you must pass the remote IP address to reCAPTCHA."
-PLG_RECAPTCHA_ERROR_NO_PRIVATE_KEY="reCAPTCHA plugin needs a secret key to be set in its parameters. Please contact a site administrator."
-PLG_RECAPTCHA_ERROR_NO_PUBLIC_KEY="reCAPTCHA plugin needs a site key to be set in its parameters. Please contact a site administrator."
-PLG_RECAPTCHA_EXPIRED_CALLBACK_DESC="(Optional) JavaScript callback, executed when the reCAPTCHA expired."
-PLG_RECAPTCHA_EXPIRED_CALLBACK_LABEL="Expired Callback"
-PLG_RECAPTCHA_PRIVACY_CAPABILITY_IP_ADDRESS="The reCAPTCHA plugin integrates with Google's reCAPTCHA system as a spam protection service. As part of this service, the IP address of the user answering the captcha challenge is transmitted to Google."
-PLG_RECAPTCHA_PRIVATE_KEY_LABEL="Secret Key"
-PLG_RECAPTCHA_PUBLIC_KEY_LABEL="Site Key"
-PLG_RECAPTCHA_SIZE_LABEL="Size"
-PLG_RECAPTCHA_TABINDEX_DESC="The tabindex of the reCAPTCHA widget."
-PLG_RECAPTCHA_TABINDEX_LABEL="Tabindex"
-PLG_RECAPTCHA_THEME_COMPACT="Compact"
-PLG_RECAPTCHA_THEME_DARK="Dark"
-PLG_RECAPTCHA_THEME_LABEL="Theme"
-PLG_RECAPTCHA_THEME_LIGHT="Light"
-PLG_RECAPTCHA_THEME_NORMAL="Normal"
-PLG_RECAPTCHA_VERSION_LABEL="Version"
-PLG_RECAPTCHA_VERSION_V2="2.0"
diff --git a/administrator/language/en-GB/plg_captcha_recaptcha.sys.ini b/administrator/language/en-GB/plg_captcha_recaptcha.sys.ini
deleted file mode 100644
index d639ba46ba74c..0000000000000
--- a/administrator/language/en-GB/plg_captcha_recaptcha.sys.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-; Joomla! Project
-; (C) 2011 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_RECAPTCHA="CAPTCHA - reCAPTCHA"
-PLG_CAPTCHA_RECAPTCHA_XML_DESCRIPTION="This CAPTCHA plugin uses the reCAPTCHA service to prevent spammers while it helps to digitize books, newspapers and old radio shows. To get a site and secret key for your domain, go to <a href=\"https://www.google.com/recaptcha\" target=\"_blank\" rel=\"noopener noreferrer\">https://www.google.com/recaptcha</a>. To use this for new account registration, go to Options in the User Manager and select CAPTCHA - reCAPTCHA as the CAPTCHA."
diff --git a/administrator/language/en-GB/plg_captcha_recaptcha_invisible.ini b/administrator/language/en-GB/plg_captcha_recaptcha_invisible.ini
deleted file mode 100644
index 7ce712231dd2a..0000000000000
--- a/administrator/language/en-GB/plg_captcha_recaptcha_invisible.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-; Joomla! Project
-; (C) 2018 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_RECAPTCHA_INVISIBLE="CAPTCHA - Invisible reCAPTCHA"
-PLG_CAPTCHA_RECAPTCHA_INVISIBLE_XML_DESCRIPTION="This CAPTCHA plugin uses the Invisible reCAPTCHA service. To get a site and secret key for your domain, go to <a href=\"https://www.google.com/recaptcha\" target=\"_blank\" rel=\"noopener noreferrer\">https://www.google.com/recaptcha</a>."
-PLG_RECAPTCHA_INVISIBLE_BADGE_BOTTOMLEFT="Bottom left"
-PLG_RECAPTCHA_INVISIBLE_BADGE_BOTTOMRIGHT="Bottom right"
-PLG_RECAPTCHA_INVISIBLE_BADGE_DESC="Positioning of the reCAPTCHA badge."
-PLG_RECAPTCHA_INVISIBLE_BADGE_INLINE="Inline"
-PLG_RECAPTCHA_INVISIBLE_BADGE_LABEL="Badge"
-PLG_RECAPTCHA_INVISIBLE_CALLBACK_DESC="(Optional) JavaScript callback, executed after successful reCAPTCHA response."
-PLG_RECAPTCHA_INVISIBLE_CALLBACK_LABEL="Callback"
-PLG_RECAPTCHA_INVISIBLE_ERROR_CALLBACK_DESC="(Optional) JavaScript callback, executed when the reCAPTCHA encounters an error."
-PLG_RECAPTCHA_INVISIBLE_ERROR_CALLBACK_LABEL="Error Callback"
-PLG_RECAPTCHA_INVISIBLE_ERROR_EMPTY_SOLUTION="Empty solution not allowed."
-PLG_RECAPTCHA_INVISIBLE_ERROR_NO_IP="For security reasons, you must pass the remote IP address to reCAPTCHA."
-PLG_RECAPTCHA_INVISIBLE_ERROR_NO_PRIVATE_KEY="reCAPTCHA plugin needs a secret key to be set in its parameters. Please contact a site administrator."
-PLG_RECAPTCHA_INVISIBLE_ERROR_NO_PUBLIC_KEY="reCAPTCHA plugin needs a site key to be set in its parameters. Please contact a site administrator."
-PLG_RECAPTCHA_INVISIBLE_EXPIRED_CALLBACK_DESC="(Optional) JavaScript callback, executed when the reCAPTCHA expired."
-PLG_RECAPTCHA_INVISIBLE_EXPIRED_CALLBACK_LABEL="Expired Callback"
-PLG_RECAPTCHA_INVISIBLE_PRIVACY_CAPABILITY_IP_ADDRESS="The Invisible reCAPTCHA plugin integrates with Google's reCAPTCHA system as a spam protection service. As part of this service, the IP address of the user answering the captcha challenge is transmitted to Google."
-PLG_RECAPTCHA_INVISIBLE_PRIVATE_KEY_DESC="Used in the communication between your server and the reCAPTCHA server. Be sure to keep it a secret."
-PLG_RECAPTCHA_INVISIBLE_PRIVATE_KEY_LABEL="Secret Key"
-PLG_RECAPTCHA_INVISIBLE_PUBLIC_KEY_DESC="Used in the JavaScript code that is served to your users."
-PLG_RECAPTCHA_INVISIBLE_PUBLIC_KEY_LABEL="Site Key"
-PLG_RECAPTCHA_INVISIBLE_TABINDEX_DESC="The tabindex of the challenge."
-PLG_RECAPTCHA_INVISIBLE_TABINDEX_LABEL="Tabindex"
diff --git a/administrator/language/en-GB/plg_captcha_recaptcha_invisible.sys.ini b/administrator/language/en-GB/plg_captcha_recaptcha_invisible.sys.ini
deleted file mode 100644
index e4416144b6f2b..0000000000000
--- a/administrator/language/en-GB/plg_captcha_recaptcha_invisible.sys.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-; Joomla! Project
-; (C) 2018 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_RECAPTCHA_INVISIBLE="CAPTCHA - Invisible reCAPTCHA"
-PLG_CAPTCHA_RECAPTCHA_INVISIBLE_XML_DESCRIPTION="This CAPTCHA plugin uses the Invisible reCAPTCHA service. To get a site and secret key for your domain, go to <a href=\"https://www.google.com/recaptcha\" target=\"_blank\" rel=\"noopener noreferrer\">https://www.google.com/recaptcha</a>."
diff --git a/administrator/language/en-GB/plg_content_joomla.ini b/administrator/language/en-GB/plg_content_joomla.ini
index 62530d1928f81..5b818a07e48e6 100644
--- a/administrator/language/en-GB/plg_content_joomla.ini
+++ b/administrator/language/en-GB/plg_content_joomla.ini
@@ -8,4 +8,8 @@ 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_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"
+PLG_CONTENT_JOOMLA_SCHEMA_CONTENT_LABEL="Content Schema"
 PLG_CONTENT_JOOMLA_XML_DESCRIPTION="This plugin does category processing for core extensions; sends an email when new article is submitted in the Frontend or a transition is executed."
diff --git a/administrator/language/en-GB/plg_editors_codemirror.ini b/administrator/language/en-GB/plg_editors_codemirror.ini
index 8b9d426177497..d3028b388d99f 100644
--- a/administrator/language/en-GB/plg_editors_codemirror.ini
+++ b/administrator/language/en-GB/plg_editors_codemirror.ini
@@ -3,42 +3,49 @@
 ; 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_COLOR_LABEL="Active Line Colour"
-PLG_CODEMIRROR_FIELD_ACTIVELINE_LABEL="Highlight Active Line"
 PLG_CODEMIRROR_FIELD_AUTOCLOSEBRACKET_LABEL="Bracket Completion"
-PLG_CODEMIRROR_FIELD_AUTOCLOSETAGS_LABEL="Tag Completion"
 PLG_CODEMIRROR_FIELD_CODEFOLDING_LABEL="Code Folding"
-PLG_CODEMIRROR_FIELD_FONT_FAMILY_LABEL="Font"
-PLG_CODEMIRROR_FIELD_FONT_SIZE_LABEL="Font Size (px)"
+PLG_CODEMIRROR_FIELD_CUSTOM_EXTENSIONS_LABEL="Custom Extensions"
+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_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"
 PLG_CODEMIRROR_FIELD_FULLSCREEN_MOD_LABEL="Toggle Fullscreen Modifier"
-PLG_CODEMIRROR_FIELD_HIGHLIGHT_MATCH_COLOR_LABEL="Matching Tag Colour"
 PLG_CODEMIRROR_FIELD_KEYMAP_DESC="Make CodeMirror work like other popular editors."
 PLG_CODEMIRROR_FIELD_KEYMAP_EMACS="Emacs"
 PLG_CODEMIRROR_FIELD_KEYMAP_LABEL="Key Map"
+PLG_CODEMIRROR_FIELD_LINENUMBERS_LABEL="Line Numbers"
+PLG_CODEMIRROR_FIELD_LINEWRAPPING_LABEL="Line Wrapping"
+PLG_CODEMIRROR_FIELD_SELECTIONMATCHES_LABEL="Highlight Selection Matches"
+PLG_CODEMIRROR_FIELD_VALUE_FULLSCREEN_MOD_ALT="Alt"
+PLG_CODEMIRROR_FIELD_VALUE_FULLSCREEN_MOD_CMD="Command"
+PLG_CODEMIRROR_FIELD_VALUE_FULLSCREEN_MOD_CTRL="Control"
+PLG_CODEMIRROR_FIELD_VALUE_FULLSCREEN_MOD_SHIFT="Shift"
+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_LINENUMBERS_LABEL="Line Numbers"
-PLG_CODEMIRROR_FIELD_LINEWRAPPING_LABEL="Line Wrapping"
 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_SELECTIONMATCHES_LABEL="Highlight Selection Matches"
 PLG_CODEMIRROR_FIELD_THEME_LABEL="Theme"
 PLG_CODEMIRROR_FIELD_VALUE_FONT_FAMILY_DEFAULT="Browser Default"
-PLG_CODEMIRROR_FIELD_VALUE_FULLSCREEN_MOD_ALT="Alt"
-PLG_CODEMIRROR_FIELD_VALUE_FULLSCREEN_MOD_CMD="Command"
-PLG_CODEMIRROR_FIELD_VALUE_FULLSCREEN_MOD_CTRL="Control"
-PLG_CODEMIRROR_FIELD_VALUE_FULLSCREEN_MOD_SHIFT="Shift"
 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"
-PLG_CODEMIRROR_FIELDSET_APPEARANCE_OPTIONS_LABEL="Appearance Options"
-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"
diff --git a/administrator/language/en-GB/plg_fields_sql.ini b/administrator/language/en-GB/plg_fields_sql.ini
index 26552719cbb48..fd483b287cd3e 100644
--- a/administrator/language/en-GB/plg_fields_sql.ini
+++ b/administrator/language/en-GB/plg_fields_sql.ini
@@ -7,6 +7,8 @@ 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)"
 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"
 PLG_FIELDS_SQL_PARAMS_QUERY_DESC="The SQL query which will provide the data for the dropdown list. The query must return two columns; one called 'value' which will hold the values of the list items; the other called 'text' with the text in the dropdown list." ; The terms 'value' and 'text' should not be translated
 PLG_FIELDS_SQL_PARAMS_QUERY_LABEL="Query"
diff --git a/administrator/language/en-GB/plg_finder_categories.ini b/administrator/language/en-GB/plg_finder_categories.ini
index d97f8c763fe88..37527650399d3 100644
--- a/administrator/language/en-GB/plg_finder_categories.ini
+++ b/administrator/language/en-GB/plg_finder_categories.ini
@@ -5,3 +5,8 @@
 
 PLG_FINDER_CATEGORIES="Smart Search - Categories"
 PLG_FINDER_CATEGORIES_XML_DESCRIPTION="This plugin indexes Joomla! Categories."
+PLG_FINDER_CATEGORIES_FIELD_SEARCH_ARCHIVED_DESC="When changing this setting, you have to run the index command in Smart Search before this takes effect."
+PLG_FINDER_CATEGORIES_FIELD_SEARCH_ARCHIVED_LABEL="Search Archived Content"
+PLG_FINDER_CATEGORIES_TAXONOMIES_LABEL="Taxonomies to Index"
+PLG_FINDER_CATEGORIES_TAXONOMIES_LANGUAGE="Language"
+PLG_FINDER_CATEGORIES_TAXONOMIES_TYPE="Type"
diff --git a/administrator/language/en-GB/plg_finder_contacts.ini b/administrator/language/en-GB/plg_finder_contacts.ini
index f7ca248056249..c7ab9917db870 100644
--- a/administrator/language/en-GB/plg_finder_contacts.ini
+++ b/administrator/language/en-GB/plg_finder_contacts.ini
@@ -5,6 +5,14 @@
 
 PLG_FINDER_CONTACTS="Smart Search - Contacts"
 PLG_FINDER_CONTACTS_XML_DESCRIPTION="This plugin indexes Joomla! Contacts."
+PLG_FINDER_CONTACTS_FIELD_SEARCH_ARCHIVED_DESC="When changing this setting, you have to run the index command in Smart Search before this takes effect."
+PLG_FINDER_CONTACTS_FIELD_SEARCH_ARCHIVED_LABEL="Search Archived Content"
+PLG_FINDER_CONTACTS_TAXONOMIES_CATEGORY="Category"
+PLG_FINDER_CONTACTS_TAXONOMIES_COUNTRY="Country"
+PLG_FINDER_CONTACTS_TAXONOMIES_LABEL="Taxonomies to Index"
+PLG_FINDER_CONTACTS_TAXONOMIES_LANGUAGE="Language"
+PLG_FINDER_CONTACTS_TAXONOMIES_REGION="Region"
+PLG_FINDER_CONTACTS_TAXONOMIES_TYPE="Type"
 PLG_FINDER_QUERY_FILTER_BRANCH_P_CONTACT="Contacts"
 PLG_FINDER_QUERY_FILTER_BRANCH_P_COUNTRY="Countries"
 PLG_FINDER_QUERY_FILTER_BRANCH_P_REGION="Regions"
diff --git a/administrator/language/en-GB/plg_finder_content.ini b/administrator/language/en-GB/plg_finder_content.ini
index 8666746f3b9ab..5cf0f0faa1be1 100644
--- a/administrator/language/en-GB/plg_finder_content.ini
+++ b/administrator/language/en-GB/plg_finder_content.ini
@@ -4,6 +4,13 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_FINDER_CONTENT="Smart Search - Content"
+PLG_FINDER_CONTENT_FIELD_SEARCH_ARCHIVED_DESC="When changing this setting, you have to run the index command in Smart Search before this takes effect."
+PLG_FINDER_CONTENT_FIELD_SEARCH_ARCHIVED_LABEL="Search Archived Content"
+PLG_FINDER_CONTENT_TAXONOMIES_AUTHOR="Author"
+PLG_FINDER_CONTENT_TAXONOMIES_CATEGORY="Category"
+PLG_FINDER_CONTENT_TAXONOMIES_LABEL="Taxonomies to Index"
+PLG_FINDER_CONTENT_TAXONOMIES_LANGUAGE="Language"
+PLG_FINDER_CONTENT_TAXONOMIES_TYPE="Type"
 PLG_FINDER_CONTENT_XML_DESCRIPTION="Updates the indexes of Joomla! Articles whenever an article is created, modified or deleted. NOTE the Content - Smart Search plugin must be enabled."
 PLG_FINDER_QUERY_FILTER_BRANCH_P_ARTICLE="Articles"
 PLG_FINDER_QUERY_FILTER_BRANCH_P_AUTHOR="Authors"
diff --git a/administrator/language/en-GB/plg_finder_newsfeeds.ini b/administrator/language/en-GB/plg_finder_newsfeeds.ini
index c3a6c37ade57b..de8dbc76cd2a7 100644
--- a/administrator/language/en-GB/plg_finder_newsfeeds.ini
+++ b/administrator/language/en-GB/plg_finder_newsfeeds.ini
@@ -4,6 +4,12 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_FINDER_NEWSFEEDS="Smart Search - News Feeds"
+PLG_FINDER_NEWSFEEDS_FIELD_SEARCH_ARCHIVED_DESC="When changing this setting, you have to run the index command in Smart Search before this takes effect."
+PLG_FINDER_NEWSFEEDS_FIELD_SEARCH_ARCHIVED_LABEL="Search Archived Content"
 PLG_FINDER_NEWSFEEDS_XML_DESCRIPTION="This plugin indexes Joomla! News feeds."
+PLG_FINDER_NEWSFEEDS_TAXONOMIES_CATEGORY="Category"
+PLG_FINDER_NEWSFEEDS_TAXONOMIES_LABEL="Taxonomies to Index"
+PLG_FINDER_NEWSFEEDS_TAXONOMIES_LANGUAGE="Language"
+PLG_FINDER_NEWSFEEDS_TAXONOMIES_TYPE="Type"
 PLG_FINDER_QUERY_FILTER_BRANCH_P_NEWS_FEED="News feeds"
 PLG_FINDER_QUERY_FILTER_BRANCH_S_NEWS_FEED="News feed"
diff --git a/administrator/language/en-GB/plg_finder_tags.ini b/administrator/language/en-GB/plg_finder_tags.ini
index 9ddbd0c01124d..aa663215f91e0 100644
--- a/administrator/language/en-GB/plg_finder_tags.ini
+++ b/administrator/language/en-GB/plg_finder_tags.ini
@@ -7,3 +7,9 @@ PLG_FINDER_QUERY_FILTER_BRANCH_P_TAG="Tags"
 PLG_FINDER_QUERY_FILTER_BRANCH_S_TAG="Tag"
 PLG_FINDER_TAGS="Smart Search - Tags"
 PLG_FINDER_TAGS_XML_DESCRIPTION="This plugin indexes Joomla! Tags."
+PLG_FINDER_TAGS_FIELD_SEARCH_ARCHIVED_DESC="When changing this setting, you have to run the index command in Smart Search before this takes effect."
+PLG_FINDER_TAGS_FIELD_SEARCH_ARCHIVED_LABEL="Search Archived Content"
+PLG_FINDER_TAGS_TAXONOMIES_AUTHOR="Author"
+PLG_FINDER_TAGS_TAXONOMIES_LABEL="Taxonomies to Index"
+PLG_FINDER_TAGS_TAXONOMIES_LANGUAGE="Language"
+PLG_FINDER_TAGS_TAXONOMIES_TYPE="Type"
diff --git a/administrator/language/en-GB/plg_multifactorauth_webauthn.ini b/administrator/language/en-GB/plg_multifactorauth_webauthn.ini
index 11adfe91cd382..a3edee65bb718 100644
--- a/administrator/language/en-GB/plg_multifactorauth_webauthn.ini
+++ b/administrator/language/en-GB/plg_multifactorauth_webauthn.ini
@@ -3,21 +3,21 @@
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
-PLG_MULTIFACTORAUTH_WEBAUTHN="Multi-factor Authentication - Web Authentication"
+PLG_MULTIFACTORAUTH_WEBAUTHN="Multi-factor Authentication - Passkeys"
 PLG_MULTIFACTORAUTH_WEBAUTHN_ERR_CREATE_INVALID_LOGIN_REQUEST="Invalid authentication request."
-PLG_MULTIFACTORAUTH_WEBAUTHN_ERR_CREATE_INVALID_PK="The authenticator registration has failed. The authenticator response received from the browser does not match the Public Key issued by the server. This means that someone tried to hack you or something is broken."
-PLG_MULTIFACTORAUTH_WEBAUTHN_ERR_CREATE_INVALID_USER="For security reasons you are not allowed to register authenticators on behalf of another user."
-PLG_MULTIFACTORAUTH_WEBAUTHN_ERR_CREATE_NO_ATTESTED_DATA="Something went wrong but no further information about the error is available at this time. Please retry registering your authenticator."
-PLG_MULTIFACTORAUTH_WEBAUTHN_ERR_CREATE_NO_PK="The server has not issued a Public Key for authenticator registration but somehow received an authenticator registration request from the browser. This means that someone tried to hack you or something is broken."
-PLG_MULTIFACTORAUTH_WEBAUTHN_ERR_NOTAVAILABLE_BODY="Your browser doesn't support the WebAuthn standard. Not all browsers are compatible with WebAuthn on all devices just yet."
-PLG_MULTIFACTORAUTH_WEBAUTHN_ERR_NOTAVAILABLE_HEAD="Your browser lacks support for WebAuthn"
-PLG_MULTIFACTORAUTH_WEBAUTHN_ERR_NOTHTTPS_BODY="Please access the site over HTTPS to enable Multi-factor Authentication with WebAuthn."
-PLG_MULTIFACTORAUTH_WEBAUTHN_ERR_NOTHTTPS_HEAD="WebAuthn is only available on HTTPS"
-PLG_MULTIFACTORAUTH_WEBAUTHN_ERR_NO_STORED_CREDENTIAL="You have not configured an Authenticator yet or the Authenticator you are trying to use is ineligible."
-PLG_MULTIFACTORAUTH_WEBAUTHN_LBL_CONFIGURED="You have already configured your Authenticator. Please note that you can only modify its title from this page."
-PLG_MULTIFACTORAUTH_WEBAUTHN_LBL_DISPLAYEDAS="Web Authentication"
-PLG_MULTIFACTORAUTH_WEBAUTHN_LBL_INSTRUCTIONS="Use the &ldquo;%s&rdquo; button on this page to start the Web Authentication process. Then please follow the instructions given to you by your browser to complete Web Authentication with your preferred Authenticator."
-PLG_MULTIFACTORAUTH_WEBAUTHN_LBL_REGISTERKEY="Register your Authenticator"
-PLG_MULTIFACTORAUTH_WEBAUTHN_LBL_SHORTINFO="Use WebAuthn with any hardware or software security key."
-PLG_MULTIFACTORAUTH_WEBAUTHN_LBL_VALIDATEKEY="Validate with your Authenticator"
-PLG_MULTIFACTORAUTH_WEBAUTHN_XML_DESCRIPTION="Use W3C Web Authentication (Webauthn) as a Multi-factor Authentication method. All modern browsers support it. Most browsers offer device-specific authentication protected by a password and/or biometrics (fingerprint sensor, face scan, &hellip;)."
+PLG_MULTIFACTORAUTH_WEBAUTHN_ERR_CREATE_INVALID_PK="The passkey registration has failed. The passkey response received from the browser does not match the Public Key issued by the server. This means that someone tried to hack you or something is broken."
+PLG_MULTIFACTORAUTH_WEBAUTHN_ERR_CREATE_INVALID_USER="For security reasons you are not allowed to register passkeys on behalf of another user."
+PLG_MULTIFACTORAUTH_WEBAUTHN_ERR_CREATE_NO_ATTESTED_DATA="Something went wrong but no further information about the error is available at this time. Please retry registering your passkey."
+PLG_MULTIFACTORAUTH_WEBAUTHN_ERR_CREATE_NO_PK="The server has not issued a Public Key for passkey registration but somehow received a passkey registration request from the browser. This means that someone tried to hack you or something is broken."
+PLG_MULTIFACTORAUTH_WEBAUTHN_ERR_NOTAVAILABLE_BODY="Your browser doesn't support the passkey standard. Not all browsers are compatible with passkeys on all devices just yet."
+PLG_MULTIFACTORAUTH_WEBAUTHN_ERR_NOTAVAILABLE_HEAD="Your browser lacks support for passkeys"
+PLG_MULTIFACTORAUTH_WEBAUTHN_ERR_NOTHTTPS_BODY="Please access the site over HTTPS to enable Multi-factor Authentication with passkeys."
+PLG_MULTIFACTORAUTH_WEBAUTHN_ERR_NOTHTTPS_HEAD="Passkeys is only available on HTTPS"
+PLG_MULTIFACTORAUTH_WEBAUTHN_ERR_NO_STORED_CREDENTIAL="You have not configured a passkey yet or the passkey you are trying to use is ineligible."
+PLG_MULTIFACTORAUTH_WEBAUTHN_LBL_CONFIGURED="You have already configured your passkey. Please note that you can only modify its title from this page."
+PLG_MULTIFACTORAUTH_WEBAUTHN_LBL_DISPLAYEDAS="Passkey"
+PLG_MULTIFACTORAUTH_WEBAUTHN_LBL_INSTRUCTIONS="Use the &ldquo;%s&rdquo; button on this page to start the Web Authentication process. Then please follow the instructions given to you by your browser to complete Web Authentication with your preferred passkey."
+PLG_MULTIFACTORAUTH_WEBAUTHN_LBL_REGISTERKEY="Register your passkey"
+PLG_MULTIFACTORAUTH_WEBAUTHN_LBL_SHORTINFO="Use browser passkeys with any hardware or software security key."
+PLG_MULTIFACTORAUTH_WEBAUTHN_LBL_VALIDATEKEY="Validate with your passkey"
+PLG_MULTIFACTORAUTH_WEBAUTHN_XML_DESCRIPTION="Use browser passkeys as a Multi-factor Authentication method. All modern browsers support it. Most browsers offer device-specific authentication protected by a password and/or biometrics (fingerprint sensor, face scan, &hellip;)."
diff --git a/administrator/language/en-GB/plg_multifactorauth_webauthn.sys.ini b/administrator/language/en-GB/plg_multifactorauth_webauthn.sys.ini
index 8f6890a389ecb..cd6d1e8f0faa4 100644
--- a/administrator/language/en-GB/plg_multifactorauth_webauthn.sys.ini
+++ b/administrator/language/en-GB/plg_multifactorauth_webauthn.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_MULTIFACTORAUTH_WEBAUTHN="Multi-factor Authentication - Web Authentication"
-PLG_MULTIFACTORAUTH_WEBAUTHN_XML_DESCRIPTION="Use W3C Web Authentication (Webauthn) as a Multi-factor Authentication method. All modern browsers support it. Most browsers offer device-specific authentication protected by a password and/or biometrics (fingerprint sensor, face scan, &hellip;)."
+PLG_MULTIFACTORAUTH_WEBAUTHN="Multi-factor Authentication - Passkeys"
+PLG_MULTIFACTORAUTH_WEBAUTHN_XML_DESCRIPTION="Use browser passkeys as a Multi-factor Authentication method. All modern browsers support it. Most browsers offer device-specific authentication protected by a password and/or biometrics (fingerprint sensor, face scan, &hellip;)."
diff --git a/administrator/language/en-GB/plg_quickicon_eos.ini b/administrator/language/en-GB/plg_quickicon_eos.ini
new file mode 100644
index 0000000000000..64e44bf0bda4a
--- /dev/null
+++ b/administrator/language/en-GB/plg_quickicon_eos.ini
@@ -0,0 +1,13 @@
+; 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_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_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."
diff --git a/administrator/language/en-GB/plg_quickicon_eos.sys.ini b/administrator/language/en-GB/plg_quickicon_eos.sys.ini
new file mode 100644
index 0000000000000..78cfc1cff5fdb
--- /dev/null
+++ b/administrator/language/en-GB/plg_quickicon_eos.sys.ini
@@ -0,0 +1,7 @@
+; 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_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."
diff --git a/administrator/language/en-GB/plg_sampledata_blog.ini b/administrator/language/en-GB/plg_sampledata_blog.ini
index f1456775a833f..78e84a78f9782 100644
--- a/administrator/language/en-GB/plg_sampledata_blog.ini
+++ b/administrator/language/en-GB/plg_sampledata_blog.ini
@@ -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 4!</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 5!</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 4.</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 5.</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 4"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_TAG_3_TITLE="Joomla 5"
 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_schemaorg_blogposting.ini b/administrator/language/en-GB/plg_schemaorg_blogposting.ini
new file mode 100755
index 0000000000000..c46ada2ac3ae6
--- /dev/null
+++ b/administrator/language/en-GB/plg_schemaorg_blogposting.ini
@@ -0,0 +1,28 @@
+; 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_SCHEMAORG_BLOGPOSTING="Schema.org - BlogPosting"
+PLG_SCHEMAORG_BLOGPOSTING_DESCRIPTION_LABEL="More information on the Schema.org BlogPosting Type can be found at <a href=\"https://schema.org/BlogPosting\" target=\"_blank\" rel=\"noopener noreferrer\">https://schema.org/BlogPosting</a>"
+PLG_SCHEMAORG_BLOGPOSTING_FIELD_ADDRESS_LABEL="Address"
+PLG_SCHEMAORG_BLOGPOSTING_FIELD_AUTHOR_LABEL="Author"
+PLG_SCHEMAORG_BLOGPOSTING_FIELD_DATE_MODIFIED_LABEL="Date Modified"
+PLG_SCHEMAORG_BLOGPOSTING_FIELD_DATE_PUBLISHED_LABEL="Date Published"
+PLG_SCHEMAORG_BLOGPOSTING_FIELD_DESCRIPTION_LABEL="Description"
+PLG_SCHEMAORG_BLOGPOSTING_FIELD_EMAIL_LABEL="Email"
+PLG_SCHEMAORG_BLOGPOSTING_FIELD_GENERIC_FIELD_LABEL="Generic Field"
+PLG_SCHEMAORG_BLOGPOSTING_FIELD_GENERIC_TITLE_LABEL="Title"
+PLG_SCHEMAORG_BLOGPOSTING_FIELD_GENERIC_VALUE_LABEL="Value"
+PLG_SCHEMAORG_BLOGPOSTING_FIELD_HEADLINE_LABEL="Headline"
+PLG_SCHEMAORG_BLOGPOSTING_FIELD_IMAGE_LABEL="Image"
+PLG_SCHEMAORG_BLOGPOSTING_FIELD_LOCALITY_LABEL="Locality"
+PLG_SCHEMAORG_BLOGPOSTING_FIELD_LOGO_LABEL="Logo"
+PLG_SCHEMAORG_BLOGPOSTING_FIELD_NAME_LABEL="Name"
+PLG_SCHEMAORG_BLOGPOSTING_FIELD_ORGANIZATION_LABEL="Organization"
+PLG_SCHEMAORG_BLOGPOSTING_FIELD_PERSON_LABEL="Person"
+PLG_SCHEMAORG_BLOGPOSTING_FIELD_POSTAL_CODE_LABEL="Postal Code"
+PLG_SCHEMAORG_BLOGPOSTING_FIELD_STREET_ADDRESS_LABEL="Street Address"
+PLG_SCHEMAORG_BLOGPOSTING_FIELD_TYPE_LABEL="Type"
+PLG_SCHEMAORG_BLOGPOSTING_FIELD_URL_LABEL="Url"
+PLG_SCHEMAORG_BLOGPOSTING_XML_DESCRIPTION="Adds Blog as a new schema type in existing schemas."
diff --git a/administrator/language/en-GB/plg_schemaorg_blogposting.sys.ini b/administrator/language/en-GB/plg_schemaorg_blogposting.sys.ini
new file mode 100755
index 0000000000000..726e91e09b2cf
--- /dev/null
+++ b/administrator/language/en-GB/plg_schemaorg_blogposting.sys.ini
@@ -0,0 +1,7 @@
+; 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_SCHEMAORG_BLOGPOSTING="Schema.org - BlogPosting"
+PLG_SCHEMAORG_BLOGPOSTING_XML_DESCRIPTION="Adds Blog as a new schema type in existing schemas."
diff --git a/administrator/language/en-GB/plg_schemaorg_book.ini b/administrator/language/en-GB/plg_schemaorg_book.ini
new file mode 100755
index 0000000000000..7c50127b5b14b
--- /dev/null
+++ b/administrator/language/en-GB/plg_schemaorg_book.ini
@@ -0,0 +1,32 @@
+; 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_SCHEMAORG_BOOK="Schema.org - Book"
+PLG_SCHEMAORG_BOOK_DESCRIPTION_LABEL="More information on the Schema.org Book Type can be found at <a href=\"https://schema.org/Book\" target=\"_blank\" rel=\"noopener noreferrer\">https://schema.org/Book</a>"
+PLG_SCHEMAORG_BOOK_FIELD_ABRIDGED_LABEL="Abridged"
+PLG_SCHEMAORG_BOOK_FIELD_ADDRESS_LABEL="Address"
+PLG_SCHEMAORG_BOOK_FIELD_AUDIOBOOK_LABEL="Audiobook"
+PLG_SCHEMAORG_BOOK_FIELD_AUTHOR_LABEL="Author"
+PLG_SCHEMAORG_BOOK_FIELD_BOOK_EDITION_LABEL="Book Edition"
+PLG_SCHEMAORG_BOOK_FIELD_BOOK_FORMAT_LABEL="Book Format"
+PLG_SCHEMAORG_BOOK_FIELD_DATE_PUBLISHED_LABEL="Date Published"
+PLG_SCHEMAORG_BOOK_FIELD_EMAIL_LABEL="Email"
+PLG_SCHEMAORG_BOOK_FIELD_E_BOOK_LABEL="E-book"
+PLG_SCHEMAORG_BOOK_FIELD_GENERIC_FIELD_LABEL="Generic Field"
+PLG_SCHEMAORG_BOOK_FIELD_GENERIC_TITLE_LABEL="Title"
+PLG_SCHEMAORG_BOOK_FIELD_GENERIC_VALUE_LABEL="Value"
+PLG_SCHEMAORG_BOOK_FIELD_GRAPHIC_NOVEL="Graphic Novel"
+PLG_SCHEMAORG_BOOK_FIELD_HARDCOVER_LABEL="Hardcover"
+PLG_SCHEMAORG_BOOK_FIELD_ILLUSTRATOR_LABEL="Illustrator"
+PLG_SCHEMAORG_BOOK_FIELD_ILLUSTRATOR_NAME_LABEL="Name"
+PLG_SCHEMAORG_BOOK_FIELD_ISBN_LABEL="ISBN"
+PLG_SCHEMAORG_BOOK_FIELD_LOCALITY_LABEL="Locality"
+PLG_SCHEMAORG_BOOK_FIELD_NAME_LABEL="Title"
+PLG_SCHEMAORG_BOOK_FIELD_NUMBER_OF_PAGES_LABEL="Number of Pages"
+PLG_SCHEMAORG_BOOK_FIELD_PAPERBACK_LABEL="Paperback"
+PLG_SCHEMAORG_BOOK_FIELD_POSTAL_CODE_LABEL="Postal Code"
+PLG_SCHEMAORG_BOOK_FIELD_STREET_ADDRESS_LABEL="Street Address"
+PLG_SCHEMAORG_BOOK_FIELD_URL_LABEL="Url"
+PLG_SCHEMAORG_BOOK_XML_DESCRIPTION="Adds Book as a new schema type in existing schemas."
diff --git a/administrator/language/en-GB/plg_schemaorg_book.sys.ini b/administrator/language/en-GB/plg_schemaorg_book.sys.ini
new file mode 100755
index 0000000000000..e20dd6144b9d7
--- /dev/null
+++ b/administrator/language/en-GB/plg_schemaorg_book.sys.ini
@@ -0,0 +1,7 @@
+; 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_SCHEMAORG_BOOK="Schema.org - Book"
+PLG_SCHEMAORG_BOOK_XML_DESCRIPTION="Adds Book as a new schema type in existing schemas."
diff --git a/administrator/language/en-GB/plg_schemaorg_event.ini b/administrator/language/en-GB/plg_schemaorg_event.ini
new file mode 100755
index 0000000000000..c96e18bc909d7
--- /dev/null
+++ b/administrator/language/en-GB/plg_schemaorg_event.ini
@@ -0,0 +1,32 @@
+; 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_SCHEMAORG_EVENT="Schema.org - Event"
+PLG_SCHEMAORG_EVENT_DESCRIPTION_LABEL="More information on the Schema.org Event Type can be found at <a href=\"https://schema.org/Event\" target=\"_blank\" rel=\"noopener noreferrer\">https://schema.org/Event</a>"
+PLG_SCHEMAORG_EVENT_FIELD_ADDRESS_LABEL="Address"
+PLG_SCHEMAORG_EVENT_FIELD_AGGREGATE_RATING_LABEL="Aggregate Rating"
+PLG_SCHEMAORG_EVENT_FIELD_DESCRIPTION_LABEL="Description"
+PLG_SCHEMAORG_EVENT_FIELD_EMAIL_LABEL="Email"
+PLG_SCHEMAORG_EVENT_FIELD_GENERIC_FIELD_LABEL="Generic Field"
+PLG_SCHEMAORG_EVENT_FIELD_GENERIC_TITLE_LABEL="Title"
+PLG_SCHEMAORG_EVENT_FIELD_GENERIC_VALUE_LABEL="Value"
+PLG_SCHEMAORG_EVENT_FIELD_IMAGE_LABEL="Image"
+PLG_SCHEMAORG_EVENT_FIELD_LOCALITY_LABEL="Locality"
+PLG_SCHEMAORG_EVENT_FIELD_LOCATION_LABEL="Location"
+PLG_SCHEMAORG_EVENT_FIELD_LOCATION_NAME_LABEL="Name"
+PLG_SCHEMAORG_EVENT_FIELD_LOGO_LABEL="Logo"
+PLG_SCHEMAORG_EVENT_FIELD_NAME_LABEL="Name"
+PLG_SCHEMAORG_EVENT_FIELD_ORGANIZATION_LABEL="Organization"
+PLG_SCHEMAORG_EVENT_FIELD_ORGANIZER_LABEL="Organizer"
+PLG_SCHEMAORG_EVENT_FIELD_ORGANIZER_NAME_LABEL="Name"
+PLG_SCHEMAORG_EVENT_FIELD_PERSON_LABEL="Person"
+PLG_SCHEMAORG_EVENT_FIELD_POSTAL_CODE_LABEL="Postal Code"
+PLG_SCHEMAORG_EVENT_FIELD_RATING_VALUE_LABEL="Rating Value"
+PLG_SCHEMAORG_EVENT_FIELD_REVIEW_COUNT_LABEL="Review Count"
+PLG_SCHEMAORG_EVENT_FIELD_START_DATE_LABEL="Start Date"
+PLG_SCHEMAORG_EVENT_FIELD_STREET_ADDRESS_LABEL="Street Address"
+PLG_SCHEMAORG_EVENT_FIELD_TYPE_LABEL="Type"
+PLG_SCHEMAORG_EVENT_FIELD_URL_LABEL="Url"
+PLG_SCHEMAORG_EVENT_XML_DESCRIPTION="Adds Event as a new schema type in existing schemas."
diff --git a/administrator/language/en-GB/plg_schemaorg_event.sys.ini b/administrator/language/en-GB/plg_schemaorg_event.sys.ini
new file mode 100755
index 0000000000000..22e1fb9e318e7
--- /dev/null
+++ b/administrator/language/en-GB/plg_schemaorg_event.sys.ini
@@ -0,0 +1,7 @@
+; 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_SCHEMAORG_EVENT="Schema.org - Event"
+PLG_SCHEMAORG_EVENT_XML_DESCRIPTION="Adds Event as a new schema type in existing schemas."
diff --git a/administrator/language/en-GB/plg_schemaorg_jobposting.ini b/administrator/language/en-GB/plg_schemaorg_jobposting.ini
new file mode 100755
index 0000000000000..29d5c1927773d
--- /dev/null
+++ b/administrator/language/en-GB/plg_schemaorg_jobposting.ini
@@ -0,0 +1,58 @@
+; 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_SCHEMAORG_JOBPOSTING_DESCRIPTION_LABEL="More information on the Schema.org JobPosting Type can be found at <a href=\"https://schema.org/JobPosting\" target=\"_blank\" rel=\"noopener noreferrer\">https://schema.org/JobPosting</a>"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_ADDRESS_COUNTRY_LABEL="Country"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_ADDRESS_LABEL="Address"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_ADDRESS_REGION_LABEL="Region"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_APPLICANT_LOCATION_REQUIREMENT_COUNTRY_LABEL="Country"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_APPLICANT_LOCATION_REQUIREMENT_LABEL="Applicant Location Requirement"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_BASESALARY_LABEL="Base Salary"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_BASESALARY_UNIT_OPTION_DAY="Day"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_BASESALARY_UNIT_OPTION_HOUR="Hour"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_BASESALARY_UNIT_OPTION_MONTH="Month"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_BASESALARY_UNIT_OPTION_WEEK="Week"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_BASESALARY_UNIT_OPTION_YEAR="Year"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_CURRENCY_LABEL="Currency"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_DATE_LABEL="Date"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_DATEPOSTED_LABEL="Date Posted"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_DESCRIPTION_LABEL="Description"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_EMAIL_LABEL="Email"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_EMPLOYMENTTYPE_LABEL="Employment Type"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_GENERIC_FIELD_LABEL="Generic Field"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_GENERIC_TITLE_LABEL="Title"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_GENERIC_VALUE_LABEL="Value"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_HIRINGORGANIZATION_LABEL="Hiring Organization"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_HIRINGORGANIZATION_NAME_LABEL="Title"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_HIRINGORGANIZATION_TYPE_LABEL="Type"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_HYBRID_LABEL="Hybrid"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_IDENTIFIER_LABEL="Identifier"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_IMAGE_LABEL="Logo"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_JOBLOCATION_LABEL="Job Location"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_JOBLOCATIONTYPE_LABEL="Description of the Job Location"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_JOBSTARTDATE_DATE_LABEL="Date"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_JOBSTARTDATE_LABEL="Date to Start"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_JOBSTARTDATE_TEXT_HINT="ASAP"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_JOBSTARTDATE_TEXT_LABEL="Text"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_JOBSTARTDATE_TYPE_LABEL="Type"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_LOCALITY_LABEL="Locality"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_MAXVALUE_LABEL="Maximum"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_MINVALUE_LABEL="Minimum"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_NAME_LABEL="Name"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_ONSITE_LABEL="Onsite"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_ORGANIZATION_LABEL="Organization"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_PERSON_LABEL="Person"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_POSTAL_CODE_LABEL="Postal Code"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_SALARY_VALUE_LABEL="Amount"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_STREET_ADDRESS_LABEL="Street Address"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_TELECOMMUTE_LABEL="Telecommute"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_TEXT_LABEL="Text"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_TITLE_LABEL="Title"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_UNITTEXT_LABEL="Currency Unit"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_URL_LABEL="URL"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_VALIDTHROUGH_LABEL="Valid Through"
+PLG_SCHEMAORG_JOBPOSTING_FIELD_VALUE_LABEL="Value"
+PLG_SCHEMAORG_JOBPOSTING="Schema.org - JobPosting"
+PLG_SCHEMAORG_JOBPOSTING_XML_DESCRIPTION="Adds JobPosting as a new schema type in existing schemas."
diff --git a/administrator/language/en-GB/plg_schemaorg_jobposting.sys.ini b/administrator/language/en-GB/plg_schemaorg_jobposting.sys.ini
new file mode 100755
index 0000000000000..38667b694fdcf
--- /dev/null
+++ b/administrator/language/en-GB/plg_schemaorg_jobposting.sys.ini
@@ -0,0 +1,7 @@
+; 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_SCHEMAORG_JOBPOSTING="Schema.org - JobPosting"
+PLG_SCHEMAORG_JOBPOSTING_XML_DESCRIPTION="Adds JobPosting as a new schema type in existing schemas."
diff --git a/administrator/language/en-GB/plg_schemaorg_organization.ini b/administrator/language/en-GB/plg_schemaorg_organization.ini
new file mode 100755
index 0000000000000..04325eb554403
--- /dev/null
+++ b/administrator/language/en-GB/plg_schemaorg_organization.ini
@@ -0,0 +1,19 @@
+; 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_SCHEMAORG_ORGANIZATION="Schema.org - Organization"
+PLG_SCHEMAORG_ORGANIZATION_DESCRIPTION_LABEL="More information on the Schema.org Organization Type can be found at <a href=\"https://schema.org/Organization\" target=\"_blank\" rel=\"noopener noreferrer\">https://schema.org/Organization</a>"
+PLG_SCHEMAORG_ORGANIZATION_FIELD_ADDRESS_LABEL="Address"
+PLG_SCHEMAORG_ORGANIZATION_FIELD_EMAIL_LABEL="Email"
+PLG_SCHEMAORG_ORGANIZATION_FIELD_GENERIC_FIELD_LABEL="Generic Field"
+PLG_SCHEMAORG_ORGANIZATION_FIELD_GENERIC_TITLE_LABEL="Title"
+PLG_SCHEMAORG_ORGANIZATION_FIELD_GENERIC_VALUE_LABEL="Value"
+PLG_SCHEMAORG_ORGANIZATION_FIELD_LOCALITY_LABEL="Locality"
+PLG_SCHEMAORG_ORGANIZATION_FIELD_LOGO_LABEL="Logo"
+PLG_SCHEMAORG_ORGANIZATION_FIELD_NAME_LABEL="Name"
+PLG_SCHEMAORG_ORGANIZATION_FIELD_POSTAL_CODE_LABEL="Postal Code"
+PLG_SCHEMAORG_ORGANIZATION_FIELD_STREET_ADDRESS_LABEL="Street Address"
+PLG_SCHEMAORG_ORGANIZATION_FIELD_URL_LABEL="URL"
+PLG_SCHEMAORG_ORGANIZATION_XML_DESCRIPTION="Adds Organization as a new schema type in existing schemas."
diff --git a/administrator/language/en-GB/plg_schemaorg_organization.sys.ini b/administrator/language/en-GB/plg_schemaorg_organization.sys.ini
new file mode 100755
index 0000000000000..58e04cf03884f
--- /dev/null
+++ b/administrator/language/en-GB/plg_schemaorg_organization.sys.ini
@@ -0,0 +1,7 @@
+; 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_SCHEMAORG_ORGANIZATION="Schema.org - Organization"
+PLG_SCHEMAORG_ORGANIZATION_XML_DESCRIPTION="Adds Organization as a new schema type in existing schemas"
diff --git a/administrator/language/en-GB/plg_schemaorg_person.ini b/administrator/language/en-GB/plg_schemaorg_person.ini
new file mode 100755
index 0000000000000..e6ec741d16511
--- /dev/null
+++ b/administrator/language/en-GB/plg_schemaorg_person.ini
@@ -0,0 +1,18 @@
+; 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_SCHEMAORG_PERSON="Schema.org - Person"
+PLG_SCHEMAORG_PERSON_DESCRIPTION_LABEL="More information on the Schema.org Person Type can be found at <a href=\"https://schema.org/Person\" target=\"_blank\" rel=\"noopener noreferrer\">https://schema.org/Person</a>"
+PLG_SCHEMAORG_PERSON_FIELD_ADDRESS_LABEL="Address"
+PLG_SCHEMAORG_PERSON_FIELD_EMAIL_LABEL="Email"
+PLG_SCHEMAORG_PERSON_FIELD_GENERIC_FIELD_LABEL="Generic Field"
+PLG_SCHEMAORG_PERSON_FIELD_GENERIC_TITLE_LABEL="Title"
+PLG_SCHEMAORG_PERSON_FIELD_GENERIC_VALUE_LABEL="Value"
+PLG_SCHEMAORG_PERSON_FIELD_LOCALITY_LABEL="Locality"
+PLG_SCHEMAORG_PERSON_FIELD_NAME_LABEL="Name"
+PLG_SCHEMAORG_PERSON_FIELD_POSTAL_CODE_LABEL="Postal Code"
+PLG_SCHEMAORG_PERSON_FIELD_STREET_ADDRESS_LABEL="Street Address"
+PLG_SCHEMAORG_PERSON_FIELD_URL_LABEL="URL"
+PLG_SCHEMAORG_PERSON_XML_DESCRIPTION="Adds Person as a new schema type in existing schemas."
diff --git a/administrator/language/en-GB/plg_schemaorg_person.sys.ini b/administrator/language/en-GB/plg_schemaorg_person.sys.ini
new file mode 100755
index 0000000000000..cae501dd38b9f
--- /dev/null
+++ b/administrator/language/en-GB/plg_schemaorg_person.sys.ini
@@ -0,0 +1,7 @@
+; 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_SCHEMAORG_PERSON="Schema.org - Person"
+PLG_SCHEMAORG_PERSON_XML_DESCRIPTION="Adds Person as a new schema type in existing schemas."
diff --git a/administrator/language/en-GB/plg_schemaorg_recipe.ini b/administrator/language/en-GB/plg_schemaorg_recipe.ini
new file mode 100755
index 0000000000000..5d2dd31f6f575
--- /dev/null
+++ b/administrator/language/en-GB/plg_schemaorg_recipe.ini
@@ -0,0 +1,40 @@
+; 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_SCHEMAORG_RECIPE="Schema.org - Recipe"
+PLG_SCHEMAORG_RECIPE_DESCRIPTION_LABEL="More information on the Schema.org Recipe Type can be found at <a href=\"https://schema.org/Recipe\" target=\"_blank\" rel=\"noopener noreferrer\">https://schema.org/Recipe</a>"
+PLG_SCHEMAORG_RECIPE_FIELD_AUTHOR_LABEL="Author"
+PLG_SCHEMAORG_RECIPE_FIELD_CALORIES_LABEL="Calories"
+PLG_SCHEMAORG_RECIPE_FIELD_CARBOHYDRATE_LABEL="Carbohydrate"
+PLG_SCHEMAORG_RECIPE_FIELD_CATEGORY_LABEL="Category"
+PLG_SCHEMAORG_RECIPE_FIELD_CHOLESTEROL_CONTENT_LABEL="Cholesterol"
+PLG_SCHEMAORG_RECIPE_FIELD_COOKING_METHOD_LABEL="Cooking Method"
+PLG_SCHEMAORG_RECIPE_FIELD_COOK_TIME_LABEL="Cook Time"
+PLG_SCHEMAORG_RECIPE_FIELD_CUISINE_LABEL="Cuisine"
+PLG_SCHEMAORG_RECIPE_FIELD_DATE_PUBLISHED_LABEL="Date Published"
+PLG_SCHEMAORG_RECIPE_FIELD_DESCRIPTION_LABEL="Description"
+PLG_SCHEMAORG_RECIPE_FIELD_FAT_LABEL="Fat"
+PLG_SCHEMAORG_RECIPE_FIELD_FIBER_LABEL="Fibre"
+PLG_SCHEMAORG_RECIPE_FIELD_GENERIC_FIELD_LABEL="Generic Field"
+PLG_SCHEMAORG_RECIPE_FIELD_GENERIC_TITLE_LABEL="Title"
+PLG_SCHEMAORG_RECIPE_FIELD_GENERIC_VALUE_LABEL="Value"
+PLG_SCHEMAORG_RECIPE_FIELD_HOUR_LABEL="Hours"
+PLG_SCHEMAORG_RECIPE_FIELD_IMAGE_LABEL="Image"
+PLG_SCHEMAORG_RECIPE_FIELD_INGREDIENTS_LABEL="Ingredients"
+PLG_SCHEMAORG_RECIPE_FIELD_INSTRUCTIONS_LABEL="Instructions"
+PLG_SCHEMAORG_RECIPE_FIELD_MINUTE_LABEL="Minutes"
+PLG_SCHEMAORG_RECIPE_FIELD_NAME_LABEL="Title"
+PLG_SCHEMAORG_RECIPE_FIELD_NUTRITION_LABEL="Nutrition"
+PLG_SCHEMAORG_RECIPE_FIELD_PREPARATION_TIME_LABEL="Preparation Time"
+PLG_SCHEMAORG_RECIPE_FIELD_PROTEIN_LABEL="Protein"
+PLG_SCHEMAORG_RECIPE_FIELD_SATURATED_FAT_LABEL="Saturated Fat"
+PLG_SCHEMAORG_RECIPE_FIELD_SERVING_SIZE_LABEL="Serving Size"
+PLG_SCHEMAORG_RECIPE_FIELD_SODIUM_LABEL="Sodium"
+PLG_SCHEMAORG_RECIPE_FIELD_SUGAR_LABEL="Sugar"
+PLG_SCHEMAORG_RECIPE_FIELD_SUITABLE_FOR_DIET_LABEL="Suitable for Diet"
+PLG_SCHEMAORG_RECIPE_FIELD_TRANS_FAT_LABEL="Trans Fat"
+PLG_SCHEMAORG_RECIPE_FIELD_UNSATURATED_FAT_LABEL="Unsaturated Fat"
+PLG_SCHEMAORG_RECIPE_FIELD_YIELD_LABEL="Yield"
+PLG_SCHEMAORG_RECIPE_XML_DESCRIPTION="Adds Recipe as a new schema type in existing schemas."
diff --git a/administrator/language/en-GB/plg_schemaorg_recipe.sys.ini b/administrator/language/en-GB/plg_schemaorg_recipe.sys.ini
new file mode 100755
index 0000000000000..afc6bf3960614
--- /dev/null
+++ b/administrator/language/en-GB/plg_schemaorg_recipe.sys.ini
@@ -0,0 +1,7 @@
+; 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_SCHEMAORG_RECIPE="Schema.org - Recipe"
+PLG_SCHEMAORG_RECIPE_XML_DESCRIPTION="Adds Recipe as a new schema type in existing schemas."
diff --git a/administrator/language/en-GB/plg_system_actionlogs.ini b/administrator/language/en-GB/plg_system_actionlogs.ini
index 1b63c7b5a6acb..1f0ec95576f52 100644
--- a/administrator/language/en-GB/plg_system_actionlogs.ini
+++ b/administrator/language/en-GB/plg_system_actionlogs.ini
@@ -9,8 +9,6 @@ PLG_SYSTEM_ACTIONLOGS_INFO_DESC="The Action Log - Joomla plugin is disabled"
 PLG_SYSTEM_ACTIONLOGS_INFO_LABEL="Information"
 PLG_SYSTEM_ACTIONLOGS_JOOMLA_ACTIONLOG_DISABLED="Action Log - Joomla"
 PLG_SYSTEM_ACTIONLOGS_JOOMLA_ACTIONLOG_DISABLED_REDIRECT="The %s plugin is disabled."
-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_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."
@@ -22,3 +20,7 @@ PLG_SYSTEM_ACTIONLOGS_CONTENT_PUBLISHED="User <a href=\"{accountlink}\">{usernam
 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."
diff --git a/administrator/language/en-GB/plg_system_debug.ini b/administrator/language/en-GB/plg_system_debug.ini
index 87e08c6a98530..cdb82aafd0481 100644
--- a/administrator/language/en-GB/plg_system_debug.ini
+++ b/administrator/language/en-GB/plg_system_debug.ini
@@ -3,13 +3,6 @@
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
-PLG_DEBUG_BYTES="Bytes"
-PLG_DEBUG_CALL_STACK="Call Stack"
-PLG_DEBUG_CALL_STACK_CALLER="Caller"
-PLG_DEBUG_CALL_STACK_FILE_AND_LINE="File and line number"
-PLG_DEBUG_CALL_STACK_SAME_FILE="<em>Same as call in the line below.</em>"
-PLG_DEBUG_ERRORS="Errors"
-PLG_DEBUG_EXPLAIN="Explain"
 PLG_DEBUG_FIELD_ALLOWED_GROUPS_LABEL="Allowed Groups"
 PLG_DEBUG_FIELD_LANGUAGE_ERRORFILES_LABEL="Errors When Parsing Language Files"
 PLG_DEBUG_FIELD_LANGUAGE_FILES_LABEL="Language Files"
@@ -33,13 +26,24 @@ PLG_DEBUG_FIELD_STRIP_SUFFIX_DESC="Strip words from the end of the string. For m
 PLG_DEBUG_FIELD_STRIP_SUFFIX_LABEL="Strip From End"
 PLG_DEBUG_FIELD_TRACK_REQUEST_HISTORY_LABEL="Track Request History"
 PLG_DEBUG_FIELD_TRACK_REQUEST_HISTORY_DESC="When enabled this saves the request history data into the filesystem for future analysis. This data may include passwords and secret tokens. Only enable this for a short period of time as the file can be read by anyone with read access to the cache folder. When this setting is subsequently disabled it is strongly recommended to clear the Site Cache!"
-PLG_DEBUG_LANG_LOADED="Loaded"
-PLG_DEBUG_LANG_NOT_LOADED="Not loaded"
 PLG_DEBUG_LANGUAGE_FIELDSET_LABEL="Language"
+PLG_DEBUG_LOGGING_FIELDSET_LABEL="Logging"
+PLG_DEBUG_XML_DESCRIPTION="This plugin provides a variety of system information as well as help for the creation of translation files."
+PLG_SYSTEM_DEBUG="System - Debug"
+
+; All the following strings are deprecated and will be removed with 5.0
+PLG_DEBUG_BYTES="Bytes"
+PLG_DEBUG_CALL_STACK="Call Stack"
+PLG_DEBUG_CALL_STACK_CALLER="Caller"
+PLG_DEBUG_CALL_STACK_FILE_AND_LINE="File and line number"
+PLG_DEBUG_CALL_STACK_SAME_FILE="<em>Same as call in the line below.</em>"
+PLG_DEBUG_ERRORS="Errors"
+PLG_DEBUG_EXPLAIN="Explain"
 PLG_DEBUG_LANGUAGE_FILES_IN_ERROR="Parsing errors in language files"
 PLG_DEBUG_LANGUAGE_FILES_LOADED="Language Files Loaded"
+PLG_DEBUG_LANG_LOADED="Loaded"
+PLG_DEBUG_LANG_NOT_LOADED="Not loaded"
 PLG_DEBUG_LINK_FORMAT="Add xdebug.file_link_format directive to your php.ini file to have links for files."
-PLG_DEBUG_LOGGING_FIELDSET_LABEL="Logging"
 PLG_DEBUG_LOGS="Log Messages"
 PLG_DEBUG_LOGS_DEPRECATED_FOUND_TEXT="The code that is marked as deprecated will not work in upcoming Joomla versions, please review it."
 PLG_DEBUG_LOGS_DEPRECATED_FOUND_TITLE="%s deprecated messages logged!"
@@ -61,8 +65,8 @@ PLG_DEBUG_QUERY_DUPLICATES_NUMBER="%s duplicates"
 PLG_DEBUG_QUERY_DUPLICATES_TOTAL_NUMBER="%s duplicate found!"
 PLG_DEBUG_QUERY_EXPLAIN_NOT_POSSIBLE="EXPLAIN not possible on query: %s"
 PLG_DEBUG_QUERY_TIME="Query Time: %s"
-PLG_DEBUG_QUERY_TYPE_AND_OCCURRENCES="%2$d &#215; %1$s"
 PLG_DEBUG_QUERY_TYPES_LOGGED="%d Query Types Logged, Sorted by Occurrences."
+PLG_DEBUG_QUERY_TYPE_AND_OCCURRENCES="%2$d &#215; %1$s"
 PLG_DEBUG_ROWS_RETURNED_BY_QUERY="Rows returned: %s"
 PLG_DEBUG_SELECT_QUERIES="SELECT Tables:"
 PLG_DEBUG_SESSION="Session"
@@ -74,5 +78,3 @@ PLG_DEBUG_WARNING_NO_INDEX="NO INDEX KEY COULD BE USED"
 PLG_DEBUG_WARNING_NO_INDEX_DESC="This table probably has a missing index on WHERE equalities and/or JOIN ON column(s) or is written in a way that no index can be used, causing a time-consuming full table scan."
 PLG_DEBUG_WARNING_USING_FILESORT="Using filesort"
 PLG_DEBUG_WARNING_USING_FILESORT_DESC="This table probably has a missing index on WHERE/ON equality column(s) ending by the ORDER BY column(s) or is written in a way that no index can be used, causing a time-consuming filesort."
-PLG_DEBUG_XML_DESCRIPTION="This plugin provides a variety of system information as well as help for the creation of translation files."
-PLG_SYSTEM_DEBUG="System - Debug"
diff --git a/administrator/language/en-GB/plg_system_logrotation.ini b/administrator/language/en-GB/plg_system_logrotation.ini
deleted file mode 100644
index c55fc9fa19758..0000000000000
--- a/administrator/language/en-GB/plg_system_logrotation.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-; Joomla! Project
-; (C) 2018 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_SYSTEM_LOGROTATION="System - Log Rotation"
-PLG_SYSTEM_LOGROTATION_CACHETIMEOUT_LABEL="Log Rotation (in days)"
-PLG_SYSTEM_LOGROTATION_LOGSTOKEEP_LABEL="Maximum Logs"
-PLG_SYSTEM_LOGROTATION_XML_DESCRIPTION="This plugin periodically rotates system log files."
diff --git a/administrator/language/en-GB/plg_system_logrotation.sys.ini b/administrator/language/en-GB/plg_system_logrotation.sys.ini
deleted file mode 100644
index 131c5d8174c80..0000000000000
--- a/administrator/language/en-GB/plg_system_logrotation.sys.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-; Joomla! Project
-; (C) 2018 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_SYSTEM_LOGROTATION="System - Log Rotation"
-PLG_SYSTEM_LOGROTATION_XML_DESCRIPTION="This plugin periodically rotates system log files."
diff --git a/administrator/language/en-GB/plg_system_privacyconsent.ini b/administrator/language/en-GB/plg_system_privacyconsent.ini
index 30ef0294554d5..2abb7a81a4ec4 100644
--- a/administrator/language/en-GB/plg_system_privacyconsent.ini
+++ b/administrator/language/en-GB/plg_system_privacyconsent.ini
@@ -5,18 +5,11 @@
 
 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_CACHETIMEOUT_DESC="How often the check is performed."
-PLG_SYSTEM_PRIVACYCONSENT_CACHETIMEOUT_LABEL="Periodic check (days)"
 PLG_SYSTEM_PRIVACYCONSENT_CONSENT="User <a href='{accountlink}'>{username}</a> consented to the privacy policy."
-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_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_ENABLED_DESC="When enabled it performs checks for consent expiration."
-PLG_SYSTEM_PRIVACYCONSENT_FIELD_ENABLED_LABEL="Enable"
 PLG_SYSTEM_PRIVACYCONSENT_FIELD_ERROR="Agreement to the site's Privacy Policy is required."
 PLG_SYSTEM_PRIVACYCONSENT_FIELD_LABEL="Privacy Policy"
 PLG_SYSTEM_PRIVACYCONSENT_FIELD_MENU_ITEM_LABEL="Privacy Menu Item"
@@ -36,7 +29,16 @@ PLG_SYSTEM_PRIVACYCONSENT_OPTION_DO_NOT_AGREE="I do not agree"
 PLG_SYSTEM_PRIVACYCONSENT_REDIRECT_MESSAGE_DEFAULT="Please confirm that you consent to this website storing your information by agreeing to the privacy policy."
 PLG_SYSTEM_PRIVACYCONSENT_REDIRECT_MESSAGE_DESC="Custom message to be displayed on redirect. If left blank then the default message will be used."
 PLG_SYSTEM_PRIVACYCONSENT_REDIRECT_MESSAGE_LABEL="Redirect Message"
-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"
 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_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_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
new file mode 100755
index 0000000000000..1a09bab4e6adf
--- /dev/null
+++ b/administrator/language/en-GB/plg_system_schemaorg.ini
@@ -0,0 +1,21 @@
+; 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_SYSTEM_SCHEMAORG="System - Schema.org"
+PLG_SYSTEM_SCHEMAORG_BASETYPE_DESCRIPTION="Choose whether your website represents an organization or a single person."
+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>."
+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_LABEL="Schema"
+PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_TYPE_LABEL="Schema Type"
+PLG_SYSTEM_SCHEMAORG_IMAGE_LABEL="Image"
+PLG_SYSTEM_SCHEMAORG_NAME_LABEL="Name"
+PLG_SYSTEM_SCHEMAORG_SOCIALMEDIA_LABEL="Social Media Accounts"
+PLG_SYSTEM_SCHEMAORG_SOCIALMEDIA_URL_LABEL="URL"
+PLG_SYSTEM_SCHEMAORG_USER_LABEL="Select User"
+PLG_SYSTEM_SCHEMAORG_XML_DESCRIPTION="Adds custom form field in article view and then injects that data in JSON+LD format in the head tag of that particular article."
diff --git a/administrator/language/en-GB/plg_system_schemaorg.sys.ini b/administrator/language/en-GB/plg_system_schemaorg.sys.ini
new file mode 100755
index 0000000000000..2c08ee3667e6f
--- /dev/null
+++ b/administrator/language/en-GB/plg_system_schemaorg.sys.ini
@@ -0,0 +1,7 @@
+; 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_SYSTEM_SCHEMAORG="System - Schema.org"
+PLG_SYSTEM_SCHEMAORG_XML_DESCRIPTION="Adds custom form field in article view and then injects that data in JSON+LD format in the head tag of that particular article."
diff --git a/administrator/language/en-GB/plg_system_updatenotification.ini b/administrator/language/en-GB/plg_system_updatenotification.ini
deleted file mode 100644
index b0e1f285584a6..0000000000000
--- a/administrator/language/en-GB/plg_system_updatenotification.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-; Joomla! Project
-; (C) 2015 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_SYSTEM_UPDATENOTIFICATION="System - Joomla! Update Notification"
-PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_BODY="This email IS NOT sent by the Joomla! project. It is sent automatically by your own site,\n{SITENAME} - {URL} \n\n================================================================================\nUPDATE INFORMATION\n================================================================================\n\nYour site has discovered that there is an updated version of Joomla! available for download.\n\nJoomla! version currently installed: {CURVERSION}\nJoomla! version available for installation: {NEWVERSION}\n\nThis email is sent to you by your site to remind you of this fact.\nThe Joomla! project will never contact you directly about available updates of Joomla! on your site.\n\n================================================================================\nUPDATE INSTRUCTIONS\n================================================================================\n\nTo install the update on {SITENAME} please select the following link. (If the URL is not a link, copy & paste it to your browser).\n\nUpdate link: {LINK}\n\nRelease News can be found here: {RELEASENEWS}\n\n================================================================================\nWHY AM I RECEIVING THIS EMAIL?\n================================================================================\n\nThis email has been automatically sent by a plugin provided by Joomla!, the software which powers your site.\nThis plugin looks for updated versions of Joomla! and sends an email notification to its administrators.\nYou will receive several similar emails from your site until you either update the software or disable these emails.\n\nTo disable these emails, please unpublish the 'System - Joomla! Update Notification' plugin in the Plugin Manager on your site.\n\nIf you do not understand what Joomla! is and what you need to do please do not contact the Joomla! project.\nThey are NOT sending you this email and they cannot help you. Instead, please contact the person who built or manages your site.\n\nIf you are the person who built or manages your website, please note that this plugin may have been activated automatically when you installed or updated Joomla! on your site.\n\n================================================================================\nWHO SENT ME THIS EMAIL?\n================================================================================\n\nThis email is sent to you by your own site, {SITENAME}"
-PLG_SYSTEM_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_SYSTEM_UPDATENOTIFICATION_EMAIL_LBL="Super User Emails"
-; You can use the following merge codes:
-; {NEWVERSION}		New Joomla! version, e.g. 1.2.3
-; {CURVERSION}		Currently installed Joomla! version, e.g. 1.2.0
-; {SITENAME}		Site name, as set in Global Configuration.
-; {URL}			URL of the site's frontend page.
-; {LINK}		Update URL (link to com_joomlaupdate, will request login if the Super User isn't already logged in).
-; {RELEASENEWS}		URL to the release news on joomla.org
-; \n			Newline character. Use it to start a new line in the email.
-PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_SUBJECT="Joomla! Update available for {SITENAME} – {URL}"
-PLG_SYSTEM_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_DESC="Select a language for the update notification emails. Set to Auto to send them in the site language at the time."
-PLG_SYSTEM_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_LBL="Email Language"
-PLG_SYSTEM_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_NONE="Auto"
-PLG_SYSTEM_UPDATENOTIFICATION_MAIL_MAIL_DESC="Sent to the site administrators when the &quot;Joomla! Update Notification&quot; system plugin detects an update."
-PLG_SYSTEM_UPDATENOTIFICATION_MAIL_MAIL_TITLE="Joomla: Update Notification"
-PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME="The Joomla! Update Notification will not run in this configuration"
-PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_ACTION="Set it back to the default setting (6 Hours)"
-PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_BODY="<p>In your Installer Configuration you have set the Option Update Cache (in Hours) to 0 this means that Joomla is not caching the Update. This means an email should be sent on every page visit but this is not possible. Please increase the value (6 is default) or confirm that the Joomla! Update Notification will never send you mails.</p>"
-PLG_SYSTEM_UPDATENOTIFICATION_XML_DESCRIPTION="This plugin periodically checks for the availability of new Joomla! versions. When one is found it will send you an email, reminding you to update. You can customise the email at System &rarr; Mail Templates."
diff --git a/administrator/language/en-GB/plg_system_updatenotification.sys.ini b/administrator/language/en-GB/plg_system_updatenotification.sys.ini
deleted file mode 100644
index 705dcc576acc3..0000000000000
--- a/administrator/language/en-GB/plg_system_updatenotification.sys.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-; Joomla! Project
-; (C) 2015 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_SYSTEM_UPDATENOTIFICATION="System - Joomla! Update Notification"
-PLG_SYSTEM_UPDATENOTIFICATION_XML_DESCRIPTION="This plugin periodically checks for the availability of new Joomla! versions. When one is found it will send you an email, reminding you to update. You can customise the email at System &rarr; Mail Templates."
diff --git a/administrator/language/en-GB/plg_system_webauthn.ini b/administrator/language/en-GB/plg_system_webauthn.ini
index 5c7f8465f20c5..5c6c8b77e5c59 100644
--- a/administrator/language/en-GB/plg_system_webauthn.ini
+++ b/administrator/language/en-GB/plg_system_webauthn.ini
@@ -3,49 +3,49 @@
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
-PLG_SYSTEM_WEBAUTHN="System - WebAuthn Passwordless Login"
-PLG_SYSTEM_WEBAUTHN_CANNOT_ADD_FOR_A_USER="You cannot add or remove authenticators on behalf of users. Users must login, and set up their own devices."
-PLG_SYSTEM_WEBAUTHN_DESCRIPTION="Enables passwordless authentication using the W3C Web Authentication (WebAuthn) API. Please note that the WebAuthn tab in the user profile editor and the WebAuthn login buttons will only be displayed if the user is accessing the site over HTTPS. Furthermore, registering WebAuthn authenticators and using them to log into your site will only work when your site is using a valid certificate, signed by a Certificate Authority the user's browser trusts."
+PLG_SYSTEM_WEBAUTHN="System - Passkey (Passwordless) Login"
+PLG_SYSTEM_WEBAUTHN_CANNOT_ADD_FOR_A_USER="You cannot add or remove passkeys on behalf of users. Users must login, and set up their own devices."
+PLG_SYSTEM_WEBAUTHN_DESCRIPTION="Enables passwordless authentication using passkeys. Please note that the passkeys tab in the user profile editor and the passkeys login buttons will only be displayed if the user is accessing the site over HTTPS. Registering passkeys and using them to log into your site will only work when your site is using a valid certificate, signed by a Certificate Authority the user's browser trusts."
 PLG_SYSTEM_WEBAUTHN_ERR_CANNOT_FIND_USERNAME="Cannot find the username field in the login module. Sorry, Passwordless authentication will not work on this site unless you use a different login module."
 PLG_SYSTEM_WEBAUTHN_ERR_CANT_STORE_FOR_GUEST="Cannot possibly store credentials for Guest user!"
-PLG_SYSTEM_WEBAUTHN_ERR_CORRUPT_STORED_CREDENTIAL="The stored credentials are corrupt for your user account. Log in using another method, then remove and add again your login authenticator."
+PLG_SYSTEM_WEBAUTHN_ERR_CORRUPT_STORED_CREDENTIAL="The stored credentials are corrupt for your user account. Log in using another method, then remove and add again your passkey."
 PLG_SYSTEM_WEBAUTHN_ERR_CREATE_INVALID_LOGIN_REQUEST="Invalid passwordless login request. Something is broken or this is an attempt to hack the site."
-PLG_SYSTEM_WEBAUTHN_ERR_CREATE_INVALID_PK="The authenticator registration has failed. The authenticator response received from the browser does not match the Public Key issued by the server. This means that someone tried to hack you or something is broken."
-PLG_SYSTEM_WEBAUTHN_ERR_CREATE_INVALID_USER="For security reasons you are not allowed to register passwordless authentication tokens on behalf of another user."
-PLG_SYSTEM_WEBAUTHN_ERR_CREATE_NO_ATTESTED_DATA="Something went wrong but no further information about the error is available at this time. Please retry registering your authenticator."
-PLG_SYSTEM_WEBAUTHN_ERR_CREATE_NO_PK="The server has not issued a Public Key for authenticator registration but somehow received an authenticator registration request from the browser. This means that someone tried to hack you or something is broken."
+PLG_SYSTEM_WEBAUTHN_ERR_CREATE_INVALID_PK="The passkey registration has failed. The passkey response received from the browser does not match the Public Key issued by the server. This means that someone tried to hack you or something is broken."
+PLG_SYSTEM_WEBAUTHN_ERR_CREATE_INVALID_USER="For security reasons you are not allowed to register passkeys on behalf of another user."
+PLG_SYSTEM_WEBAUTHN_ERR_CREATE_NO_ATTESTED_DATA="Something went wrong but no further information about the error is available at this time. Please retry registering your passkey."
+PLG_SYSTEM_WEBAUTHN_ERR_CREATE_NO_PK="The server has not issued a Public Key for passkey registration but somehow received a passkey registration request from the browser. This means that someone tried to hack you or something is broken."
 PLG_SYSTEM_WEBAUTHN_ERR_CREDENTIAL_ID_ALREADY_IN_USE="Cannot save credentials. These credentials are already being used by a different user."
-PLG_SYSTEM_WEBAUTHN_ERR_EMPTY_USERNAME="You need to enter your username (but NOT your password) before selecting the Web Authentication login button."
+PLG_SYSTEM_WEBAUTHN_ERR_EMPTY_USERNAME="You need to enter your username (but NOT your password) before selecting the passkey login button."
 PLG_SYSTEM_WEBAUTHN_ERR_INVALID_USERNAME="The specified username does not correspond to a user account that has enabled passwordless login on this site."
 PLG_SYSTEM_WEBAUTHN_ERR_LABEL_NOT_SAVED="Could not save the new label"
-PLG_SYSTEM_WEBAUTHN_ERR_NOT_DELETED="Could not remove the authenticator"
+PLG_SYSTEM_WEBAUTHN_ERR_NOT_DELETED="Could not remove the passkey"
 PLG_SYSTEM_WEBAUTHN_ERR_NOUSER="No user account has been found"
-PLG_SYSTEM_WEBAUTHN_ERR_NO_BROWSER_SUPPORT="Sorry, your browser does not support the W3C Web Authentication standard for passwordless logins or your site is not being served over HTTPS with a valid certificate, signed by a Certificate Authority your browser trusts. You will need to log into this site using your username and password."
-PLG_SYSTEM_WEBAUTHN_ERR_NO_STORED_CREDENTIAL="Cannot find the stored credentials for your login authenticator."
-PLG_SYSTEM_WEBAUTHN_ERR_USER_REMOVED="The user for this authenticator seems to no longer exist on this site."
-PLG_SYSTEM_WEBAUTHN_ERR_XHR_INITCREATE="Cannot get the authenticator registration information from your site."
-PLG_SYSTEM_WEBAUTHN_FIELD_ATTESTATION_SUPPORT_DESC="Only allow authenticators with verifiable cryptographic signatures to be used for WebAuthn logins. Strongly recommended for high security environments. Requires the system temporary directory being writeable by PHP, and the OpenSSL extension. May prevent some cheaper, non-certified authenticators from working at all. Disabling it also prevents Joomla from identifying the make and model of the authenticator you are using (no icon will be displayed next to the Authenticator Name)."
+PLG_SYSTEM_WEBAUTHN_ERR_NO_BROWSER_SUPPORT="Sorry, your browser does not support the passkeys standard for passwordless logins or your site is not being served over HTTPS with a valid certificate, signed by a Certificate Authority your browser trusts. You will need to log into this site using your username and password."
+PLG_SYSTEM_WEBAUTHN_ERR_NO_STORED_CREDENTIAL="Cannot find the stored credentials for your passkey."
+PLG_SYSTEM_WEBAUTHN_ERR_USER_REMOVED="The user for this passkey seems to no longer exist on this site."
+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 writeable 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 the W3C Web Authentication standard. You need a supported browser and authenticator (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\">WebAuthn Passwordless Login documentation</a>."
-PLG_SYSTEM_WEBAUTHN_FIELD_LABEL="W3C Web Authentication (WebAuthn) Login"
-PLG_SYSTEM_WEBAUTHN_FIELD_N_AUTHENTICATORS_REGISTERED="%d WebAuthn authenticators already set up: %s"
-PLG_SYSTEM_WEBAUTHN_FIELD_N_AUTHENTICATORS_REGISTERED_0="No WebAuthn authenticator has been set up yet"
-PLG_SYSTEM_WEBAUTHN_FIELD_N_AUTHENTICATORS_REGISTERED_1="One WebAuthn authenticator already set up: %2$s"
-PLG_SYSTEM_WEBAUTHN_HEADER="W3C Web Authentication (WebAuthn) Login"
-PLG_SYSTEM_WEBAUTHN_LBL_DEFAULT_AUTHENTICATOR="Generic Authenticator"
+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_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"
+PLG_SYSTEM_WEBAUTHN_FIELD_N_AUTHENTICATORS_REGISTERED_1="One passkey already set up: %2$s"
+PLG_SYSTEM_WEBAUTHN_HEADER="Passkey Login"
+PLG_SYSTEM_WEBAUTHN_LBL_DEFAULT_AUTHENTICATOR="Generic Passkey"
 PLG_SYSTEM_WEBAUTHN_LBL_DEFAULT_AUTHENTICATOR_LABEL="%s added on %s"
-PLG_SYSTEM_WEBAUTHN_LOGIN_DESC="Login without a password using the W3C Web Authentication (WebAuthn) standard in compatible browsers. You need to have already set up WebAuthn authentication in your user profile."
-PLG_SYSTEM_WEBAUTHN_LOGIN_LABEL="Web Authentication"
-PLG_SYSTEM_WEBAUTHN_MANAGE_BTN_ADD_LABEL="Add New Authenticator"
+PLG_SYSTEM_WEBAUTHN_LOGIN_DESC="Login without a password using the browser passkey standard in compatible browsers. You need to have already set up passkey authentication in your user profile."
+PLG_SYSTEM_WEBAUTHN_LOGIN_LABEL="Sign in with a passkey"
+PLG_SYSTEM_WEBAUTHN_MANAGE_BTN_ADD_LABEL="Add New Passkey"
 PLG_SYSTEM_WEBAUTHN_MANAGE_BTN_CANCEL_LABEL="Cancel"
 PLG_SYSTEM_WEBAUTHN_MANAGE_BTN_DELETE_LABEL="Remove"
 PLG_SYSTEM_WEBAUTHN_MANAGE_BTN_EDIT_LABEL="Edit Name"
 PLG_SYSTEM_WEBAUTHN_MANAGE_BTN_SAVE_LABEL="Save"
-PLG_SYSTEM_WEBAUTHN_MANAGE_FIELD_KEYLABEL_DESC="A short name for the authenticator used with this passwordless login method."
-PLG_SYSTEM_WEBAUTHN_MANAGE_FIELD_KEYLABEL_LABEL="Authenticator Name"
+PLG_SYSTEM_WEBAUTHN_MANAGE_FIELD_KEYLABEL_DESC="A short name for the passkey used with this passkeys login method."
+PLG_SYSTEM_WEBAUTHN_MANAGE_FIELD_KEYLABEL_LABEL="Passkey Name"
 PLG_SYSTEM_WEBAUTHN_MANAGE_HEADER_ACTIONS_LABEL="Actions"
-PLG_SYSTEM_WEBAUTHN_MANAGE_HEADER_NOMETHODS_LABEL="No authenticators have been set up yet."
-PLG_SYSTEM_WEBAUTHN_MSG_DELETED="The authenticator has been removed."
+PLG_SYSTEM_WEBAUTHN_MANAGE_HEADER_NOMETHODS_LABEL="No passkeys have been set up yet."
+PLG_SYSTEM_WEBAUTHN_MSG_DELETED="The passkey has been removed."
 PLG_SYSTEM_WEBAUTHN_MSG_SAVED_LABEL="The label has been saved."
-PLG_SYSTEM_WEBAUTHN_REQUIRES_GMP="Either of the PHP extensions GMP or BCmath must be loaded to add authenticators."
-PLG_SYSTEM_WEBAUTHN_TABLE_CAPTION="WebAuthn Authenticators"
+PLG_SYSTEM_WEBAUTHN_REQUIRES_GMP="Either of the PHP extensions GMP or BCmath must be loaded to add passkeys."
+PLG_SYSTEM_WEBAUTHN_TABLE_CAPTION="Passkeys"
diff --git a/administrator/language/en-GB/plg_system_webauthn.sys.ini b/administrator/language/en-GB/plg_system_webauthn.sys.ini
index 5ed4596fcdfcf..21a49757ded2e 100644
--- a/administrator/language/en-GB/plg_system_webauthn.sys.ini
+++ b/administrator/language/en-GB/plg_system_webauthn.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_SYSTEM_WEBAUTHN="System - WebAuthn Passwordless Login"
-PLG_SYSTEM_WEBAUTHN_DESCRIPTION="Enables passwordless authentication using the W3C Web Authentication (WebAuthn) API. Please note that the WebAuthn tab in the user profile editor and the WebAuthn login buttons will only be displayed if the user is accessing the site over HTTPS. Furthermore, registering WebAuthn authenticators and using them to log into your site will only work when your site is using a valid certificate, signed by a Certificate Authority the user's browser trusts."
+PLG_SYSTEM_WEBAUTHN="System - Passkey (Passwordless) Login"
+PLG_SYSTEM_WEBAUTHN_DESCRIPTION="Enables passwordless authentication using passkeys. Please note that the passkeys tab in the user profile editor and the passkeys login buttons will only be displayed if the user is accessing the site over HTTPS. Registering passkeys and using them to log into your site will only work when your site is using a valid certificate, signed by a Certificate Authority the user's browser trusts."
diff --git a/administrator/language/en-GB/plg_task_deleteactionlogs.ini b/administrator/language/en-GB/plg_task_deleteactionlogs.ini
new file mode 100644
index 0000000000000..30a9ede1a6fb2
--- /dev/null
+++ b/administrator/language/en-GB/plg_task_deleteactionlogs.ini
@@ -0,0 +1,10 @@
+; 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_TASK_DELETEACTIONLOGS="Task - Delete Action Logs"
+PLG_TASK_DELETEACTIONLOGS_DELETE_DESC="Delete Action logs after days"
+PLG_TASK_DELETEACTIONLOGS_DELETE_TITLE="Delete ActionLogs - Task"
+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_deleteactionlogs.sys.ini b/administrator/language/en-GB/plg_task_deleteactionlogs.sys.ini
new file mode 100644
index 0000000000000..fed421579b57f
--- /dev/null
+++ b/administrator/language/en-GB/plg_task_deleteactionlogs.sys.ini
@@ -0,0 +1,7 @@
+; 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_TASK_DELETEACTIONLOGS="Task - Delete Action Logs"
+PLG_TASK_DELETEACTIONLOGS_XML_DESCRIPTION="This plugin for schedule Action Logs delete Tasks."
diff --git a/administrator/language/en-GB/plg_task_demotasks.ini b/administrator/language/en-GB/plg_task_demotasks.ini
deleted file mode 100644
index b2d276c78a974..0000000000000
--- a/administrator/language/en-GB/plg_task_demotasks.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-; Joomla! Project
-; (C) 2021 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_TASK_DEMO_TASKS="Task - Demo Tasks!"
-PLG_TASK_DEMO_TASKS_SLEEP_TIMEOUT_LABEL="Sleep Timeout (seconds)"
-PLG_TASK_DEMO_TASKS_STRESS_MEMORY_DESC="What happens to a task when the PHP memory limit is exhausted?"
-PLG_TASK_DEMO_TASKS_STRESS_MEMORY_OVERRIDE_DESC="What happens to a task when the system memory is exhausted?"
-PLG_TASK_DEMO_TASKS_STRESS_MEMORY_OVERRIDE_TITLE="Stress Memory, Override Limit"
-PLG_TASK_DEMO_TASKS_STRESS_MEMORY_TITLE="Stress Memory"
-PLG_TASK_DEMO_TASKS_RESUMABLE_TITLE="Resumable Task"
-PLG_TASK_DEMO_TASKS_RESUMABLE_DESC="A simple task to demonstrate resumable task behaviour."
-PLG_TASK_DEMO_TASKS_RESUMABLE_STEPS_LABEL="Total number of steps"
-PLG_TASK_DEMO_TASKS_RESUMABLE_TIMEOUT_LABEL="Delay per step (seconds)"
-PLG_TASK_DEMO_TASKS_TASK_SLEEP_DESC="Sleep, do nothing for x seconds."
-PLG_TASK_DEMO_TASKS_TASK_SLEEP_ROUTINE_END_LOG_MESSAGE="TestTask1 return code is: %1$d. Processing Time: %2$.2f seconds"
-PLG_TASK_DEMO_TASKS_TASK_SLEEP_TITLE="Demo Task - Sleep"
-PLG_TASK_DEMO_TASKS_XML_DESCRIPTION="This is a demo plugin for the development of Joomla! Scheduled Tasks."
diff --git a/administrator/language/en-GB/plg_task_demotasks.sys.ini b/administrator/language/en-GB/plg_task_demotasks.sys.ini
deleted file mode 100644
index 6e691072a04ba..0000000000000
--- a/administrator/language/en-GB/plg_task_demotasks.sys.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-; Joomla! Project
-; (C) 2021 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_TASK_DEMO_TASKS="Task - Demo Tasks!"
-PLG_TASK_DEMO_TASKS_XML_DESCRIPTION="This is a demo plugin for the development of Joomla! Scheduled Tasks."
diff --git a/administrator/language/en-GB/plg_task_globalcheckin.ini b/administrator/language/en-GB/plg_task_globalcheckin.ini
new file mode 100644
index 0000000000000..d7463afd2bf63
--- /dev/null
+++ b/administrator/language/en-GB/plg_task_globalcheckin.ini
@@ -0,0 +1,10 @@
+; 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_TASK_GLOBALCHECKIN="Task - Global Check-in"
+PLG_TASK_GLOBALCHECKIN_DELAY_LABEL="Minimum Period Before Checkin (hours)"
+PLG_TASK_GLOBALCHECKIN_DESC="Check in checked out items."
+PLG_TASK_GLOBALCHECKIN_TITLE="Global Check-in"
+PLG_TASK_GLOBALCHECKIN_XML_DESCRIPTION="Plugin to global check in checked out items."
diff --git a/administrator/language/en-GB/plg_task_globalcheckin.sys.ini b/administrator/language/en-GB/plg_task_globalcheckin.sys.ini
new file mode 100644
index 0000000000000..a4f0a5500e67a
--- /dev/null
+++ b/administrator/language/en-GB/plg_task_globalcheckin.sys.ini
@@ -0,0 +1,7 @@
+; 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_TASK_GLOBALCHECKIN="Task - Global Check-in"
+PLG_TASK_GLOBALCHECKIN_XML_DESCRIPTION="Plugin to global check in checked out items."
diff --git a/administrator/language/en-GB/plg_task_privacyconsent.ini b/administrator/language/en-GB/plg_task_privacyconsent.ini
new file mode 100644
index 0000000000000..5baf97d04fae5
--- /dev/null
+++ b/administrator/language/en-GB/plg_task_privacyconsent.ini
@@ -0,0 +1,47 @@
+; 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_TASK_PRIVACYCONSENT="Task - Privacy Consents"
+PLG_TASK_PRIVACYCONSENT_CONSENTEXPIRATIONDAYS_DESC="Number of days after which the privacy consent shall expire."
+PLG_TASK_PRIVACYCONSENT_CONSENTEXPIRATIONDAYS_LABEL="Expiration"
+PLG_TASK_PRIVACYCONSENT_INVALIDATE_TITLE ="Expiration of privacy consents"
+PLG_TASK_PRIVACYCONSENT_INVALIDATE_DESC ="Manage the expiration of privacy consents"
+PLG_TASK_PRIVACYCONSENT_REMIND_DESC="Manage the remind of expiration of privacy consents"
+PLG_TASK_PRIVACYCONSENT_REMIND_TITLE="Remind" 
+PLG_TASK_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_TASK_PRIVACYCONSENT_CACHETIMEOUT_DESC="How often the check is performed."
+PLG_TASK_PRIVACYCONSENT_CACHETIMEOUT_LABEL="Periodic check (days)"
+PLG_TASK_PRIVACYCONSENT_CONSENT="User <a href='{accountlink}'>{username}</a> consented to the privacy policy."
+
+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_EXPIRATION_FIELDSET_LABEL="Expiration"
+PLG_TASK_PRIVACYCONSENT_FIELD_ARTICLE_DESC="Select the article from the list or create a new one."
+PLG_TASK_PRIVACYCONSENT_FIELD_ARTICLE_LABEL="Privacy Article"
+PLG_TASK_PRIVACYCONSENT_FIELD_ENABLED_DESC="When enabled it performs checks for consent expiration."
+PLG_TASK_PRIVACYCONSENT_FIELD_ENABLED_LABEL="Enable"
+PLG_TASK_PRIVACYCONSENT_FIELD_ERROR="Agreement to the site's Privacy Policy is required."
+PLG_TASK_PRIVACYCONSENT_FIELD_LABEL="Privacy Policy"
+PLG_TASK_PRIVACYCONSENT_FIELD_MENU_ITEM_LABEL="Privacy Menu Item"
+PLG_TASK_PRIVACYCONSENT_FIELD_TYPE_ARTICLE="Article"
+PLG_TASK_PRIVACYCONSENT_FIELD_TYPE_LABEL="Privacy Type"
+PLG_TASK_PRIVACYCONSENT_FIELD_TYPE_MENU_ITEM="Menu Item"
+PLG_TASK_PRIVACYCONSENT_LABEL="Website Privacy"
+PLG_TASK_PRIVACYCONSENT_MAIL_REQUEST_REMINDER_DESC="Reminder to renew the privacy consent for this website."
+PLG_TASK_PRIVACYCONSENT_MAIL_REQUEST_REMINDER_TITLE="System - Privacy Consent: Renew Consent"
+PLG_TASK_PRIVACYCONSENT_NOTE_FIELD_DEFAULT="By signing up to this website and agreeing to the Privacy Policy you agree to this website storing your information."
+PLG_TASK_PRIVACYCONSENT_NOTE_FIELD_DESC="A summary of the site's privacy policy. If left blank then the default message will be used."
+PLG_TASK_PRIVACYCONSENT_NOTE_FIELD_LABEL="Short Privacy Policy"
+PLG_TASK_PRIVACYCONSENT_NOTIFICATION_USER_PRIVACY_EXPIRED_MESSAGE="Privacy consent has expired for %1$s."
+PLG_TASK_PRIVACYCONSENT_NOTIFICATION_USER_PRIVACY_EXPIRED_SUBJECT="Privacy Consent Expired"
+PLG_TASK_PRIVACYCONSENT_OPTION_AGREE="I agree"
+PLG_TASK_PRIVACYCONSENT_OPTION_DO_NOT_AGREE="I do not agree"
+PLG_TASK_PRIVACYCONSENT_REDIRECT_MESSAGE_DEFAULT="Please confirm that you consent to this website storing your information by agreeing to the privacy policy."
+PLG_TASK_PRIVACYCONSENT_REDIRECT_MESSAGE_DESC="Custom message to be displayed on redirect. If left blank then the default message will be used."
+PLG_TASK_PRIVACYCONSENT_REDIRECT_MESSAGE_LABEL="Redirect Message"
+PLG_TASK_PRIVACYCONSENT_REMINDBEFORE_DESC="Number of days to send a reminder before the expiration of the privacy consent."
+PLG_TASK_PRIVACYCONSENT_REMINDBEFORE_LABEL="Remind"
+PLG_TASK_PRIVACYCONSENT_SUBJECT="Privacy Policy"
+PLG_TASK_PRIVACYCONSENT_XML_DESCRIPTION="Task for remind expired consents and delete expired consents"
diff --git a/administrator/language/en-GB/plg_task_privacyconsent.sys.ini b/administrator/language/en-GB/plg_task_privacyconsent.sys.ini
new file mode 100644
index 0000000000000..4893e9d29203a
--- /dev/null
+++ b/administrator/language/en-GB/plg_task_privacyconsent.sys.ini
@@ -0,0 +1,7 @@
+; 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_TASK_PRIVACYCONSENT="Task - Privacy Consents"
+PLG_TASK_PRIVACYCONSENT_XML_DESCRIPTION="Task for remind expired consents and delete expired consents."
diff --git a/administrator/language/en-GB/plg_task_rotatelogs.ini b/administrator/language/en-GB/plg_task_rotatelogs.ini
new file mode 100644
index 0000000000000..c533473a0c0dd
--- /dev/null
+++ b/administrator/language/en-GB/plg_task_rotatelogs.ini
@@ -0,0 +1,10 @@
+; 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_TASK_ROTATELOGS="Task - Rotate Logs"
+PLG_TASK_ROTATELOGS_LOGSTOKEEP_LABEL="Maximum Logs"
+PLG_TASK_ROTATELOGS_ROTATION_DESC="Periodically rotates log files."
+PLG_TASK_ROTATELOGS_ROTATION_TITLE="Rotate Logs"
+PLG_TASK_ROTATELOGS_XML_DESCRIPTION="Task routines to schedule Log Rotation."
diff --git a/administrator/language/en-GB/plg_task_rotatelogs.sys.ini b/administrator/language/en-GB/plg_task_rotatelogs.sys.ini
new file mode 100644
index 0000000000000..c08a06a9e3226
--- /dev/null
+++ b/administrator/language/en-GB/plg_task_rotatelogs.sys.ini
@@ -0,0 +1,7 @@
+; 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_TASK_ROTATELOGS="Task - Rotate Logs"
+PLG_TASK_ROTATELOGS_XML_DESCRIPTION="Task routines to schedule Log Rotation."
diff --git a/administrator/language/en-GB/plg_task_updatenotification.ini b/administrator/language/en-GB/plg_task_updatenotification.ini
new file mode 100644
index 0000000000000..49a91ff4e443b
--- /dev/null
+++ b/administrator/language/en-GB/plg_task_updatenotification.ini
@@ -0,0 +1,26 @@
+; 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_TASK_UPDATENOTIFICATION="Task - Joomla! Update Notification"
+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"
+PLG_TASK_UPDATENOTIFICATION_SEND_DESC="This task periodically checks for the availability of new Joomla! versions. When one is found it will send you an email, reminding you to update. You can customise the email at System &rarr; Mail Templates."
+PLG_TASK_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_DESC="Select a language for the update notification emails. Set to Auto to send them in the site language at the time."
+PLG_TASK_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_LBL="Email Language"
+PLG_TASK_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_NONE="Auto"
+PLG_TASK_UPDATENOTIFICATION_EMAIL_BODY="This email IS NOT sent by the Joomla! project. It is sent automatically by your own site,\n{SITENAME} - {URL} \n\n================================================================================\nUPDATE INFORMATION\n================================================================================\n\nYour site has discovered that there is an updated version of Joomla! available.\n\nJoomla! version currently installed: {CURVERSION}\nJoomla! version available for installation: {NEWVERSION}\n\nThis email is sent to you by your site to remind you of this fact.\nThe Joomla! project will never contact you directly about available updates of Joomla! on your site.\n\n================================================================================\nUPDATE INSTRUCTIONS\n================================================================================\n\nTo install the update on {SITENAME} please select the following link. (If the URL is not a link, copy & paste it to your browser).\n\nUpdate link: {LINK}\n\nRelease News can be found here: {RELEASENEWS}\n\n================================================================================\nWHY AM I RECEIVING THIS EMAIL?\n================================================================================\n\nThis email has been automatically sent by a plugin provided by Joomla!, the software which powers your site.\nThis plugin looks for updated versions of Joomla! and sends an email notification to its administrators.\nYou will receive several similar emails from your site until you either update the software or disable these emails.\n\nTo disable these emails, please unpublish the 'Task - Joomla! Update Notification' plugin in the Plugin Manager on your site.\n\nIf you do not understand what Joomla! is and what you need to do please do not contact the Joomla! project.\nThey are NOT sending you this email and they cannot help you. Instead, please contact the person who built or manages your site.\n\nIf you are the person who built or manages your website, please note that this plugin may have been activated automatically when you installed or updated Joomla! on your site.\n\n================================================================================\nWHO SENT ME THIS EMAIL?\n================================================================================\n\nThis email is sent to you by your own site, {SITENAME}"
+; You can use the following merge codes:
+; {NEWVERSION}		New Joomla! version, e.g. 1.2.3
+; {CURVERSION}		Currently installed Joomla! version, e.g. 1.2.0
+; {SITENAME}		Site name, as set in Global Configuration.
+; {URL}			URL of the site's frontend page.
+; {LINK}		Update URL (link to com_joomlaupdate, will request login if the Super User isn't already logged in).
+; {RELEASENEWS}		URL to the release news on joomla.org
+; \n			Newline character. Use it to start a new line in the email.
+PLG_TASK_UPDATENOTIFICATION_EMAIL_SUBJECT="Joomla! Update available for {SITENAME} – {URL}"
+PLG_TASK_UPDATENOTIFICATION_MAIL_MAIL_DESC="Sent to the site administrators when the &quot;Joomla! Update Notification&quot; task plugin detects an update."
+PLG_TASK_UPDATENOTIFICATION_MAIL_MAIL_TITLE="Joomla: Update Notification"
+PLG_TASK_UPDATENOTIFICATION_XML_DESCRIPTION="This task periodically checks for the availability of new Joomla! versions. When one is found it will send you an email, reminding you to update. You can customise the email at System &rarr; Mail Templates."
\ No newline at end of file
diff --git a/administrator/language/en-GB/plg_task_updatenotification.sys.ini b/administrator/language/en-GB/plg_task_updatenotification.sys.ini
new file mode 100644
index 0000000000000..f954af8812658
--- /dev/null
+++ b/administrator/language/en-GB/plg_task_updatenotification.sys.ini
@@ -0,0 +1,7 @@
+; 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_TASK_UPDATENOTIFICATION="Task - Joomla! Update Notification"
+PLG_TASK_UPDATENOTIFICATION_XML_DESCRIPTION="This task periodically checks for the availability of new Joomla! versions. When one is found it will send you an email, reminding you to update. You can customise the email at System &rarr; Mail Templates."
diff --git a/administrator/language/en-GB/plg_user_joomla.ini b/administrator/language/en-GB/plg_user_joomla.ini
index 862eb8cd49a00..141946e97716e 100644
--- a/administrator/language/en-GB/plg_user_joomla.ini
+++ b/administrator/language/en-GB/plg_user_joomla.ini
@@ -7,12 +7,8 @@ PLG_USER_JOOMLA="User - Joomla!"
 PLG_USER_JOOMLA_FIELD_AUTOREGISTER_LABEL="Auto-create Users"
 PLG_USER_JOOMLA_FIELD_FORCELOGOUT_LABEL="Force Logout for all Sessions?"
 PLG_USER_JOOMLA_FIELD_MAILTOUSER_LABEL="Notification Mail to User"
-PLG_USER_JOOMLA_FIELD_STRONG_PASSWORDS_LABEL="Strong Passwords"
 PLG_USER_JOOMLA_MAIL_MAIL_DESC="Sent to a new user when created in the backend."
 PLG_USER_JOOMLA_MAIL_MAIL_TITLE="Users: New User"
 PLG_USER_JOOMLA_NEW_USER_EMAIL_BODY="Hello {NAME},\n\n\nYou have been added as a User to {SITENAME} by an Administrator.\n\nThis email has your username and password to log in to {URL}\n\nUsername: {USERNAME}\nPassword: {PASSWORD}\n\n\nPlease do not respond to this message as it is automatically generated and is for information purposes only."
 PLG_USER_JOOMLA_NEW_USER_EMAIL_SUBJECT="New User Details"
-PLG_USER_JOOMLA_POSTINSTALL_STRONGPW_BTN="Enable Strong Password Encryption"
-PLG_USER_JOOMLA_POSTINSTALL_STRONGPW_TEXT="<p>As a security feature, Joomla allows you to switch to strong password encryption.</p><p>To turn strong passwords on select the button below. Alternatively you can edit the User - Joomla plugin and change the strong password setting to On.</p><p>Before enabling you should verify that all third party registration/login, user management or bridge extensions installed on your site support this strong password encryption.</p>"
-PLG_USER_JOOMLA_POSTINSTALL_STRONGPW_TITLE="Strong passwords"
 PLG_USER_JOOMLA_XML_DESCRIPTION="<p>Handles Joomla's default User synchronisation.</p><p><strong>Warning! You must have enabled at least one plugin that handles the user session management or you will lose all access to your site.</strong></p>"
diff --git a/administrator/language/en-GB/yoursites.site_check.ini b/administrator/language/en-GB/yoursites.site_check.ini
new file mode 100644
index 0000000000000..930af93a5cfcc
--- /dev/null
+++ b/administrator/language/en-GB/yoursites.site_check.ini
@@ -0,0 +1,7 @@
+; 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
+
+COM_YOURSITES_TOUR_SITE_CHECK_TITLE="How to check a site :D"
+COM_GUIDEDTOURS_TOUR_MENUS_DESCRIPTION="This tour will show you how you can create a menu."
diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml
index fb33764c4dbaa..3b7ba6815f0d7 100644
--- a/administrator/manifests/files/joomla.xml
+++ b/administrator/manifests/files/joomla.xml
@@ -6,8 +6,8 @@
 	<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.0.0-dev</version>
-	<creationDate>2022-08</creationDate>
+	<version>5.0.0-beta1-dev</version>
+	<creationDate>2023-08</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
 	<scriptfile>administrator/components/com_admin/script.php</scriptfile>
diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml
index 2a8d2b88245ae..eadfad2013e9e 100644
--- a/administrator/manifests/packages/pkg_en-GB.xml
+++ b/administrator/manifests/packages/pkg_en-GB.xml
@@ -3,7 +3,7 @@
 	<name>English (en-GB) Language Pack</name>
 	<packagename>en-GB</packagename>
 	<version>5.0.0.1</version>
-	<creationDate>2022-08</creationDate>
+	<creationDate>2023-08</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
@@ -21,7 +21,7 @@
 	</files>
 	<updateservers>
 		<server type="collection" priority="1" name="Accredited Joomla! Translations">
-			https://update.joomla.org/language/translationlist_4.xml
+			https://update.joomla.org/language/translationlist_5.xml
 		</server>
 	</updateservers>
 </extension>
diff --git a/administrator/modules/mod_feed/tmpl/default.php b/administrator/modules/mod_feed/tmpl/default.php
index 4846fceb8fef6..b7febc8b86dca 100644
--- a/administrator/modules/mod_feed/tmpl/default.php
+++ b/administrator/modules/mod_feed/tmpl/default.php
@@ -10,9 +10,9 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Filter\OutputFilter;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
+use Joomla\Filter\OutputFilter;
 
 // Check if feed URL has been set
 if (empty($rssurl)) {
diff --git a/administrator/modules/mod_guidedtours/mod_guidedtours.xml b/administrator/modules/mod_guidedtours/mod_guidedtours.xml
index ae24c332046da..904206c921c47 100644
--- a/administrator/modules/mod_guidedtours/mod_guidedtours.xml
+++ b/administrator/modules/mod_guidedtours/mod_guidedtours.xml
@@ -23,6 +23,17 @@
 	<config>
 		<fields name="params">
 			<fieldset name="basic">
+				<field
+					name="contextcount"
+					type="number"
+					label="MOD_GUIDEDTOURS_FIELD_CONTEXT_TOUR_COUNT_LABEL"
+					description="MOD_GUIDEDTOURS_FIELD_CONTEXT_TOUR_COUNT_DESC"
+					default="7"
+					filter="integer"
+					min="0"
+					validate="number"
+				/>
+
 				<field
 					name="tourscount"
 					type="number"
diff --git a/administrator/modules/mod_guidedtours/tmpl/default.php b/administrator/modules/mod_guidedtours/tmpl/default.php
index bd6e2f92a4c00..9ea8ab3c82982 100644
--- a/administrator/modules/mod_guidedtours/tmpl/default.php
+++ b/administrator/modules/mod_guidedtours/tmpl/default.php
@@ -25,22 +25,55 @@
     ->getWebAssetManager()
     ->useScript('bootstrap.dropdown');
 
-$lang = $app->getLanguage();
-
-$extension = $app->input->get('option');
-
-$listTours = [];
-$allTours = [];
+$lang         = $app->getLanguage();
+$extension    = $app->getInput()->get('option');
+$contextTours = [];
+$starTours    = [];
+$listTours    = [];
+$allTours     = [];
+$contextCount = $params->get('contextcount', 7);
+$toursCount   = $params->get('tourscount', 7);
 
 foreach ($tours as $tour) :
-    if (count(array_intersect(['*', $extension], $tour->extensions))) :
+    $uri = new Uri($tour->url);
+
+    if (in_array('*', $tour->extensions)) :
+        $starTours[] = $tour;
+    elseif (in_array($extension, $tour->extensions)) :
+        if ($extension === 'com_categories') :
+            // Special case for the categories page, where the context is complemented with the extension the categories apply to
+            if ($uri->getVar('option', '') === 'com_categories') :
+                if ($uri->getVar('extension', '') === $app->getInput()->get('extension', '')) :
+                    if ($contextCount > 0) :
+                        $contextTours[] = $tour;
+                        $contextCount--;
+                    endif;
+                elseif ($toursCount > 0) :
+                    $listTours[] = $tour;
+                    $toursCount--;
+                endif;
+            else :
+                if (in_array($app->getInput()->get('extension', ''), $tour->extensions)) :
+                    if ($contextCount > 0) :
+                        $contextTours[] = $tour;
+                        $contextCount--;
+                    endif;
+                elseif ($toursCount > 0) :
+                    $listTours[] = $tour;
+                    $toursCount--;
+                endif;
+            endif;
+        elseif ($contextCount > 0) :
+            $contextTours[] = $tour;
+            $contextCount--;
+        endif;
+    elseif ($toursCount > 0) :
         $listTours[] = $tour;
+        $toursCount--;
     endif;
 
-    $uri = new Uri($tour->url);
-
     // We assume the url is the starting point
-    $key = $uri->getVar('option') ?? Text::_('MOD_GUIDEDTOURS_GENERIC_TOUR');
+    $key = $uri->getVar('option') ?? 'com_cpanel';
 
     if (!isset($allTours[$key])) :
         $lang->load("$key.sys", JPATH_ADMINISTRATOR)
@@ -52,8 +85,10 @@
     $allTours[$key][] = $tour;
 endforeach;
 
-ksort($allTours);
-
+if ($contextCount > 0) :
+    // The '*' tours have lower priority than contextual tours and are added after them, room permitting
+    $contextTours = array_slice(array_merge($contextTours, $starTours), 0, $params->get('contextcount', 7));
+endif;
 ?>
 <div class="header-item-content dropdown header-tours d-none d-sm-block">
     <button class="dropdown-toggle d-flex align-items-center ps-0 py-0" data-bs-toggle="dropdown" type="button" title="<?php echo Text::_('MOD_GUIDEDTOURS_MENU'); ?>">
@@ -66,15 +101,32 @@
         <span class="icon-angle-down" aria-hidden="true"></span>
     </button>
     <div class="dropdown-menu dropdown-menu-end">
-        <?php foreach ($listTours as $i => $tour) : ?>
-            <?php if ($i >= $params->get('tourscount', 7)) : ?>
-                <?php break; ?>
-            <?php endif; ?>
-            <button type="button" class="button-start-guidedtour dropdown-item" data-id="<?php echo $tour->id ?>">
-                <span class="icon-map-signs" aria-hidden="true"></span>
-                <?php echo $tour->title; ?>
-            </button>
-        <?php endforeach; ?>
+        <?php if (count($contextTours) > 0) : ?>
+            <ul class="list-unstyled m-0">
+                <?php foreach ($contextTours as $tour) : ?>
+                    <li>
+                        <button type="button" class="button-start-guidedtour dropdown-item" data-id="<?php echo $tour->id; ?>">
+                            <span class="icon-star icon-fw" aria-hidden="true"></span>
+                            <?php echo $tour->title; ?>
+                        </button>
+                    </li>
+                <?php endforeach; ?>
+            </ul>
+            <hr class="dropdown-divider m-0" role="separator" />
+        <?php endif; ?>
+        <?php if (count($listTours) > 0) : ?>
+            <ul class="list-unstyled m-0">
+                <?php foreach ($listTours as $tour) : ?>
+                    <li>
+                        <button type="button" class="button-start-guidedtour dropdown-item" data-id="<?php echo $tour->id; ?>">
+                            <span class="icon-map-signs icon-fw" aria-hidden="true"></span>
+                            <?php echo $tour->title; ?>
+                        </button>
+                    </li>
+                <?php endforeach; ?>
+            </ul>
+            <hr class="dropdown-divider m-0" role="separator" />
+        <?php endif; ?>
         <button type="button" class="dropdown-item text-center" data-bs-toggle="modal" data-bs-target="#modGuidedTours-modal">
             <?php echo Text::_('MOD_GUIDEDTOURS_SHOW_ALL'); ?>
         </button>
diff --git a/administrator/modules/mod_latestactions/src/Helper/LatestActionsHelper.php b/administrator/modules/mod_latestactions/src/Helper/LatestActionsHelper.php
index 0c4785ba22eeb..1f2c2916efb47 100644
--- a/administrator/modules/mod_latestactions/src/Helper/LatestActionsHelper.php
+++ b/administrator/modules/mod_latestactions/src/Helper/LatestActionsHelper.php
@@ -27,7 +27,7 @@
 abstract class LatestActionsHelper
 {
     /**
-     * Get a list of articles.
+     * Get a list of logged actions.
      *
      * @param   Registry  &$params  The module parameters.
      *
diff --git a/administrator/modules/mod_menu/src/Menu/CssMenu.php b/administrator/modules/mod_menu/src/Menu/CssMenu.php
index 0e66f4a2ed886..6c2642321cc5a 100644
--- a/administrator/modules/mod_menu/src/Menu/CssMenu.php
+++ b/administrator/modules/mod_menu/src/Menu/CssMenu.php
@@ -12,9 +12,11 @@
 
 use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Event\Menu\PreprocessMenuItemsEvent;
 use Joomla\CMS\Language\Associations;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Menu\AdministratorMenuItem;
+use Joomla\CMS\Proxy\ArrayProxy;
 use Joomla\CMS\Table\Table;
 use Joomla\CMS\Uri\Uri;
 use Joomla\Component\Menus\Administrator\Helper\MenusHelper;
@@ -257,6 +259,7 @@ protected function preprocess($parent)
     {
         $user       = $this->application->getIdentity();
         $language   = $this->application->getLanguage();
+        $dispatcher = $this->application->getDispatcher();
 
         $noSeparator = true;
         $children    = $parent->getChildren();
@@ -266,7 +269,12 @@ protected function preprocess($parent)
          * $children is an array of AdministratorMenuItem objects. A plugin can traverse the whole tree,
          * but new nodes will only be run through this method if their parents have not been processed yet.
          */
-        $this->application->triggerEvent('onPreprocessMenuItems', ['com_menus.administrator.module', $children, $this->params, $this->enabled]);
+        $dispatcher->dispatch('onPreprocessMenuItems', new PreprocessMenuItemsEvent('onPreprocessMenuItems', [
+            'context' => 'com_menus.administrator.module',
+            'subject' => new ArrayProxy($children),
+            'params'  => $this->params,
+            'enabled' => $this->enabled,
+        ]));
 
         foreach ($children as $item) {
             $itemParams = $item->getParams();
diff --git a/administrator/modules/mod_privacy_status/mod_privacy_status.php b/administrator/modules/mod_privacy_status/mod_privacy_status.php
index afa43af91bbf1..69a74628c439f 100644
--- a/administrator/modules/mod_privacy_status/mod_privacy_status.php
+++ b/administrator/modules/mod_privacy_status/mod_privacy_status.php
@@ -14,6 +14,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ModuleHelper;
 use Joomla\Component\Privacy\Administrator\Helper\PrivacyHelper;
+use Joomla\Database\DatabaseInterface;
 use Joomla\Module\PrivacyStatus\Administrator\Helper\PrivacyStatusHelper;
 
 // Only super user can view this data
@@ -35,6 +36,6 @@
 $sendMailEnabled              = (bool) $app->get('mailonline', 1);
 $numberOfUrgentRequests       = PrivacyStatusHelper::getNumberUrgentRequests();
 $urgentRequestDays            = (int) ComponentHelper::getParams('com_privacy')->get('notify', 14);
-$databaseConnectionEncryption = Factory::getContainer()->get('DatabaseDriver')->getConnectionEncryption();
+$databaseConnectionEncryption = Factory::getContainer()->get(DatabaseInterface::class)->getConnectionEncryption();
 
 require ModuleHelper::getLayoutPath('mod_privacy_status', $params->get('layout', 'default'));
diff --git a/administrator/modules/mod_privacy_status/src/Helper/PrivacyStatusHelper.php b/administrator/modules/mod_privacy_status/src/Helper/PrivacyStatusHelper.php
index 91def613d9efa..dca3f93a2e706 100644
--- a/administrator/modules/mod_privacy_status/src/Helper/PrivacyStatusHelper.php
+++ b/administrator/modules/mod_privacy_status/src/Helper/PrivacyStatusHelper.php
@@ -11,9 +11,11 @@
 namespace Joomla\Module\PrivacyStatus\Administrator\Helper;
 
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Event\Privacy\CheckPrivacyPolicyPublishedEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\Proxy\ArrayProxy;
 use Joomla\CMS\Router\Route;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -36,7 +38,8 @@ class PrivacyStatusHelper
      */
     public static function getPrivacyPolicyInfo()
     {
-        $policy = [
+        $dispatcher = Factory::getApplication()->getDispatcher();
+        $policy     = [
             'published'        => false,
             'articlePublished' => false,
             'editLink'         => '',
@@ -46,10 +49,15 @@ public static function getPrivacyPolicyInfo()
          * Prior to 3.9.0 it was common for a plugin such as the User - Profile plugin to define a privacy policy or
          * terms of service article, therefore we will also import the user plugin group to process this event.
          */
-        PluginHelper::importPlugin('privacy');
-        PluginHelper::importPlugin('user');
-
-        Factory::getApplication()->triggerEvent('onPrivacyCheckPrivacyPolicyPublished', [&$policy]);
+        PluginHelper::importPlugin('privacy', null, true, $dispatcher);
+        PluginHelper::importPlugin('user', null, true, $dispatcher);
+
+        $dispatcher->dispatch(
+            'onPrivacyCheckPrivacyPolicyPublished',
+            new CheckPrivacyPolicyPublishedEvent('onPrivacyCheckPrivacyPolicyPublished', [
+                'subject' => new ArrayProxy($policy),
+            ])
+        );
 
         return $policy;
     }
diff --git a/administrator/modules/mod_quickicon/src/Dispatcher/Dispatcher.php b/administrator/modules/mod_quickicon/src/Dispatcher/Dispatcher.php
index d0c85af5735e1..456803cd23431 100644
--- a/administrator/modules/mod_quickicon/src/Dispatcher/Dispatcher.php
+++ b/administrator/modules/mod_quickicon/src/Dispatcher/Dispatcher.php
@@ -11,6 +11,8 @@
 namespace Joomla\Module\Quickicon\Administrator\Dispatcher;
 
 use Joomla\CMS\Dispatcher\AbstractModuleDispatcher;
+use Joomla\CMS\Helper\HelperFactoryAwareInterface;
+use Joomla\CMS\Helper\HelperFactoryAwareTrait;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -21,8 +23,10 @@
  *
  * @since  4.0.0
  */
-class Dispatcher extends AbstractModuleDispatcher
+class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareInterface
 {
+    use HelperFactoryAwareTrait;
+
     /**
      * Returns the layout data.
      *
@@ -34,8 +38,7 @@ protected function getLayoutData()
     {
         $data = parent::getLayoutData();
 
-        $helper          = $this->app->bootModule('mod_quickicon', 'administrator')->getHelper('QuickIconHelper');
-        $data['buttons'] = $helper->getButtons($data['params'], $this->getApplication());
+        $data['buttons'] = $this->getHelperFactory()->getHelper('QuickIconHelper')->getButtons($data['params'], $this->getApplication());
 
         return $data;
     }
diff --git a/administrator/modules/mod_quickicon/src/Helper/QuickIconHelper.php b/administrator/modules/mod_quickicon/src/Helper/QuickIconHelper.php
index 585454664f4eb..69d1fc7c06fb2 100644
--- a/administrator/modules/mod_quickicon/src/Helper/QuickIconHelper.php
+++ b/administrator/modules/mod_quickicon/src/Helper/QuickIconHelper.php
@@ -11,6 +11,7 @@
 namespace Joomla\Module\Quickicon\Administrator\Helper;
 
 use Joomla\CMS\Application\CMSApplication;
+use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Router\Route;
@@ -115,7 +116,7 @@ public function getButtons(Registry $params, CMSApplication $application = null)
                 $this->buttons[$key][] = $tmp;
             }
 
-            if ($params->get('show_tags')) {
+            if (ComponentHelper::isEnabled('com_tags') && $params->get('show_tags')) {
                 $tmp = [
                     'image'   => 'icon-tag',
                     'link'    => Route::_('index.php?option=com_tags&view=tags'),
@@ -281,7 +282,7 @@ public function getButtons(Registry $params, CMSApplication $application = null)
                 ];
             }
 
-            if ($params->get('show_banners')) {
+            if (ComponentHelper::isEnabled('com_banners') && $params->get('show_banners')) {
                 $tmp = [
                     'image'   => 'icon-bookmark banners',
                     'link'    => Route::_('index.php?option=com_banners&view=banners'),
@@ -298,7 +299,7 @@ public function getButtons(Registry $params, CMSApplication $application = null)
                 $this->buttons[$key][] = $tmp;
             }
 
-            if ($params->get('show_contact')) {
+            if (ComponentHelper::isEnabled('com_contact') && $params->get('show_contact')) {
                 $tmp = [
                     'image'   => 'icon-address-book contact',
                     'link'    => Route::_('index.php?option=com_contact&view=contacts'),
@@ -315,7 +316,7 @@ public function getButtons(Registry $params, CMSApplication $application = null)
                 $this->buttons[$key][] = $tmp;
             }
 
-            if ($params->get('show_newsfeeds')) {
+            if (ComponentHelper::isEnabled('com_newsfeeds') && $params->get('show_newsfeeds')) {
                 $tmp = [
                     'image'   => 'icon-rss newsfeeds',
                     'link'    => Route::_('index.php?option=com_newsfeeds&view=newsfeeds'),
@@ -332,7 +333,7 @@ public function getButtons(Registry $params, CMSApplication $application = null)
                 $this->buttons[$key][] = $tmp;
             }
 
-            if ($params->get('show_redirect')) {
+            if (ComponentHelper::isEnabled('com_redirect') && $params->get('show_redirect')) {
                 $this->buttons[$key][] = [
                     'image'   => 'icon-map-signs redirect',
                     'link'    => Route::_('index.php?option=com_redirect&view=links'),
@@ -343,7 +344,7 @@ public function getButtons(Registry $params, CMSApplication $application = null)
                 ];
             }
 
-            if ($params->get('show_associations')) {
+            if (ComponentHelper::isEnabled('com_associations') && $params->get('show_associations')) {
                 $this->buttons[$key][] = [
                     'image'  => 'icon-language',
                     'link'   => Route::_('index.php?option=com_associations&view=associations'),
@@ -353,7 +354,7 @@ public function getButtons(Registry $params, CMSApplication $application = null)
                 ];
             }
 
-            if ($params->get('show_finder')) {
+            if (ComponentHelper::isEnabled('com_finder') && $params->get('show_finder')) {
                 $this->buttons[$key][] = [
                     'image'  => 'icon-search-plus finder',
                     'link'   => Route::_('index.php?option=com_finder&view=index'),
@@ -366,7 +367,7 @@ public function getButtons(Registry $params, CMSApplication $application = null)
             if ($params->get('show_languages')) {
                 $tmp = [
                     'image'   => 'icon-comments langmanager',
-                    'link'    => Route::_('index.php?option=com_languages&view=installed'),
+                    'link'    => Route::_('index.php?option=com_languages&view=languages'),
                     'linkadd' => Route::_('index.php?option=com_installer&view=languages'),
                     'name'    => 'MOD_QUICKICON_LANGUAGES_MANAGER',
                     'access'  => ['core.manage', 'com_languages'],
diff --git a/administrator/modules/mod_quickicon/tmpl/default.php b/administrator/modules/mod_quickicon/tmpl/default.php
index fbb84edfd3a8a..544f994312c10 100644
--- a/administrator/modules/mod_quickicon/tmpl/default.php
+++ b/administrator/modules/mod_quickicon/tmpl/default.php
@@ -18,7 +18,6 @@
 $wa->useScript('core')
     ->useScript('bootstrap.dropdown');
 $wa->registerAndUseScript('mod_quickicon', 'mod_quickicon/quickicon.min.js', ['relative' => true, 'version' => 'auto'], ['type' => 'module']);
-$wa->registerAndUseScript('mod_quickicon-es5', 'mod_quickicon/quickicon-es5.min.js', ['relative' => true, 'version' => 'auto'], ['nomodule' => true, 'defer' => true]);
 
 $html = HTMLHelper::_('icons.buttons', $buttons);
 ?>
diff --git a/administrator/modules/mod_submenu/src/Menu/Menu.php b/administrator/modules/mod_submenu/src/Menu/Menu.php
index 03e7b936db028..4b43ec8ab9cd8 100644
--- a/administrator/modules/mod_submenu/src/Menu/Menu.php
+++ b/administrator/modules/mod_submenu/src/Menu/Menu.php
@@ -11,10 +11,12 @@
 namespace Joomla\Module\Submenu\Administrator\Menu;
 
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Event\Menu\PreprocessMenuItemsEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Associations;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Menu\MenuItem;
+use Joomla\CMS\Proxy\ArrayProxy;
 use Joomla\CMS\Uri\Uri;
 use Joomla\Component\Menus\Administrator\Helper\MenusHelper;
 use Joomla\Utilities\ArrayHelper;
@@ -41,17 +43,23 @@ abstract class Menu
      */
     public static function preprocess($parent)
     {
-        $app      = Factory::getApplication();
-        $user     = $app->getIdentity();
-        $children = $parent->getChildren();
-        $language = Factory::getLanguage();
+        $app        = Factory::getApplication();
+        $user       = $app->getIdentity();
+        $children   = $parent->getChildren();
+        $language   = Factory::getLanguage();
+        $dispatcher = $app->getDispatcher();
 
         /**
          * Trigger onPreprocessMenuItems for the current level of backend menu items.
          * $children is an array of MenuItem objects. A plugin can traverse the whole tree,
          * but new nodes will only be run through this method if their parents have not been processed yet.
          */
-        $app->triggerEvent('onPreprocessMenuItems', ['administrator.module.mod_submenu', $children]);
+        $dispatcher->dispatch('onPreprocessMenuItems', new PreprocessMenuItemsEvent('onPreprocessMenuItems', [
+            'context' => 'administrator.module.mod_submenu',
+            'subject' => new ArrayProxy($children),
+            'params'  => null,
+            'enabled' => true,
+        ]));
 
         foreach ($children as $item) {
             if (substr($item->link, 0, 8) === 'special:') {
diff --git a/administrator/modules/mod_submenu/tmpl/default.php b/administrator/modules/mod_submenu/tmpl/default.php
index ceef2b423a5c6..42f6ef6c68058 100644
--- a/administrator/modules/mod_submenu/tmpl/default.php
+++ b/administrator/modules/mod_submenu/tmpl/default.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
-$user = \Joomla\CMS\Factory::getApplication()->getIdentity();
+$user = $app->getIdentity();
 
 /** @var  \Joomla\CMS\Menu\MenuItem  $root */
 ?>
diff --git a/administrator/modules/mod_toolbar/mod_toolbar.php b/administrator/modules/mod_toolbar/mod_toolbar.php
index 9466a9efd76b3..4c1cb606e6f6a 100644
--- a/administrator/modules/mod_toolbar/mod_toolbar.php
+++ b/administrator/modules/mod_toolbar/mod_toolbar.php
@@ -10,9 +10,11 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ModuleHelper;
-use Joomla\CMS\Toolbar\Toolbar;
 
-$toolbar = Toolbar::getInstance('toolbar')->render();
+/** @var $params Joomla\Registry\Registry */
+
+$toolbar = Factory::getApplication()->getDocument()->getToolbar($params->get('toolbar', 'toolbar'))->render();
 
 require ModuleHelper::getLayoutPath('mod_toolbar', $params->get('layout', 'default'));
diff --git a/administrator/modules/mod_toolbar/mod_toolbar.xml b/administrator/modules/mod_toolbar/mod_toolbar.xml
index 41cb6c5c8e182..05ba439b0e4d9 100644
--- a/administrator/modules/mod_toolbar/mod_toolbar.xml
+++ b/administrator/modules/mod_toolbar/mod_toolbar.xml
@@ -20,6 +20,16 @@
 	<help key="Admin_Modules:_Toolbar" />
 	<config>
 		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="toolbar"
+					type="text"
+					default="toolbar"
+					label="MOD_TOOLBAR_FIELD_TOOLBAR_LABEL"
+					description="MOD_TOOLBAR_FIELD_TOOLBAR_DESCRIPTION"
+				/>
+			</fieldset>
+
 			<fieldset name="advanced">
 				<field
 					name="layout"
diff --git a/administrator/modules/mod_user/tmpl/default.php b/administrator/modules/mod_user/tmpl/default.php
index 61ff2bf5ca61d..e72715932e44f 100644
--- a/administrator/modules/mod_user/tmpl/default.php
+++ b/administrator/modules/mod_user/tmpl/default.php
@@ -28,12 +28,12 @@
 <div class="header-item-content dropdown header-profile">
     <button class="dropdown-toggle d-flex align-items-center ps-0 py-0" data-bs-toggle="dropdown" type="button"
         title="<?php echo Text::_('MOD_USER_MENU'); ?>">
-        <div class="header-item-icon">
+        <span class="header-item-icon">
             <span class="icon-user-circle" aria-hidden="true"></span>
-        </div>
-        <div class="header-item-text">
+        </span>
+        <span class="header-item-text">
             <?php echo Text::_('MOD_USER_MENU'); ?>
-        </div>
+        </span>
         <span class="icon-angle-down" aria-hidden="true"></span>
     </button>
     <div class="dropdown-menu dropdown-menu-end">
diff --git a/administrator/templates/atum/component.php b/administrator/templates/atum/component.php
index 0d52a6bed1064..e1dcbf5d6d74e 100644
--- a/administrator/templates/atum/component.php
+++ b/administrator/templates/atum/component.php
@@ -19,17 +19,21 @@
 // Get the hue value
 preg_match('#^hsla?\(([0-9]+)[\D]+([0-9]+)[\D]+([0-9]+)[\D]+([0-9](?:.\d+)?)?\)$#i', $this->params->get('hue', 'hsl(214, 63%, 20%)'), $matches);
 
+$linkColor = $this->params->get('link-color', '#2a69b8');
+list($r, $g, $b) = sscanf($linkColor, "#%02x%02x%02x");
+
 // Enable assets
 $wa->usePreset('template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr'))
     ->useStyle('template.active.language')
     ->useStyle('template.user')
     ->addInlineStyle(':root {
 		--hue: ' . $matches[1] . ';
-		--template-bg-light: ' . $this->params->get('bg-light', '--template-bg-light') . ';
-		--template-text-dark: ' . $this->params->get('text-dark', '--template-text-dark') . ';
-		--template-text-light: ' . $this->params->get('text-light', '--template-text-light') . ';
-		--template-link-color: ' . $this->params->get('link-color', '--template-link-color') . ';
-		--template-special-color: ' . $this->params->get('special-color', '--template-special-color') . ';
+		--template-bg-light: ' . $this->params->get('bg-light', 'var(--template-bg-light)') . ';
+		--template-text-dark: ' . $this->params->get('text-dark', 'var(--template-text-dark)') . ';
+		--template-text-light: ' . $this->params->get('text-light', 'var(--template-text-light)') . ';
+		--link-color: ' . $linkColor . ';
+        --link-color-rgb: ' . $r . ',' . $g . ',' . $b . ';
+		--template-special-color: ' . $this->params->get('special-color', 'var(--template-special-color)') . ';
 	}');
 
 // No template.js for modals
@@ -53,6 +57,12 @@
     <jdoc:include type="scripts" />
 </head>
 <body class="contentpane component">
+    <?php if ($this->countModules('toolbar', true)) : ?>
+    <div class="subhead noshadow mb-3">
+        <jdoc:include type="modules" name="toolbar" style="none" />
+    </div>
+    <?php endif; ?>
+
     <jdoc:include type="message" />
     <jdoc:include type="component" />
 </body>
diff --git a/administrator/templates/atum/error_full.php b/administrator/templates/atum/error_full.php
index b612bf1eb62df..66170ca1936a1 100644
--- a/administrator/templates/atum/error_full.php
+++ b/administrator/templates/atum/error_full.php
@@ -54,6 +54,9 @@
     // Get the hue value
     preg_match('#^hsla?\(([0-9]+)[\D]+([0-9]+)[\D]+([0-9]+)[\D]+([0-9](?:.\d+)?)?\)$#i', $this->params->get('hue', 'hsl(214, 63%, 20%)'), $matches);
 
+    $linkColor = $this->params->get('link-color', '#2a69b8');
+    list($r, $g, $b) = sscanf($linkColor, "#%02x%02x%02x");
+
     // Enable assets
     $wa->usePreset('template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr'))
         ->useStyle('template.active.language')
@@ -63,7 +66,8 @@
 			--template-bg-light: ' . $this->params->get('bg-light', '#f0f4fb') . ';
 			--template-text-dark: ' . $this->params->get('text-dark', '#495057') . ';
 			--template-text-light: ' . $this->params->get('text-light', '#ffffff') . ';
-			--template-link-color: ' . $this->params->get('link-color', '#2a69b8') . ';
+			--link-color: ' . $linkColor . ';
+    		--link-color-rgb: ' . $r . ',' . $g . ',' . $b . ';
 			--template-special-color: ' . $this->params->get('special-color', '#001B4C') . ';
 		}');
 
diff --git a/administrator/templates/atum/error_login.php b/administrator/templates/atum/error_login.php
index 91bff637c2b26..d0bfcfa118f79 100644
--- a/administrator/templates/atum/error_login.php
+++ b/administrator/templates/atum/error_login.php
@@ -58,6 +58,9 @@
     // Get the hue value
 preg_match('#^hsla?\(([0-9]+)[\D]+([0-9]+)[\D]+([0-9]+)[\D]+([0-9](?:.\d+)?)?\)$#i', $this->params->get('hue', 'hsl(214, 63%, 20%)'), $matches);
 
+$linkColor = $this->params->get('link-color', '#2a69b8');
+list($r, $g, $b) = sscanf($linkColor, "#%02x%02x%02x");
+
 // Enable assets
 $wa->usePreset('template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr'))
     ->useStyle('template.active.language')
@@ -67,7 +70,8 @@
 		--template-bg-light: ' . $this->params->get('bg-light', '#f0f4fb') . ';
 		--template-text-dark: ' . $this->params->get('text-dark', '#495057') . ';
 		--template-text-light: ' . $this->params->get('text-light', '#ffffff') . ';
-		--template-link-color: ' . $this->params->get('link-color', '#2a69b8') . ';
+		--link-color: ' . $linkColor . ';
+        --link-color-rgb: ' . $r . ',' . $g . ',' . $b . ';
 		--template-special-color: ' . $this->params->get('special-color', '#001B4C') . ';
 	}');
 
diff --git a/administrator/templates/atum/index.php b/administrator/templates/atum/index.php
index cd98539ce4a2d..031efcb36abfe 100644
--- a/administrator/templates/atum/index.php
+++ b/administrator/templates/atum/index.php
@@ -61,6 +61,9 @@
 // Get the hue value
 preg_match('#^hsla?\(([0-9]+)[\D]+([0-9]+)[\D]+([0-9]+)[\D]+([0-9](?:.\d+)?)?\)$#i', $this->params->get('hue', 'hsl(214, 63%, 20%)'), $matches);
 
+$linkColor = $this->params->get('link-color', '#2a69b8');
+list($r, $g, $b) = sscanf($linkColor, "#%02x%02x%02x");
+
 // Enable assets
 $wa->usePreset('template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr'))
     ->useStyle('template.active.language')
@@ -70,7 +73,8 @@
 		--template-bg-light: ' . $this->params->get('bg-light', '#f0f4fb') . ';
 		--template-text-dark: ' . $this->params->get('text-dark', '#495057') . ';
 		--template-text-light: ' . $this->params->get('text-light', '#ffffff') . ';
-		--template-link-color: ' . $this->params->get('link-color', '#2a69b8') . ';
+		--link-color: ' . $linkColor . ';
+		--link-color-rgb: ' . $r . ',' . $g . ',' . $b . ';
 		--template-special-color: ' . $this->params->get('special-color', '#001B4C') . ';
 	}');
 
diff --git a/administrator/templates/atum/joomla.asset.json b/administrator/templates/atum/joomla.asset.json
index d3ca87af1b3f5..3fefb64813627 100644
--- a/administrator/templates/atum/joomla.asset.json
+++ b/administrator/templates/atum/joomla.asset.json
@@ -45,26 +45,13 @@
         "template.active.language"
       ]
     },
-    {
-      "name": "template.atum-es5",
-      "description": "The file containing the javascript for this template.",
-      "type": "script",
-      "uri": "media/templates/administrator/atum/js/template-es5.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
     {
       "name": "template.atum",
       "description": "The file containing the javascript for this template.",
       "type": "script",
       "uri": "media/templates/administrator/atum/js/template.min.js",
       "dependencies": [
-        "template.atum-es5"
+        "core"
       ],
       "attributes": {
         "type": "module"
diff --git a/administrator/templates/atum/login.php b/administrator/templates/atum/login.php
index e60de6bac7f03..719a1e71e2a9d 100644
--- a/administrator/templates/atum/login.php
+++ b/administrator/templates/atum/login.php
@@ -65,7 +65,7 @@
 		--template-bg-light: ' . $this->params->get('bg-light', '#f0f4fb') . ';
 		--template-text-dark: ' . $this->params->get('text-dark', '#495057') . ';
 		--template-text-light: ' . $this->params->get('text-light', '#ffffff') . ';
-		--template-link-color: ' . $this->params->get('link-color', '#2a69b8') . ';
+		--link-color: ' . $this->params->get('link-color', '#2a69b8') . ';
 		--template-special-color: ' . $this->params->get('special-color', '#001B4C') . ';
 	}');
 
diff --git a/api/components/com_categories/src/View/Categories/JsonapiView.php b/api/components/com_categories/src/View/Categories/JsonapiView.php
index 25a63ba4b14a7..360a5ba3f03a2 100644
--- a/api/components/com_categories/src/View/Categories/JsonapiView.php
+++ b/api/components/com_categories/src/View/Categories/JsonapiView.php
@@ -57,6 +57,7 @@ class JsonapiView extends BaseApiView
         'count_published',
         'count_archived',
         'params',
+        'description',
     ];
 
     /**
@@ -90,6 +91,7 @@ class JsonapiView extends BaseApiView
         'count_published',
         'count_archived',
         'params',
+        'description',
     ];
 
     /**
diff --git a/api/components/com_config/src/View/Application/JsonapiView.php b/api/components/com_config/src/View/Application/JsonapiView.php
index d4f09fac9f61f..c9a762672d80d 100644
--- a/api/components/com_config/src/View/Application/JsonapiView.php
+++ b/api/components/com_config/src/View/Application/JsonapiView.php
@@ -60,7 +60,7 @@ public function displayList(array $items = null)
 
         $items = array_splice($items, $offset, $limit);
 
-        $this->document->addMeta('total-pages', $totalPagesAvailable)
+        $this->getDocument()->addMeta('total-pages', $totalPagesAvailable)
             ->addLink('self', (string) $currentUrl);
 
         // Check for first and previous pages
@@ -76,7 +76,7 @@ public function displayList(array $items = null)
             $previousPageQuery['offset'] = $previousOffset >= 0 ? $previousOffset : 0;
             $previousPage->setVar('page', $previousPageQuery);
 
-            $this->document->addLink('first', $this->queryEncode((string) $firstPage))
+            $this->getDocument()->addLink('first', $this->queryEncode((string) $firstPage))
                 ->addLink('previous', $this->queryEncode((string) $previousPage));
         }
 
@@ -93,16 +93,16 @@ public function displayList(array $items = null)
             $lastPageQuery['offset'] = ($totalPagesAvailable - 1) * $limit;
             $lastPage->setVar('page', $lastPageQuery);
 
-            $this->document->addLink('next', $this->queryEncode((string) $nextPage))
+            $this->getDocument()->addLink('next', $this->queryEncode((string) $nextPage))
                 ->addLink('last', $this->queryEncode((string) $lastPage));
         }
 
         $collection = (new Collection($items, new JoomlaSerializer($this->type)));
 
         // Set the data into the document and render it
-        $this->document->setData($collection);
+        $this->getDocument()->setData($collection);
 
-        return $this->document->render();
+        return $this->getDocument()->render();
     }
 
     /**
diff --git a/api/components/com_config/src/View/Component/JsonapiView.php b/api/components/com_config/src/View/Component/JsonapiView.php
index 604a36517d351..0cf690523a6f1 100644
--- a/api/components/com_config/src/View/Component/JsonapiView.php
+++ b/api/components/com_config/src/View/Component/JsonapiView.php
@@ -72,7 +72,7 @@ public function displayList(array $items = null)
 
         $items = array_splice($items, $offset, $limit);
 
-        $this->document->addMeta('total-pages', $totalPagesAvailable)
+        $this->getDocument()->addMeta('total-pages', $totalPagesAvailable)
             ->addLink('self', (string) $currentUrl);
 
         // Check for first and previous pages
@@ -88,7 +88,7 @@ public function displayList(array $items = null)
             $previousPageQuery['offset'] = $previousOffset >= 0 ? $previousOffset : 0;
             $previousPage->setVar('page', $previousPageQuery);
 
-            $this->document->addLink('first', $this->queryEncode((string) $firstPage))
+            $this->getDocument()->addLink('first', $this->queryEncode((string) $firstPage))
                 ->addLink('previous', $this->queryEncode((string) $previousPage));
         }
 
@@ -105,16 +105,16 @@ public function displayList(array $items = null)
             $lastPageQuery['offset'] = ($totalPagesAvailable - 1) * $limit;
             $lastPage->setVar('page', $lastPageQuery);
 
-            $this->document->addLink('next', $this->queryEncode((string) $nextPage))
+            $this->getDocument()->addLink('next', $this->queryEncode((string) $nextPage))
                 ->addLink('last', $this->queryEncode((string) $lastPage));
         }
 
         $collection = (new Collection($items, new JoomlaSerializer($this->type)));
 
         // Set the data into the document and render it
-        $this->document->setData($collection);
+        $this->getDocument()->setData($collection);
 
-        return $this->document->render();
+        return $this->getDocument()->render();
     }
 
     /**
diff --git a/api/components/com_contact/src/Controller/ContactController.php b/api/components/com_contact/src/Controller/ContactController.php
index f9a4aff07835d..972b815ac248b 100644
--- a/api/components/com_contact/src/Controller/ContactController.php
+++ b/api/components/com_contact/src/Controller/ContactController.php
@@ -11,6 +11,8 @@
 namespace Joomla\Component\Contact\Api\Controller;
 
 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\Text;
@@ -20,10 +22,12 @@
 use Joomla\CMS\MVC\Controller\ApiController;
 use Joomla\CMS\MVC\Controller\Exception\SendEmail;
 use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\Proxy\ArrayProxy;
 use Joomla\CMS\Router\Exception\RouteNotFoundException;
 use Joomla\CMS\String\PunycodeHelper;
 use Joomla\CMS\Uri\Uri;
-use Joomla\CMS\User\User;
+use Joomla\CMS\User\UserFactoryAwareInterface;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\Component\Fields\Administrator\Helper\FieldsHelper;
 use Joomla\Registry\Registry;
 use Joomla\String\Inflector;
@@ -39,8 +43,10 @@
  *
  * @since  4.0.0
  */
-class ContactController extends ApiController
+class ContactController extends ApiController implements UserFactoryAwareInterface
 {
+    use UserFactoryAwareTrait;
+
     /**
      * The content type of the item.
      *
@@ -146,7 +152,11 @@ public function submitForm($id = null)
         }
 
         // Validation succeeded, continue with custom handlers
-        $results = $this->app->triggerEvent('onValidateContact', [&$contact, &$data]);
+        $eventData = new ArrayProxy($data);
+        $results   = $this->getDispatcher()->dispatch('onValidateContact', new ValidateContactEvent('onValidateContact', [
+            'subject' => $contact,
+            'data'    => $eventData,
+        ]))->getArgument('result', []);
 
         foreach ($results as $result) {
             if ($result instanceof \Exception) {
@@ -155,7 +165,10 @@ public function submitForm($id = null)
         }
 
         // Passed Validation: Process the contact plugins to integrate with other applications
-        $this->app->triggerEvent('onSubmitContact', [&$contact, &$data]);
+        $this->getDispatcher()->dispatch('onSubmitContact', new SubmitContactEvent('onSubmitContact', [
+            'subject' => $contact,
+            'data'    => $eventData,
+        ]));
 
         // Send the email
         $sent = false;
@@ -188,10 +201,10 @@ private function _sendEmail($data, $contact, $emailCopyToSender)
     {
         $app = $this->app;
 
-        Factory::getLanguage()->load('com_contact', JPATH_SITE, $app->getLanguage()->getTag(), true);
+        $app->getLanguage()->load('com_contact', JPATH_SITE, $app->getLanguage()->getTag(), true);
 
         if ($contact->email_to == '' && $contact->user_id != 0) {
-            $contact_user      = User::getInstance($contact->user_id);
+            $contact_user      = $this->getUserFactory()->loadUserById($contact->user_id);
             $contact->email_to = $contact_user->get('email');
         }
 
diff --git a/api/components/com_languages/src/View/Strings/JsonapiView.php b/api/components/com_languages/src/View/Strings/JsonapiView.php
index 9c14d17d7c502..e0302321d37ae 100644
--- a/api/components/com_languages/src/View/Strings/JsonapiView.php
+++ b/api/components/com_languages/src/View/Strings/JsonapiView.php
@@ -77,9 +77,9 @@ public function displayList(array $items = null)
             ->fields([$this->type => $this->fieldsToRenderList]);
 
         // Set the data into the document and render it
-        $this->document->setData($collection);
+        $this->getDocument()->setData($collection);
 
-        return $this->document->render();
+        return $this->getDocument()->render();
     }
 
     /**
diff --git a/api/components/com_menus/src/View/Items/JsonapiView.php b/api/components/com_menus/src/View/Items/JsonapiView.php
index 3e641a48ddaa4..acd6065da5f9f 100644
--- a/api/components/com_menus/src/View/Items/JsonapiView.php
+++ b/api/components/com_menus/src/View/Items/JsonapiView.php
@@ -178,7 +178,7 @@ public function displayListTypes()
         $collection = (new Collection($items, new JoomlaSerializer('menutypes')));
 
         // Set the data into the document and render it
-        $this->document->addMeta('total-pages', $totalPagesAvailable)
+        $this->getDocument()->addMeta('total-pages', $totalPagesAvailable)
             ->setData($collection)
             ->addLink('self', (string) $currentUrl)
             ->addLink('first', (string) $firstPage)
@@ -186,7 +186,7 @@ public function displayListTypes()
             ->addLink('previous', (string) $previousPage)
             ->addLink('last', (string) $lastPage);
 
-        return $this->document->render();
+        return $this->getDocument()->render();
     }
 
     /**
diff --git a/api/components/com_privacy/src/View/Consents/JsonapiView.php b/api/components/com_privacy/src/View/Consents/JsonapiView.php
index e1ef4308e68df..3f80696da0e6b 100644
--- a/api/components/com_privacy/src/View/Consents/JsonapiView.php
+++ b/api/components/com_privacy/src/View/Consents/JsonapiView.php
@@ -112,9 +112,9 @@ public function displayItem($item = null)
         $element    = (new Resource($displayItem, $serializer))
             ->fields([$this->type => $this->fieldsToRenderItem]);
 
-        $this->document->setData($element);
-        $this->document->addLink('self', Uri::current());
+        $this->getDocument()->setData($element);
+        $this->getDocument()->addLink('self', Uri::current());
 
-        return $this->document->render();
+        return $this->getDocument()->render();
     }
 }
diff --git a/api/components/com_privacy/src/View/Requests/JsonapiView.php b/api/components/com_privacy/src/View/Requests/JsonapiView.php
index ff91b6bab6d36..d4b8caf68397c 100644
--- a/api/components/com_privacy/src/View/Requests/JsonapiView.php
+++ b/api/components/com_privacy/src/View/Requests/JsonapiView.php
@@ -65,9 +65,9 @@ public function export()
         $serializer = new JoomlaSerializer('export');
         $element    = (new Resource($exportData, $serializer));
 
-        $this->document->setData($element);
-        $this->document->addLink('self', Uri::current());
+        $this->getDocument()->setData($element);
+        $this->getDocument()->addLink('self', Uri::current());
 
-        return $this->document->render();
+        return $this->getDocument()->render();
     }
 }
diff --git a/api/includes/app.php b/api/includes/app.php
index 9f10825f9f10b..d55fc47a3c6cd 100644
--- a/api/includes/app.php
+++ b/api/includes/app.php
@@ -22,6 +22,10 @@
     require_once JPATH_BASE . '/includes/defines.php';
 }
 
+if (!defined('JPATH_PUBLIC')) {
+    define('JPATH_PUBLIC', JPATH_ROOT);
+}
+
 require_once JPATH_BASE . '/includes/framework.php';
 
 // Set profiler start time and memory usage and mark afterLoad in the profiler.
diff --git a/api/includes/defines.php b/api/includes/defines.php
index 6148b98c0969d..09df2661f67d3 100644
--- a/api/includes/defines.php
+++ b/api/includes/defines.php
@@ -16,6 +16,7 @@
 // Defines.
 define('JPATH_ROOT', implode(DIRECTORY_SEPARATOR, $parts));
 define('JPATH_SITE', JPATH_ROOT);
+define('JPATH_PUBLIC', JPATH_ROOT);
 define('JPATH_CONFIGURATION', JPATH_ROOT);
 define('JPATH_ADMINISTRATOR', JPATH_ROOT . DIRECTORY_SEPARATOR . 'administrator');
 define('JPATH_LIBRARIES', JPATH_ROOT . DIRECTORY_SEPARATOR . 'libraries');
diff --git a/api/language/en-GB/install.xml b/api/language/en-GB/install.xml
index 6a0012ed87d10..0e99d14109f1d 100644
--- a/api/language/en-GB/install.xml
+++ b/api/language/en-GB/install.xml
@@ -3,7 +3,7 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>5.0.0</version>
-	<creationDate>2022-08</creationDate>
+	<creationDate>2023-08</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/api/language/en-GB/joomla.ini b/api/language/en-GB/joomla.ini
index 8486a3cc6de75..e787e4f8d6986 100644
--- a/api/language/en-GB/joomla.ini
+++ b/api/language/en-GB/joomla.ini
@@ -89,7 +89,7 @@ JHELP="Help"
 JHIDE="Hide"
 JHIDEPASSWORD="Hide Password"
 JINVALID_TOKEN="The most recent request was denied because it had an invalid security token. Please refresh the page and try again."
-JINVALID_TOKEN_NOTICE="The security token did not match. The request was aborted to prevent any security breach. Please try again."
+JINVALID_TOKEN_NOTICE="The security token did not match. The request was cancelled to prevent any security breach. Please try again."
 JLOGIN="Log in"
 JLOGOUT="Log out"
 JMENU_MULTILANG_WARNING_MISSING_MODULES="An administrator menu module for <strong>%s</strong> does not exist. <br>Create a custom administrator menu and module for each administrator language or publish a menu module set to All languages."
@@ -818,6 +818,13 @@ JWARNING_REMOVE_ROOT_USER_ADMIN="The emergency Root User setting is enabled for
 JWARNING_TRASH_MUST_SELECT="You must select at least one item to remove."
 JWARNING_UNPUBLISH_MUST_SELECT="You must select at least one item to unpublish."
 
+; Schemaorg
+JSCHEMAORG_EXTENSION_ALLOWED_DESCRIPTION="Activate this plugin only for listed extensions. If used all other extensions are disabled."
+JSCHEMAORG_EXTENSION_ALLOWED_LABEL="Allowed Extensions"
+JSCHEMAORG_EXTENSION_FORBIDDEN_DESCRIPTION="Disable this plugin for listed extensions."
+JSCHEMAORG_EXTENSION_FORBIDDEN_LABEL="Forbidden Extensions"
+JSCHEMAORG_FIELD_COMPONENT_SECTIONS_TEXT="%2$s"
+
 ; Workflow
 JWORKFLOW="Workflow: %s"
 JWORKFLOW_ENABLED_LABEL="Enable Workflow"
diff --git a/api/language/en-GB/langmetadata.xml b/api/language/en-GB/langmetadata.xml
index 5b4285bf2f4c2..df50c91cd9cb6 100644
--- a/api/language/en-GB/langmetadata.xml
+++ b/api/language/en-GB/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="api">
 	<name>English (en-GB)</name>
 	<version>5.0.0</version>
-	<creationDate>2022-08</creationDate>
+	<creationDate>2023-08</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/build/README.md b/build/README.md
index 96d724ffbdcb1..d9509e73624da 100644
--- a/build/README.md
+++ b/build/README.md
@@ -17,12 +17,12 @@ For some of these operations, conventions were established to simplify and speed
 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 and then transpile to ES5. This step creates both normal and minified files.
-  Production code WILL NOT have the `.es6` part for ES2017+ files but WILL HAVE a `-es5.js` for the ES5 ones.
+  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.
 
 - 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 and then transpile to ES5. 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+ files but WILL HAVE a `-es5.js` for the ES5 ones.
+  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.
diff --git a/build/build-modules-js/error-pages.es6.js b/build/build-modules-js/error-pages.es6.js
index 1dc8d7e3f2ce1..680ac76aa782b 100644
--- a/build/build-modules-js/error-pages.es6.js
+++ b/build/build-modules-js/error-pages.es6.js
@@ -135,26 +135,24 @@ module.exports.createErrorPages = async (options) => {
       template = template.replace('{{jsContents}}', jsContent.code);
     }
 
-    let mediaExists = false;
-    try {
-      await access(dirname(`${RootPath}${options.settings.errorPages[name].destFile}`));
-      mediaExists = true;
-    } catch (err) {
-      // Do nothing
-    }
-
-    if (!mediaExists) {
-      await mkdir(dirname(`${RootPath}${options.settings.errorPages[name].destFile}`), { recursive: true, mode: 0o755 });
-    }
-
-    await writeFile(
-      `${RootPath}${options.settings.errorPages[name].destFile}`,
-      template,
-      { encoding: 'utf8', mode: 0o644 },
-    );
-
-    // eslint-disable-next-line no-console
-    console.error(`✅ Created the file: ${options.settings.errorPages[name].destFile}`);
+    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 });
+
+      // eslint-disable-next-line no-console
+      console.error(`✅ Created the file: ${folder}`);
+    });
   };
 
   Object.keys(options.settings.errorPages).forEach((name) => processPages.push(processPage(name)));
diff --git a/build/build-modules-js/init/common/resolve-package.es6.js b/build/build-modules-js/init/common/resolve-package.es6.js
new file mode 100644
index 0000000000000..c69e25e5cef3e
--- /dev/null
+++ b/build/build-modules-js/init/common/resolve-package.es6.js
@@ -0,0 +1,49 @@
+const { existsSync, readdirSync } = require('fs-extra');
+
+/**
+ * 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 = [];
+
+  // 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.push(`${scope}/${subModule}`);
+    });
+  });
+
+  return cmModules;
+};
diff --git a/build/build-modules-js/init/exemptions/codemirror.es6.js b/build/build-modules-js/init/exemptions/codemirror.es6.js
deleted file mode 100644
index 1040c51a51a64..0000000000000
--- a/build/build-modules-js/init/exemptions/codemirror.es6.js
+++ /dev/null
@@ -1,72 +0,0 @@
-const {
-  existsSync, readFile, writeFile, mkdir,
-} = require('fs-extra');
-const { join } = require('path');
-
-const { concatFiles } = require('../common/concat-files.es6.js');
-const { copyAllFiles } = require('../common/copy-all-files.es6.js');
-
-const RootPath = process.cwd();
-const xmlVersionStr = /(<version>)(.+)(<\/version>)/;
-
-/**
- * Codemirror needs special treatment
- */
-module.exports.codeMirror = async (packageName, version) => {
-  const itemvendorPath = join(RootPath, `media/vendor/${packageName}`);
-  if (!await existsSync(itemvendorPath)) {
-    await mkdir(itemvendorPath, { recursive: true, mode: 0o755 });
-    await mkdir(join(itemvendorPath, 'addon'), { mode: 0o755 });
-    await mkdir(join(itemvendorPath, 'lib'), { mode: 0o755 });
-    await mkdir(join(itemvendorPath, 'mode'), { mode: 0o755 });
-    await mkdir(join(itemvendorPath, 'keymap'), { mode: 0o755 });
-    await mkdir(join(itemvendorPath, 'theme'), { mode: 0o755 });
-  }
-
-  await copyAllFiles('addon', 'codemirror', 'addon');
-  await copyAllFiles('lib', 'codemirror', 'lib');
-  await copyAllFiles('mode', 'codemirror', 'mode');
-  await copyAllFiles('keymap', 'codemirror', 'keymap');
-  await copyAllFiles('theme', 'codemirror', 'theme');
-
-  await concatFiles(
-    [
-      'media/vendor/codemirror/addon/display/fullscreen.js',
-      'media/vendor/codemirror/addon/display/panel.js',
-      'media/vendor/codemirror/addon/edit/closebrackets.js',
-      'media/vendor/codemirror/addon/edit/closetag.js',
-      'media/vendor/codemirror/addon/edit/matchbrackets.js',
-      'media/vendor/codemirror/addon/edit/matchtags.js',
-      'media/vendor/codemirror/addon/fold/brace-fold.js',
-      'media/vendor/codemirror/addon/fold/foldcode.js',
-      'media/vendor/codemirror/addon/fold/foldgutter.js',
-      'media/vendor/codemirror/addon/fold/xml-fold.js',
-      'media/vendor/codemirror/addon/mode/loadmode.js',
-      'media/vendor/codemirror/addon/mode/multiplex.js',
-      'media/vendor/codemirror/addon/scroll/annotatescrollbar.js',
-      'media/vendor/codemirror/addon/scroll/simplescrollbars.js',
-      'media/vendor/codemirror/addon/search/match-highlighter.js',
-      'media/vendor/codemirror/addon/search/matchesonscrollbar.js',
-      'media/vendor/codemirror/addon/search/search.js',
-      'media/vendor/codemirror/addon/search/searchcursor.js',
-      'media/vendor/codemirror/addon/selection/active-line.js',
-      'media/vendor/codemirror/mode/meta.js',
-    ],
-    'media/vendor/codemirror/lib/addons.js',
-  );
-
-  await concatFiles(
-    [
-      'media/vendor/codemirror/addon/display/fullscreen.css',
-      'media/vendor/codemirror/addon/fold/foldgutter.css',
-      'media/vendor/codemirror/addon/scroll/simplescrollbars.css',
-      'media/vendor/codemirror/addon/search/matchesonscrollbar.css',
-    ],
-    'media/vendor/codemirror/lib/addons.css',
-  );
-
-  // Update the XML file for Codemirror
-  let codemirrorXml = await readFile(`${RootPath}/plugins/editors/codemirror/codemirror.xml`, { encoding: 'utf8' });
-  codemirrorXml = codemirrorXml.replace(xmlVersionStr, `$1${version}$3`);
-  await writeFile(`${RootPath}/plugins/editors/codemirror/codemirror.xml`, codemirrorXml, { encoding: 'utf8', mode: 0o644 });
-};
diff --git a/build/build-modules-js/init/exemptions/tinymce.es6.js b/build/build-modules-js/init/exemptions/tinymce.es6.js
index bf4d1bff45a12..232976e910e46 100644
--- a/build/build-modules-js/init/exemptions/tinymce.es6.js
+++ b/build/build-modules-js/init/exemptions/tinymce.es6.js
@@ -1,9 +1,6 @@
 const {
-  existsSync, copy, readFile, writeFile, mkdir,
+  existsSync, copy, readFile, writeFile, mkdir, removeSync,
 } = require('fs-extra');
-const CssNano = require('cssnano');
-const Postcss = require('postcss');
-const { minify } = require('terser');
 
 const { join } = require('path');
 
@@ -71,27 +68,10 @@ module.exports.tinyMCE = async (packageName, version) => {
   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 });
 
-  /* Create the Highlighter plugin */
-  // Get the css
-  let cssContent = await readFile('build/media_source/plg_editors_tinymce/js/plugins/highlighter/source.css', { encoding: 'utf8' });
-  cssContent = await Postcss([CssNano()]).process(cssContent, { from: undefined });
-  // Get the JS
-  let jsContent = await readFile('build/media_source/plg_editors_tinymce/js/plugins/highlighter/source.es6.js', { encoding: 'utf8' });
-  jsContent = await minify(jsContent, { sourceMap: false, format: { comments: false } });
-  // Write the HTML file
-  const htmlContent = `<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8">
-    <script type="module">${jsContent.code}</script>
-    <style type="text/css">${cssContent.css}</style>
-  </head>
-  <body style="height: 100vh"></body>
-</html>
-`;
-
-  await writeFile('media/plg_editors_tinymce/js/plugins/highlighter/source.html', htmlContent, { 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.es6.js b/build/build-modules-js/init/localise-packages.es6.js
index 8133a6c5c090d..e72229a3a52e1 100644
--- a/build/build-modules-js/init/localise-packages.es6.js
+++ b/build/build-modules-js/init/localise-packages.es6.js
@@ -2,8 +2,8 @@ const {
   existsSync, copy, writeFile, mkdir, mkdirs, ensureDir,
 } = require('fs-extra');
 const { dirname, join } = require('path');
-const { codeMirror } = require('./exemptions/codemirror.es6.js');
 const { tinyMCE } = require('./exemptions/tinymce.es6.js');
+const { resolvePackageFile } = require('./common/resolve-package.es6.js');
 
 const RootPath = process.cwd();
 
@@ -39,16 +39,14 @@ const copyFilesTo = async (files, srcDir, destDir) => {
  */
 const resolvePackage = async (vendor, packageName, mediaVendorPath, options, registry) => {
   const vendorName = vendor.name || packageName;
-  const modulePathJson = require.resolve(`${packageName}/package.json`);
+  const modulePathJson = resolvePackageFile(`${packageName}/package.json`);
   const modulePathRoot = dirname(modulePathJson);
   // eslint-disable-next-line global-require, import/no-dynamic-require
   const moduleOptions = require(modulePathJson);
 
   const promises = [];
 
-  if (packageName === 'codemirror') {
-    promises.push(codeMirror(packageName, moduleOptions.version));
-  } else if (packageName === 'tinymce') {
+  if (packageName === 'tinymce') {
     promises.push(tinyMCE(packageName, moduleOptions.version));
   } else {
     await mkdirs(join(mediaVendorPath, vendorName));
diff --git a/build/build-modules-js/init/minify-vendor.es6.js b/build/build-modules-js/init/minify-vendor.es6.js
index 1825228b02aab..686b90564775a 100644
--- a/build/build-modules-js/init/minify-vendor.es6.js
+++ b/build/build-modules-js/init/minify-vendor.es6.js
@@ -11,6 +11,7 @@ const folders = [
   'media/vendor/codemirror',
   'media/vendor/debugbar',
   'media/vendor/diff/js',
+  'media/vendor/es-module-shims/js',
   'media/vendor/qrcode/js',
   'media/vendor/short-and-sweet/js',
   'media/vendor/webcomponentsjs/js',
diff --git a/build/build-modules-js/init/patches.es6.js b/build/build-modules-js/init/patches.es6.js
index 99dfe6937e236..3cea4ff76cf6e 100644
--- a/build/build-modules-js/init/patches.es6.js
+++ b/build/build-modules-js/init/patches.es6.js
@@ -34,20 +34,10 @@ document.addEventListener("joomla:updated", (event) => [].slice.call(event.targe
 `);
   await writeFile(shortandsweetPath, ShortandsweetJs, { encoding: 'utf8', mode: 0o644 });
 
-  // Patch the Font Awesome math.div sass deprecations
-  // _larger.scss
-  let faPath = join(mediaVendorPath, 'fontawesome-free/scss/_larger.scss');
-  let newScss = (await readFile(faPath, { encoding: 'utf8' })).replace('(4em / 3)', '(4em * .333)').replace('(3em / 4)', '(3em * .25)');
-  await writeFile(faPath, newScss, { encoding: 'utf8', mode: 0o644 });
-  await writeFile(join(RootPath, 'node_modules/@fortawesome/fontawesome-free/scss/_larger.scss'), newScss, { encoding: 'utf8', mode: 0o644 });
-  // _list.scss
-  faPath = join(mediaVendorPath, 'fontawesome-free/scss/_list.scss');
-  newScss = (await readFile(faPath, { encoding: 'utf8' })).replace('5/4', '1.25');
-  await writeFile(faPath, newScss, { encoding: 'utf8', mode: 0o644 });
-  await writeFile(join(RootPath, 'node_modules/@fortawesome/fontawesome-free/scss/_list.scss'), newScss, { encoding: 'utf8', mode: 0o644 });
-  // _variables.scss
-  faPath = join(mediaVendorPath, 'fontawesome-free/scss/_variables.scss');
-  newScss = (await readFile(faPath, { encoding: 'utf8' })).replace('(20em / 16)', '(20em * .0625)');
+  // 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 });
-  await writeFile(join(RootPath, 'node_modules/@fortawesome/fontawesome-free/scss/_variables.scss'), newScss, { encoding: 'utf8', mode: 0o644 });
 };
diff --git a/build/build-modules-js/javascript/build-bootstrap-js.es6.js b/build/build-modules-js/javascript/build-bootstrap-js.es6.js
index 4e2340c88a010..666dae9369bed 100644
--- a/build/build-modules-js/javascript/build-bootstrap-js.es6.js
+++ b/build/build-modules-js/javascript/build-bootstrap-js.es6.js
@@ -8,7 +8,6 @@ const rollup = require('rollup');
 const { nodeResolve } = require('@rollup/plugin-node-resolve');
 const replace = require('@rollup/plugin-replace');
 const { babel } = require('@rollup/plugin-babel');
-const commonjs = require('@rollup/plugin-commonjs');
 const bsVersion = require('../../../package.json').dependencies.bootstrap.replace(/^\^|~/, '');
 
 const tasks = [];
@@ -48,7 +47,6 @@ const build = async () => {
               targets: {
                 browsers: [
                   '> 1%',
-                  'not ie 11',
                   'not op_mini all',
                 ],
               },
@@ -57,12 +55,6 @@ const build = async () => {
         ],
       }),
     ],
-    external: [
-      './base-component.js',
-      ...domImports.map((file) => `./dom/${file}`),
-      ...domImports.map((file) => `./${file}`),
-      ...utilImports.map((file) => `./util/${file}`),
-    ],
     manualChunks: {
       alert: ['build/media_source/vendor/bootstrap/js/alert.es6.js'],
       button: ['build/media_source/vendor/bootstrap/js/button.es6.js'],
@@ -95,55 +87,6 @@ const build = async () => {
   await bundle.close();
 };
 
-const buildLegacy = async () => {
-  // eslint-disable-next-line no-console
-  console.log('Building Legacy...');
-
-  const bundle = await rollup.rollup({
-    input: resolve(inputFolder, 'index.es6.js'),
-    plugins: [
-      commonjs(),
-      nodeResolve(),
-      replace({
-        preventAssignment: true,
-        'process.env.NODE_ENV': '\'production\'',
-      }),
-      babel({
-        exclude: 'node_modules/core-js/**',
-        babelHelpers: 'bundled',
-        babelrc: false,
-        presets: [
-          [
-            '@babel/preset-env',
-            {
-              corejs: '3.8',
-              useBuiltIns: 'usage',
-              targets: {
-                chrome: '58',
-                ie: '11',
-              },
-              loose: true,
-              bugfixes: true,
-              modules: false,
-            },
-          ],
-        ],
-      }),
-    ],
-    external: [],
-  });
-
-  await bundle.write({
-    format: 'iife',
-    sourcemap: false,
-    name: 'bootstrap',
-    file: resolve(outputFolder, 'bootstrap-es5.js'),
-  });
-
-  // closes the bundle
-  await bundle.close();
-};
-
 module.exports.bootstrapJs = async () => {
   rimraf.sync(resolve(outputFolder));
 
@@ -160,23 +103,7 @@ module.exports.bootstrapJs = async () => {
     tasks.push(createMinified(file));
   });
 
-  return Promise.all(tasks).then(async () => {
-    // eslint-disable-next-line no-console
-    console.log('✅ ES6 components ready');
-
-    try {
-      await buildLegacy(inputFolder, 'index.es6.js');
-      const es5File = await readFile(resolve(outputFolder, 'bootstrap-es5.js'), { encoding: 'utf8' });
-      const mini = await minify(es5File, { sourceMap: false, format: { comments: false } });
-      await writeFile(resolve(outputFolder, 'bootstrap-es5.min.js'), mini.code, { encoding: 'utf8', mode: 0o644 });
-      // eslint-disable-next-line no-console
-      console.log('✅ Legacy done!');
-    } catch (error) {
-      // eslint-disable-next-line no-console
-      console.error(error);
-      process.exit(1);
-    }
-  }).catch((er) => {
+  return Promise.all(tasks).catch((er) => {
     // eslint-disable-next-line no-console
     console.log(er);
     process.exit(1);
diff --git a/build/build-modules-js/javascript/build-codemirror.es6.js b/build/build-modules-js/javascript/build-codemirror.es6.js
new file mode 100644
index 0000000000000..dc1d72466a25d
--- /dev/null
+++ b/build/build-modules-js/javascript/build-codemirror.es6.js
@@ -0,0 +1,138 @@
+/**
+ * Build codemirror modules
+ */
+/* eslint-disable import/no-extraneous-dependencies, global-require, import/no-dynamic-require */
+
+const { readFileSync, writeFile } = require('fs-extra');
+const cliProgress = require('cli-progress');
+const rollup = require('rollup');
+const { nodeResolve } = require('@rollup/plugin-node-resolve');
+const replace = require('@rollup/plugin-replace');
+const { minify } = require('terser');
+const { resolvePackageFile, getPackagesUnderScope } = require('../init/common/resolve-package.es6.js');
+
+// Build the module
+const buildModule = async (module, externalModules, destFile) => {
+  const build = await rollup.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 minify(src, { sourceMap: false, format: { comments: false } });
+  // 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 },
+  );
+};
+
+module.exports.compileCodemirror = async () => {
+  // eslint-disable-next-line no-console
+  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.es6.js b/build/build-modules-js/javascript/build-com_media-js.es6.js
index 998e37c18fe9b..53cfac168a4f8 100644
--- a/build/build-modules-js/javascript/build-com_media-js.es6.js
+++ b/build/build-modules-js/javascript/build-com_media-js.es6.js
@@ -1,6 +1,5 @@
 const { resolve } = require('path');
-const { writeFile, copyFile, rm } = require('fs').promises;
-const { existsSync } = require('fs');
+const { writeFile, copyFile } = require('fs').promises;
 const rollup = require('rollup');
 const { nodeResolve } = require('@rollup/plugin-node-resolve');
 const replace = require('@rollup/plugin-replace');
@@ -13,61 +12,6 @@ require('dotenv').config();
 const inputJS = 'administrator/components/com_media/resources/scripts/mediamanager.es6.js';
 const isProduction = process.env.NODE_ENV !== 'DEVELOPMENT';
 
-const buildLegacy = async (file) => {
-  // eslint-disable-next-line no-console
-  console.log('Building Legacy Media Manager...');
-
-  const bundle = await rollup.rollup({
-    input: file,
-    plugins: [
-      nodeResolve(),
-      commonjs(),
-      babel({
-        exclude: 'node_modules/core-js/**',
-        babelHelpers: 'bundled',
-        babelrc: false,
-        presets: [
-          [
-            '@babel/preset-env',
-            {
-              corejs: '3.8',
-              useBuiltIns: 'usage',
-              targets: {
-                ie: '11',
-              },
-              loose: true,
-              bugfixes: true,
-              modules: false,
-              ignoreBrowserslistConfig: true,
-            },
-          ],
-        ],
-      }),
-    ],
-    external: [],
-  });
-
-  await bundle.write({
-    format: 'iife',
-    sourcemap: false,
-    name: 'JoomlaMediaManager',
-    file: 'media/com_media/js/media-manager-es5.js',
-  })
-    .then((value) => minifyJsCode(value.output[0].code))
-    .then((content) => {
-      // eslint-disable-next-line no-console
-      console.log('✅ Legacy Media Manager ready');
-      return writeFile(resolve('media/com_media/js/media-manager-es5.min.js'), content.code, { encoding: 'utf8', mode: 0o644 });
-    })
-    .catch((error) => {
-      // eslint-disable-next-line no-console
-      console.error(error);
-    });
-
-  // closes the bundle
-  await bundle.close();
-};
-
 module.exports.mediaManager = async () => {
   // eslint-disable-next-line no-console
   console.log('Building Media Manager ES Module...');
@@ -102,8 +46,12 @@ module.exports.mediaManager = async () => {
               targets: {
                 browsers: [
                   '> 1%',
-                  'not ie 11',
                   'not op_mini all',
+                  /** https://caniuse.com/es6-module */
+                  'chrome >= 61',
+                  'safari >= 11',
+                  'edge >= 16',
+                  'Firefox >= 60',
                 ],
               },
               loose: true,
@@ -126,17 +74,10 @@ module.exports.mediaManager = async () => {
       if (isProduction) {
         // eslint-disable-next-line no-console
         console.log('✅ ES2017 Media Manager ready');
-        writeFile(resolve('media/com_media/js/media-manager.min.js'), content.code, { encoding: 'utf8', mode: 0o644 });
-        return buildLegacy(resolve('media/com_media/js/media-manager.js'));
+        return writeFile(resolve('media/com_media/js/media-manager.min.js'), content.code, { encoding: 'utf8', mode: 0o644 });
       }
       // eslint-disable-next-line no-console
       console.log('✅ ES2017 Media Manager ready');
-      if (existsSync(resolve('media/com_media/js/media-manager-es5.js'))) {
-        rm(resolve('media/com_media/js/media-manager-es5.js'));
-      }
-      if (existsSync(resolve('media/com_media/js/media-manager-es5.min.js'))) {
-        rm(resolve('media/com_media/js/media-manager-es5.min.js'));
-      }
       return copyFile(resolve('media/com_media/js/media-manager.js'), resolve('media/com_media/js/media-manager.min.js'));
     })
     .catch((error) => {
@@ -149,12 +90,6 @@ module.exports.mediaManager = async () => {
 };
 
 module.exports.watchMediaManager = async () => {
-  if (existsSync(resolve('media/com_media/js/media-manager-es5.js'))) {
-    rm(resolve('media/com_media/js/media-manager-es5.js'));
-  }
-  if (existsSync(resolve('media/com_media/js/media-manager-es5.min.js'))) {
-    rm(resolve('media/com_media/js/media-manager-es5.min.js'));
-  }
   // eslint-disable-next-line no-console
   console.log('Watching Media Manager js+vue files...');
   // eslint-disable-next-line no-console
@@ -189,8 +124,12 @@ module.exports.watchMediaManager = async () => {
               targets: {
                 browsers: [
                   '> 1%',
-                  'not ie 11',
                   'not op_mini all',
+                  /** https://caniuse.com/es6-module */
+                  'chrome 61',
+                  'safari 11',
+                  'edge 16',
+                  'Firefox 60',
                 ],
               },
               loose: true,
diff --git a/build/build-modules-js/javascript/compile-to-es2017.es6.js b/build/build-modules-js/javascript/compile-to-es2017.es6.js
index 8849b39f8a08b..f51ba2ebab2ed 100644
--- a/build/build-modules-js/javascript/compile-to-es2017.es6.js
+++ b/build/build-modules-js/javascript/compile-to-es2017.es6.js
@@ -1,3 +1,5 @@
+/* eslint-disable import/no-extraneous-dependencies, global-require, import/no-dynamic-require */
+
 const { access, writeFile } = require('fs').promises;
 const { constants } = require('fs');
 const Autoprefixer = require('autoprefixer');
@@ -10,7 +12,7 @@ const { babel } = require('@rollup/plugin-babel');
 const Postcss = require('postcss');
 const { renderSync } = require('sass-embedded');
 const { minifyJsCode } = require('./minify.es6.js');
-const { handleESMToLegacy } = require('./compile-to-es5.es6.js');
+const { getPackagesUnderScope } = require('../init/common/resolve-package.es6.js');
 
 const getWcMinifiedCss = async (file) => {
   let scssFileExists = false;
@@ -43,6 +45,33 @@ const getWcMinifiedCss = async (file) => {
   return '';
 };
 
+// List of external modules that should not be resolved by rollup
+const externalModules = [];
+const collectExternals = () => {
+  if (externalModules.length) {
+    return;
+  }
+
+  // Joomla modules
+  externalModules.push(
+    'cropper-module',
+    'codemirror',
+    'joomla.dialog',
+    'editor-api',
+    'editor-decorator',
+  );
+
+  // 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.
  *
@@ -51,12 +80,14 @@ const getWcMinifiedCss = async (file) => {
 module.exports.handleESMFile = async (file) => {
   const newPath = file.replace(/\.w-c\.es6\.js$/, '').replace(/\.es6\.js$/, '').replace(`${sep}build${sep}media_source${sep}`, `${sep}media${sep}`);
   const minifiedCss = await getWcMinifiedCss(file);
+
+  // Make sure externals are collected
+  collectExternals();
+
   const bundle = await rollup.rollup({
     input: resolve(file),
     plugins: [
-      nodeResolve({
-        preferBuiltins: false,
-      }),
+      nodeResolve({ preferBuiltins: false }),
       replace({
         preventAssignment: true,
         CSS_CONTENTS_PLACEHOLDER: minifiedCss,
@@ -73,8 +104,12 @@ module.exports.handleESMFile = async (file) => {
               targets: {
                 browsers: [
                   '> 1%',
-                  'not ie 11',
                   'not op_mini all',
+                  /** https://caniuse.com/es6-module */
+                  'chrome >= 61',
+                  'safari >= 11',
+                  'edge >= 16',
+                  'Firefox >= 60',
                 ],
               },
               bugfixes: true,
@@ -84,7 +119,7 @@ module.exports.handleESMFile = async (file) => {
         ],
       }),
     ],
-    external: [],
+    external: externalModules,
   });
 
   bundle.write({
@@ -99,7 +134,6 @@ module.exports.handleESMFile = async (file) => {
 
       return writeFile(resolve(`${newPath}.min.js`), content.code, { encoding: 'utf8', mode: 0o644 });
     })
-    .then(() => handleESMToLegacy(resolve(`${newPath}.js`)))
     .catch((error) => {
       // eslint-disable-next-line no-console
       console.error(error);
diff --git a/build/build-modules-js/javascript/compile-to-es5.es6.js b/build/build-modules-js/javascript/compile-to-es5.es6.js
deleted file mode 100644
index bd4527488b136..0000000000000
--- a/build/build-modules-js/javascript/compile-to-es5.es6.js
+++ /dev/null
@@ -1,53 +0,0 @@
-const { basename, resolve } = require('path');
-const rollup = require('rollup');
-const { nodeResolve } = require('@rollup/plugin-node-resolve');
-const { babel } = require('@rollup/plugin-babel');
-const commonjs = require('@rollup/plugin-commonjs');
-const { minifyJs } = require('./minify.es6.js');
-
-/**
- * Compiles es6 files to es5.
- *
- * @param file the full path to the file + filename + extension
- */
-module.exports.handleESMToLegacy = async (file) => {
-  const bundleLegacy = await rollup.rollup({
-    input: resolve(file),
-    plugins: [
-      nodeResolve(),
-      commonjs(),
-      babel({
-        exclude: ['node_modules/core-js/**', 'media/system/js/core.js'],
-        babelHelpers: 'bundled', // runtime
-        babelrc: false,
-        presets: [
-          [
-            '@babel/preset-env',
-            {
-              corejs: '3.8',
-              useBuiltIns: 'entry', // usage
-              targets: {
-                ie: '11',
-              },
-              loose: true,
-              bugfixes: false,
-              modules: false,
-            },
-          ],
-        ],
-        // plugins: ['@babel/plugin-transform-runtime'],
-      }),
-    ],
-  });
-
-  await bundleLegacy.write({
-    format: 'iife',
-    sourcemap: false,
-    file: resolve(`${file.replace(/\.js$/, '')}-es5.js`),
-  }).then(() => {
-    // eslint-disable-next-line no-console
-    console.log(`✅ ES5 file: ${basename(file).replace('.js', '-es5.js')}: transpiled`);
-
-    minifyJs(resolve(`${file.replace(/\.js$/, '')}-es5.js`));
-  });
-};
diff --git a/build/build-modules-js/settings.json b/build/build-modules-js/settings.json
index b46d54e373f50..c9f7a04454e99 100644
--- a/build/build-modules-js/settings.json
+++ b/build/build-modules-js/settings.json
@@ -73,24 +73,12 @@
               "bootstrap.css"
             ]
           },
-          {
-            "name": "bootstrap.es5",
-            "type": "script",
-            "uri": "bootstrap-es5.min.js",
-            "dependencies": [
-              "core"
-            ],
-            "attributes": {
-              "nomodule": true,
-              "defer": true
-            }
-          },
           {
             "name": "bootstrap.alert",
             "type": "script",
             "uri": "alert.min.js",
             "dependencies": [
-              "bootstrap.es5"
+              "core"
             ],
             "attributes": {
               "type": "module"
@@ -101,7 +89,7 @@
             "type": "script",
             "uri": "button.min.js",
             "dependencies": [
-              "bootstrap.es5"
+              "core"
             ],
             "attributes": {
               "type": "module"
@@ -112,7 +100,7 @@
             "type": "script",
             "uri": "carousel.min.js",
             "dependencies": [
-              "bootstrap.es5"
+              "core"
             ],
             "attributes": {
               "type": "module"
@@ -123,7 +111,7 @@
             "type": "script",
             "uri": "collapse.min.js",
             "dependencies": [
-              "bootstrap.es5"
+              "core"
             ],
             "attributes": {
               "type": "module"
@@ -134,7 +122,7 @@
             "type": "script",
             "uri": "dropdown.min.js",
             "dependencies": [
-              "bootstrap.es5"
+              "core"
             ],
             "attributes": {
               "type": "module"
@@ -145,7 +133,7 @@
             "type": "script",
             "uri": "modal.min.js",
             "dependencies": [
-              "bootstrap.es5"
+              "core"
             ],
             "attributes": {
               "type": "module"
@@ -156,7 +144,7 @@
             "type": "script",
             "uri": "offcanvas.min.js",
             "dependencies": [
-              "bootstrap.es5"
+              "core"
             ],
             "attributes": {
               "type": "module"
@@ -167,7 +155,7 @@
             "type": "script",
             "uri": "popover.min.js",
             "dependencies": [
-              "bootstrap.es5"
+              "core"
             ],
             "attributes": {
               "type": "module"
@@ -178,7 +166,7 @@
             "type": "script",
             "uri": "scrollspy.min.js",
             "dependencies": [
-              "bootstrap.es5"
+              "core"
             ],
             "attributes": {
               "type": "module"
@@ -189,7 +177,7 @@
             "type": "script",
             "uri": "tab.min.js",
             "dependencies": [
-              "bootstrap.es5"
+              "core"
             ],
             "attributes": {
               "type": "module"
@@ -200,7 +188,7 @@
             "type": "script",
             "uri": "toast.min.js",
             "dependencies": [
-              "bootstrap.es5"
+              "core"
             ],
             "attributes": {
               "type": "module"
@@ -214,7 +202,8 @@
         "name": "cropperjs",
         "js": {
           "dist/cropper.js": "js/cropper.js",
-          "dist/cropper.min.js": "js/cropper.min.js"
+          "dist/cropper.min.js": "js/cropper.min.js",
+          "dist/cropper.esm.js": "js/cropper.esm.js"
         },
         "css": {
           "dist/cropper.css": "css/cropper.css",
@@ -226,9 +215,16 @@
             "type": "style",
             "uri": "cropper.min.css"
           },
+          {
+            "name": "cropper-module",
+            "type": "script",
+            "uri": "cropper.esm.js",
+            "importmap": true
+          },
           {
             "name": "cropperjs",
             "type": "script",
+            "deprecated": true,
             "uri": "cropper.min.js",
             "attributes": {
               "defer": true
@@ -340,6 +336,24 @@
         "dependencies": [],
         "licenseFilename": "license"
       },
+      "es-module-shims": {
+        "name": "es-module-shims",
+        "js": {
+          "dist/es-module-shims.js": "js/es-module-shims.js"
+        },
+        "provideAssets": [
+          {
+            "name": "es-module-shims",
+            "type": "script",
+            "uri": "es-module-shims.min.js",
+            "attributes": {
+              "async": true
+            }
+          }
+        ],
+        "dependencies": [],
+        "licenseFilename": "LICENSE"
+      },
       "focus-visible": {
         "name": "focus-visible",
         "js": {
@@ -453,12 +467,8 @@
         "js": {
           "dist/js/joomla-alert.js": "js/joomla-alert.js",
           "dist/js/joomla-alert.min.js": "js/joomla-alert.min.js",
-          "dist/js/joomla-alert-es5.js": "js/joomla-alert-es5.js",
-          "dist/js/joomla-alert-es5.min.js": "js/joomla-alert-es5.min.js",
           "dist/js/joomla-tab.js": "js/joomla-tab.js",
-          "dist/js/joomla-tab.min.js": "js/joomla-tab.min.js",
-          "dist/js/joomla-tab-es5.js": "js/joomla-tab-es5.js",
-          "dist/js/joomla-tab-es5.min.js": "js/joomla-tab-es5.min.js"
+          "dist/js/joomla-tab.min.js": "js/joomla-tab.min.js"
         },
         "css": {
           "dist/css/joomla-alert.css": "css/joomla-alert.css",
@@ -475,7 +485,7 @@
           {
             "name": "webcomponent.joomla-alert-legacy",
             "type": "script",
-            "uri": "joomla-alert-es5.min.js",
+            "uri": "",
             "attributes": {
               "nomodule": true,
               "defer": true
@@ -492,7 +502,7 @@
               "type": "module"
             },
             "dependencies": [
-              "webcomponent.joomla-alert-legacy"
+              "wcpolyfill"
             ]
           },
           {
@@ -503,7 +513,7 @@
           {
             "name": "webcomponent.joomla-tab-legacy",
             "type": "script",
-            "uri": "joomla-tab-es5.min.js",
+            "uri": "",
             "attributes": {
               "nomodule": true,
               "defer": true
@@ -520,7 +530,7 @@
               "type": "module"
             },
             "dependencies": [
-              "webcomponent.joomla-tab-legacy"
+              "wcpolyfill"
             ]
           }
         ],
@@ -542,11 +552,6 @@
           "build/mediaelementplayer-legacy.css": "css/mediaelementplayer-legacy.css"
         },
         "filesExtra": {
-          "build/mediaelement-flash-audio-ogg.swf": "js/mediaelement-flash-audio-ogg.swf",
-          "build/mediaelement-flash-audio.swf": "js/mediaelement-flash-audio.swf",
-          "build/mediaelement-flash-video-hls.swf": "js/mediaelement-flash-video-hls.swf",
-          "build/mediaelement-flash-video-mdash.swf": "js/mediaelement-flash-video-mdash.swf",
-          "build/mediaelement-flash-video.swf": "js/mediaelement-flash-video.swf",
           "build/mejs-controls.svg": "css/mejs-controls.svg"
         },
         "dependencies": [],
@@ -599,7 +604,7 @@
         ],
         "licenseFilename": "LICENSE.md"
       },
-      "codemirror": {
+      "@codemirror/view": {
         "name": "codemirror",
         "licenseFilename": "LICENSE"
       },
@@ -788,7 +793,7 @@
         "text": "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.",
         "link": "J4.x:Setting_Up_Your_Local_Environment",
         "linkText": "More Details",
-        "destFile": "/templates/system/build_incomplete.html"
+        "destFile": ["/templates/system/build_incomplete.html"]
       },
       "unsupported": {
         "title": "Joomla: unsupported PHP version",
@@ -796,7 +801,7 @@
         "text": "Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla!",
         "link": "J4.x:Unsupported_PHP_Version",
         "linkText": "Help me resolve this",
-        "destFile": "/templates/system/incompatible.html"
+        "destFile": ["/templates/system/incompatible.html", "/includes/incompatible.html"]
       },
       "noxml": {
         "title": "Joomla: Missing PHP-XML library",
@@ -804,7 +809,7 @@
         "text": "Your host needs to use PHP with support for the XML library to run this version of Joomla!",
         "link": "J4.x:Missing_XML_Library",
         "linkText": "Help me resolve this",
-        "destFile": "/media/system/html/noxml.html"
+        "destFile": ["/media/system/html/noxml.html"]
       },
       "fatal": {
         "title": "An Error Occurred: {{statusText}}",
@@ -812,7 +817,7 @@
         "text": "The server returned a \"{{statusCode_statusText}}\"",
         "link": "J4.x:FatalError",
         "linkText": "Help me resolve this",
-        "destFile": "/templates/system/fatal-error.html"
+        "destFile": ["/templates/system/fatal-error.html"]
       }
     }
   }
diff --git a/build/build.js b/build/build.js
index aa71fadceccf5..637514ef8f28b 100644
--- a/build/build.js
+++ b/build/build.js
@@ -34,6 +34,7 @@ const { mediaManager, watchMediaManager } = require('./build-modules-js/javascri
 const { compressFiles } = require('./build-modules-js/compress.es6.js');
 const { versioning } = require('./build-modules-js/versioning.es6.js');
 const { Timer } = require('./build-modules-js/utils/timer.es6.js');
+const { compileCodemirror } = require('./build-modules-js/javascript/build-codemirror.es6.js');
 
 // The settings
 const options = require('../package.json');
@@ -68,6 +69,7 @@ Program
   .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.')
@@ -125,6 +127,11 @@ if (cliOptions.compileBs) {
   bootstrapJs();
 }
 
+// Compile codemirror
+if (cliOptions.compileCodemirror) {
+  compileCodemirror();
+}
+
 // Gzip js/css files
 if (cliOptions.gzip) {
   compressFiles();
@@ -155,16 +162,13 @@ if (cliOptions.prepare) {
     .then(() => cleanVendors())
     .then(() => localisePackages(options))
     .then(() => patchPackages(options))
-    .then(() => Promise.all(
-      [
-        minifyVendor(),
-        createErrorPages(options),
-        stylesheets(options, Program.args[0]),
-        scripts(options, Program.args[0]),
-        bootstrapJs(),
-        mediaManager(true),
-      ],
-    ))
+    .then(() => minifyVendor())
+    .then(() => createErrorPages(options))
+    .then(() => stylesheets(options, Program.args[0]))
+    .then(() => scripts(options, Program.args[0]))
+    .then(() => mediaManager())
+    .then(() => bootstrapJs())
+    .then(() => compileCodemirror())
     .then(() => bench.stop('Build'))
     .then(() => { process.exit(0); })
     .catch((err) => {
diff --git a/build/build.php b/build/build.php
index 18fa86ca99a24..dc2ab73d895bd 100644
--- a/build/build.php
+++ b/build/build.php
@@ -239,7 +239,7 @@ function clean_composer(string $dir)
 $excludeGzip        = isset($options['exclude-gzip']);
 $excludeBzip2       = isset($options['exclude-bzip2']);
 $excludeZstd        = !isset($options['include-zstd']);
-$buildPatchPackages = !isset($options['disable-patch-packages']);
+$buildPatchPackages = false && !isset($options['disable-patch-packages']);
 $showHelp           = isset($options['help']);
 
 // Disable the generation of extra text files
@@ -325,7 +325,7 @@ function clean_composer(string $dir)
 echo "Workspace built.\n";
 
 // Import the version class to set the version information
-define('JPATH_PLATFORM', 1);
+define('_JEXEC', 1);
 require_once $fullpath . '/libraries/src/Version.php';
 
 // Set version information for the build
diff --git a/build/convert_or_die.php b/build/convert_or_die.php
index 0745276e048d3..b7d79b005d91a 100644
--- a/build/convert_or_die.php
+++ b/build/convert_or_die.php
@@ -33,7 +33,7 @@ function insertDefineOrDie($file, $keyword)
             $lastComment = $k;
         }
 
-        if (preg_match('/^[ \t\\\]*(defined).*(_JEXEC|JPATH_PLATFORM|JPATH_BASE).*/', $line, $matches)) {
+        if (preg_match('/^[ \t\\\]*(defined).*(_JEXEC|JPATH_BASE).*/', $line, $matches)) {
             $jexecfound[$file] = $file;
             unset($skipped[$file]);
 
@@ -179,7 +179,7 @@ function insertDefineOrDie($file, $keyword)
             // we only test the first 200 lines for a jexec die
             break;
         }
-        if (preg_match('/^[ \t\\\]*(defined).*(_JEXEC|JPATH_PLATFORM|JPATH_BASE).*/', $line, $matches)) {
+        if (preg_match('/^[ \t\\\]*(defined).*(_JEXEC|JPATH_BASE).*/', $line, $matches)) {
             $keyword = $matches[2];
             break;
         }
diff --git a/build/deleted_file_check.php b/build/deleted_file_check.php
index 899cdc89768fb..0ca0720b5b05a 100644
--- a/build/deleted_file_check.php
+++ b/build/deleted_file_check.php
@@ -71,6 +71,8 @@ function usage($command)
     $options['from'] . '/plugins/fields/repeatable',
     $options['from'] . '/plugins/quickicon/eos310',
     $options['from'] . '/plugins/search',
+    $options['from'] . '/plugins/system/compat',
+    $options['from'] . '/plugins/task/demotasks',
 ];
 
 /**
@@ -170,6 +172,10 @@ function usage($command)
     "'/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_system_compat.ini',",
+    "'/administrator/language/en-GB/plg_system_compat.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',",
diff --git a/build/github_rebase.php b/build/github_rebase.php
index df1c56a2e1a92..721d2cd7e8cb3 100644
--- a/build/github_rebase.php
+++ b/build/github_rebase.php
@@ -9,15 +9,18 @@
  */
 
 // Set defaults
-$scriptRoot   = __DIR__;
-$prNumber     = false;
-$php          = 'php';
-$git          = 'git';
-$gh           = 'gh';
-$checkPath    = false;
-$ghRepo       = 'joomla/joomla-cms';
-$baseBranches = '4.1-dev';
-$targetBranch = '4.2-dev';
+$scriptRoot       = __DIR__;
+$prNumber         = false;
+$php              = 'php';
+$git              = 'git';
+$gh               = 'gh';
+$checkPath        = false;
+$ghRepo           = 'joomla/joomla-cms';
+$baseBranches     = '4.1-dev';
+$targetBranch     = '4.2-dev';
+$label            = '';
+$additionalReason = '';
+$tryRun           = false;
 
 $script = array_shift($argv);
 
@@ -31,12 +34,18 @@
         Description:
             Rebase all open pull requests on github to the target branch.
 
+            --try-run:
+              Just list the PRs which would be rebased.
+
             --base:
               The base branch of the pull request. Multiple branches can be separated by comma.
 
             --target:
               The target branch the pull request gets rebased to.
 
+            --label:
+              The tag of the pull request must have to be rebased.
+
             --pr:
               Rebase only the given PR.
 
@@ -48,6 +57,9 @@
     if (substr($arg, 0, 2) === '--') {
         $argi = explode('=', $arg, 2);
         switch ($argi[0]) {
+            case '--try-run':
+                $tryRun = true;
+                break;
             case '--base':
                 $baseBranches = $argi[1];
                 break;
@@ -57,6 +69,14 @@
             case '--pr':
                     $prNumber = $argi[1];
                 break;
+            case '--label':
+                    $label = $argi[1];
+                break;
+            case '--reason':
+                    $additionalReason = $argi[1];
+                break;
+            default:
+                die('Unknown option: ' . $argi[0]);
         }
     } else {
         $checkPath = $arg;
@@ -64,6 +84,12 @@
     }
 }
 
+$reason = 'This pull request has been automatically rebased to ' . $targetBranch . '.';
+
+if (!empty($additionalReason)) {
+    $reason .= ' ' . $additionalReason;
+}
+
 $cmd        = $git . ' -C "' . $scriptRoot . '" rev-parse --show-toplevel';
 $output     = [];
 $repoScript = '';
@@ -107,6 +133,10 @@
 
 $branches = 'base:' . implode(' base:', explode(',', $baseBranches));
 
+if (!empty($label)) {
+    $branches .= ' label:' . $label;
+}
+
 if (!empty($prNumber)) {
     echo "Retrieving Pull Request " . $prNumber . "...\n";
     $cmd = $gh . ' pr view ' . $prNumber . ' --json ' . implode(',', $fieldList);
@@ -137,17 +167,25 @@
 
     $cmd    = $gh . ' pr edit ' . $pr['url'] . ' --base ' . $targetBranch;
     $output = [];
-    exec($cmd, $output, $result);
-    if ($result !== 0) {
-        var_dump([$cmd, $output, $result]);
-        die('Unable to set target branch for pr #' . $pr['number']);
+    if (!$tryRun) {
+        exec($cmd, $output, $result);
+        if ($result !== 0) {
+            var_dump([$cmd, $output, $result]);
+            die('Unable to set target branch for pr #' . $pr['number']);
+        }
+    } else {
+        echo "TRY RUN: " . $cmd . "\n";
     }
 
-    $cmd    = $gh . ' pr comment ' . $pr['url'] . ' --body "This pull request has been automatically rebased to ' . $targetBranch . '."';
+    $cmd    = $gh . ' pr comment ' . $pr['url'] . ' --body "' . $reason . '"';
     $output = [];
-    exec($cmd, $output, $result);
-    if ($result !== 0) {
-        var_dump([$cmd, $output, $result]);
-        die('Unable to create a comment for pr #' . $pr['number']);
+    if (!$tryRun) {
+        exec($cmd, $output, $result);
+        if ($result !== 0) {
+            var_dump([$cmd, $output, $result]);
+            die('Unable to create a comment for pr #' . $pr['number']);
+        }
+    } else {
+        echo "TRY RUN: " . $cmd . "\n";
     }
 }
diff --git a/build/media_source/com_actionlogs/joomla.asset.json b/build/media_source/com_actionlogs/joomla.asset.json
index cea66161ac4a8..8b045ccb190dd 100644
--- a/build/media_source/com_actionlogs/joomla.asset.json
+++ b/build/media_source/com_actionlogs/joomla.asset.json
@@ -5,24 +5,12 @@
   "description": "Joomla CMS",
   "license": "GPL-2.0-or-later",
   "assets": [
-    {
-      "name": "com_actionlogs.admin-actionlogs.es5",
-      "type": "script",
-      "uri": "com_actionlogs/admin-actionlogs-default-es5.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
     {
       "name": "com_actionlogs.admin-actionlogs",
       "type": "script",
       "uri": "com_actionlogs/admin-actionlogs-default.min.js",
       "dependencies": [
-        "com_actionlogs.admin-actionlogs.es5"
+        "core"
       ],
       "attributes": {
         "type": "module"
diff --git a/build/media_source/com_admin/joomla.asset.json b/build/media_source/com_admin/joomla.asset.json
index d0267f9bccb86..627ed01b2d73f 100644
--- a/build/media_source/com_admin/joomla.asset.json
+++ b/build/media_source/com_admin/joomla.asset.json
@@ -5,24 +5,12 @@
   "description": "Joomla CMS",
   "license": "GPL-2.0-or-later",
   "assets": [
-    {
-    "name": "com_admin.admin-help.es5",
-    "type": "script",
-    "uri": "com_admin/admin-help-es5.min.js",
-    "dependencies": [
-      "core"
-    ],
-    "attributes": {
-      "nomodule": true,
-      "defer": true
-    }
-  },
     {
       "name": "com_admin.admin-help",
       "type": "script",
       "uri": "com_admin/admin-help.min.js",
       "dependencies": [
-        "com_admin.admin-help.es5"
+        "core"
       ],
       "attributes": {
         "type": "module"
diff --git a/build/media_source/com_associations/joomla.asset.json b/build/media_source/com_associations/joomla.asset.json
index e7cee41f3e308..bbf3b05d877c7 100644
--- a/build/media_source/com_associations/joomla.asset.json
+++ b/build/media_source/com_associations/joomla.asset.json
@@ -5,62 +5,26 @@
   "description": "Joomla CMS",
   "license": "GPL-2.0-or-later",
   "assets": [
-    {
-      "name": "com_associations.admin-associations-default.es5",
-      "type": "script",
-      "uri": "com_associations/admin-associations-default-es5.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
     {
       "name": "com_associations.admin-associations-default",
       "type": "script",
       "uri": "com_associations/admin-associations-default.min.js",
-      "dependencies": [
-        "com_associations.admin-associations-default.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_associations.admin-associations-modal.es5",
-      "type": "script",
-      "uri": "com_associations/admin-associations-modal-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type": "module"
       }
     },
     {
       "name": "com_associations.admin-associations-modal",
       "type": "script",
       "uri": "com_associations/admin-associations-modal.min.js",
-      "dependencies": [
-        "com_associations.admin-associations-modal.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_associations.associations-edit.es5",
-      "type": "script",
-      "uri": "com_associations/associations-edit-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type": "module"
       }
     },
     {
@@ -68,7 +32,7 @@
       "type": "script",
       "uri": "com_associations/associations-edit.min.js",
       "dependencies": [
-        "com_associations.associations-edit.es5"
+        "core"
       ],
       "attributes": {
         "type": "module",
diff --git a/build/media_source/com_associations/js/associations-edit.es6.js b/build/media_source/com_associations/js/associations-edit.es6.js
index 4f22d29a7edc2..3f342fbdd5403 100644
--- a/build/media_source/com_associations/js/associations-edit.es6.js
+++ b/build/media_source/com_associations/js/associations-edit.es6.js
@@ -179,7 +179,8 @@ Joomla = window.Joomla || {};
           }
 
           // Call the modal clear button
-          const clear = document.getElementById(`${formControl}_associations_${languageCode}_clear`);
+          let clear = document.getElementById(`${formControl}_associations_${languageCode}_clear`);
+          clear = clear || element.querySelector('[data-button-action="clear"]');
 
           if (clear.onclick) {
             clear.onclick();
diff --git a/build/media_source/com_banners/joomla.asset.json b/build/media_source/com_banners/joomla.asset.json
index e54c5ee313de4..c3826be31200f 100644
--- a/build/media_source/com_banners/joomla.asset.json
+++ b/build/media_source/com_banners/joomla.asset.json
@@ -5,24 +5,12 @@
   "description": "Joomla CMS",
   "license": "GPL-2.0-or-later",
   "assets": [
-    {
-      "name": "com_banners.admin-banner-edit.es5",
-      "type": "script",
-      "uri": "com_banners/admin-banner-edit-es5.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
     {
       "name": "com_banners.admin-banner-edit",
       "type": "script",
       "uri": "com_banners/admin-banner-edit.min.js",
       "dependencies": [
-        "com_banners.admin-banner-edit.es5"
+        "core"
       ],
       "attributes": {
         "type": "module"
diff --git a/build/media_source/com_cache/joomla.asset.json b/build/media_source/com_cache/joomla.asset.json
index fa129e5e984b1..089bd2cc97a6a 100644
--- a/build/media_source/com_cache/joomla.asset.json
+++ b/build/media_source/com_cache/joomla.asset.json
@@ -5,24 +5,12 @@
   "description": "Joomla CMS",
   "license": "GPL-2.0-or-later",
   "assets": [
-    {
-    "name": "com_cache.admin-cache.es5",
-    "type": "script",
-    "uri": "com_cache/admin-cache-default-es5.min.js",
-    "dependencies": [
-      "core"
-    ],
-    "attributes": {
-      "nomodule": true,
-      "defer": true
-    }
-  },
     {
       "name": "com_cache.admin-cache",
       "type": "script",
       "uri": "com_cache/admin-cache-default.min.js",
       "dependencies": [
-        "com_cache.admin-cache.es5"
+        "core"
       ],
       "attributes": {
         "type": "module"
diff --git a/build/media_source/com_categories/joomla.asset.json b/build/media_source/com_categories/joomla.asset.json
index 41e1542d8d37f..4fc2d4b0f2572 100644
--- a/build/media_source/com_categories/joomla.asset.json
+++ b/build/media_source/com_categories/joomla.asset.json
@@ -13,24 +13,12 @@
         "com_categories.shared-categories-accordion#script"
       ]
     },
-    {
-      "name": "com_categories.shared-categories-accordion.es5",
-      "type": "script",
-      "uri": "com_categories/shared-categories-accordion-es5.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
     {
       "name": "com_categories.shared-categories-accordion",
       "type": "script",
       "uri": "com_categories/shared-categories-accordion.min.js",
       "dependencies": [
-        "com_categories.shared-categories-accordion.es5"
+        "core"
       ],
       "attributes": {
         "type": "module"
diff --git a/build/media_source/com_config/joomla.asset.json b/build/media_source/com_config/joomla.asset.json
index 71fb94e5a2901..dfa94f13a4df5 100644
--- a/build/media_source/com_config/joomla.asset.json
+++ b/build/media_source/com_config/joomla.asset.json
@@ -5,85 +5,37 @@
   "description": "Joomla CMS",
   "license": "GPL-2.0-or-later",
   "assets": [
-    {
-      "name": "com_config.config.es5",
-      "type": "script",
-      "uri": "com_config/config-default-es5.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
     {
       "name": "com_config.config",
       "type": "script",
       "uri": "com_config/config-default.min.js",
-      "dependencies": [
-        "com_config.config.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_config.modules.es5",
-      "type": "script",
-      "uri": "com_config/modules-default-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type": "module"
       }
     },
     {
       "name": "com_config.modules",
       "type": "script",
       "uri": "com_config/modules-default.min.js",
-      "dependencies": [
-        "com_config.modules.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_config.templates.es5",
-      "type": "script",
-      "uri": "com_config/templates-default-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type": "module"
       }
     },
     {
       "name": "com_config.templates",
       "type": "script",
       "uri": "com_config/templates-default.min.js",
-      "dependencies": [
-        "com_config.templates.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_config.filters.es5",
-      "type": "script",
-      "uri": "com_config/config-filters-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type": "module"
       }
     },
     {
@@ -91,7 +43,7 @@
       "type": "script",
       "uri": "com_config/config-filters.min.js",
       "dependencies": [
-        "com_config.filters.es5"
+        "core"
       ],
       "attributes": {
         "type": "module"
diff --git a/build/media_source/com_contact/joomla.asset.json b/build/media_source/com_contact/joomla.asset.json
index 441551ba469dd..cd5a1b75354d1 100644
--- a/build/media_source/com_contact/joomla.asset.json
+++ b/build/media_source/com_contact/joomla.asset.json
@@ -5,39 +5,15 @@
   "description": "Joomla CMS",
   "license": "GPL-2.0-or-later",
   "assets": [
-    {
-      "name": "com_contact.admin-contacts-modal.es5",
-      "type": "script",
-      "uri": "com_contact/admin-contacts-modal-es5.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
     {
       "name": "com_contact.admin-contacts-modal",
       "type": "script",
       "uri": "com_contact/admin-contacts-modal.min.js",
-      "dependencies": [
-        "com_contact.admin-contacts-modal.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_contact.contacts-list.es5",
-      "type": "script",
-      "uri": "com_contact/contacts-list-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type": "module"
       }
     },
     {
@@ -45,7 +21,7 @@
       "type": "script",
       "uri": "com_contact/contacts-list.min.js",
       "dependencies": [
-        "com_contact.contacts-list.es5"
+        "core"
       ],
       "attributes": {
         "type": "module"
diff --git a/build/media_source/com_content/joomla.asset.json b/build/media_source/com_content/joomla.asset.json
index 695bcab967809..741f9c58161fa 100644
--- a/build/media_source/com_content/joomla.asset.json
+++ b/build/media_source/com_content/joomla.asset.json
@@ -5,39 +5,15 @@
   "description": "Joomla CMS",
   "license": "GPL-2.0-or-later",
   "assets": [
-    {
-      "name": "com_content.admin-article-pagebreak.es5",
-      "type": "script",
-      "uri": "com_content/admin-article-pagebreak-es5.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
     {
       "name": "com_content.admin-article-pagebreak",
       "type": "script",
       "uri": "com_content/admin-article-pagebreak.min.js",
-      "dependencies": [
-        "com_content.admin-article-pagebreak.es5"
-      ],
-      "attributes": {
-        "type": "module",
-        "defer": true
-      }
-    },
-    {
-      "name": "com_content.admin-article-readmore.es5",
-      "type": "script",
-      "uri": "com_content/admin-article-readmore-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
+        "type": "module",
         "defer": true
       }
     },
@@ -45,138 +21,68 @@
       "name": "com_content.admin-article-readmore",
       "type": "script",
       "uri": "com_content/admin-article-readmore.min.js",
-      "dependencies": [
-        "com_content.admin-article-readmore.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_content.admin-articles-batch.es5",
-      "type": "script",
-      "uri": "com_content/admin-articles-default-batch-footer-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type": "module"
       }
     },
     {
       "name": "com_content.admin-articles-batch",
       "type": "script",
       "uri": "com_content/admin-articles-default-batch-footer.min.js",
-      "dependencies": [
-        "com_content.admin-articles-batch.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_content.admin-articles-stage.es5",
-      "type": "script",
-      "uri": "com_content/admin-articles-default-stage-footer-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type": "module"
       }
     },
     {
       "name": "com_content.admin-articles-stage",
       "type": "script",
       "uri": "com_content/admin-articles-default-stage-footer.min.js",
-      "dependencies": [
-        "com_content.admin-articles-stage.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_content.admin-articles-modal.es5",
-      "type": "script",
-      "uri": "com_content/admin-articles-modal-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type": "module"
       }
     },
     {
       "name": "com_content.admin-articles-modal",
       "type": "script",
       "uri": "com_content/admin-articles-modal.min.js",
-      "dependencies": [
-        "com_content.admin-articles-modal.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_content.form-edit.es5",
-      "type": "script",
-      "uri": "com_content/form-edit-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
+        "type": "module"
+      },
+      "deprecated": true,
+      "deprecatedMsg": "Use postMessage() directly or with help of [modal-content-select] asset. To post the modal selection."
     },
     {
       "name": "com_content.form-edit",
       "type": "script",
       "uri": "com_content/form-edit.min.js",
-      "dependencies": [
-        "com_content.form-edit.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_content.articles-list.es5",
-      "type": "script",
-      "uri": "com_content/articles-list-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type": "module"
       }
     },
     {
       "name": "com_content.articles-list",
       "type": "script",
       "uri": "com_content/articles-list.min.js",
-      "dependencies": [
-        "com_content.articles-list.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_content.articles-status.es5",
-      "type": "script",
-      "uri": "com_content/articles-status-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type": "module"
       }
     },
     {
@@ -184,7 +90,7 @@
       "type": "script",
       "uri": "com_content/articles-status.min.js",
       "dependencies": [
-        "com_content.articles-status.es5"
+        "core"
       ],
       "attributes": {
         "type": "module"
diff --git a/build/media_source/com_content/js/admin-article-readmore.es6.js b/build/media_source/com_content/js/admin-article-readmore.es6.js
index 02e0aa9d2d02b..aa1fdcb1aecce 100644
--- a/build/media_source/com_content/js/admin-article-readmore.es6.js
+++ b/build/media_source/com_content/js/admin-article-readmore.es6.js
@@ -2,29 +2,33 @@
  * @copyright  (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
-(() => {
-  'use strict';
 
-  const options = window.Joomla.getOptions('xtd-readmore');
+// eslint-disable-next-line import/no-unresolved
+import { JoomlaEditor, JoomlaEditorButton } from 'editor-api';
+// eslint-disable-next-line import/no-unresolved
+import JoomlaDialog from 'joomla.dialog';
 
-  window.insertReadmore = (editor) => {
-    if (!options) {
-      // Something went wrong!
-      throw new Error('XTD Button \'read more\' not properly initialized');
-    }
+const insertReadmoreHandler = (editor) => {
+  const content = editor.getValue();
 
-    const content = window.Joomla.editors.instances[editor].getValue();
+  if (!content) {
+    editor.replaceSelection('<hr id="system-readmore">');
+  } else if (content && !content.match(/<hr\s+id=("|')system-readmore("|')\s*\/*>/i)) {
+    editor.replaceSelection('<hr id="system-readmore">');
+  } else {
+    JoomlaDialog.alert(Joomla.Text._('PLG_READMORE_ALREADY_EXISTS'));
+  }
+};
 
-    if (!content) {
-      Joomla.editors.instances[editor].replaceSelection('<hr id="system-readmore">');
-    } else if (content && !content.match(/<hr\s+id=("|')system-readmore("|')\s*\/*>/i)) {
-      Joomla.editors.instances[editor].replaceSelection('<hr id="system-readmore">');
-    } else {
-      Joomla.renderMessages({
-        error: [options.exists],
-      });
-      return false;
-    }
-    return true;
-  };
-})();
+// @TODO: Remove in Joomla 6
+window.insertReadmore = () => {
+  // eslint-disable-next-line no-console
+  console.warn('Method window.insertReadmore() is deprecated, use button action "insert-readmore."');
+  const editor = JoomlaEditor.getActive();
+  if (!editor) {
+    throw new Error('An active editor are not available');
+  }
+  insertReadmoreHandler(editor);
+};
+
+JoomlaEditorButton.registerAction('insert-readmore', insertReadmoreHandler);
diff --git a/build/media_source/com_content/js/admin-articles-modal.es6.js b/build/media_source/com_content/js/admin-articles-modal.es6.js
index 33ffaa65db5d9..579d5f759e73e 100644
--- a/build/media_source/com_content/js/admin-articles-modal.es6.js
+++ b/build/media_source/com_content/js/admin-articles-modal.es6.js
@@ -5,6 +5,11 @@
 (() => {
   'use strict';
 
+  // Use a JoomlaExpectingPostMessage flag to be able to distinct legacy methods
+  if (window.parent.JoomlaExpectingPostMessage) {
+    return;
+  }
+
   /**
     * Javascript to insert the link
     * View element calls jSelectArticle when an article is clicked
@@ -12,17 +17,18 @@
     * and closes the select frame.
     * */
   window.jSelectArticle = (id, title, catid, object, link, lang) => {
+    // eslint-disable-next-line no-console
+    console.warn('Method jSelectArticle() is deprecated. Use postMessage() instead.');
+
     if (!Joomla.getOptions('xtd-articles')) {
-      if (window.parent.Joomla.Modal) {
-        window.parent.Joomla.Modal.getCurrent().close();
-      }
+      return;
     }
 
     const { editor } = Joomla.getOptions('xtd-articles');
     const tag = `<a href="${link}"${lang !== '' ? ` hreflang="${lang}"` : ''}>${title}</a>`;
     window.parent.Joomla.editors.instances[editor].replaceSelection(tag);
 
-    if (window.parent.Joomla.Modal) {
+    if (window.parent.Joomla.Modal && window.parent.Joomla.Modal.getCurrent()) {
       window.parent.Joomla.Modal.getCurrent().close();
     }
   };
@@ -34,15 +40,15 @@
       const { target } = event;
       const functionName = target.getAttribute('data-function');
 
-      if (functionName === 'jSelectArticle') {
+      if (functionName === 'jSelectArticle' && window[functionName]) {
         // Used in xtd_contacts
         window[functionName](target.getAttribute('data-id'), target.getAttribute('data-title'), target.getAttribute('data-cat-id'), null, target.getAttribute('data-uri'), target.getAttribute('data-language'));
-      } else {
+      } else if (window.parent[functionName]) {
         // Used in com_menus
         window.parent[functionName](target.getAttribute('data-id'), target.getAttribute('data-title'), target.getAttribute('data-cat-id'), null, target.getAttribute('data-uri'), target.getAttribute('data-language'));
       }
 
-      if (window.parent.Joomla.Modal) {
+      if (window.parent.Joomla.Modal && window.parent.Joomla.Modal.getCurrent()) {
         window.parent.Joomla.Modal.getCurrent().close();
       }
     });
diff --git a/build/media_source/com_contenthistory/joomla.asset.json b/build/media_source/com_contenthistory/joomla.asset.json
index 0bf31646f9416..db18948043168 100644
--- a/build/media_source/com_contenthistory/joomla.asset.json
+++ b/build/media_source/com_contenthistory/joomla.asset.json
@@ -5,63 +5,26 @@
   "description": "Joomla CMS",
   "license": "GPL-2.0-or-later",
   "assets": [
-    {
-      "name": "com_contenthistory.admin-compare-compare.es5",
-      "type": "script",
-      "uri": "com_contenthistory/admin-compare-compare-es5.min.js",
-      "dependencies": [
-        "core",
-        "diff"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
     {
       "name": "com_contenthistory.admin-compare-compare",
       "type": "script",
       "uri": "com_contenthistory/admin-compare-compare.min.js",
-      "dependencies": [
-        "com_contenthistory.admin-compare-compare.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_contenthistory.admin-history-modal.es5",
-      "type": "script",
-      "uri": "com_contenthistory/admin-history-modal-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type": "module"
       }
     },
     {
       "name": "com_contenthistory.admin-history-modal",
       "type": "script",
       "uri": "com_contenthistory/admin-history-modal.min.js",
-      "dependencies": [
-        "com_contenthistory.admin-history-modal.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_contenthistory.admin-history-versions.es5",
-      "type": "script",
-      "uri": "com_contenthistory/admin-history-versions-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type": "module"
       }
     },
     {
@@ -69,7 +32,7 @@
       "type": "script",
       "uri": "com_contenthistory/admin-history-versions.min.js",
       "dependencies": [
-        "com_contenthistory.admin-history-versions.es5"
+        "core"
       ],
       "attributes": {
         "type": "module"
diff --git a/build/media_source/com_cpanel/joomla.asset.json b/build/media_source/com_cpanel/joomla.asset.json
index 3612ec951f3bd..9dee0564003fa 100644
--- a/build/media_source/com_cpanel/joomla.asset.json
+++ b/build/media_source/com_cpanel/joomla.asset.json
@@ -5,62 +5,26 @@
   "description": "Joomla CMS",
   "license": "GPL-2.0-or-later",
   "assets": [
-    {
-      "name": "com_cpanel.admin-addmodule.es5",
-      "type": "script",
-      "uri": "com_cpanel/admin-add_module-es5.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
     {
       "name": "com_cpanel.admin-addmodule",
       "type": "script",
       "uri": "com_cpanel/admin-add_module.min.js",
-      "dependencies": [
-        "com_cpanel.admin-addmodule.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_cpanel.admin-cpanel.es5",
-      "type": "script",
-      "uri": "com_cpanel/admin-cpanel-default-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type": "module"
       }
     },
     {
       "name": "com_cpanel.admin-cpanel",
       "type": "script",
       "uri": "com_cpanel/admin-cpanel-default.min.js",
-      "dependencies": [
-        "com_cpanel.admin-cpanel.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_cpanel.admin-system-loader.es5",
-      "type": "script",
-      "uri": "com_cpanel/admin-system-loader-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type": "module"
       }
     },
     {
@@ -68,7 +32,7 @@
       "type": "script",
       "uri": "com_cpanel/admin-system-loader.min.js",
       "dependencies": [
-        "com_cpanel.admin-system-loader.es5"
+        "core"
       ],
       "attributes": {
         "type": "module",
diff --git a/build/media_source/com_fields/joomla.asset.json b/build/media_source/com_fields/joomla.asset.json
index 8fbfac96324b8..5797bcaaba3b0 100644
--- a/build/media_source/com_fields/joomla.asset.json
+++ b/build/media_source/com_fields/joomla.asset.json
@@ -5,108 +5,48 @@
   "description": "Joomla CMS",
   "license": "GPL-2.0-or-later",
   "assets": [
-    {
-      "name": "com_fields.admin-field-changecontext.es5",
-      "type": "script",
-      "uri": "com_fields/admin-field-changecontext-es5.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
     {
       "name": "com_fields.admin-field-changecontext",
       "type": "script",
       "uri": "com_fields/admin-field-changecontext.min.js",
-      "dependencies": [
-        "com_fields.admin-field-changecontext.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_fields.admin-field-edit.es5",
-      "type": "script",
-      "uri": "com_fields/admin-field-edit-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type": "module"
       }
     },
     {
       "name": "com_fields.admin-field-edit",
       "type": "script",
       "uri": "com_fields/admin-field-edit.min.js",
-      "dependencies": [
-        "com_fields.admin-field-edit.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_fields.admin-field-typehaschanged.es5",
-      "type": "script",
-      "uri": "com_fields/admin-field-typehaschanged-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type": "module"
       }
     },
     {
       "name": "com_fields.admin-field-typehaschanged",
       "type": "script",
       "uri": "com_fields/admin-field-typehaschanged.min.js",
-      "dependencies": [
-        "com_fields.admin-field-typehaschanged.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_fields.admin-fields-batch.es5",
-      "type": "script",
-      "uri": "com_fields/admin-fields-default-batch-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type": "module"
       }
     },
     {
       "name": "com_fields.admin-fields-batch",
       "type": "script",
       "uri": "com_fields/admin-fields-default-batch.min.js",
-      "dependencies": [
-        "com_fields.admin-fields-batch.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_fields.admin-fields-modal.es5",
-      "type": "script",
-      "uri": "com_fields/admin-fields-modal-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type": "module"
       }
     },
     {
@@ -114,11 +54,13 @@
       "type": "script",
       "uri": "com_fields/admin-fields-modal.min.js",
       "dependencies": [
-        "com_fields.admin-fields-modal.es5"
+        "core"
       ],
       "attributes": {
         "type": "module"
-      }
+      },
+      "deprecated": true,
+      "deprecatedMsg": "Use postMessage() directly or with help of [modal-content-select] asset. To post the modal selection."
     }
   ]
 }
diff --git a/build/media_source/com_fields/js/admin-fields-modal.es6.js b/build/media_source/com_fields/js/admin-fields-modal.es6.js
index a1e8ed6f0bfb2..afba52f29555a 100644
--- a/build/media_source/com_fields/js/admin-fields-modal.es6.js
+++ b/build/media_source/com_fields/js/admin-fields-modal.es6.js
@@ -14,6 +14,13 @@
   }
 
   Joomla.fieldIns = (id, editor) => {
+    // Use a JoomlaExpectingPostMessage flag to be able to distinct legacy methods
+    if (window.parent.JoomlaExpectingPostMessage) {
+      return;
+    }
+    // eslint-disable-next-line no-console
+    console.warn('Method Joomla.fieldIns() is deprecated. Use postMessage() instead.');
+
     window.parent.Joomla.editors.instances[editor].replaceSelection(`{field ${id}}`);
 
     if (window.parent.Joomla.Modal) {
@@ -22,6 +29,13 @@
   };
 
   Joomla.fieldgroupIns = (id, editor) => {
+    // Use a JoomlaExpectingPostMessage flag to be able to distinct legacy methods
+    if (window.parent.JoomlaExpectingPostMessage) {
+      return;
+    }
+    // eslint-disable-next-line no-console
+    console.warn('Method Joomla.fieldgroupIns() is deprecated. Use postMessage() instead.');
+
     window.parent.Joomla.editors.instances[editor].replaceSelection(`{fieldgroup ${id}}`);
 
     if (window.parent.Joomla.Modal) {
diff --git a/build/media_source/com_finder/joomla.asset.json b/build/media_source/com_finder/joomla.asset.json
index 8d562f35ec7d3..89c119a19b0c1 100644
--- a/build/media_source/com_finder/joomla.asset.json
+++ b/build/media_source/com_finder/joomla.asset.json
@@ -11,15 +11,14 @@
       "uri": "com_finder/dates.min.css"
     },
     {
-      "name": "com_finder.filters.es5",
+      "name": "com_finder.debug",
       "type": "script",
-      "uri": "com_finder/filters-es5.min.js",
+      "uri": "com_finder/debug.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type": "module"
       }
     },
     {
@@ -27,7 +26,7 @@
       "type": "script",
       "uri": "com_finder/filters.min.js",
       "dependencies": [
-        "com_finder.filters.es5"
+        "core"
       ],
       "attributes": {
         "type": "module"
@@ -38,39 +37,15 @@
       "type": "style",
       "uri": "com_finder/finder.min.css"
     },
-    {
-      "name": "com_finder.finder.es5",
-      "type": "script",
-      "uri": "com_finder/finder-es5.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
     {
       "name": "com_finder.finder",
       "type": "script",
       "uri": "com_finder/finder.min.js",
-      "dependencies": [
-        "com_finder.finder.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_finder.finder-edit.es5",
-      "type": "script",
-      "uri": "com_finder/finder-edit-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type": "module"
       }
     },
     {
@@ -78,7 +53,7 @@
       "type": "script",
       "uri": "com_finder/finder-edit.min.js",
       "dependencies": [
-        "com_finder.finder-edit.es5"
+        "core"
       ],
       "attributes": {
         "type": "module"
@@ -89,39 +64,15 @@
       "type": "style",
       "uri": "com_finder/indexer.min.css"
     },
-    {
-      "name": "com_finder.indexer.es5",
-      "type": "script",
-      "uri": "com_finder/indexer-es5.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
     {
       "name": "com_finder.indexer",
       "type": "script",
       "uri": "com_finder/indexer.min.js",
-      "dependencies": [
-        "com_finder.indexer.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_finder.maps.es5",
-      "type": "script",
-      "uri": "com_finder/maps-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type": "module"
       }
     },
     {
@@ -129,7 +80,7 @@
       "type": "script",
       "uri": "com_finder/maps.min.js",
       "dependencies": [
-        "com_finder.maps.es5"
+        "core"
       ],
       "attributes": {
         "type": "module"
diff --git a/build/media_source/com_finder/js/debug.es6.js b/build/media_source/com_finder/js/debug.es6.js
new file mode 100644
index 0000000000000..274ba59c49d34
--- /dev/null
+++ b/build/media_source/com_finder/js/debug.es6.js
@@ -0,0 +1,46 @@
+/**
+ * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// eslint-disable no-alert
+((Joomla, document) => {
+  'use strict';
+
+  if (!Joomla) {
+    throw new Error('core.js was not properly initialised');
+  }
+
+  Joomla.finderIndexer = () => {
+    const path = 'index.php?option=com_finder&task=indexer.debug&tmpl=component&format=json';
+    const token = `&${document.getElementById('finder-indexer-token').getAttribute('name')}=1`;
+
+    Joomla.debugIndexing = () => {
+      const formEls = new URLSearchParams(Array.from(new FormData(document.getElementById('debug-form')))).toString();
+      Joomla.request({
+        url: `${path}${token}&${formEls}`,
+        method: 'GET',
+        data: '',
+        perform: true,
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+        onSuccess: (response) => {
+          const output = document.getElementById('indexer-output');
+          try {
+            const parsed = JSON.parse(response);
+            output.innerHTML = parsed.rendered;
+          } catch (e) {
+            output.innerHTML = response;
+          }
+        },
+        onError: (xhr) => {
+          const output = document.getElementById('indexer-output');
+          output.innerHTML = xhr.response;
+        },
+      });
+    };
+  };
+})(Joomla, document);
+
+// @todo use directly the Joomla.finderIndexer() instead of the Indexer()!!!
+document.addEventListener('DOMContentLoaded', () => {
+  window.Indexer = Joomla.finderIndexer();
+});
diff --git a/build/media_source/com_installer/css/installer.css b/build/media_source/com_installer/css/installer.css
index 39b41b3268717..0b2132474d43a 100644
--- a/build/media_source/com_installer/css/installer.css
+++ b/build/media_source/com_installer/css/installer.css
@@ -14,7 +14,7 @@
 }
 
 #dragarea {
-  background-color: #fafbfc;
+  background-color: var(--body-bg);
   border: 1px dashed #999;
   box-sizing: border-box;
   padding: 5% 0;
diff --git a/build/media_source/com_installer/joomla.asset.json b/build/media_source/com_installer/joomla.asset.json
index a54d6728a0eab..11bc62d387616 100644
--- a/build/media_source/com_installer/joomla.asset.json
+++ b/build/media_source/com_installer/joomla.asset.json
@@ -5,24 +5,12 @@
   "description": "Joomla CMS",
   "license": "GPL-2.0-or-later",
   "assets": [
-    {
-      "name": "com_installer.changelog.es5",
-      "type": "script",
-      "uri": "com_installer/changelog-es5.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
     {
       "name": "com_installer.changelog",
       "type": "script",
       "uri": "com_installer/changelog.min.js",
       "dependencies": [
-        "com_installer.changelog.es5"
+        "core"
       ],
       "attributes": {
         "type": "module"
@@ -33,24 +21,12 @@
       "type": "style",
       "uri": "com_installer/installer.min.css"
     },
-    {
-      "name": "com_installer.installer.es5",
-      "type": "script",
-      "uri": "com_installer/installer-es5.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
     {
       "name": "com_installer.installer",
       "type": "script",
       "uri": "com_installer/installer.min.js",
       "dependencies": [
-        "com_installer.installer.es5"
+        "core"
       ],
       "attributes": {
         "type": "module"
diff --git a/build/media_source/com_joomlaupdate/joomla.asset.json b/build/media_source/com_joomlaupdate/joomla.asset.json
index 295cce677ed08..c171c1a422325 100644
--- a/build/media_source/com_joomlaupdate/joomla.asset.json
+++ b/build/media_source/com_joomlaupdate/joomla.asset.json
@@ -5,48 +5,24 @@
   "description": "Joomla CMS",
   "license": "GPL-2.0-or-later",
   "assets": [
-    {
-      "name": "com_joomlaupdate.admin-update-es5",
-      "type": "script",
-      "uri": "com_joomlaupdate/admin-update-default-es5.min.js",
-      "dependencies": [
-        "core",
-        "bootstrap.modal"
-      ],
-      "attributes": {
-        "defer": true,
-        "nomodule": true
-      }
-    },
     {
       "name": "com_joomlaupdate.admin-update",
       "type": "script",
       "uri": "com_joomlaupdate/admin-update-default.min.js",
       "dependencies": [
-        "com_joomlaupdate.admin-update-es5"
+        "core",
+        "bootstrap.modal"
       ],
       "attributes": {
         "type": "module"
       }
     },
-    {
-      "name": "com_joomlaupdate.default-es5",
-      "type": "script",
-      "uri": "com_joomlaupdate/default-es5.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "defer": true,
-        "nomodule": true
-      }
-    },
     {
       "name": "com_joomlaupdate.default",
       "type": "script",
       "uri": "com_joomlaupdate/default.min.js",
       "dependencies": [
-        "com_joomlaupdate.default-es5"
+        "core"
       ],
       "attributes": {
         "type": "module"
diff --git a/build/media_source/com_joomlaupdate/js/admin-update-default.es6.js b/build/media_source/com_joomlaupdate/js/admin-update-default.es6.js
index ebf02cb9a9e47..076c14369c86c 100644
--- a/build/media_source/com_joomlaupdate/js/admin-update-default.es6.js
+++ b/build/media_source/com_joomlaupdate/js/admin-update-default.es6.js
@@ -61,7 +61,7 @@ Joomla.Update = window.Joomla.Update || {
 
     document.getElementById('extbytesin').innerText = Joomla.Update.formatBytes(Joomla.Update.stat_inbytes);
     document.getElementById('extbytesout').innerText = Joomla.Update.formatBytes(Joomla.Update.stat_outbytes);
-    document.getElementById('extfiles').innerText = Joomla.Update.stat_files;
+    document.getElementById('extfiles').innerText = Joomla.Update.formatFiles(Joomla.Update.stat_files);
 
     const postData = new FormData();
     postData.append('task', 'startExtract');
@@ -95,40 +95,36 @@ Joomla.Update = window.Joomla.Update || {
     }
 
     const progressDiv = document.getElementById('progress-bar');
-    const titleDiv = document.getElementById('update-title');
 
     // Add data to variables
     Joomla.Update.stat_inbytes = data.bytesIn;
     Joomla.Update.stat_percent = data.percent;
     Joomla.Update.stat_percent = Joomla.Update.stat_percent
-      || (100 * (Joomla.Update.stat_inbytes / Joomla.Update.totalsize));
+      || (80 * (Joomla.Update.stat_inbytes / Joomla.Update.totalsize));
 
     // Update GUI
     Joomla.Update.stat_outbytes = data.bytesOut;
     Joomla.Update.stat_files = data.files;
 
-    if (Joomla.Update.stat_percent < 100) {
+    if (Joomla.Update.stat_percent < 80) {
       progressDiv.classList.remove('bg-success');
       progressDiv.style.width = `${Joomla.Update.stat_percent}%`;
       progressDiv.setAttribute('aria-valuenow', Joomla.Update.stat_percent);
-    } else if (Joomla.Update.stat_percent >= 100) {
-      progressDiv.classList.add('bg-success');
-      progressDiv.style.width = '100%';
-      progressDiv.setAttribute('aria-valuenow', 100);
+    } else if (Joomla.Update.stat_percent >= 80) {
+      progressDiv.style.width = '80%';
+      progressDiv.setAttribute('aria-valuenow', 80);
     }
 
     progressDiv.innerText = `${Joomla.Update.stat_percent.toFixed(1)}%`;
 
     document.getElementById('extbytesin').innerText = Joomla.Update.formatBytes(Joomla.Update.stat_inbytes);
     document.getElementById('extbytesout').innerText = Joomla.Update.formatBytes(Joomla.Update.stat_outbytes);
-    document.getElementById('extfiles').innerText = Joomla.Update.stat_files;
+    document.getElementById('extfiles').innerText = Joomla.Update.formatFiles(Joomla.Update.stat_files);
 
     // Are we done extracting?
     if (data.done) {
-      progressDiv.classList.add('bg-success');
-      progressDiv.style.width = '100%';
-      progressDiv.setAttribute('aria-valuenow', 100);
-      titleDiv.innerHTML = Joomla.Text._('COM_JOOMLAUPDATE_UPDATING_COMPLETE');
+      progressDiv.style.width = '80%';
+      progressDiv.setAttribute('aria-valuenow', 80);
 
       Joomla.Update.finalizeUpdate();
 
@@ -177,7 +173,19 @@ Joomla.Update = window.Joomla.Update || {
       method: 'POST',
       perform: true,
       onSuccess: () => {
-        window.location = Joomla.Update.return_url;
+        const progressDiv = document.getElementById('progress-bar');
+        const titleDiv = document.getElementById('update-title');
+
+        progressDiv.classList.add('bg-success');
+        progressDiv.style.width = '100%';
+        progressDiv.innerText = '100%';
+        progressDiv.setAttribute('aria-valuenow', 100);
+        titleDiv.innerText = Joomla.Text._('COM_JOOMLAUPDATE_UPDATING_COMPLETE');
+
+        // Allow people to see the completion message
+        window.setTimeout(() => {
+          window.location = Joomla.Update.return_url;
+        }, 1000);
       },
       onError: Joomla.Update.handleErrorResponse,
     });
@@ -203,6 +211,7 @@ Joomla.Update = window.Joomla.Update || {
 
     return `${parseFloat((bytes / (k ** i)).toFixed(dm))} ${sizes[i]}`;
   },
+  formatFiles: (files) => `${files} ${Joomla.Text._('COM_JOOMLAUPDATE_VIEW_UPDATE_ITEMS')}`,
   resumeButtonHandler: (e) => {
     e.preventDefault();
 
diff --git a/build/media_source/com_languages/joomla.asset.json b/build/media_source/com_languages/joomla.asset.json
index 988a1ef0f98f8..cf7586cd3ccc8 100644
--- a/build/media_source/com_languages/joomla.asset.json
+++ b/build/media_source/com_languages/joomla.asset.json
@@ -5,39 +5,15 @@
   "description": "Joomla CMS",
   "license": "GPL-2.0-or-later",
   "assets": [
-    {
-      "name": "com_languages.admin-language-edit-change-flag.es5",
-      "type": "script",
-      "uri": "com_languages/admin-language-edit-change-flag-es5.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
     {
       "name": "com_languages.admin-language-edit-change-flag",
       "type": "script",
       "uri": "com_languages/admin-language-edit-change-flag.min.js",
-      "dependencies": [
-        "com_languages.admin-language-edit-change-flag.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_languages.admin-override-edit-refresh-searchstring.es5",
-      "type": "script",
-      "uri": "com_languages/admin-override-edit-refresh-searchstring-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type": "module"
       }
     },
     {
@@ -45,7 +21,7 @@
       "type": "script",
       "uri": "com_languages/admin-override-edit-refresh-searchstring.min.js",
       "dependencies": [
-        "com_languages.admin-override-edit-refresh-searchstring.es5"
+        "core"
       ],
       "attributes": {
         "type": "module"
@@ -56,24 +32,12 @@
       "type": "style",
       "uri": "com_languages/overrider.min.css"
     },
-    {
-      "name": "com_languages.overrider.es5",
-      "type": "script",
-      "uri": "com_languages/overrider-es5.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
     {
       "name": "com_languages.overrider",
       "type": "script",
       "uri": "com_languages/overrider.min.js",
       "dependencies": [
-        "com_languages.overrider.es5"
+        "core"
       ],
       "attributes": {
         "type": "module"
diff --git a/build/media_source/com_mails/joomla.asset.json b/build/media_source/com_mails/joomla.asset.json
index ce28d3cdfee6b..872114528af2b 100644
--- a/build/media_source/com_mails/joomla.asset.json
+++ b/build/media_source/com_mails/joomla.asset.json
@@ -5,24 +5,12 @@
   "description": "Joomla CMS",
   "license": "GPL-2.0-or-later",
   "assets": [
-    {
-      "name": "com_mails.admin-email-template-edit.es5",
-      "type": "script",
-      "uri": "com_mails/admin-email-template-edit-es5.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
     {
       "name": "com_mails.admin-email-template-edit",
       "type": "script",
       "uri": "com_mails/admin-email-template-edit.min.js",
       "dependencies": [
-        "com_mails.admin-email-template-edit.es5"
+        "core"
       ],
       "attributes": {
         "type": "module"
diff --git a/build/media_source/com_media/joomla.asset.json b/build/media_source/com_media/joomla.asset.json
index 01250542846a1..b540e406aee0e 100644
--- a/build/media_source/com_media/joomla.asset.json
+++ b/build/media_source/com_media/joomla.asset.json
@@ -5,24 +5,12 @@
   "description": "Joomla CMS",
   "license": "GPL-2.0-or-later",
   "assets": [
-    {
-      "name": "com_media.edit-images.es5",
-      "type": "script",
-      "uri": "com_media/edit-images-es5.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
     {
       "name": "com_media.edit-images",
       "type": "script",
       "uri": "com_media/edit-images.min.js",
       "dependencies": [
-        "com_media.edit-images.es5"
+        "core"
       ],
       "attributes": {
         "type": "module"
@@ -33,24 +21,12 @@
       "type": "style",
       "uri": "com_media/media-manager.min.css"
     },
-    {
-      "name": "com_media.mediamanager.es5",
-      "type": "script",
-      "uri": "com_media/media-manager-es5.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
     {
       "name": "com_media.mediamanager",
       "type": "script",
       "uri": "com_media/media-manager.min.js",
       "dependencies": [
-        "com_media.mediamanager.es5"
+        "core", "messages"
       ],
       "attributes": {
         "type": "module"
diff --git a/build/media_source/com_media/scss/_variables.scss b/build/media_source/com_media/scss/_variables.scss
index d0014a9c249f2..5b2330efde965 100644
--- a/build/media_source/com_media/scss/_variables.scss
+++ b/build/media_source/com_media/scss/_variables.scss
@@ -11,7 +11,7 @@ $col-gutter-width:                  $gutter-width;
 $col-box-shadow:                    0 2px 10px -8px var(--template-bg-dark-50);
 
 // Sidebar
-$sidebar-drive-bg:                  #fff;
+$sidebar-drive-bg:                  var(--media-manager-content-bg, #fff);
 $sidebar-tree-line-color:           $border-color;
 $sidebar-tree-icon-color:           #aaa;
 $sidebar-tree-line-height:          26px;
@@ -21,7 +21,7 @@ $sidebar-active-icon-color:         $highlight-color;
 
 // Toolbar
 $toolbar-height:                    46px;
-$toolbar-bg:                        #fff;
+$toolbar-bg:                        var(--media-manager-content-bg, #fff);
 $toolbar-icon-width:                50px;
 $toolbar-icon-color:                lighten(#2a69b8,30%);
 $toolbar-icon-bg-hover:             #f0f0f0;
@@ -30,7 +30,7 @@ $toolbar-loader-height:             2px;
 
 // Breadcrumbs
 $breadcrumbs-bg:                    var(--template-bg-dark-3);
-$breadcrumbs-current-bg:            #fff;
+$breadcrumbs-current-bg:            var(--media-manager-content-bg, #fff);
 
 // Media Browser Grid
 $grid-gutter-width:                 $col-gutter-width;
@@ -59,9 +59,10 @@ $table-item-icon-bg-selected:       #006898;
 $table-item-bg-hover:               rgba(0, 0, 0, .03);
 
 // Media Info bar
-$info-bg:                           var(--template-bg-dark-3);
-$info-title-bg:                     var(--template-bg-dark-5);
+$info-bg:                           var(--media-manager-overlay-bg, var(--template-bg-dark-3));
+$info-title-bg:                     var(--media-manager-overlay-header-bg, var(--template-bg-dark-5));
 $info-dt-width:                     33.33333%;
+$info-dt-color:                     var(--media-manager-infobar-dt-color, rgba(0, 0, 0, .54));
 $info-dd-width:                     66.66667%;
 $info-close-color:                  var(--template-bg-dark-60);
 $info-close-color-hover:            var(--template-bg-dark-40);
diff --git a/build/media_source/com_media/scss/components/_layout.scss b/build/media_source/com_media/scss/components/_layout.scss
index 1f4e6c41514cf..af86c18aa9a2c 100644
--- a/build/media_source/com_media/scss/components/_layout.scss
+++ b/build/media_source/com_media/scss/components/_layout.scss
@@ -3,7 +3,7 @@
   display: flex;
   flex-wrap: wrap;
   margin-top: 1rem;
-  background-color: #fff;
+  background-color: var(--media-manager-content-bg, #fff);
   border-radius: $border-radius;
   box-shadow: $col-box-shadow;
 
diff --git a/build/media_source/com_media/scss/components/_media-browser.scss b/build/media_source/com_media/scss/components/_media-browser.scss
index 25577a3f3a8fd..ea48de5d9d710 100644
--- a/build/media_source/com_media/scss/components/_media-browser.scss
+++ b/build/media_source/com_media/scss/components/_media-browser.scss
@@ -88,7 +88,7 @@
     left: 0;
     width: calc(#{$grid-item-icon-size} * 1.3);
     height: calc(#{$grid-item-icon-size} * 1.3);
-    font-family: "Font Awesome 5 Free";
+    font-family: "Font Awesome 6 Free";
     font-size: $grid-item-icon-size;
     font-weight: 900;
     line-height: calc(#{$grid-item-icon-size} * 1.3);
@@ -127,7 +127,7 @@
     z-index: 1;
     width: max-content;
     min-width: 100%;
-    background-color: var(--template-bg-dark-3);
+    background-color: var(--media-manager-overlay-bg, var(--template-bg-dark-3));
     border: 1px solid hsl(var(--hue), 35%, 95%);
     border-radius: .25rem;
     box-shadow: 0 2px 10px -8px var(--template-bg-dark-50);
@@ -354,7 +354,7 @@
       transition: all .2s cubic-bezier(.4, 0, .2, 1);
     }
     &::before {
-      font-family: "Font Awesome 5 Free";
+      font-family: "Font Awesome 6 Free";
       color: $table-item-icon-color;
       .selected & {
         color: $table-item-icon-color-selected;
diff --git a/build/media_source/com_media/scss/components/_media-infobar.scss b/build/media_source/com_media/scss/components/_media-infobar.scss
index 65eebfda4d3aa..92195990b677e 100644
--- a/build/media_source/com_media/scss/components/_media-infobar.scss
+++ b/build/media_source/com_media/scss/components/_media-infobar.scss
@@ -43,7 +43,7 @@ $fa-css-prefix:    fa;
   }
   dt {
     font-weight: normal;
-    color: rgba(0, 0, 0, .54);
+    color: $info-dt-color;
   }
 }
 
diff --git a/build/media_source/com_menus/joomla.asset.json b/build/media_source/com_menus/joomla.asset.json
index 9ec5613e05ee0..d9af26dcc1424 100644
--- a/build/media_source/com_menus/joomla.asset.json
+++ b/build/media_source/com_menus/joomla.asset.json
@@ -5,24 +5,12 @@
   "description": "Joomla CMS",
   "license": "GPL-2.0-or-later",
   "assets": [
-    {
-      "name": "com_menus.admin-item-edit.es5",
-      "type": "script",
-      "uri": "com_menus/admin-item-edit-es5.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
     {
       "name": "com_menus.admin-item-edit",
       "type": "script",
       "uri": "com_menus/admin-item-edit.min.js",
       "dependencies": [
-        "com_menus.admin-item-edit.es5"
+        "core"
       ],
       "attributes": {
         "type": "module"
@@ -33,131 +21,59 @@
       "type": "style",
       "uri": "com_menus/admin-item-edit_container.min.css"
     },
-    {
-      "name": "com_menus.admin-item-edit-container.es5",
-      "type": "script",
-      "uri": "com_menus/admin-item-edit_container-es5.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
     {
       "name": "com_menus.admin-item-edit-container",
       "type": "script",
       "uri": "com_menus/admin-item-edit_container.min.js",
-      "dependencies": [
-        "com_menus.admin-item-edit-container.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_menus.admin-item-edit-modules.es5",
-      "type": "script",
-      "uri": "com_menus/admin-item-edit_modules-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type": "module"
       }
     },
     {
       "name": "com_menus.admin-item-edit-modules",
       "type": "script",
       "uri": "com_menus/admin-item-edit_modules.min.js",
-      "dependencies": [
-        "com_menus.admin-item-edit-modules.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_menus.admin-item-modal.es5",
-      "type": "script",
-      "uri": "com_menus/admin-item-modal-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type": "module"
       }
     },
     {
       "name": "com_menus.admin-item-modal",
       "type": "script",
       "uri": "com_menus/admin-item-modal.min.js",
-      "dependencies": [
-        "com_menus.admin-item-modal.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_menus.admin-items-modal.es5",
-      "type": "script",
-      "uri": "com_menus/admin-items-modal-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type": "module"
       }
     },
     {
       "name": "com_menus.admin-items-modal",
       "type": "script",
       "uri": "com_menus/admin-items-modal.min.js",
-      "dependencies": [
-        "com_menus.admin-items-modal.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_menus.admin-menus.es5",
-      "type": "script",
-      "uri": "com_menus/admin-menus-default-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type": "module"
       }
     },
     {
       "name": "com_menus.admin-menus",
       "type": "script",
       "uri": "com_menus/admin-menus-default.min.js",
-      "dependencies": [
-        "com_menus.admin-menus.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_menus.batch-body.es5",
-      "type": "script",
-      "uri": "com_menus/default-batch-body-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type": "module"
       }
     },
     {
@@ -165,7 +81,7 @@
       "type": "script",
       "uri": "com_menus/default-batch-body.min.js",
       "dependencies": [
-        "com_menus.batch-body.es5"
+        "core"
       ],
       "attributes": {
         "type": "module"
diff --git a/build/media_source/com_modules/joomla.asset.json b/build/media_source/com_modules/joomla.asset.json
index 8797814a122dd..70ff669528af7 100644
--- a/build/media_source/com_modules/joomla.asset.json
+++ b/build/media_source/com_modules/joomla.asset.json
@@ -5,116 +5,58 @@
   "description": "Joomla CMS",
   "license": "GPL-2.0-or-later",
   "assets": [
-    {
-      "name": "com_modules.admin-module-edit.es5",
-      "type": "script",
-      "uri": "com_modules/admin-module-edit-es5.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
     {
       "name": "com_modules.admin-module-edit",
       "type": "script",
       "uri": "com_modules/admin-module-edit.min.js",
-      "dependencies": [
-        "com_modules.admin-module-edit.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_modules.admin-module-edit-assignment.es5",
-      "type": "script",
-      "uri": "com_modules/admin-module-edit_assignment-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type": "module"
       }
     },
     {
       "name": "com_modules.admin-module-edit-assignment",
       "type": "script",
       "uri": "com_modules/admin-module-edit_assignment.min.js",
-      "dependencies": [
-        "com_modules.admin-module-edit-assignment.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_modules.admin-module-search.es5",
-      "type": "script",
-      "uri": "com_modules/admin-module-search-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type": "module"
       }
     },
     {
       "name": "com_modules.admin-module-search",
       "type": "script",
       "uri": "com_modules/admin-module-search.min.js",
-      "dependencies": [
-        "com_modules.admin-module-search.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_modules.admin-modules-modal.es5",
-      "type": "script",
-      "uri": "com_modules/admin-modules-modal-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type": "module"
       }
     },
     {
       "name": "com_modules.admin-modules-modal",
       "type": "script",
       "uri": "com_modules/admin-modules-modal.min.js",
-      "dependencies": [
-        "com_modules.admin-modules-modal.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_modules.admin-select-modal.es5",
-      "type": "script",
-      "uri": "com_modules/admin-select-modal-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
+        "type": "module"
+      },
+      "deprecated": true,
+      "deprecatedMsg": "Use postMessage() directly or with help of [modal-content-select] asset. To post the modal selection."
     },
     {
       "name": "com_modules.admin-select-modal",
       "type": "script",
       "uri": "com_modules/admin-select-modal.min.js",
       "dependencies": [
-        "com_modules.admin-select-modal.es5"
+        "core"
       ],
       "attributes": {
         "type": "module"
diff --git a/build/media_source/com_modules/js/admin-modules-modal.es6.js b/build/media_source/com_modules/js/admin-modules-modal.es6.js
index 2313b7dcdb159..04224ce983416 100644
--- a/build/media_source/com_modules/js/admin-modules-modal.es6.js
+++ b/build/media_source/com_modules/js/admin-modules-modal.es6.js
@@ -3,15 +3,14 @@
   * @license    GNU General Public License version 2 or later; see LICENSE.txt
   */
 
-document.addEventListener('DOMContentLoaded', () => {
-  'use strict';
-
-  // Get the elements
-  const modulesLinks = [].slice.call(document.querySelectorAll('.js-module-insert'));
-  const positionsLinks = [].slice.call(document.querySelectorAll('.js-position-insert'));
+(() => {
+  // Use a JoomlaExpectingPostMessage flag to be able to distinct legacy methods
+  if (window.parent.JoomlaExpectingPostMessage) {
+    return;
+  }
 
   // Assign listener for click event (for single module id insertion)
-  modulesLinks.forEach((element) => {
+  document.querySelectorAll('.js-module-insert').forEach((element) => {
     element.addEventListener('click', (event) => {
       event.preventDefault();
       const modid = event.target.getAttribute('data-module');
@@ -31,7 +30,7 @@ document.addEventListener('DOMContentLoaded', () => {
   });
 
   // Assign listener for click event (for position insertion)
-  positionsLinks.forEach((element) => {
+  document.querySelectorAll('.js-position-insert').forEach((element) => {
     element.addEventListener('click', (event) => {
       event.preventDefault();
       const position = event.target.getAttribute('data-position');
@@ -48,4 +47,4 @@ document.addEventListener('DOMContentLoaded', () => {
       }
     });
   });
-});
+})();
diff --git a/build/media_source/com_scheduler/joomla.asset.json b/build/media_source/com_scheduler/joomla.asset.json
index 530f26cf4d27a..4908ee88b07b6 100644
--- a/build/media_source/com_scheduler/joomla.asset.json
+++ b/build/media_source/com_scheduler/joomla.asset.json
@@ -5,61 +5,26 @@
   "description": "Joomla CMS",
   "license": "GNU General Public License version 2 or later; see LICENSE.txt",
   "assets": [
-    {
-      "name": "com_scheduler.test-task.es5",
-      "type": "script",
-      "uri": "com_scheduler/admin-view-run-test-task-es5.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
     {
       "name": "com_scheduler.test-task",
       "type": "script",
       "uri": "com_scheduler/admin-view-run-test-task.js",
-      "dependencies": [
-        "com_scheduler.test-task.es5"
-      ],
-      "attributes": {
-        "type" : "module"
-      }
-    },
-    {
-      "name": "com_scheduler.admin-view-select-task-search.es5",
-      "type": "script",
-      "uri": "com_scheduler/admin-view-select-task-search-es5.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type" : "module"
       }
     },
     {
       "name": "com_scheduler.admin-view-select-task-search",
       "type": "script",
       "uri": "com_scheduler/admin-view-select-task-search.js",
-      "dependencies": [
-        "com_scheduler.admin-view-select-task-search.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_scheduler.scheduler-config.es5",
-      "type": "script",
-      "uri": "com_scheduler/scheduler-config-es5.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true
+        "type": "module"
       }
     },
     {
@@ -67,8 +32,7 @@
       "type": "script",
       "uri": "com_scheduler/scheduler-config.js",
       "dependencies": [
-        "core",
-        "com_scheduler.scheduler-config.es5"
+        "core"
       ],
       "attributes": {
         "type": "module"
diff --git a/build/media_source/com_tags/joomla.asset.json b/build/media_source/com_tags/joomla.asset.json
index 732a25a78203d..0170b55735653 100644
--- a/build/media_source/com_tags/joomla.asset.json
+++ b/build/media_source/com_tags/joomla.asset.json
@@ -5,62 +5,26 @@
   "description": "Joomla CMS",
   "license": "GPL-2.0-or-later",
   "assets": [
-    {
-      "name": "com_tags.tag-default.es5",
-      "type": "script",
-      "uri": "com_tags/tag-default-es5.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
     {
       "name": "com_tags.tag-default",
       "type": "script",
       "uri": "com_tags/tag-default.min.js",
-      "dependencies": [
-        "com_tags.tag-default.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_tags.tag-list.es5",
-      "type": "script",
-      "uri": "com_tags/tag-list-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type": "module"
       }
     },
     {
       "name": "com_tags.tag-list",
       "type": "script",
       "uri": "com_tags/tag-list.min.js",
-      "dependencies": [
-        "com_tags.tag-list.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_tags.tags-default.es5",
-      "type": "script",
-      "uri": "com_tags/tags-default-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type": "module"
       }
     },
     {
@@ -68,7 +32,7 @@
       "type": "script",
       "uri": "com_tags/tags-default.min.js",
       "dependencies": [
-        "com_tags.tags-default.es5"
+        "core"
       ],
       "attributes": {
         "type": "module"
diff --git a/build/media_source/com_templates/joomla.asset.json b/build/media_source/com_templates/joomla.asset.json
index 3e663870697d0..5eb9e8383bc37 100644
--- a/build/media_source/com_templates/joomla.asset.json
+++ b/build/media_source/com_templates/joomla.asset.json
@@ -5,63 +5,15 @@
   "description": "Joomla CMS",
   "license": "GPL-2.0-or-later",
   "assets": [
-    {
-      "name": "com_templates.admin-template-compare.es5",
-      "type": "script",
-      "uri": "com_templates/admin-template-compare-es5.min.js",
-      "dependencies": [
-        "core",
-        "diff"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_templates.admin-template-compare",
-      "type": "script",
-      "uri": "com_templates/admin-template-compare.min.js",
-      "dependencies": [
-        "com_templates.admin-template-compare.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_templates.admin-template-toggle-assignment.es5",
-      "type": "script",
-      "uri": "com_templates/admin-template-toggle-assignment-es5.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
     {
       "name": "com_templates.admin-template-toggle-assignment",
       "type": "script",
       "uri": "com_templates/admin-template-toggle-assignment.min.js",
-      "dependencies": [
-        "com_templates.admin-template-toggle-assignment.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_templates.admin-template-toggle-switch.es5",
-      "type": "script",
-      "uri": "com_templates/admin-template-toggle-switch-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type": "module"
       }
     },
     {
@@ -69,7 +21,7 @@
       "type": "script",
       "uri": "com_templates/admin-template-toggle-switch.min.js",
       "dependencies": [
-        "com_templates.admin-template-toggle-switch.es5"
+        "core"
       ],
       "attributes": {
         "type": "module"
@@ -80,24 +32,12 @@
       "type": "style",
       "uri": "com_templates/admin-templates-default.min.css"
     },
-    {
-      "name": "com_templates.admin-templates.es5",
-      "type": "script",
-      "uri": "com_templates/admin-templates-default-es5.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
     {
       "name": "com_templates.admin-templates",
       "type": "script",
       "uri": "com_templates/admin-templates-default.min.js",
       "dependencies": [
-        "com_templates.admin-templates.es5"
+        "core"
       ],
       "attributes": {
         "type": "module"
diff --git a/build/media_source/com_templates/js/admin-template-compare.es6.js b/build/media_source/com_templates/js/admin-template-compare.es6.js
deleted file mode 100644
index 0c833ae2c517a..0000000000000
--- a/build/media_source/com_templates/js/admin-template-compare.es6.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * @copyright  (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- *
- * @deprecated  4.3
- *              This file is deprecated and will be removed with Joomla 5.0
- */
-(() => {
-  'use strict';
-
-  document.addEventListener('DOMContentLoaded', () => {
-    const decodeHtmlspecialChars = (text) => {
-      const map = {
-        '&amp;': '&',
-        '&#038;': '&',
-        '&lt;': '<',
-        '&gt;': '>',
-        '&quot;': '"',
-        '&#039;': "'",
-        '&#8217;': '’',
-        '&#8216;': '‘',
-        '&#8211;': '–',
-        '&#8212;': '—',
-        '&#8230;': '…',
-        '&#8221;': '”',
-      };
-
-      /* eslint-disable */
-      return text.replace(/\&[\w\d\#]{2,5}\;/g, (m) => { const n = map[m]; return n; });
-    };
-
-    const compare = (original, changed) => {
-      const display = changed.nextElementSibling;
-      let color = '';
-      let pre = null;
-      const diff = Diff.diffLines(original.innerHTML, changed.innerHTML);
-      const fragment = document.createDocumentFragment();
-
-      /* eslint-enable */
-
-      diff.forEach((part) => {
-        if (part.added) {
-          color = '#a6f3a6';
-        } else if (part.removed) {
-          color = '#f8cbcb';
-        } else {
-          color = '';
-        }
-        pre = document.createElement('pre');
-        pre.style.backgroundColor = color;
-        pre.className = 'diffview';
-        pre.appendChild(document.createTextNode(decodeHtmlspecialChars(part.value)));
-        fragment.appendChild(pre);
-      });
-
-      display.appendChild(fragment);
-    };
-
-    const diffs = [].slice.call(document.querySelectorAll('#original'));
-    for (let i = 0, l = diffs.length; i < l; i += 1) {
-      compare(diffs[i], diffs[i].nextElementSibling);
-    }
-  });
-})();
diff --git a/build/media_source/com_templates/js/admin-template-toggle-switch.es6.js b/build/media_source/com_templates/js/admin-template-toggle-switch.es6.js
index 564f8080abbe3..d1cde8cab63ed 100644
--- a/build/media_source/com_templates/js/admin-template-toggle-switch.es6.js
+++ b/build/media_source/com_templates/js/admin-template-toggle-switch.es6.js
@@ -61,10 +61,6 @@
         fieldset.classList.add('options-grid-form-half');
       }
 
-      if (Joomla.editors.instances.jform_core) {
-        Joomla.editors.instances.jform_core.refresh();
-      }
-
       if (typeof Storage !== 'undefined') {
         localStorage.setItem('coreSwitchState', 'checked');
       }
diff --git a/build/media_source/com_users/joomla.asset.json b/build/media_source/com_users/joomla.asset.json
index d313d57c9f722..10fc7a97de56a 100644
--- a/build/media_source/com_users/joomla.asset.json
+++ b/build/media_source/com_users/joomla.asset.json
@@ -5,18 +5,6 @@
   "description": "Joomla CMS",
   "license": "GPL-2.0-or-later",
   "assets": [
-    {
-      "name": "com_users.admin-users-groups.es5",
-      "type": "script",
-      "uri": "com_users/admin-users-groups-es5.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
     {
       "name": "com_users.admin-users-groups",
       "type": "script",
@@ -28,62 +16,15 @@
         "type": "module"
       }
     },
-    {
-      "name": "com_users.admin-users-mail.es5",
-      "type": "script",
-      "uri": "com_users/admin-users-mail-es5.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_users.admin-users-mail",
-      "type": "script",
-      "uri": "com_users/admin-users-mail.min.js",
-      "dependencies": [
-        "com_users.admin-users-mail.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_users.two-factor-focus.es5",
-      "type": "script",
-      "uri": "com_users/two-factor-focus-es5.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
     {
       "name": "com_users.two-factor-focus",
       "type": "script",
       "uri": "com_users/two-factor-focus.min.js",
-      "dependencies": [
-        "com_users.two-factor-focus.es5"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    },
-    {
-      "name": "com_users.two-factor-list.es5",
-      "type": "script",
-      "uri": "com_users/two-factor-list-es5.min.js",
       "dependencies": [
         "core"
       ],
       "attributes": {
-        "nomodule": true,
-        "defer": true
+        "type": "module"
       }
     },
     {
@@ -91,7 +32,7 @@
       "type": "script",
       "uri": "com_users/two-factor-list.min.js",
       "dependencies": [
-        "com_users.two-factor-list.es5"
+        "core"
       ],
       "attributes": {
         "type": "module"
diff --git a/build/media_source/com_users/js/admin-users-mail.es6.js b/build/media_source/com_users/js/admin-users-mail.es6.js
deleted file mode 100644
index b0d6f0fb933f9..0000000000000
--- a/build/media_source/com_users/js/admin-users-mail.es6.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * @copyright   (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- *
- * @deprecated  4.3
- *              This file is deprecated and will be removed with Joomla 5.0
- */
-
-(() => {
-  'use strict';
-
-  document.addEventListener('DOMContentLoaded', () => {
-    Joomla.submitbutton = (pressbutton) => {
-      const form = document.adminForm;
-      const html = document.createElement('joomla-alert');
-
-      if (pressbutton === 'mail.cancel') {
-        Joomla.submitform(pressbutton);
-        return;
-      }
-
-      // do field validation
-      if (form.jform_subject.value === '') {
-        html.innerText = Joomla.Text._('COM_USERS_MAIL_PLEASE_FILL_IN_THE_SUBJECT');
-        form.insertAdjacentElement('afterbegin', html);
-      } else if (form.jform_group.value < 0) {
-        html.innerText = Joomla.Text._('COM_USERS_MAIL_PLEASE_SELECT_A_GROUP');
-        form.insertAdjacentElement('afterbegin', html);
-      } else if (form.jform_message.value === '') {
-        html.innerText = Joomla.Text._('COM_USERS_MAIL_PLEASE_FILL_IN_THE_MESSAGE');
-        form.insertAdjacentElement('afterbegin', html);
-      } else {
-        Joomla.submitform(pressbutton);
-      }
-    };
-  });
-})();
diff --git a/build/media_source/com_users/js/two-factor-focus.es6.js b/build/media_source/com_users/js/two-factor-focus.es6.js
index 14567c94c5d6d..04292d3fbcc97 100644
--- a/build/media_source/com_users/js/two-factor-focus.es6.js
+++ b/build/media_source/com_users/js/two-factor-focus.es6.js
@@ -9,7 +9,7 @@
   document.addEventListener('DOMContentLoaded', () => {
     const elCodeField = document.getElementById('users-mfa-code');
     const elValidateButton = document.getElementById('users-mfa-captive-button-submit');
-    const elToolbarButton = document.getElementById('toolbar-user-mfa-submit').querySelector('button');
+    const elToolbarButton = document.getElementById('toolbar-user-mfa-submit')?.querySelector('button');
 
     // Focus the code field. If the code field is hidden, focus the submit button (useful e.g. for WebAuthn)
     if (
diff --git a/build/media_source/com_workflow/joomla.asset.json b/build/media_source/com_workflow/joomla.asset.json
index ce498de46d72f..ed1cbf269248f 100644
--- a/build/media_source/com_workflow/joomla.asset.json
+++ b/build/media_source/com_workflow/joomla.asset.json
@@ -5,24 +5,12 @@
   "description": "Joomla CMS",
   "license": "GPL-2.0-or-later",
   "assets": [
-    {
-      "name": "com_workflow.admin-items-workflow-buttons.es5",
-      "type": "script",
-      "uri": "com_workflow/admin-items-workflow-buttons-es5.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
     {
       "name": "com_workflow.admin-items-workflow-buttons",
       "type": "script",
       "uri": "com_workflow/admin-items-workflow-buttons.min.js",
       "dependencies": [
-        "com_workflow.admin-items-workflow-buttons.es5"
+        "core"
       ],
       "attributes": {
         "type": "module"
diff --git a/build/media_source/plg_behaviour_compat/es5.asset.json b/build/media_source/plg_behaviour_compat/es5.asset.json
new file mode 100644
index 0000000000000..fe0d8342c60ef
--- /dev/null
+++ b/build/media_source/plg_behaviour_compat/es5.asset.json
@@ -0,0 +1,1091 @@
+{
+  "$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_editors_codemirror/css/codemirror.css b/build/media_source/plg_editors_codemirror/css/codemirror.css
index 80be033806a53..0b0c2b53db1d1 100644
--- a/build/media_source/plg_editors_codemirror/css/codemirror.css
+++ b/build/media_source/plg_editors_codemirror/css/codemirror.css
@@ -3,42 +3,32 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-.CodeMirror {
-  margin-bottom: 15px;
+joomla-editor-codemirror {
+  display: block;
+  background-color: #fff;
+}
+.cm-editor {
+  margin-bottom: 16px;
   border: 1px solid #ccc;
 }
-
-/* In order to hide the Joomla menu */
-.CodeMirror-fullscreen {
-  z-index: 1040;
+.cm-editor .cm-scroller {
+  min-height: 100px;
+  overflow: auto;
 }
 
-/* Make the fold marker a little more visible/nice */
-.CodeMirror-foldmarker {
-  background: rgb(255,128,0);
-  background: rgba(255,128,0,.5);
-  box-shadow: inset 0 0 2px rgba(255,255,255,.5);
-  font-family: serif;
-  font-size: 90%;
-  border-radius: 1em;
-  padding: 0 1em;
-  vertical-align: middle;
-  color: white;
-  text-shadow: none;
-}
-
-.CodeMirror-foldgutter,
-.CodeMirror-markergutter {
-  width: 1.2em;
-  text-align: center;
-}
-.CodeMirror-markergutter {
-  cursor: pointer;
+/* Full screen mode */
+joomla-editor-codemirror.fullscreen {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1038;
 }
-.CodeMirror-markergutter-mark {
-  cursor: pointer;
-  text-align: center;
-}
-.CodeMirror-markergutter-mark:after {
-  content: "\25CF";
+joomla-editor-codemirror.fullscreen .cm-editor {
+  width: auto !important;
+  height: 90vh !important;
 }
+
+
+
diff --git a/build/media_source/plg_editors_codemirror/joomla.asset.json b/build/media_source/plg_editors_codemirror/joomla.asset.json
new file mode 100644
index 0000000000000..7832390700e09
--- /dev/null
+++ b/build/media_source/plg_editors_codemirror/joomla.asset.json
@@ -0,0 +1,34 @@
+{
+  "$schema": "https://developer.joomla.org/schemas/json-schema/web_assets.json",
+  "name": "plg_editors_codemirror",
+  "version": "5.0.0",
+  "description": "Joomla CMS",
+  "license": "GPL-2.0-or-later",
+  "assets": [
+    {
+      "name": "plg_editors_codemirror",
+      "type": "style",
+      "uri": "plg_editors_codemirror/codemirror.css"
+    },
+    {
+      "name": "codemirror",
+      "type": "script",
+      "uri": "plg_editors_codemirror/codemirror.min.js",
+      "importmap": true
+    },
+    {
+      "name": "webcomponent.editor-codemirror",
+      "type": "script",
+      "uri": "plg_editors_codemirror/joomla-editor-codemirror.min.js",
+      "dependencies": [
+        "core",
+        "codemirror",
+        "editors",
+        "wcpolyfill"
+      ],
+      "attributes": {
+        "type": "module"
+      }
+    }
+  ]
+}
diff --git a/build/media_source/plg_editors_codemirror/js/codemirror.es6.js b/build/media_source/plg_editors_codemirror/js/codemirror.es6.js
new file mode 100644
index 0000000000000..2733b35760dec
--- /dev/null
+++ b/build/media_source/plg_editors_codemirror/js/codemirror.es6.js
@@ -0,0 +1,170 @@
+/**
+ * @copyright  (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+import {
+  EditorView,
+  lineNumbers,
+  highlightActiveLineGutter,
+  highlightSpecialChars,
+  drawSelection,
+  highlightActiveLine,
+  keymap,
+} from '@codemirror/view';
+import { EditorState, Compartment } from '@codemirror/state';
+import {
+  foldGutter,
+  syntaxHighlighting,
+  defaultHighlightStyle,
+} from '@codemirror/language';
+import {
+  history, defaultKeymap, historyKeymap, emacsStyleKeymap,
+} from '@codemirror/commands';
+import { highlightSelectionMatches, searchKeymap } from '@codemirror/search';
+import { closeBrackets } from '@codemirror/autocomplete';
+
+const minimalSetup = (() => [
+  highlightSpecialChars(),
+  history(),
+  drawSelection(),
+  syntaxHighlighting(defaultHighlightStyle, { fallback: true }),
+]);
+
+/**
+ * Configure and return list of extensions for given options
+ *
+ * @param {Object} options
+ * @returns {Promise<[]>}
+ */
+const optionsToExtensions = async (options) => {
+  const extensions = [];
+  const q = [];
+
+  // Load the language for syntax mode
+  if (options.mode) {
+    const { mode } = options;
+    const modeOptions = options[mode] || {};
+
+    // eslint-disable-next-line consistent-return
+    q.push(import(`@codemirror/lang-${options.mode}`).then((modeMod) => {
+      // For html and php we need to configure selfClosingTags, to make code folding work correctly with <jdoc:include />
+      if (mode === 'php') {
+        return import('@codemirror/lang-html').then(({ html }) => {
+          const htmlOptions = options.html || { selfClosingTags: true };
+          extensions.push(modeMod.php({ baseLanguage: html(htmlOptions).language }));
+        });
+      }
+      if (mode === 'html') {
+        modeOptions.selfClosingTags = true;
+      }
+      extensions.push(modeMod[options.mode](modeOptions));
+    }).catch((error) => {
+      // eslint-disable-next-line no-console
+      console.error(`Cannot creat an extension for "${options.mode}" syntax mode.`, error);
+    }));
+  }
+
+  if (options.lineNumbers) {
+    extensions.push(lineNumbers());
+  }
+
+  if (options.lineWrapping) {
+    extensions.push(EditorView.lineWrapping);
+  }
+
+  if (options.activeLine) {
+    extensions.push(highlightActiveLineGutter(), highlightActiveLine());
+  }
+
+  if (options.highlightSelection) {
+    extensions.push(highlightSelectionMatches());
+  }
+
+  if (options.autoCloseBrackets) {
+    extensions.push(closeBrackets());
+  }
+
+  if (options.foldGutter) {
+    extensions.push(foldGutter());
+  }
+
+  // Keymaps
+  switch (options.keyMap) {
+    case 'emacs':
+      extensions.push(keymap.of([...emacsStyleKeymap, ...historyKeymap]));
+      break;
+    default:
+      extensions.push(keymap.of([...defaultKeymap, ...searchKeymap, ...historyKeymap]));
+      break;
+  }
+
+  // Configurable read only
+  const readOnly = new Compartment();
+  // Set a custom name so later on we can retrieve this Compartment from view.state.config.compartments
+  readOnly.$j_name = 'readOnly';
+  extensions.push(readOnly.of(EditorState.readOnly.of(!!options.readOnly)));
+
+  // Check for custom extensions,
+  // in format [['module1 name or URL', ['init method2']], ['module2 name or URL', ['init method2']], () => <return extension>]
+  if (options.customExtensions && options.customExtensions.length) {
+    options.customExtensions.forEach((extInfo) => {
+      // Check whether we have a callable
+      if (extInfo instanceof Function) {
+        extensions.push(extInfo());
+        return;
+      }
+      // Import the module
+      const [module, methods] = extInfo;
+      q.push(import(module).then((modObject) => {
+        // Call each method
+        methods.forEach((method) => {
+          extensions.push(modObject[method]());
+        });
+      }));
+    });
+  }
+
+  return Promise.all(q).then(() => extensions);
+};
+
+/**
+ * Create an editor instance for given textarea
+ *
+ * @param {HTMLTextAreaElement} textarea
+ * @param {Object} options
+ * @returns {Promise<EditorView>}
+ */
+async function createFromTextarea(textarea, options) {
+  const extensions = [minimalSetup(), await optionsToExtensions(options)];
+  const view = new EditorView({
+    doc: textarea.value,
+    root: options.root || null,
+    extensions,
+  });
+  textarea.parentNode.insertBefore(view.dom, textarea);
+  textarea.style.display = 'none';
+  if (textarea.form) {
+    textarea.form.addEventListener('submit', () => {
+      textarea.value = view.state.doc.toString();
+    });
+  }
+
+  // Set up sizing
+  if (options.width) {
+    view.dom.style.width = options.width;
+  }
+  if (options.height) {
+    view.dom.style.height = options.height;
+  }
+
+  return view;
+}
+
+export {
+  minimalSetup,
+  createFromTextarea,
+  optionsToExtensions,
+  EditorState,
+  EditorView,
+  keymap,
+};
diff --git a/build/media_source/plg_editors_codemirror/js/joomla-editor-codemirror.w-c.es6.js b/build/media_source/plg_editors_codemirror/js/joomla-editor-codemirror.w-c.es6.js
index 5ca43dc8b9dc4..6d0cc79db52c4 100644
--- a/build/media_source/plg_editors_codemirror/js/joomla-editor-codemirror.w-c.es6.js
+++ b/build/media_source/plg_editors_codemirror/js/joomla-editor-codemirror.w-c.es6.js
@@ -1,153 +1,138 @@
+/**
+ * @copyright  (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// eslint-disable-next-line import/no-unresolved, max-classes-per-file
+import { JoomlaEditor, JoomlaEditorDecorator } from 'editor-api';
+// eslint-disable-next-line import/no-unresolved
+import { createFromTextarea, EditorState, keymap } from 'codemirror';
+
+/**
+ * Codemirror Decorator for JoomlaEditor
+ */
+// eslint-disable-next-line max-classes-per-file
+class CodemirrorDecorator extends JoomlaEditorDecorator {
+  /**
+   * @returns {string}
+   */
+  getValue() {
+    return this.instance.state.doc.toString();
+  }
+
+  /**
+   * @param {String} value
+   * @returns {CodemirrorDecorator}
+   */
+  setValue(value) {
+    const editor = this.instance;
+    editor.dispatch({
+      changes: { from: 0, to: editor.state.doc.length, insert: value },
+    });
+    return this;
+  }
+
+  /**
+   * @returns {string}
+   */
+  getSelection() {
+    const { state } = this.instance;
+    return state.sliceDoc(
+      state.selection.main.from,
+      state.selection.main.to,
+    );
+  }
+
+  replaceSelection(value) {
+    const v = this.instance.state.replaceSelection(value);
+    this.instance.dispatch(v);
+    return this;
+  }
+
+  disable(enable) {
+    const editor = this.instance;
+    editor.state.config.compartments.forEach((facet, compartment) => {
+      if (compartment.$j_name === 'readOnly') {
+        editor.dispatch({
+          effects: compartment.reconfigure(EditorState.readOnly.of(!enable)),
+        });
+      }
+    });
+    return this;
+  }
+}
+
 class CodemirrorEditor extends HTMLElement {
   constructor() {
     super();
 
-    this.instance = '';
-    this.host = window.location.origin;
-    this.element = this.querySelector('textarea');
-    this.refresh = this.refresh.bind(this);
-
-    // Observer instance to refresh the Editor when it become visible, eg after Tab switching
-    this.intersectionObserver = new IntersectionObserver((entries) => {
-      if (entries[0].isIntersecting && this.instance) {
-        this.instance.refresh();
+    this.toggleFullScreen = () => {
+      if (!this.classList.contains('fullscreen')) {
+        this.classList.add('fullscreen');
+        document.documentElement.scrollTop = 0;
+        document.documentElement.style.overflow = 'hidden';
+      } else {
+        this.closeFullScreen();
       }
-    }, { threshold: 0 });
-  }
+    };
+
+    this.closeFullScreen = () => {
+      this.classList.remove('fullscreen');
+      document.documentElement.style.overflow = '';
+    };
 
-  static get observedAttributes() {
-    return ['options'];
+    this.interactionCallback = () => {
+      JoomlaEditor.setActive(this.element.id);
+    };
   }
 
   get options() { return JSON.parse(this.getAttribute('options')); }
 
-  set options(value) { this.setAttribute('options', value); }
-
-  attributeChangedCallback(attr, oldValue, newValue) {
-    switch (attr) {
-      case 'options':
-        if (oldValue && newValue !== oldValue) {
-          this.refresh(this.element);
-        }
-        break;
-      default:
-      // Do nothing
-    }
-  }
+  get fsCombo() { return this.getAttribute('fs-combo'); }
 
   async connectedCallback() {
-    const cmPath = this.getAttribute('editor');
-    const addonsPath = this.getAttribute('addons');
-
-    await import(`${this.host}/${cmPath}`);
-
-    if (this.options.keyMapUrl) {
-      await import(`${this.host}/${this.options.keyMapUrl}`);
-    }
-    await import(`${this.host}/${addonsPath}`);
-
-    const that = this;
-
-    // For mode autoloading.
-    window.CodeMirror.modeURL = this.getAttribute('mod-path');
-
-    // Fire this function any time an editor is created.
-    window.CodeMirror.defineInitHook((editor) => {
-      // Try to set up the mode
-      const mode = window.CodeMirror.findModeByName(editor.options.mode || '')
-        || window.CodeMirror.findModeByExtension(editor.options.mode || '');
-
-      window.CodeMirror.autoLoadMode(editor, typeof mode === 'object' ? mode.mode : editor.options.mode);
-
-      if (mode && mode.mime) {
-        // Fix the x-php error
-        if (['text/x-php', 'application/x-httpd-php', 'application/x-httpd-php-open'].includes(mode.mime)) {
-          editor.setOption('mode', 'php');
-        } else if (mode.mime === 'text/html') {
-          editor.setOption('mode', mode.mode);
-        } else {
-          editor.setOption('mode', mode.mime);
-        }
-      }
-
-      const toggleFullScreen = () => {
-        that.instance.setOption('fullScreen', !that.instance.getOption('fullScreen'));
-        const header = document.getElementById('subhead');
-        if (header) {
-          const header1 = document.getElementById('header');
-          header1.classList.toggle('hidden');
-          header.classList.toggle('hidden');
-          that.instance.display.wrapper.style.top = `${header.getBoundingClientRect().height}px`;
-        }
-      };
-
-      const closeFullScreen = () => {
-        that.instance.getOption('fullScreen');
-        that.instance.setOption('fullScreen', false);
-
-        if (!that.instance.getOption('fullScreen')) {
-          const header = document.getElementById('subhead');
-          if (header) {
-            const header1 = document.getElementById('header');
-            header.classList.toggle('hidden');
-            header1.classList.toggle('hidden');
-            that.instance.display.wrapper.style.top = `${header.getBoundingClientRect().height}px`;
-          }
-        }
-      };
-
-      const map = {
-        'Ctrl-Q': toggleFullScreen,
-        [that.getAttribute('fs-combo')]: toggleFullScreen,
-        Esc: closeFullScreen,
-      };
-
-      editor.addKeyMap(map);
-
-      const makeMarker = () => {
-        const marker = document.createElement('div');
-        marker.className = 'CodeMirror-markergutter-mark';
-
-        return marker;
-      };
-
-      // Handle gutter clicks (place or remove a marker).
-      editor.on('gutterClick', (ed, n, gutter) => {
-        if (gutter !== 'CodeMirror-markergutter') {
-          return;
-        }
-
-        const info = ed.lineInfo(n);
-        const hasMarker = !!info.gutterMarkers && !!info.gutterMarkers['CodeMirror-markergutter'];
-        ed.setGutterMarker(n, 'CodeMirror-markergutter', hasMarker ? null : makeMarker());
+    const { options } = this;
+
+    // Configure full screen feature
+    if (this.fsCombo) {
+      options.customExtensions = options.customExtensions || [];
+      options.customExtensions.push(() => keymap.of([
+        { key: this.fsCombo, run: this.toggleFullScreen },
+        { key: 'Escape', run: this.closeFullScreen },
+      ]));
+
+      // Relocate BS modals, to resolve z-index issue in full screen
+      this.bsModals = this.querySelectorAll('.joomla-modal.modal');
+      this.bsModals.forEach((modal) => {
+        document.body.appendChild(modal);
       });
+    }
 
-      /* Some browsers do something weird with the fieldset which doesn't
-        work well with CodeMirror. Fix it. */
-      if (that.parentNode.tagName.toLowerCase() === 'fieldset') {
-        that.parentNode.style.minWidth = 0;
-      }
-    });
-
-    // Register Editor
-    this.instance = window.CodeMirror.fromTextArea(this.element, this.options);
-    this.instance.disable = (disabled) => this.setOption('readOnly', disabled ? 'nocursor' : false);
-    Joomla.editors.instances[this.element.id] = this.instance;
+    // Create and register the Editor
+    this.element = this.querySelector('textarea');
+    this.instance = await createFromTextarea(this.element, options);
+    this.jEditor = new CodemirrorDecorator(this.instance, 'codemirror', this.element.id);
+    JoomlaEditor.register(this.jEditor);
 
-    // Watch when the element in viewport, and refresh the editor
-    this.intersectionObserver.observe(this);
+    // Find out when editor is interacted
+    this.addEventListener('click', this.interactionCallback);
   }
 
   disconnectedCallback() {
+    if (this.instance) {
+      this.element.style.display = '';
+      this.instance.destroy();
+    }
     // Remove from the Joomla API
-    delete Joomla.editors.instances[this.element.id];
+    JoomlaEditor.unregister(this.element.id);
+    this.removeEventListener('click', this.interactionCallback);
 
-    // Remove from observer
-    this.intersectionObserver.unobserve(this);
-  }
-
-  refresh(element) {
-    this.instance.fromTextArea(element, this.options);
+    // Restore modals
+    if (this.bsModals && this.bsModals.length) {
+      this.bsModals.forEach((modal) => {
+        this.appendChild(modal);
+      });
+    }
   }
 }
 
diff --git a/build/media_source/plg_editors_none/js/joomla-editor-none.w-c.es6.js b/build/media_source/plg_editors_none/js/joomla-editor-none.w-c.es6.js
index 6fef5a6cb0616..8c45b608af511 100644
--- a/build/media_source/plg_editors_none/js/joomla-editor-none.w-c.es6.js
+++ b/build/media_source/plg_editors_none/js/joomla-editor-none.w-c.es6.js
@@ -2,7 +2,53 @@
  * @copyright  (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
-window.customElements.define('joomla-editor-none', class extends HTMLElement {
+
+// eslint-disable-next-line import/no-unresolved, max-classes-per-file
+import { JoomlaEditor, JoomlaEditorDecorator } from 'editor-api';
+
+/**
+ * EditorNone Decorator for Joomla.Editor
+ */
+// eslint-disable-next-line max-classes-per-file
+class EditorNoneDecorator extends JoomlaEditorDecorator {
+  /**
+   * @returns {string}
+   */
+  getValue() {
+    return this.instance.getValue();
+  }
+
+  /**
+   * @param {string} value
+   * @returns {EditorNoneDecorator}
+   */
+  setValue(value) {
+    this.instance.setValue(value);
+    return this;
+  }
+
+  /**
+   * @returns {string}
+   */
+  getSelection() {
+    return this.instance.getSelection();
+  }
+
+  replaceSelection(value) {
+    this.instance.replaceSelection(value);
+    return this;
+  }
+
+  disable(enable) {
+    if (this.instance.editor) {
+      this.instance.editor.disabled = !enable;
+      this.instance.editor.readOnly = !enable;
+    }
+    return this;
+  }
+}
+
+class JoomlaEditorNone extends HTMLElement {
   constructor() {
     super();
 
@@ -19,6 +65,13 @@ window.customElements.define('joomla-editor-none', class extends HTMLElement {
     // eslint-disable-next-line no-return-assign
     new MutationObserver(() => this.childrenChange())
       .observe(this, { childList: true });
+
+    // Find out when editor is interacted
+    this.interactionCallback = () => {
+      if (this.editor) {
+        JoomlaEditor.setActive(this.editor.id);
+      }
+    };
   }
 
   /**
@@ -28,6 +81,7 @@ window.customElements.define('joomla-editor-none', class extends HTMLElement {
     // Note the mutation observer won't fire for initial contents,
     // so childrenChange is also called here.
     this.childrenChange();
+    this.addEventListener('click', this.interactionCallback);
   }
 
   /**
@@ -35,59 +89,55 @@ window.customElements.define('joomla-editor-none', class extends HTMLElement {
    */
   disconnectedCallback() {
     this.unregisterEditor();
+    this.removeEventListener('click', this.interactionCallback);
+  }
+
+  /**
+   * Get editor value
+   */
+  getValue() {
+    return this.editor.value;
+  }
+
+  /**
+   * Set editor value
+   * @param {string} text
+   */
+  setValue(text) {
+    this.editor.value = text;
   }
 
   /**
    * Get the selected text
    */
   getSelection() {
-    if (document.selection) {
-      // IE support
-      this.editor.focus();
-      return document.selection.createRange();
-    } if (this.editor.selectionStart || this.editor.selectionStart === 0) {
-      // MOZILLA/NETSCAPE support
+    if (this.editor.selectionStart || this.editor.selectionStart === 0) {
       return this.editor.value.substring(this.editor.selectionStart, this.editor.selectionEnd);
     }
     return this.editor.value;
   }
 
   /**
-   * Register the editor
+   * Replace selected text
+   * @param {string} text
    */
-  registerEditor() {
-    if (!window.Joomla
-        || !window.Joomla.editors
-        || typeof window.Joomla.editors !== 'object') {
-      throw new Error('The Joomla API is not correctly registered.');
+  replaceSelection(text) {
+    const ed = this.editor;
+    if (ed.selectionStart || ed.selectionStart === 0) {
+      ed.value = ed.value.substring(0, ed.selectionStart)
+        + text
+        + ed.value.substring(ed.selectionEnd, ed.value.length);
+    } else {
+      ed.value += text;
     }
+  }
 
-    window.Joomla.editors.instances[this.editor.id] = {
-      id: () => this.editor.id,
-      element: () => this.editor,
-      // eslint-disable-next-line no-return-assign
-      getValue: () => this.editor.value,
-      // eslint-disable-next-line no-return-assign
-      setValue: (text) => this.editor.value = text,
-      // eslint-disable-next-line no-return-assign
-      getSelection: () => this.getSelection(),
-      // eslint-disable-next-line no-return-assign
-      disable: (disabled) => {
-        this.editor.disabled = disabled;
-        this.editor.readOnly = disabled;
-      },
-      // eslint-disable-next-line no-return-assign
-      replaceSelection: (text) => {
-        if (this.editor.selectionStart || this.editor.selectionStart === 0) {
-          this.editor.value = this.editor.value.substring(0, this.editor.selectionStart)
-            + text
-            + this.editor.value.substring(this.editor.selectionEnd, this.editor.value.length);
-        } else {
-          this.editor.value += text;
-        }
-      },
-      onSave: () => {},
-    };
+  /**
+   * Register the editor
+   */
+  registerEditor() {
+    const jEditor = new EditorNoneDecorator(this, 'none', this.editor.id);
+    JoomlaEditor.register(jEditor);
   }
 
   /**
@@ -95,7 +145,7 @@ window.customElements.define('joomla-editor-none', class extends HTMLElement {
    */
   unregisterEditor() {
     if (this.editor) {
-      delete window.Joomla.editors.instances[this.editor.id];
+      JoomlaEditor.unregister(this.editor.id);
     }
   }
 
@@ -113,4 +163,6 @@ window.customElements.define('joomla-editor-none', class extends HTMLElement {
       this.registerEditor();
     }
   }
-});
+}
+
+customElements.define('joomla-editor-none', JoomlaEditorNone);
diff --git a/build/media_source/plg_editors_tinymce/js/plugins/dragdrop/plugin.es5.js b/build/media_source/plg_editors_tinymce/js/plugins/dragdrop/plugin.es5.js
deleted file mode 100644
index 20c3fdc86c716..0000000000000
--- a/build/media_source/plg_editors_tinymce/js/plugins/dragdrop/plugin.es5.js
+++ /dev/null
@@ -1,167 +0,0 @@
-(function () {
-  'use strict';
-
-  /* eslint-disable no-undef */
-  tinymce.PluginManager.add('jdragndrop', function (editor) {
-    // Reset the drop area border
-    var dragleaveCallback = function (e) {
-      if (!e.dataTransfer.types.includes('Files')) return;
-      e.stopPropagation();
-      e.preventDefault();
-      editor.contentAreaContainer.style.borderWidth = '0';
-      return false;
-    }
-    tinyMCE.DOM.bind(document, 'dragleave', dragleaveCallback);
-
-    // Remove listener when editor are removed
-    editor.on('remove', function () {
-      tinyMCE.DOM.unbind(document, 'dragleave', dragleaveCallback);
-    });
-
-    // Fix for Chrome
-    editor.on('dragenter', function (e) {
-      if (!e.dataTransfer.types.includes('Files')) return;
-      e.stopPropagation();
-      return false;
-    });
-
-    // Notify user when file is over the drop area
-    editor.on('dragover', function (e) {
-      if (!e.dataTransfer.types.includes('Files')) return;
-      e.preventDefault();
-      editor.contentAreaContainer.style.borderStyle = 'dashed';
-      editor.contentAreaContainer.style.borderWidth = '5px';
-      return false;
-    });
-
-    function uploadFile(name, content) {
-      var _data;
-
-      var url = editor.settings.uploadUri + "&path=" + editor.settings.comMediaAdapter + editor.settings.parentUploadFolder;
-      var data = (_data = {}, _data[editor.settings.csrfToken] = '1', _data.name = name, _data.content = content, _data.parent = editor.settings.parentUploadFolder, _data);
-      Joomla.request({
-        url: url,
-        method: 'POST',
-        data: JSON.stringify(data),
-        headers: {
-          'Content-Type': 'application/json'
-        },
-        onSuccess: function onSuccess(resp) {
-          var response;
-
-          try {
-            response = JSON.parse(resp);
-          } catch (e) {
-            editor.windowManager.alert(Joomla.Text._('ERROR') + ": {e}");
-          }
-
-          if (response.data && response.data.path) {
-            var responseData = response.data;
-            var urlPath; // For local adapters use relative paths
-
-            var _Joomla$getOptions = Joomla.getOptions('system.paths'),
-            rootFull = _Joomla$getOptions.rootFull;
-            var parts = response.data.url.split(rootFull);
-            if (parts.length > 1) {
-              urlPath = "" + parts[1];
-            } else if (responseData.url) {
-              // Absolute path for different domain
-              urlPath = responseData.url;
-            }
-
-            var dialogClose = function dialogClose(api) {
-              var dialogData = api.getData();
-              var altEmpty = dialogData.altEmpty ? ' alt=""' : '';
-              var altValue = dialogData.altText ? " alt=\"" + dialogData.altText + "\"" : altEmpty;
-              var lazyValue = dialogData.isLazy ? ' loading="lazy"' : '';
-              var width = dialogData.isLazy ? " width=\"" + responseData.width + "\"" : '';
-              var height = dialogData.isLazy ? " height=\"" + responseData.height + "\"" : '';
-              editor.execCommand('mceInsertContent', false, "<img src=\"" + urlPath + "\"" + altValue + lazyValue + width + height + "/>");
-            };
-
-            editor.windowManager.open({
-              title: Joomla.Text._('PLG_TINY_DND_ADDITIONALDATA'),
-              body: {
-                type: 'panel',
-                items: [{
-                  type: 'input',
-                  name: 'altText',
-                  label: Joomla.Text._('PLG_TINY_DND_ALTTEXT')
-                }, {
-                  type: 'checkbox',
-                  name: 'altEmpty',
-                  label: Joomla.Text._('PLG_TINY_DND_EMPTY_ALT')
-                }, {
-                  type: 'checkbox',
-                  name: 'isLazy',
-                  label: Joomla.Text._('PLG_TINY_DND_LAZYLOADED')
-                }]
-              },
-              buttons: [{
-                type: 'cancel',
-                text: 'Cancel'
-              }, {
-                type: 'submit',
-                name: 'submitButton',
-                text: 'Save',
-                primary: true
-              }],
-              initialData: {
-                altText: '',
-                isLazy: true,
-                altEmpty: false
-              },
-              onSubmit: function onSubmit(api) {
-                dialogClose(api);
-                api.close();
-              },
-              onCancel: function onCancel(api) {
-                dialogClose(api);
-              }
-            });
-          }
-        },
-        onError: function onError(xhr) {
-          editor.windowManager.alert("Error: " + xhr.statusText);
-        }
-      });
-    }
-
-    function readFile(file) {
-      // Create a new file reader instance
-      var reader = new FileReader();
-
-      // Add the on load callback
-      reader.onload = function (progressEvent) {
-        var result = progressEvent.target.result;
-        var splitIndex = result.indexOf('base64') + 7;
-        var content = result.slice(splitIndex, result.length);
-
-        // Upload the file
-        uploadFile(file.name, content);
-      };
-
-      reader.readAsDataURL(file);
-    }
-
-    // Logic for the dropped file
-    editor.on('drop', function (e) {
-      if (!e.dataTransfer.types.includes('Files')) return;
-      e.preventDefault();
-
-      // Read and upload files
-      if (e.dataTransfer.files.length > 0) {
-        var files = [].slice.call(e.dataTransfer.files);
-        files.forEach(function (file) {
-          // Only images allowed
-          if (file.name.toLowerCase().match(/\.(jpg|jpeg|png|gif|webp)$/)) {
-            // Upload the file(s)
-            readFile(file);
-          }
-        });
-      }
-
-      editor.contentAreaContainer.style.borderWidth = '0';
-    });
-  });
-}());
diff --git a/build/media_source/plg_editors_tinymce/js/plugins/dragdrop/plugin.es6.js b/build/media_source/plg_editors_tinymce/js/plugins/dragdrop/plugin.es6.js
new file mode 100644
index 0000000000000..aafc4208474a7
--- /dev/null
+++ b/build/media_source/plg_editors_tinymce/js/plugins/dragdrop/plugin.es6.js
@@ -0,0 +1,171 @@
+/**
+ * File reader helper
+ *
+ * @param {*} file the file
+ * @param {*} callback function to callback
+ *
+ * @TODO replace it with await new Response(file)
+ */
+function readFile(file, callback) {
+  // Create a new file reader instance
+  const reader = new FileReader();
+
+  // Add the on load callback
+  reader.onload = (event) => {
+    const { result } = event.target;
+    const splitIndex = result.indexOf('base64') + 7;
+    const content = result.slice(splitIndex, result.length);
+
+    // Upload the file
+    callback(file.name, content);
+  };
+
+  reader.readAsDataURL(file);
+}
+
+window.tinymce.PluginManager.add('jdragndrop', (editor) => {
+  const registerOption = editor.options.register;
+  registerOption('uploadUri', { processor: 'string' });
+  registerOption('comMediaAdapter', { processor: 'string' });
+  registerOption('parentUploadFolder', { processor: 'string' });
+  registerOption('csrfToken', { processor: 'string' });
+
+  // Reset the drop area border
+  const dragleaveCallback = (e) => {
+    if (!e.dataTransfer.types.includes('Files')) return;
+    e.stopPropagation();
+    e.preventDefault();
+    editor.contentAreaContainer.style.borderWidth = '0';
+  };
+
+  window.tinyMCE.DOM.bind(document, 'dragleave', dragleaveCallback);
+
+  // Remove listener when editor are removed
+  editor.on('remove', () => window.tinyMCE.DOM.unbind(document, 'dragleave', dragleaveCallback));
+
+  // Fix for Chrome
+  editor.on('dragenter', (e) => {
+    if (!e.dataTransfer.types.includes('Files')) return;
+    e.stopPropagation();
+  });
+
+  // Notify user when file is over the drop area
+  editor.on('dragover', (e) => {
+    if (!e.dataTransfer.types.includes('Files')) return;
+    e.preventDefault();
+    editor.contentAreaContainer.style.borderStyle = 'dashed';
+    editor.contentAreaContainer.style.borderWidth = '5px';
+  });
+
+  async function uploadFile(name, content) {
+    const settings = editor.options.get;
+
+    Joomla.request({
+      url: `${settings('uploadUri')}&path=${settings('comMediaAdapter')}${settings('parentUploadFolder')}`,
+      method: 'POST',
+      data: JSON.stringify({
+        [settings('csrfToken')]: 1,
+        name,
+        content,
+        parent: settings('parentUploadFolder'),
+      }),
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      onSuccess: (resp) => {
+        let response;
+
+        try {
+          response = JSON.parse(resp);
+        } catch (e) {
+          editor.windowManager.alert(`${Joomla.Text._('ERROR')}: {${e}}`);
+        }
+
+        if (response.data && response.data.path) {
+          const responseData = response.data;
+          let urlPath;
+
+          const paths = Joomla.getOptions('system.paths');
+          const { rootFull } = paths;
+          const parts = response.data.url.split(rootFull);
+          if (parts.length > 1) {
+            // For local adapters use relative paths
+            urlPath = `${parts[1]}`;
+          } else if (responseData.url) {
+            // Absolute path for different domain
+            urlPath = responseData.url;
+          }
+
+          const dialogClose = function dialogClose(api) {
+            const dialogData = api.getData();
+            const altEmpty = dialogData.altEmpty ? ' alt=""' : '';
+            const altValue = dialogData.altText ? ` alt="${dialogData.altText}"` : altEmpty;
+            const lazyValue = dialogData.isLazy ? ' loading="lazy"' : '';
+            const width = dialogData.isLazy ? ` width="${responseData.width}"` : '';
+            const height = dialogData.isLazy ? ` height="${responseData.height}"` : '';
+            editor.execCommand('mceInsertContent', false, `<img src="${urlPath}"${altValue}${lazyValue}${width}${height}/>`);
+          };
+
+          editor.windowManager.open({
+            title: Joomla.Text._('PLG_TINY_DND_ADDITIONALDATA'),
+            body: {
+              type: 'panel',
+              items: [{
+                type: 'input',
+                name: 'altText',
+                label: Joomla.Text._('PLG_TINY_DND_ALTTEXT'),
+              }, {
+                type: 'checkbox',
+                name: 'altEmpty',
+                label: Joomla.Text._('PLG_TINY_DND_EMPTY_ALT'),
+              }, {
+                type: 'checkbox',
+                name: 'isLazy',
+                label: Joomla.Text._('PLG_TINY_DND_LAZYLOADED'),
+              }],
+            },
+            buttons: [{
+              type: 'cancel',
+              text: 'Cancel',
+            }, {
+              type: 'submit',
+              name: 'submitButton',
+              text: 'Save',
+              primary: true,
+            }],
+            initialData: {
+              altText: '',
+              isLazy: true,
+              altEmpty: false,
+            },
+            onSubmit: (api) => {
+              dialogClose(api);
+              api.close();
+            },
+            onCancel: (api) => dialogClose(api),
+          });
+        }
+      },
+      onError: (xhr) => editor.windowManager.alert(`Error: ${xhr.statusText}`),
+    });
+  }
+
+  // Logic for the dropped file
+  editor.on('drop', (e) => {
+    if (!e.dataTransfer.types.includes('Files')) return;
+    e.preventDefault();
+
+    // Read and upload files
+    if (e.dataTransfer.files.length > 0) {
+      Array.from(e.dataTransfer.files).forEach((file) => {
+        // Only images allowed
+        if (file.name.toLowerCase().match(/\.(jpg|jpeg|png|gif|webp)$/)) {
+          // Upload the file(s)
+          readFile(file, uploadFile);
+        }
+      });
+    }
+
+    editor.contentAreaContainer.style.borderWidth = '0';
+  });
+});
diff --git a/build/media_source/plg_editors_tinymce/js/plugins/highlighter/plugin.es6.js b/build/media_source/plg_editors_tinymce/js/plugins/highlighter/plugin.es6.js
deleted file mode 100644
index 8287139cb2a58..0000000000000
--- a/build/media_source/plg_editors_tinymce/js/plugins/highlighter/plugin.es6.js
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * plugin.js
- *
- * Original code by Arjan Haverkamp
- * Copyright 2013-2015 Arjan Haverkamp (arjan@webgear.nl)
- */
-window.tinymce.PluginManager.add('highlightPlus', (editor, url) => {
-  const showSourceEditor = () => {
-    editor.focus();
-    editor.selection.collapse(true);
-
-    if (!editor.settings.codemirror) editor.settings.codemirror = {};
-
-    // Insert caret marker
-    if (editor.settings.codemirror && editor.settings.codemirror.saveCursorPosition) {
-      editor.selection.setContent('<span style="display: none;" class="CmCaReT">&#x0;</span>');
-    }
-
-    let codemirrorWidth = 800;
-    if (editor.settings.codemirror.width) {
-      codemirrorWidth = editor.settings.codemirror.width;
-    }
-
-    let codemirrorHeight = 550;
-    if (editor.settings.codemirror.height) {
-      codemirrorHeight = editor.settings.codemirror.height;
-    }
-
-    const buttonsConfig = [
-      {
-        type: 'custom',
-        text: 'Ok',
-        name: 'codemirrorOk',
-        primary: true,
-      },
-      {
-        type: 'cancel',
-        text: 'Cancel',
-        name: 'codemirrorCancel',
-      },
-    ];
-
-    const config = {
-      title: 'Source code',
-      url: `${url}/source.html`,
-      width: codemirrorWidth,
-      height: codemirrorHeight,
-      resizable: true,
-      maximizable: true,
-      fullScreen: editor.settings.codemirror.fullscreen,
-      saveCursorPosition: false,
-      buttons: buttonsConfig,
-    };
-
-    config.onAction = (dialogApi, actionData) => {
-      if (actionData.name === 'codemirrorOk') {
-        const doc = document.querySelectorAll('.tox-dialog__body-iframe iframe')[0];
-        doc.contentWindow.tinymceHighlighterSubmit();
-        editor.undoManager.add();
-        // eslint-disable-next-line no-use-before-define
-        win.close();
-      }
-    };
-
-    const win = editor.windowManager.openUrl(config);
-
-    if (editor.settings.codemirror.fullscreen) {
-      win.fullscreen(true);
-    }
-  };
-
-  editor.ui.registry.addButton('code', {
-    icon: 'sourcecode',
-    title: 'Source code+',
-    tooltip: 'Source code+',
-    onAction: showSourceEditor,
-  });
-
-  editor.ui.registry.addMenuItem('code', {
-    icon: 'sourcecode',
-    text: 'Source code+',
-    onAction: showSourceEditor,
-    context: 'tools',
-  });
-});
diff --git a/build/media_source/plg_editors_tinymce/js/plugins/highlighter/source.css b/build/media_source/plg_editors_tinymce/js/plugins/highlighter/source.css
deleted file mode 100644
index 084efeda12509..0000000000000
--- a/build/media_source/plg_editors_tinymce/js/plugins/highlighter/source.css
+++ /dev/null
@@ -1,17 +0,0 @@
-html,body { height:100%; }
-body {
-  margin: 0;
-}
-.CodeMirror {
-  height: 100%;
-  font-size: 12px;
-  line-height: 18px;
-}
-.CodeMirror-activeline-background {
-  background: #e8f2ff !important;
-}
-.cm-trailingspace {
-  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAACCAYAAAB/qH1jAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QUXCToH00Y1UgAAACFJREFUCNdjPMDBUc/AwNDAAAFMTAwMDA0OP34wQgX/AQBYgwYEx4f9lQAAAABJRU5ErkJggg==);
-  background-position: bottom left;
-  background-repeat: repeat-x;
-}
diff --git a/build/media_source/plg_editors_tinymce/js/plugins/highlighter/source.es6.js b/build/media_source/plg_editors_tinymce/js/plugins/highlighter/source.es6.js
deleted file mode 100644
index d2dda804aafc3..0000000000000
--- a/build/media_source/plg_editors_tinymce/js/plugins/highlighter/source.es6.js
+++ /dev/null
@@ -1,273 +0,0 @@
-/**
- * source.js
- *
- * Original code by Arjan Haverkamp
- * Copyright 2013-2015 Arjan Haverkamp (arjan@webgear.nl)
- */
-if (!window.parent.Joomla || typeof window.parent.Joomla.getOptions !== 'function') {
-  throw new Error('Joomla API not found');
-}
-
-// Get the base path for CodeMirror
-const rootPath = window.parent.Joomla.getOptions('system.paths').rootFull;
-const cmPath = `${rootPath}/media/vendor/codemirror`;
-
-// CodeMirror settings
-let CMsettings = {
-  indentOnInit: true,
-  config: {
-    mode: 'htmlmixed',
-    theme: 'default',
-    lineNumbers: true,
-    lineWrapping: true,
-    indentUnit: 2,
-    tabSize: 2,
-    indentWithTabs: true,
-    matchBrackets: true,
-    saveCursorPosition: true,
-    styleActiveLine: true,
-  },
-  jsFiles: [
-    // Default JS files
-    `${cmPath}/lib/codemirror.min.js`,
-    `${cmPath}/addon/edit/matchbrackets.min.js`,
-    `${cmPath}/mode/xml/xml.min.js`,
-    `${cmPath}/mode/javascript/javascript.min.js`,
-    `${cmPath}/mode/css/css.min.js`,
-    `${cmPath}/mode/htmlmixed/htmlmixed.min.js`,
-    `${cmPath}/addon/dialog/dialog.min.js`,
-    `${cmPath}/addon/search/searchcursor.min.js`,
-    `${cmPath}/addon/search/search.min.js`,
-    `${cmPath}/addon/selection/active-line.min.js`,
-  ],
-  cssFiles: [
-    // Default CSS files
-    `${cmPath}/lib/codemirror.css`,
-    `${cmPath}/addon/dialog/dialog.css`,
-  ],
-};
-
-// Declare some variables:
-let tinymce; // Reference to TinyMCE
-let editor; // Reference to TinyMCE editor
-let codemirror; // CodeMirror instance
-const chr = 0; // Unused utf-8 character, placeholder for cursor
-const isMac = /macintosh|mac os/i.test(navigator.userAgent);
-
-// Utility function to load CodeMirror script files
-const loadScript = (url) => new Promise((resolve, reject) => {
-  const script = document.createElement('script');
-  script.src = url;
-  script.onload = () => resolve();
-  script.onerror = () => reject(new Error(`Failed to load the script ${url}`));
-  document.head.appendChild(script);
-});
-
-/**
- * Find the depth level
- */
-const findDepth = (haystack, needle) => {
-  const idx = haystack.indexOf(needle);
-  let depth = 0;
-  for (let x = idx - 1; x >= 0; x -= 1) {
-    switch (haystack.charAt(x)) {
-      case '<': depth -= 1; break;
-      case '>': depth += 1; break;
-      case '&': depth += 1; break;
-      default: break;
-    }
-  }
-  return depth;
-};
-
-/**
- * This function is called by plugin.js, when user clicks 'Ok' button
- */
-window.tinymceHighlighterSubmit = () => {
-  const cc = '&#x0;';
-  const { isDirty } = codemirror;
-  const { doc } = codemirror;
-
-  if (doc.somethingSelected()) {
-    // Clear selection:
-    doc.setCursor(doc.getCursor());
-  }
-
-  // Insert cursor placeholder (&#x0;)
-  doc.replaceSelection(cc);
-
-  const pos = codemirror.getCursor();
-  let curLineHTML = doc.getLine(pos.line);
-
-  if (findDepth(curLineHTML, cc) !== 0) {
-    // Cursor is inside a <tag>, don't set cursor:
-    curLineHTML = curLineHTML.replace(cc, '');
-    doc.replaceRange(curLineHTML, window.CodeMirror.Pos(pos.line, 0), window.CodeMirror.Pos(pos.line));
-  }
-
-  // Submit HTML to TinyMCE:
-  // [FIX] Cursor position inside JS, style or &nbps;
-  // Workaround to fix cursor position if inside script tag
-  const code = codemirror.getValue();
-
-  /* Regex to check if inside script or style tags */
-  const ccScript = new RegExp(`<script(.*?)>(.*?)${cc}(.*?)</script>`, 'ms');
-  const ccStyle = new RegExp(`<style(.*?)>(.*?)${cc}(.*?)</style>`, 'ms');
-
-  /* Regex to check if in beginning or end or if between < & > */
-  const ccLocationCheck = new RegExp(`<[^>]*(${cc}).*>|^(${cc})|(${cc})$`);
-
-  if (
-    code.search(ccScript) !== -1
-    || code.search(ccStyle) !== -1
-    || code.search(ccLocationCheck) !== -1
-  ) {
-    editor.setContent(code.replace(cc, ''));
-  } else {
-    editor.setContent(code.replace(cc, '<span id="CmCaReT"></span>'));
-  }
-
-  editor.isNotDirty = !isDirty;
-  if (isDirty) {
-    editor.nodeChanged();
-  }
-
-  // Set cursor:
-  const el = editor.dom.select('span#CmCaReT')[0];
-  if (el) {
-    editor.selection.scrollIntoView(el);
-    editor.selection.setCursorLocation(el, 0);
-    editor.dom.remove(el);
-  }
-};
-
-/**
- * Listen for the escape key and close the modal
- *
- * @param {Event} evt
- */
-document.addEventListener('keydown', (evt) => {
-  const event = evt || window.event;
-  let isEscape = false;
-  if ('key' in event) isEscape = (event.key === 'Escape' || event.key === 'Esc');
-  else isEscape = (event.keyCode === 27);
-
-  if (isEscape) tinymce.activeEditor.windowManager.close();
-});
-
-/**
- * Append some help text in the modal footer
- */
-const start = () => {
-  // Initialise (on load)
-  if (typeof (window.CodeMirror) !== 'function') {
-    throw new Error(`CodeMirror not found in "${CMsettings.path}", aborting...`);
-  }
-
-  // Create legend for keyboard shortcuts for find & replace:
-  const footer = window.parent.document.querySelectorAll('.tox-dialog__footer')[0];
-  const div = window.parent.document.createElement('div');
-  const td1 = '<td style="font-size:11px;background:#777;color:#fff;padding:0 4px">';
-  const td2 = '<td style="font-size:11px;padding-right:5px">';
-  div.innerHTML = `
-<table cellspacing="0" cellpadding="0" style="border-spacing:4px">
-  <tr>
-    ${td1}${(isMac ? '&#8984;-F' : 'Ctrl-F</td>')}${td2}${tinymce.translate('Start search')}</td>
-    ${td1}${(isMac ? '&#8984;-G' : 'Ctrl-G')}</td>
-    ${td2}${tinymce.translate('Find next')}</td>
-    ${td1}${(isMac ? '&#8984;-Alt-F' : 'Shift-Ctrl-F')}</td>
-    ${td2}${tinymce.translate('Find previous')}</td>
-  </tr>
-  <tr>
-    ${td1}${(isMac ? '&#8984;-Alt-F' : 'Shift-Ctrl-F')}</td>
-    ${td2}${tinymce.translate('Replace')}</td>
-    ${td1}${(isMac ? 'Shift-&#8984;-Alt-F' : 'Shift-Ctrl-R')}</td>
-    ${td2}${tinymce.translate('Replace all')}</td>
-  </tr>
-</table>`;
-
-  footer.insertAdjacentElement('afterbegin', div);
-
-  // Set CodeMirror cursor and bookmark to same position as cursor was in TinyMCE:
-  let html = editor.getContent({ source_view: true });
-
-  // [FIX] #6 z-index issue with table panel and source code dialog
-  //  editor.selection.getBookmark();
-
-  html = html.replace(/<span\s+style="display: none;"\s+class="CmCaReT"([^>]*)>([^<]*)<\/span>/gm, String.fromCharCode(chr));
-  editor.dom.remove(editor.dom.select('.CmCaReT'));
-
-  // Hide TinyMCE toolbar panels, [FIX] #6 z-index issue with table panel and source code dialog
-  // https://github.com/christiaan/tinymce-codemirror/issues/6
-  tinymce.each(editor.contextToolbars, (toolbar) => { if (toolbar.panel) { toolbar.panel.hide(); } });
-  window.CodeMirror.defineInitHook((inst) => {
-    // Move cursor to correct position:
-    inst.focus();
-    const cursor = inst.getSearchCursor(String.fromCharCode(chr), false);
-    if (cursor.findNext()) {
-      inst.setCursor(cursor.to());
-      cursor.replace('');
-    }
-
-    // Indent all code, if so requested:
-    if (editor.settings.codemirror.indentOnInit) {
-      const last = inst.lineCount();
-      inst.operation(() => {
-        // eslint-disable-next-line no-plusplus
-        for (let i = 0; i < last; ++i) {
-          inst.indentLine(i);
-        }
-      });
-    }
-  });
-
-  CMsettings.config.value = html;
-
-  // Instantiate CodeMirror:
-  codemirror = window.CodeMirror(document.body, CMsettings.config);
-  codemirror.isDirty = false;
-  codemirror.on('change', (inst) => {
-    inst.isDirty = true;
-  });
-  codemirror.setSize('100%', '100%');
-  codemirror.refresh();
-};
-
-// Initialise
-tinymce = window.parent.tinymce;
-if (!tinymce) {
-  throw new Error('tinyMCE not found');
-}
-
-editor = tinymce.activeEditor;
-const userSettings = editor.settings.codemirror;
-
-if (userSettings.fullscreen) {
-  CMsettings.jsFiles.push(`${cmPath}/addon/display/fullscreen.min.js`);
-  CMsettings.cssFiles.push(`${cmPath}/addon/display/fullscreen.css`);
-}
-
-// Merge config
-CMsettings = { ...CMsettings, ...userSettings };
-
-// Append the stylesheets
-CMsettings.cssFiles.forEach((css) => {
-  const link = document.createElement('link');
-  link.rel = 'stylesheet';
-  link.href = css;
-  document.head.appendChild(link);
-});
-
-/**
- * Append javascript files ensuring the order of execution.
- * Then execute the start function.
- */
-CMsettings.jsFiles.reduce((p, item) => p.then(() => loadScript(item)), Promise.resolve(true)).then(() => {
-  // Borrowed from codemirror.js themeChanged function. Sets the theme's class names to the html element.
-  // Without this, the background color outside of the codemirror wrapper element remains white.
-  // [TMP] commented temporary, cause JS error: Uncaught TypeError: Cannot read property 'replace' of undefined
-  if (CMsettings.config.theme) {
-    document.documentElement.className += CMsettings.config.theme.replace(/(^|\s)\s*/g, ' cm-s-');
-  }
-  start();
-});
diff --git a/build/media_source/plg_editors_tinymce/js/plugins/joomla-highlighter/plugin.es6.js b/build/media_source/plg_editors_tinymce/js/plugins/joomla-highlighter/plugin.es6.js
new file mode 100644
index 0000000000000..7922325f73e2d
--- /dev/null
+++ b/build/media_source/plg_editors_tinymce/js/plugins/joomla-highlighter/plugin.es6.js
@@ -0,0 +1,135 @@
+/**
+ * @copyright  (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+window.tinymce.PluginManager.add('joomlaHighlighter', (editor) => {
+  const setContent = (html) => {
+    editor.focus();
+    editor.undoManager.transact(() => {
+      editor.setContent(html);
+    });
+    editor.selection.setCursorLocation();
+    editor.nodeChanged();
+  };
+
+  const getContent = () => editor.getContent({ source_view: true });
+
+  let running = false;
+  const showSourceEditor = () => {
+    if (running) {
+      return;
+    }
+    running = true;
+
+    // Create the dialog
+    let cmEditor;
+    const dialogConfig = {
+      title: 'Source code',
+      body: {
+        type: 'panel',
+        classes: ['joomla-highlighter-dialog'],
+        items: [{
+          type: 'textarea',
+          name: 'textarea',
+          inputMode: 'text',
+          maximized: true,
+        }],
+      },
+      size: 'large',
+      buttons: [
+        {
+          type: 'cancel',
+          name: 'cancel',
+          text: 'Cancel',
+        },
+        {
+          type: 'submit',
+          name: 'save',
+          text: 'Save',
+          buttonType: 'primary',
+        },
+      ],
+      onSubmit: (dialogApi) => {
+        setContent(cmEditor.state.doc.toString());
+        dialogApi.close();
+      },
+      onClose: () => {
+        cmEditor.destroy();
+        cmEditor = null;
+        running = false;
+      },
+    };
+
+    // Import codemirror and open the dialog
+    // eslint-disable-next-line import/no-unresolved
+    Promise.all([import('codemirror'), import('@codemirror/view'), import('@codemirror/commands')])
+      .then(([{ createFromTextarea }, { keymap }, { indentMore }]) => {
+        editor.windowManager.open(dialogConfig);
+
+        // Find textarea and move it to shadow DOM to isolate from TinyMCE styling
+        const textarea = document.querySelector('.joomla-highlighter-dialog textarea');
+        const wrapper = textarea.parentElement;
+        const shadow = wrapper.attachShadow({ mode: 'open' });
+        textarea.value = getContent();
+        shadow.appendChild(textarea);
+
+        // Move focus out of the codemirror
+        const escapeTabTrap = (view, event) => {
+          event.preventDefault();
+          // Find a Save button
+          const dialogEl = wrapper.closest('[role="dialog"]');
+          const btnEl = dialogEl.querySelector('.tox-dialog__footer [type="button"]:not(.tox-button--secondary)');
+          if (btnEl) {
+            btnEl.focus();
+          } else {
+            dialogEl.focus();
+          }
+        };
+
+        const cmOptions = {
+          mode: 'html',
+          lineNumbers: true,
+          lineWrapping: true,
+          activeLine: true,
+          highlightSelection: true,
+          foldGutter: true,
+          width: '100%',
+          height: '100%',
+          root: shadow,
+          customExtensions: [
+            // Enable Tab trapping
+            () => keymap.of([{ key: 'Tab', run: indentMore, shift: escapeTabTrap }]),
+          ],
+        };
+        const wrapperheight = wrapper.scrollHeight;
+
+        createFromTextarea(textarea, cmOptions).then((cmView) => {
+          cmEditor = cmView;
+          cmEditor.focus();
+          cmEditor.dom.style.maxHeight = `${wrapperheight}px`;
+        });
+      });
+  };
+
+  editor.ui.registry.addButton('code', {
+    icon: 'sourcecode',
+    title: 'Source code+',
+    tooltip: 'Source code+',
+    onAction: showSourceEditor,
+  });
+
+  editor.ui.registry.addMenuItem('code', {
+    icon: 'sourcecode',
+    text: 'Source code+',
+    onAction: showSourceEditor,
+    context: 'tools',
+  });
+  editor.addShortcut('Alt+U', 'Opens the code editor', showSourceEditor);
+
+  return {
+    getMetadata: () => ({
+      name: 'Joomla highlighter plugin',
+      url: 'https://www.joomla.org/',
+    }),
+  };
+});
diff --git a/build/media_source/plg_editors_tinymce/js/plugins/jtemplate/plugin.es5.js b/build/media_source/plg_editors_tinymce/js/plugins/jtemplate/plugin.es5.js
new file mode 100644
index 0000000000000..bfa19e9c33953
--- /dev/null
+++ b/build/media_source/plg_editors_tinymce/js/plugins/jtemplate/plugin.es5.js
@@ -0,0 +1,554 @@
+/**
+ * TinyMCE version 6.4.0 (2023-03-15)
+ */
+
+(function () {
+    'use strict';
+
+    var global$3 = tinymce.util.Tools.resolve('tinymce.PluginManager');
+
+    const hasProto = (v, constructor, predicate) => {
+      var _a;
+      if (predicate(v, constructor.prototype)) {
+        return true;
+      } else {
+        return ((_a = v.constructor) === null || _a === void 0 ? void 0 : _a.name) === constructor.name;
+      }
+    };
+    const typeOf = x => {
+      const t = typeof x;
+      if (x === null) {
+        return 'null';
+      } else if (t === 'object' && Array.isArray(x)) {
+        return 'array';
+      } else if (t === 'object' && hasProto(x, String, (o, proto) => proto.isPrototypeOf(o))) {
+        return 'string';
+      } else {
+        return t;
+      }
+    };
+    const isType = type => value => typeOf(value) === type;
+    const isSimpleType = type => value => typeof value === type;
+    const isString = isType('string');
+    const isObject = isType('object');
+    const isArray = isType('array');
+    const isNullable = a => a === null || a === undefined;
+    const isNonNullable = a => !isNullable(a);
+    const isFunction = isSimpleType('function');
+    const isArrayOf = (value, pred) => {
+      if (isArray(value)) {
+        for (let i = 0, len = value.length; i < len; ++i) {
+          if (!pred(value[i])) {
+            return false;
+          }
+        }
+        return true;
+      }
+      return false;
+    };
+
+    const constant = value => {
+      return () => {
+        return value;
+      };
+    };
+    function curry(fn, ...initialArgs) {
+      return (...restArgs) => {
+        const all = initialArgs.concat(restArgs);
+        return fn.apply(null, all);
+      };
+    }
+    const never = constant(false);
+
+    const escape = text => text.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+
+    var global$2 = tinymce.util.Tools.resolve('tinymce.util.Tools');
+
+    const option = name => editor => editor.options.get(name);
+    const register$2 = editor => {
+      const registerOption = editor.options.register;
+      registerOption('template_cdate_classes', {
+        processor: 'string',
+        default: 'cdate'
+      });
+      registerOption('template_mdate_classes', {
+        processor: 'string',
+        default: 'mdate'
+      });
+      registerOption('template_selected_content_classes', {
+        processor: 'string',
+        default: 'selcontent'
+      });
+      registerOption('template_preview_replace_values', { processor: 'object' });
+      registerOption('template_replace_values', { processor: 'object' });
+      registerOption('jtemplates', {
+        processor: value => isString(value) || isArrayOf(value, isObject) || isFunction(value),
+        default: []
+      });
+      registerOption('template_cdate_format', {
+        processor: 'string',
+        default: editor.translate('%Y-%m-%d')
+      });
+      registerOption('template_mdate_format', {
+        processor: 'string',
+        default: editor.translate('%Y-%m-%d')
+      });
+    };
+    const getCreationDateClasses = option('template_cdate_classes');
+    const getModificationDateClasses = option('template_mdate_classes');
+    const getSelectedContentClasses = option('template_selected_content_classes');
+    const getPreviewReplaceValues = option('template_preview_replace_values');
+    const getTemplateReplaceValues = option('template_replace_values');
+    const getTemplates = option('jtemplates');
+    const getCdateFormat = option('template_cdate_format');
+    const getMdateFormat = option('template_mdate_format');
+    const getContentStyle = option('content_style');
+    const shouldUseContentCssCors = option('content_css_cors');
+    const getBodyClass = option('body_class');
+
+    const addZeros = (value, len) => {
+      value = '' + value;
+      if (value.length < len) {
+        for (let i = 0; i < len - value.length; i++) {
+          value = '0' + value;
+        }
+      }
+      return value;
+    };
+    const getDateTime = (editor, fmt, date = new Date()) => {
+      const daysShort = 'Sun Mon Tue Wed Thu Fri Sat Sun'.split(' ');
+      const daysLong = 'Sunday Monday Tuesday Wednesday Thursday Friday Saturday Sunday'.split(' ');
+      const monthsShort = 'Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec'.split(' ');
+      const monthsLong = 'January February March April May June July August September October November December'.split(' ');
+      fmt = fmt.replace('%D', '%m/%d/%Y');
+      fmt = fmt.replace('%r', '%I:%M:%S %p');
+      fmt = fmt.replace('%Y', '' + date.getFullYear());
+      fmt = fmt.replace('%y', '' + date.getYear());
+      fmt = fmt.replace('%m', addZeros(date.getMonth() + 1, 2));
+      fmt = fmt.replace('%d', addZeros(date.getDate(), 2));
+      fmt = fmt.replace('%H', '' + addZeros(date.getHours(), 2));
+      fmt = fmt.replace('%M', '' + addZeros(date.getMinutes(), 2));
+      fmt = fmt.replace('%S', '' + addZeros(date.getSeconds(), 2));
+      fmt = fmt.replace('%I', '' + ((date.getHours() + 11) % 12 + 1));
+      fmt = fmt.replace('%p', '' + (date.getHours() < 12 ? 'AM' : 'PM'));
+      fmt = fmt.replace('%B', '' + editor.translate(monthsLong[date.getMonth()]));
+      fmt = fmt.replace('%b', '' + editor.translate(monthsShort[date.getMonth()]));
+      fmt = fmt.replace('%A', '' + editor.translate(daysLong[date.getDay()]));
+      fmt = fmt.replace('%a', '' + editor.translate(daysShort[date.getDay()]));
+      fmt = fmt.replace('%%', '%');
+      return fmt;
+    };
+
+    class Optional {
+      constructor(tag, value) {
+        this.tag = tag;
+        this.value = value;
+      }
+      static some(value) {
+        return new Optional(true, value);
+      }
+      static none() {
+        return Optional.singletonNone;
+      }
+      fold(onNone, onSome) {
+        if (this.tag) {
+          return onSome(this.value);
+        } else {
+          return onNone();
+        }
+      }
+      isSome() {
+        return this.tag;
+      }
+      isNone() {
+        return !this.tag;
+      }
+      map(mapper) {
+        if (this.tag) {
+          return Optional.some(mapper(this.value));
+        } else {
+          return Optional.none();
+        }
+      }
+      bind(binder) {
+        if (this.tag) {
+          return binder(this.value);
+        } else {
+          return Optional.none();
+        }
+      }
+      exists(predicate) {
+        return this.tag && predicate(this.value);
+      }
+      forall(predicate) {
+        return !this.tag || predicate(this.value);
+      }
+      filter(predicate) {
+        if (!this.tag || predicate(this.value)) {
+          return this;
+        } else {
+          return Optional.none();
+        }
+      }
+      getOr(replacement) {
+        return this.tag ? this.value : replacement;
+      }
+      or(replacement) {
+        return this.tag ? this : replacement;
+      }
+      getOrThunk(thunk) {
+        return this.tag ? this.value : thunk();
+      }
+      orThunk(thunk) {
+        return this.tag ? this : thunk();
+      }
+      getOrDie(message) {
+        if (!this.tag) {
+          throw new Error(message !== null && message !== void 0 ? message : 'Called getOrDie on None');
+        } else {
+          return this.value;
+        }
+      }
+      static from(value) {
+        return isNonNullable(value) ? Optional.some(value) : Optional.none();
+      }
+      getOrNull() {
+        return this.tag ? this.value : null;
+      }
+      getOrUndefined() {
+        return this.value;
+      }
+      each(worker) {
+        if (this.tag) {
+          worker(this.value);
+        }
+      }
+      toArray() {
+        return this.tag ? [this.value] : [];
+      }
+      toString() {
+        return this.tag ? `some(${ this.value })` : 'none()';
+      }
+    }
+    Optional.singletonNone = new Optional(false);
+
+    const exists = (xs, pred) => {
+      for (let i = 0, len = xs.length; i < len; i++) {
+        const x = xs[i];
+        if (pred(x, i)) {
+          return true;
+        }
+      }
+      return false;
+    };
+    const map = (xs, f) => {
+      const len = xs.length;
+      const r = new Array(len);
+      for (let i = 0; i < len; i++) {
+        const x = xs[i];
+        r[i] = f(x, i);
+      }
+      return r;
+    };
+    const findUntil = (xs, pred, until) => {
+      for (let i = 0, len = xs.length; i < len; i++) {
+        const x = xs[i];
+        if (pred(x, i)) {
+          return Optional.some(x);
+        } else if (until(x, i)) {
+          break;
+        }
+      }
+      return Optional.none();
+    };
+    const find = (xs, pred) => {
+      return findUntil(xs, pred, never);
+    };
+
+    const hasOwnProperty = Object.hasOwnProperty;
+    const get = (obj, key) => {
+      return has(obj, key) ? Optional.from(obj[key]) : Optional.none();
+    };
+    const has = (obj, key) => hasOwnProperty.call(obj, key);
+
+    var global$1 = tinymce.util.Tools.resolve('tinymce.html.Serializer');
+
+    const entitiesAttr = {
+      '"': '&quot;',
+      '<': '&lt;',
+      '>': '&gt;',
+      '&': '&amp;',
+      '\'': '&#039;'
+    };
+    const htmlEscape = html => html.replace(/["'<>&]/g, match => get(entitiesAttr, match).getOr(match));
+    const hasAnyClasses = (dom, n, classes) => exists(classes.split(/\s+/), c => dom.hasClass(n, c));
+    const parseAndSerialize = (editor, html) => global$1({ validate: true }, editor.schema).serialize(editor.parser.parse(html, { insert: true }));
+
+    const createTemplateList = (editor, callback) => {
+      return () => {
+        const templateList = getTemplates(editor);
+        if (isFunction(templateList)) {
+          templateList(callback);
+        } else if (isString(templateList)) {
+          fetch(templateList).then(res => {
+            if (res.ok) {
+              res.json().then(callback);
+            }
+          });
+        } else {
+          callback(templateList);
+        }
+      };
+    };
+    const replaceTemplateValues = (html, templateValues) => {
+      global$2.each(templateValues, (v, k) => {
+        if (isFunction(v)) {
+          v = v(k);
+        }
+        html = html.replace(new RegExp('\\{\\$' + escape(k) + '\\}', 'g'), v);
+      });
+      return html;
+    };
+    const replaceVals = (editor, scope) => {
+      const dom = editor.dom, vl = getTemplateReplaceValues(editor);
+      global$2.each(dom.select('*', scope), e => {
+        global$2.each(vl, (v, k) => {
+          if (dom.hasClass(e, k)) {
+            if (isFunction(v)) {
+              v(e);
+            }
+          }
+        });
+      });
+    };
+    const insertTemplate = (editor, _ui, html) => {
+      const dom = editor.dom;
+      const sel = editor.selection.getContent();
+      html = replaceTemplateValues(html, getTemplateReplaceValues(editor));
+      let el = dom.create('div', {}, parseAndSerialize(editor, html));
+      const n = dom.select('.mceTmpl', el);
+      if (n && n.length > 0) {
+        el = dom.create('div');
+        el.appendChild(n[0].cloneNode(true));
+      }
+      global$2.each(dom.select('*', el), n => {
+        if (hasAnyClasses(dom, n, getCreationDateClasses(editor))) {
+          n.innerHTML = getDateTime(editor, getCdateFormat(editor));
+        }
+        if (hasAnyClasses(dom, n, getModificationDateClasses(editor))) {
+          n.innerHTML = getDateTime(editor, getMdateFormat(editor));
+        }
+        if (hasAnyClasses(dom, n, getSelectedContentClasses(editor))) {
+          n.innerHTML = sel;
+        }
+      });
+      replaceVals(editor, el);
+      editor.execCommand('mceInsertContent', false, el.innerHTML);
+      editor.addVisual();
+    };
+
+    var global = tinymce.util.Tools.resolve('tinymce.Env');
+
+    const getPreviewContent = (editor, html) => {
+      var _a;
+      if (html.indexOf('<html>') === -1) {
+        let contentCssEntries = '';
+        const contentStyle = (_a = getContentStyle(editor)) !== null && _a !== void 0 ? _a : '';
+        const cors = shouldUseContentCssCors(editor) ? ' crossorigin="anonymous"' : '';
+        global$2.each(editor.contentCSS, url => {
+          contentCssEntries += '<link type="text/css" rel="stylesheet" href="' + editor.documentBaseURI.toAbsolute(url) + '"' + cors + '>';
+        });
+        if (contentStyle) {
+          contentCssEntries += '<style type="text/css">' + contentStyle + '</style>';
+        }
+        const bodyClass = getBodyClass(editor);
+        const encode = editor.dom.encode;
+        const isMetaKeyPressed = global.os.isMacOS() || global.os.isiOS() ? 'e.metaKey' : 'e.ctrlKey && !e.altKey';
+        const preventClicksOnLinksScript = '<script>' + 'document.addEventListener && document.addEventListener("click", function(e) {' + 'for (var elm = e.target; elm; elm = elm.parentNode) {' + 'if (elm.nodeName === "A" && !(' + isMetaKeyPressed + ')) {' + 'e.preventDefault();' + '}' + '}' + '}, false);' + '</script> ';
+        const directionality = editor.getBody().dir;
+        const dirAttr = directionality ? ' dir="' + encode(directionality) + '"' : '';
+        html = '<!DOCTYPE html>' + '<html>' + '<head>' + '<base href="' + encode(editor.documentBaseURI.getURI()) + '">' + contentCssEntries + preventClicksOnLinksScript + '</head>' + '<body class="' + encode(bodyClass) + '"' + dirAttr + '>' + parseAndSerialize(editor, html) + '</body>' + '</html>';
+      }
+      return replaceTemplateValues(html, getPreviewReplaceValues(editor));
+    };
+    const open = (editor, templateList) => {
+      const createTemplates = () => {
+        if (!templateList || templateList.length === 0) {
+          const message = editor.translate('No templates defined.');
+          editor.notificationManager.open({
+            text: message,
+            type: 'info'
+          });
+          return Optional.none();
+        }
+        return Optional.from(global$2.map(templateList, (template, index) => {
+          const isUrlTemplate = t => t.url !== undefined;
+          return {
+            selected: index === 0,
+            text: template.title,
+            value: {
+              url: isUrlTemplate(template) ? Optional.from(template.url) : Optional.none(),
+              content: !isUrlTemplate(template) ? Optional.from(template.content) : Optional.none(),
+              description: template.description
+            }
+          };
+        }));
+      };
+      const createSelectBoxItems = templates => map(templates, t => ({
+        text: t.text,
+        value: t.text
+      }));
+      const findTemplate = (templates, templateTitle) => find(templates, t => t.text === templateTitle);
+      const loadFailedAlert = api => {
+        editor.windowManager.alert('Could not load the specified template.', () => api.focus('template'));
+      };
+      const getTemplateContent = t => t.value.url.fold(() => Promise.resolve(t.value.content.getOr('')), url => fetch(url).then(res => res.ok ? res.text() : Promise.reject()));
+      const onChange = (templates, updateDialog) => (api, change) => {
+        if (change.name === 'template') {
+          const newTemplateTitle = api.getData().template;
+          findTemplate(templates, newTemplateTitle).each(t => {
+            api.block('Loading...');
+            getTemplateContent(t).then(previewHtml => {
+              updateDialog(api, t, previewHtml);
+            }).catch(() => {
+              updateDialog(api, t, '');
+              api.setEnabled('save', false);
+              loadFailedAlert(api);
+            });
+          });
+        }
+      };
+      const onSubmit = templates => api => {
+        const data = api.getData();
+        findTemplate(templates, data.template).each(t => {
+          getTemplateContent(t).then(previewHtml => {
+            editor.execCommand('mceInsertTemplate', false, previewHtml);
+            api.close();
+          }).catch(() => {
+            api.setEnabled('save', false);
+            loadFailedAlert(api);
+          });
+        });
+      };
+      const openDialog = templates => {
+        const selectBoxItems = createSelectBoxItems(templates);
+        const buildDialogSpec = (bodyItems, initialData) => ({
+          title: 'Insert Template',
+          size: 'large',
+          body: {
+            type: 'panel',
+            items: bodyItems
+          },
+          initialData,
+          buttons: [
+            {
+              type: 'cancel',
+              name: 'cancel',
+              text: 'Cancel'
+            },
+            {
+              type: 'submit',
+              name: 'save',
+              text: 'Save',
+              primary: true
+            }
+          ],
+          onSubmit: onSubmit(templates),
+          onChange: onChange(templates, updateDialog)
+        });
+        const updateDialog = (dialogApi, template, previewHtml) => {
+          const content = getPreviewContent(editor, previewHtml);
+          const bodyItems = [
+            {
+              type: 'selectbox',
+              name: 'template',
+              label: 'Templates',
+              items: selectBoxItems
+            },
+            {
+              type: 'htmlpanel',
+              html: `<p aria-live="polite">${ htmlEscape(template.value.description) }</p>`
+            },
+            {
+              label: 'Preview',
+              type: 'iframe',
+              name: 'preview',
+              sandboxed: false,
+              transparent: false
+            }
+          ];
+          const initialData = {
+            template: template.text,
+            preview: content
+          };
+          dialogApi.unblock();
+          dialogApi.redial(buildDialogSpec(bodyItems, initialData));
+          dialogApi.focus('template');
+        };
+        const dialogApi = editor.windowManager.open(buildDialogSpec([], {
+          template: '',
+          preview: ''
+        }));
+        dialogApi.block('Loading...');
+        getTemplateContent(templates[0]).then(previewHtml => {
+          updateDialog(dialogApi, templates[0], previewHtml);
+        }).catch(() => {
+          updateDialog(dialogApi, templates[0], '');
+          dialogApi.setEnabled('save', false);
+          loadFailedAlert(dialogApi);
+        });
+      };
+      const optTemplates = createTemplates();
+      optTemplates.each(openDialog);
+    };
+
+    const showDialog = editor => templates => {
+      open(editor, templates);
+    };
+    const register$1 = editor => {
+      editor.addCommand('mceInsertTemplate', curry(insertTemplate, editor));
+      editor.addCommand('mceTemplate', createTemplateList(editor, showDialog(editor)));
+    };
+
+    const setup = editor => {
+      editor.on('PreProcess', o => {
+        const dom = editor.dom, dateFormat = getMdateFormat(editor);
+        global$2.each(dom.select('div', o.node), e => {
+          if (dom.hasClass(e, 'mceTmpl')) {
+            global$2.each(dom.select('*', e), e => {
+              if (hasAnyClasses(dom, e, getModificationDateClasses(editor))) {
+                e.innerHTML = getDateTime(editor, dateFormat);
+              }
+            });
+            replaceVals(editor, e);
+          }
+        });
+      });
+    };
+
+    const register = editor => {
+      const onAction = () => editor.execCommand('mceTemplate');
+      editor.ui.registry.addButton('jtemplate', {
+        icon: 'template',
+        tooltip: 'Insert template',
+        onAction
+      });
+      editor.ui.registry.addMenuItem('jtemplate', {
+        icon: 'template',
+        text: 'Insert template...',
+        onAction
+      });
+    };
+
+    var Plugin = () => {
+      global$3.add('jtemplate', editor => {
+        register$2(editor);
+        register(editor);
+        register$1(editor);
+        setup(editor);
+      });
+    };
+
+    Plugin();
+
+})();
diff --git a/build/media_source/plg_editors_tinymce/js/tinymce-builder.es6.js b/build/media_source/plg_editors_tinymce/js/tinymce-builder.es6.js
index 7c7a3b3807fb0..cdae08de84272 100644
--- a/build/media_source/plg_editors_tinymce/js/tinymce-builder.es6.js
+++ b/build/media_source/plg_editors_tinymce/js/tinymce-builder.es6.js
@@ -145,7 +145,7 @@ const tinymce = {
     'table-split-cells': '<svg width="24" height="24"><path d="M4 5h16v14H4V5zm6 2v3h4V7h-4zM9 18v-3H5v3h4zm0-4v-3H5v3h4zm0-4V7H5v3h4zm10 8v-7h-9v7h9zm0-8V7h-4v3h4zm-3.5 4.5l1.5 1.6c.3.2.3.7 0 1-.2.2-.7.2-1 0l-1.5-1.6-1.6 1.5c-.2.3-.7.3-1 0a.7.7 0 0 1 0-1l1.6-1.5-1.5-1.6a.7.7 0 0 1 1-1l1.5 1.6 1.6-1.5c.2-.3.7-.3 1 0 .2.2.2.7 0 1l-1.6 1.5z" fill-rule="evenodd"/></svg>',
     'table-top-header': '<svg width="24" height="24"><path d="M4 5h16v13H4V5zm5 12v-3H5v3h4zm0-4v-3H5v3h4zm5 4v-3h-4v3h4zm0-4v-3h-4v3h4zm5 4v-3h-4v3h4zm0-4v-3h-4v3h4z" fill-rule="evenodd"/></svg>',
     table: '<svg width="24" height="24"><path d="M4 5h16v14H4V5zm6 9h4v-3h-4v3zm4 1h-4v3h4v-3zm0-8h-4v3h4V7zM9 7H5v3h4V7zm-4 4v3h4v-3H5zm10 0v3h4v-3h-4zm0-1h4V7h-4v3zM5 15v3h4v-3H5zm10 3h4v-3h-4v3z" fill-rule="evenodd"/></svg>',
-    template: '<svg width="24" height="24"><path d="M19 19v-1H5v1h14zM9 16v-4a5 5 0 1 1 6 0v4h4a2 2 0 0 1 2 2v3H3v-3c0-1.1.9-2 2-2h4zm4 0v-5l.8-.6a3 3 0 1 0-3.6 0l.8.6v5h2z" fill-rule="nonzero"/></svg>',
+    jtemplate: '<svg width="24" height="24"><path d="M19 19v-1H5v1h14zM9 16v-4a5 5 0 1 1 6 0v4h4a2 2 0 0 1 2 2v3H3v-3c0-1.1.9-2 2-2h4zm4 0v-5l.8-.6a3 3 0 1 0-3.6 0l.8.6v5h2z" fill-rule="nonzero"/></svg>',
     'temporary-placeholder': '<svg width="24" height="24"><path d="M20.5 2.5c-.8 0-1.5.7-1.5 1.5a1.5 1.5 0 0 1-3 0 3 3 0 0 0-6 0v2H8.5c-.3 0-.5.2-.5.5v1a8 8 0 1 0 6 0v-1c0-.3-.2-.5-.5-.5H11V4a2 2 0 0 1 4 0 2.5 2.5 0 0 0 5 0c0-.3.2-.5.5-.5a.5.5 0 0 0 0-1zM8.1 10.9a5 5 0 0 0-1.2 7 .5.5 0 0 1-.8.5 6 6 0 0 1 1.5-8.3.5.5 0 1 1 .5.8z" fill-rule="nonzero"/></svg>',
     toc: '<svg width="24" height="24"><path d="M5 5c.6 0 1 .4 1 1s-.4 1-1 1a1 1 0 1 1 0-2zm3 0h11c.6 0 1 .4 1 1s-.4 1-1 1H8a1 1 0 1 1 0-2zm-3 8c.6 0 1 .4 1 1s-.4 1-1 1a1 1 0 0 1 0-2zm3 0h11c.6 0 1 .4 1 1s-.4 1-1 1H8a1 1 0 0 1 0-2zm0-4c.6 0 1 .4 1 1s-.4 1-1 1a1 1 0 1 1 0-2zm3 0h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 0 1 0-2zm-3 8c.6 0 1 .4 1 1s-.4 1-1 1a1 1 0 0 1 0-2zm3 0h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 0 1 0-2z" fill-rule="evenodd"/></svg>',
     translate: '<svg width="24" height="24"><path d="M12.7 14.3l-.3.7-.4.7-2.2-2.2-3.1 3c-.3.4-.8.4-1 0a.7.7 0 0 1 0-1l3.1-3A12.4 12.4 0 0 1 6.7 9H8a10.1 10.1 0 0 0 1.7 2.4c.5-.5 1-1.1 1.4-1.8l.9-2H4.7a.7.7 0 1 1 0-1.5h4.4v-.7c0-.4.3-.8.7-.8.4 0 .7.4.7.8v.7H15c.4 0 .8.3.8.7 0 .4-.4.8-.8.8h-1.4a12.3 12.3 0 0 1-1 2.4 13.5 13.5 0 0 1-1.7 2.3l1.9 1.8zm4.3-3l2.7 7.3a.5.5 0 0 1-.4.7 1 1 0 0 1-1-.7l-.6-1.5h-3.4l-.6 1.5a1 1 0 0 1-1 .7.5.5 0 0 1-.4-.7l2.7-7.4a1 1 0 1 1 2 0zm-2.2 4.4h2.4L16 12.5l-1.2 3.2z" fill-rule="evenodd"/></svg>',
diff --git a/build/media_source/plg_editors_tinymce/js/tinymce.es6.js b/build/media_source/plg_editors_tinymce/js/tinymce.es6.js
index dbe66b7b7cee9..a4becffdd19dd 100644
--- a/build/media_source/plg_editors_tinymce/js/tinymce.es6.js
+++ b/build/media_source/plg_editors_tinymce/js/tinymce.es6.js
@@ -3,221 +3,279 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-((tinyMCE, Joomla, window, document) => {
-  'use strict';
-
-  // Debounce ReInit per editor ID
-  const reInitQueue = {};
-  const debounceReInit = (editor, element, pluginOptions) => {
-    if (reInitQueue[element.id]) {
-      clearTimeout(reInitQueue[element.id]);
+// eslint-disable-next-line import/no-unresolved
+import { JoomlaEditor, JoomlaEditorButton, JoomlaEditorDecorator } from 'editor-api';
+
+/* global tinymce, tinyMCE */
+
+// Debounce ReInit per editor ID
+const reInitQueue = {};
+const debounceReInit = (editor, element, pluginOptions) => {
+  if (reInitQueue[element.id]) {
+    clearTimeout(reInitQueue[element.id]);
+  }
+  reInitQueue[element.id] = setTimeout(() => {
+    editor.remove();
+    JoomlaEditor.unregister(element.id);
+    Joomla.JoomlaTinyMCE.setupEditor(element, pluginOptions);
+  }, 500);
+};
+
+/**
+ * TinyMCE Decorator for JoomlaEditor
+ */
+class TinyMCEDecorator extends JoomlaEditorDecorator {
+  /**
+   * @returns {string}
+   */
+  getValue() {
+    return this.instance.getContent();
+  }
+
+  /**
+   * @param {String} value
+   * @returns {TinyMCEDecorator}
+   */
+  setValue(value) {
+    this.instance.setContent(value);
+    return this;
+  }
+
+  /**
+   * @returns {string}
+   */
+  getSelection() {
+    return this.instance.selection.getContent({ format: 'text' });
+  }
+
+  replaceSelection(value) {
+    this.instance.execCommand('mceInsertContent', false, value);
+    return this;
+  }
+
+  disable(enable) {
+    this.instance.setMode(!enable ? 'readonly' : 'design');
+    return this;
+  }
+
+  /**
+   * Toggles the editor visibility mode. Used by Toggle button.
+   * Should be implemented by editor provider.
+   *
+   * @param {boolean} show Optional. True to show, false to hide.
+   *
+   * @returns {boolean} Return True when editor become visible, and false when become hidden.
+   */
+  toggle(show) {
+    let visible = false;
+    if (show || this.instance.isHidden()) {
+      this.instance.show();
+      visible = true;
+    } else {
+      this.instance.hide();
     }
-    reInitQueue[element.id] = setTimeout(() => {
-      editor.remove();
-      Joomla.editors.instances[element.id] = null;
-      Joomla.JoomlaTinyMCE.setupEditor(element, pluginOptions);
-    }, 500);
-  };
-
-  Joomla.JoomlaTinyMCE = {
-    /**
-     * Find all TinyMCE elements and initialize TinyMCE instance for each
-     *
-     * @param {HTMLElement}  target  Target Element where to search for the editor element
-     *
-     * @since 3.7.0
-     */
-    setupEditors: (target) => {
-      const container = target || document;
-      const pluginOptions = Joomla.getOptions ? Joomla.getOptions('plg_editor_tinymce', {})
-        : (Joomla.optionsStorage.plg_editor_tinymce || {});
-      const editors = [].slice.call(container.querySelectorAll('.js-editor-tinymce'));
-
-      editors.forEach((editor) => {
-        const currentEditor = editor.querySelector('textarea');
-        const toggleButton = editor.querySelector('.js-tiny-toggler-button');
-        const toggleIcon = editor.querySelector('.icon-eye');
-
-        // Setup the editor
-        Joomla.JoomlaTinyMCE.setupEditor(currentEditor, pluginOptions);
-
-        // Setup the toggle button
-        if (toggleButton) {
-          toggleButton.removeAttribute('disabled');
-          toggleButton.addEventListener('click', () => {
-            if (Joomla.editors.instances[currentEditor.id].instance.isHidden()) {
-              Joomla.editors.instances[currentEditor.id].instance.show();
-            } else {
-              Joomla.editors.instances[currentEditor.id].instance.hide();
-            }
-
-            if (toggleIcon) {
-              toggleIcon.setAttribute('class', Joomla.editors.instances[currentEditor.id].instance.isHidden() ? 'icon-eye' : 'icon-eye-slash');
-            }
-          });
-        }
-      });
-    },
-
-    /**
-     * Initialize TinyMCE editor instance
-     *
-     * @param {HTMLElement}  element
-     * @param {Object}       pluginOptions
-     *
-     * @since 3.7.0
-     */
-    setupEditor: (element, pluginOptions) => {
-      // Check whether the editor already has ben set
-      if (Joomla.editors.instances[element.id]) {
-        return;
-      }
+    return visible;
+  }
+}
 
-      const name = element ? element.getAttribute('name').replace(/\[\]|\]/g, '').split('[').pop() : 'default'; // Get Editor name
-      const tinyMCEOptions = pluginOptions ? pluginOptions.tinyMCE || {} : {};
-      const defaultOptions = tinyMCEOptions.default || {};
-      // Check specific options by the name
-      let options = tinyMCEOptions[name] ? tinyMCEOptions[name] : defaultOptions;
-
-      // Avoid an unexpected changes, and copy the options object
-      if (options.joomlaMergeDefaults) {
-        options = Joomla.extend(Joomla.extend({}, defaultOptions), options);
-      } else {
-        options = Joomla.extend({}, options);
-      }
+Joomla.JoomlaTinyMCE = {
+  /**
+   * Find all TinyMCE elements and initialize TinyMCE instance for each
+   *
+   * @param {HTMLElement}  target  Target Element where to search for the editor element
+   *
+   * @since 3.7.0
+   */
+  setupEditors: (target) => {
+    const container = target || document;
+    const pluginOptions = Joomla.getOptions('plg_editor_tinymce', {});
+    const editors = container.querySelectorAll('.js-editor-tinymce');
 
-      if (element) {
-        // We already have the Target, so reset the selector and assign given element as target
-        options.selector = null;
-        options.target = element;
-      }
+    editors.forEach((editor) => {
+      const currentEditor = editor.querySelector('textarea');
+      const toggleButton = editor.querySelector('.js-tiny-toggler-button');
+      const toggleIcon = toggleButton.querySelector('.icon-eye');
 
-      const buttonValues = [];
-      const arr = Object.keys(options.joomlaExtButtons.names)
-        .map((key) => options.joomlaExtButtons.names[key]);
+      // Set up the editor
+      Joomla.JoomlaTinyMCE.setupEditor(currentEditor, pluginOptions);
 
-      const icons = {
-        joomla: '<svg viewBox="0 0 32 32" width="24" height="24"><path d="M8.313 8.646c1.026-1.026 2.688-1.026 3.713-0.001l0.245 0.246 3.159-3.161-0.246-0.246c-1.801-1.803-4.329-2.434-6.638-1.891-0.331-2.037-2.096-3.591-4.224-3.592-2.364 0-4.28 1.92-4.28 4.286 0 2.042 1.425 3.75 3.333 4.182-0.723 2.42-0.133 5.151 1.776 7.062l7.12 7.122 3.156-3.163-7.119-7.121c-1.021-1.023-1.023-2.691 0.006-3.722zM31.96 4.286c0-2.368-1.916-4.286-4.281-4.286-2.164 0-3.952 1.608-4.24 3.695-2.409-0.708-5.118-0.109-7.020 1.794l-7.12 7.122 3.159 3.162 7.118-7.12c1.029-1.030 2.687-1.028 3.709-0.006 1.025 1.026 1.025 2.691-0.001 3.717l-0.244 0.245 3.157 3.164 0.246-0.248c1.889-1.893 2.49-4.586 1.8-6.989 2.098-0.276 3.717-2.074 3.717-4.25zM28.321 23.471c0.566-2.327-0.062-4.885-1.878-6.703l-7.109-7.125-3.159 3.16 7.11 7.125c1.029 1.031 1.027 2.691 0.006 3.714-1.025 1.025-2.688 1.025-3.714-0.001l-0.243-0.243-3.156 3.164 0.242 0.241c1.922 1.925 4.676 2.514 7.105 1.765 0.395 1.959 2.123 3.431 4.196 3.431 2.363 0 4.28-1.917 4.28-4.285 0-2.163-1.599-3.952-3.679-4.244zM19.136 16.521l-7.111 7.125c-1.022 1.024-2.689 1.026-3.717-0.004-1.026-1.028-1.026-2.691-0.001-3.718l0.244-0.243-3.159-3.16-0.242 0.241c-1.836 1.838-2.455 4.432-1.858 6.781-1.887 0.446-3.292 2.145-3.292 4.172-0.001 2.367 1.917 4.285 4.281 4.285 2.034-0.001 3.737-1.419 4.173-3.324 2.334 0.58 4.906-0.041 6.729-1.867l7.109-7.124-3.157-3.163z"></path></svg>',
-      };
+      // Set up the toggle button
+      if (toggleButton) {
+        toggleButton.removeAttribute('disabled');
+      }
 
-      arr.forEach((xtdButton) => {
-        const tmp = {};
-        tmp.text = xtdButton.name;
-        tmp.icon = xtdButton.icon;
-        tmp.type = 'menuitem';
+      // Find out when editor is interacted
+      editor.addEventListener('click', (event) => {
+        JoomlaEditor.setActive(currentEditor.id);
 
-        if (xtdButton.iconSVG) {
-          icons[tmp.icon] = xtdButton.iconSVG;
-        }
+        // Check for the click on a toggle button
+        const toggler = event.target.closest('.js-tiny-toggler-button');
+        const ed = JoomlaEditor.getActive();
+        if (toggler && ed) {
+          const visible = ed.toggle();
 
-        if (xtdButton.href) {
-          tmp.onAction = () => {
-            document.getElementById(`${xtdButton.id}_modal`).open();
-          };
-        } else {
-          tmp.onAction = () => {
-            // eslint-disable-next-line no-new-func
-            new Function(xtdButton.click)();
-          };
+          if (toggleIcon) {
+            toggleIcon.setAttribute('class', visible ? 'icon-eye' : 'icon-eye-slash');
+          }
         }
-
-        buttonValues.push(tmp);
       });
+    });
+  },
 
-      // Ensure tinymce is initialised in readonly mode if the textarea has readonly applied
-      let readOnlyMode = false;
+  /**
+   * Initialize TinyMCE editor instance
+   *
+   * @param {HTMLElement}  element
+   * @param {Object}       pluginOptions
+   *
+   * @since 3.7.0
+   */
+  setupEditor: (element, pluginOptions) => {
+    // Check whether the editor already has been set
+    if (JoomlaEditor.get(element.id)) {
+      return;
+    }
 
-      if (element) {
-        readOnlyMode = element.readOnly;
-      }
+    const name = element ? element.getAttribute('name').replace(/\[\]|\]/g, '').split('[').pop() : 'default'; // Get Editor name
+    const tinyMCEOptions = pluginOptions ? pluginOptions.tinyMCE || {} : {};
+    const defaultOptions = tinyMCEOptions.default || {};
+    // Check specific options by the name
+    let options = tinyMCEOptions[name] ? tinyMCEOptions[name] : defaultOptions;
+
+    // Avoid an unexpected changes, and copy the options object
+    if (options.joomlaMergeDefaults) {
+      options = Joomla.extend(Joomla.extend({}, defaultOptions), options);
+    } else {
+      options = Joomla.extend({}, options);
+    }
+
+    if (element) {
+      // We already have the Target, so reset the selector and assign given element as target
+      options.selector = null;
+      options.target = element;
+    }
 
-      if (buttonValues.length) {
-        options.setup = (editor) => {
-          editor.mode.set(readOnlyMode ? 'readonly' : 'design');
-
-          Object.keys(icons).forEach((icon) => {
-            editor.ui.registry.addIcon(icon, icons[icon]);
-          });
-
-          editor.ui.registry.addMenuButton('jxtdbuttons', {
-            text: Joomla.Text._('PLG_TINY_CORE_BUTTONS'),
-            icon: 'joomla',
-            fetch: (callback) => callback(buttonValues),
-          });
-        };
-      } else {
-        options.setup = (editor) => {
-          editor.mode.set(readOnlyMode ? 'readonly' : 'design');
-        };
+    const buttonValues = [];
+    const arr = Object.keys(options.joomlaExtButtons.names)
+      .map((key) => options.joomlaExtButtons.names[key]);
+
+    const icons = {
+      joomla: '<svg viewBox="0 0 32 32" width="24" height="24"><path d="M8.313 8.646c1.026-1.026 2.688-1.026 3.713-0.001l0.245 0.246 3.159-3.161-0.246-0.246c-1.801-1.803-4.329-2.434-6.638-1.891-0.331-2.037-2.096-3.591-4.224-3.592-2.364 0-4.28 1.92-4.28 4.286 0 2.042 1.425 3.75 3.333 4.182-0.723 2.42-0.133 5.151 1.776 7.062l7.12 7.122 3.156-3.163-7.119-7.121c-1.021-1.023-1.023-2.691 0.006-3.722zM31.96 4.286c0-2.368-1.916-4.286-4.281-4.286-2.164 0-3.952 1.608-4.24 3.695-2.409-0.708-5.118-0.109-7.020 1.794l-7.12 7.122 3.159 3.162 7.118-7.12c1.029-1.030 2.687-1.028 3.709-0.006 1.025 1.026 1.025 2.691-0.001 3.717l-0.244 0.245 3.157 3.164 0.246-0.248c1.889-1.893 2.49-4.586 1.8-6.989 2.098-0.276 3.717-2.074 3.717-4.25zM28.321 23.471c0.566-2.327-0.062-4.885-1.878-6.703l-7.109-7.125-3.159 3.16 7.11 7.125c1.029 1.031 1.027 2.691 0.006 3.714-1.025 1.025-2.688 1.025-3.714-0.001l-0.243-0.243-3.156 3.164 0.242 0.241c1.922 1.925 4.676 2.514 7.105 1.765 0.395 1.959 2.123 3.431 4.196 3.431 2.363 0 4.28-1.917 4.28-4.285 0-2.163-1.599-3.952-3.679-4.244zM19.136 16.521l-7.111 7.125c-1.022 1.024-2.689 1.026-3.717-0.004-1.026-1.028-1.026-2.691-0.001-3.718l0.244-0.243-3.159-3.16-0.242 0.241c-1.836 1.838-2.455 4.432-1.858 6.781-1.887 0.446-3.292 2.145-3.292 4.172-0.001 2.367 1.917 4.285 4.281 4.285 2.034-0.001 3.737-1.419 4.173-3.324 2.334 0.58 4.906-0.041 6.729-1.867l7.109-7.124-3.157-3.163z"></path></svg>',
+    };
+
+    arr.forEach((xtdButton) => {
+      const tmp = {};
+      tmp.text = xtdButton.name;
+      tmp.icon = xtdButton.icon;
+      tmp.type = 'menuitem';
+
+      if (xtdButton.iconSVG) {
+        icons[tmp.icon] = xtdButton.iconSVG;
       }
 
-      // We'll take over the onSubmit event
-      options.init_instance_callback = (editor) => {
-        editor.on('submit', () => {
-          if (editor.isHidden()) {
-            editor.show();
-          }
-        }, true);
+      tmp.onAction = () => {
+        JoomlaEditor.setActive(element.id);
+        if (xtdButton.action) {
+          JoomlaEditorButton.runAction(xtdButton.action, xtdButton.options || {});
+        } else if (xtdButton.bsModal) {
+          document.getElementById(`${xtdButton.id}_modal`).open();
+        } else if (xtdButton.click) {
+          // eslint-disable-next-line no-new-func
+          new Function(xtdButton.click)();
+        }
       };
 
-      // Create a new instance
-      // eslint-disable-next-line no-undef
-      const ed = new tinyMCE.Editor(element.id, options, tinymce.EditorManager);
-
-      // Work around iframe behavior, when iframe element changes location in DOM and losing its content.
-      // Re init editor when iframe is reloaded.
-      if (!ed.inline) {
-        let isReady = false;
-        let isRendered = false;
-        const listenIframeReload = () => {
-          const $iframe = ed.getContentAreaContainer().querySelector('iframe');
-
-          $iframe.addEventListener('load', () => {
-            debounceReInit(ed, element, pluginOptions);
-          });
-        };
-
-        // Make sure iframe is fully loaded.
-        // This works differently in different browsers, so have to listen both "load" and "PostRender" events.
-        ed.on('load', () => {
-          isReady = true;
-          if (isRendered) {
-            listenIframeReload();
-          }
+      buttonValues.push(tmp);
+    });
+
+    // Ensure tinymce is initialised in readonly mode if the textarea has readonly applied
+    let readOnlyMode = false;
+
+    if (element) {
+      readOnlyMode = element.readOnly;
+    }
+
+    if (buttonValues.length) {
+      options.setup = (editor) => {
+        editor.mode.set(readOnlyMode ? 'readonly' : 'design');
+
+        Object.keys(icons).forEach((icon) => {
+          editor.ui.registry.addIcon(icon, icons[icon]);
         });
-        ed.on('PostRender', () => {
-          isRendered = true;
-          if (isReady) {
-            listenIframeReload();
-          }
+
+        editor.ui.registry.addMenuButton('jxtdbuttons', {
+          text: Joomla.Text._('PLG_TINY_CORE_BUTTONS'),
+          icon: 'joomla',
+          fetch: (callback) => callback(buttonValues),
         });
-      }
+      };
+    } else {
+      options.setup = (editor) => {
+        editor.mode.set(readOnlyMode ? 'readonly' : 'design');
+      };
+    }
+
+    // We'll take over the onSubmit event
+    options.init_instance_callback = (editor) => {
+      editor.on('submit', () => {
+        if (editor.isHidden()) {
+          editor.show();
+        }
+      }, true);
+    };
 
-      ed.render();
-
-      /** Register the editor's instance to Joomla Object */
-      Joomla.editors.instances[element.id] = {
-        // Required by Joomla's API for the XTD-Buttons
-        getValue: () => Joomla.editors.instances[element.id].instance.getContent(),
-        setValue: (text) => Joomla.editors.instances[element.id].instance.setContent(text),
-        getSelection: () => Joomla.editors.instances[element.id].instance.selection.getContent({ format: 'text' }),
-        replaceSelection: (text) => Joomla.editors.instances[element.id].instance.execCommand('mceInsertContent', false, text),
-        // Required by Joomla's API for Mail Component Integration
-        disable: (disabled) => Joomla.editors.instances[element.id].instance.setMode(disabled ? 'readonly' : 'design'),
-        // Some extra instance dependent
-        id: element.id,
-        instance: ed,
+    // Create a new instance
+    const ed = new tinyMCE.Editor(element.id, options, tinymce.EditorManager);
+    // Create a decorator
+    const jEditor = new TinyMCEDecorator(ed, 'tinymce', element.id);
+
+    // Work around iframe behavior, when iframe element changes location in DOM and losing its content.
+    // Re init editor when iframe is reloaded.
+    if (!ed.inline) {
+      let isReady = false;
+      let isRendered = false;
+      const listenIframeReload = () => {
+        const $iframe = ed.getContentAreaContainer().querySelector('iframe');
+
+        $iframe.addEventListener('load', () => {
+          debounceReInit(ed, element, pluginOptions);
+        });
       };
-    },
-  };
 
-  /**
-   * Initialize at an initial page load
-   */
-  document.addEventListener('DOMContentLoaded', () => { Joomla.JoomlaTinyMCE.setupEditors(document); });
+      // Make sure iframe is fully loaded.
+      // This works differently in different browsers, so have to listen both "load" and "PostRender" events.
+      ed.on('load', () => {
+        isReady = true;
+        if (isRendered) {
+          listenIframeReload();
+        }
+      });
+      ed.on('PostRender', () => {
+        isRendered = true;
+        if (isReady) {
+          listenIframeReload();
+        }
+      });
+    }
 
-  /**
-   * Initialize when a part of the page was updated
-   */
-  document.addEventListener('joomla:updated', ({ target }) => Joomla.JoomlaTinyMCE.setupEditors(target));
-})(window.tinyMCE, Joomla, window, document);
+    // Find out when editor is interacted
+    ed.on('focus', () => {
+      JoomlaEditor.setActive(jEditor);
+    });
+
+    // Render the editor
+    ed.render();
+    // Register the editor's instance to JoomlaEditor
+    JoomlaEditor.register(jEditor);
+  },
+};
+
+/**
+ * Initialize at an initial page load
+ */
+document.addEventListener('DOMContentLoaded', () => { Joomla.JoomlaTinyMCE.setupEditors(document); });
+
+/**
+ * Initialize when a part of the page was updated
+ */
+document.addEventListener('joomla:updated', ({ target }) => Joomla.JoomlaTinyMCE.setupEditors(target));
diff --git a/build/media_source/plg_installer_webinstaller/js/client.es6.js b/build/media_source/plg_installer_webinstaller/js/client.es6.js
index 119ead8768b5b..b2b848ca501eb 100644
--- a/build/media_source/plg_installer_webinstaller/js/client.es6.js
+++ b/build/media_source/plg_installer_webinstaller/js/client.es6.js
@@ -404,7 +404,7 @@ customElements.whenDefined('joomla-tab').then(() => {
   const installerTabs = document.getElementById('myTab');
   const link = installerTabs.querySelector('button[aria-controls=web]');
 
-  // Abort if the IFW tab cannot be found
+  // Stop if the IFW tab cannot be found
   if (!link) {
     return;
   }
diff --git a/build/media_source/plg_media-action_crop/js/crop.es6.js b/build/media_source/plg_media-action_crop/js/crop.es6.js
index 5b5436c9ad3c3..80b49e2dc70e1 100644
--- a/build/media_source/plg_media-action_crop/js/crop.es6.js
+++ b/build/media_source/plg_media-action_crop/js/crop.es6.js
@@ -2,7 +2,9 @@
  * @copyright  (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
-/* global Cropper */
+// eslint-disable-next-line  import/no-unresolved
+import Cropper from 'cropper-module';
+
 let formElements;
 let activated = false;
 let instance;
diff --git a/build/media_source/plg_multifactorauth_totp/joomla.asset.json b/build/media_source/plg_multifactorauth_totp/joomla.asset.json
index 8d45f62d48848..73af3523ff23f 100644
--- a/build/media_source/plg_multifactorauth_totp/joomla.asset.json
+++ b/build/media_source/plg_multifactorauth_totp/joomla.asset.json
@@ -10,26 +10,12 @@
       "type": "script",
       "uri": "plg_multifactorauth_totp/setup.min.js",
       "dependencies": [
-        "plg_multifactorauth_totp.setup.es5",
         "qrcode",
         "core"
       ],
       "attributes": {
         "type": "module"
       }
-    },
-    {
-      "name": "plg_multifactorauth_totp.setup.es5",
-      "type": "script",
-      "uri": "plg_multifactorauth_totp/setup-es5.min.js",
-      "dependencies": [
-        "qrcode",
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
     }
   ]
 }
diff --git a/build/media_source/plg_multifactorauth_webauthn/images/passkeys.svg b/build/media_source/plg_multifactorauth_webauthn/images/passkeys.svg
new file mode 100644
index 0000000000000..4a8edbfd40987
--- /dev/null
+++ b/build/media_source/plg_multifactorauth_webauthn/images/passkeys.svg
@@ -0,0 +1,14 @@
+<svg width="113" viewBox="0 0 112 30" xmlns="http://www.w3.org/2000/svg">
+	<rect x="-4" y="-2" width="119.522" height="34.182" style="fill:none;"/>
+	<g>
+		<path d="M12.648,0.445c3.829,0 6.937,3.109 6.937,6.938c0,3.829 -3.108,6.937 -6.937,6.937c-3.829,0 -6.937,-3.108 -6.937,-6.937c-0,-3.829 3.108,-6.938 6.937,-6.938Zm18.5,13.875c-0.004,2.223 -1.38,4.226 -3.454,5.026l1.912,1.911l-2.313,2.313l2.313,2.312l-3.854,3.854l-2.313,-2.312l0,-8.248c-1.879,-0.891 -3.083,-2.794 -3.083,-4.875c0,-2.96 2.436,-5.396 5.396,-5.396c2.96,0 5.396,2.436 5.396,5.396c-0,0.006 -0,0.013 -0,0.019Zm-5.396,0c0.846,0 1.541,-0.696 1.541,-1.542c0,-0.845 -0.695,-1.541 -1.541,-1.541c-0.846,-0 -1.542,0.696 -1.542,1.541c0,0.846 0.696,1.542 1.542,1.542Zm-7.03,3.114c0.539,1.195 1.365,2.239 2.405,3.037l-0,8.495l-20.041,-0l-0,-3.084c-0,-5.074 4.175,-9.249 9.25,-9.249l4.624,-0c1.297,0 2.578,0.273 3.762,0.801Z"/>
+		<path d="M44.369,16.591l-2.438,-0l-0,4.129l-2.385,0l0,-11.485l5.003,0c1.153,0 2.072,0.296 2.758,0.888c0.686,0.593 1.028,1.509 1.028,2.751c0,1.356 -0.342,2.314 -1.028,2.875c-0.686,0.561 -1.665,0.842 -2.938,0.842Zm1.122,-2.392c0.312,-0.276 0.468,-0.712 0.468,-1.309c-0,-0.598 -0.157,-1.024 -0.472,-1.278c-0.314,-0.255 -0.754,-0.382 -1.32,-0.382l-2.236,-0l-0,3.382l2.236,-0c0.566,-0 1.007,-0.138 1.324,-0.413Z" style="fill-rule:nonzero;"/>
+		<path d="M50.275,13.147c0.587,-0.748 1.595,-1.122 3.024,-1.122c0.93,-0 1.755,0.184 2.477,0.553c0.723,0.369 1.084,1.065 1.084,2.088l-0,3.896c-0,0.27 0.005,0.597 0.015,0.982c0.016,0.291 0.06,0.488 0.133,0.592c0.072,0.104 0.181,0.189 0.327,0.257l-0,0.327l-2.416,0c-0.067,-0.171 -0.114,-0.332 -0.14,-0.483c-0.026,-0.15 -0.047,-0.322 -0.062,-0.514c-0.307,0.332 -0.66,0.615 -1.06,0.849c-0.478,0.276 -1.018,0.413 -1.621,0.413c-0.768,0 -1.403,-0.219 -1.905,-0.658c-0.501,-0.439 -0.752,-1.061 -0.752,-1.866c0,-1.044 0.403,-1.8 1.208,-2.268c0.442,-0.254 1.091,-0.436 1.948,-0.545l0.756,-0.094c0.41,-0.052 0.704,-0.117 0.88,-0.194c0.317,-0.136 0.476,-0.346 0.476,-0.632c-0,-0.348 -0.121,-0.588 -0.363,-0.72c-0.241,-0.133 -0.596,-0.199 -1.063,-0.199c-0.525,-0 -0.896,0.13 -1.114,0.39c-0.156,0.192 -0.26,0.451 -0.312,0.779l-2.143,-0c0.047,-0.743 0.255,-1.353 0.623,-1.831Zm1.652,5.968c0.208,0.172 0.463,0.257 0.764,0.257c0.478,0 0.918,-0.14 1.321,-0.42c0.402,-0.281 0.611,-0.793 0.627,-1.535l-0,-0.826c-0.14,0.088 -0.282,0.159 -0.425,0.214c-0.143,0.054 -0.339,0.105 -0.588,0.152l-0.499,0.093c-0.467,0.083 -0.802,0.185 -1.005,0.304c-0.343,0.203 -0.514,0.517 -0.514,0.943c-0,0.379 0.106,0.652 0.319,0.818Z" style="fill-rule:nonzero;"/>
+		<path d="M64.683,12.617c0.664,0.426 1.046,1.158 1.145,2.197l-2.221,0c-0.031,-0.286 -0.111,-0.512 -0.241,-0.678c-0.244,-0.301 -0.66,-0.452 -1.247,-0.452c-0.483,0 -0.827,0.076 -1.032,0.226c-0.206,0.151 -0.308,0.328 -0.308,0.53c-0,0.255 0.109,0.439 0.327,0.553c0.218,0.12 0.99,0.325 2.314,0.616c0.883,0.208 1.546,0.522 1.987,0.943c0.436,0.426 0.655,0.958 0.655,1.597c-0,0.841 -0.313,1.528 -0.939,2.061c-0.626,0.532 -1.594,0.799 -2.903,0.799c-1.335,-0 -2.32,-0.282 -2.957,-0.846c-0.636,-0.563 -0.954,-1.282 -0.954,-2.154l2.252,-0c0.046,0.395 0.148,0.675 0.304,0.841c0.275,0.296 0.784,0.444 1.527,0.444c0.436,0 0.783,-0.065 1.04,-0.194c0.257,-0.13 0.386,-0.325 0.386,-0.585c-0,-0.249 -0.104,-0.439 -0.312,-0.569c-0.208,-0.129 -0.979,-0.353 -2.314,-0.67c-0.961,-0.239 -1.639,-0.537 -2.034,-0.896c-0.395,-0.353 -0.592,-0.862 -0.592,-1.527c-0,-0.784 0.308,-1.458 0.923,-2.022c0.616,-0.564 1.482,-0.845 2.599,-0.845c1.06,-0 1.924,0.21 2.595,0.631Z" style="fill-rule:nonzero;"/>
+		<path d="M73.557,12.617c0.665,0.426 1.047,1.158 1.146,2.197l-2.221,0c-0.031,-0.286 -0.112,-0.512 -0.241,-0.678c-0.245,-0.301 -0.66,-0.452 -1.247,-0.452c-0.483,0 -0.827,0.076 -1.033,0.226c-0.205,0.151 -0.307,0.328 -0.307,0.53c-0,0.255 0.109,0.439 0.327,0.553c0.218,0.12 0.989,0.325 2.314,0.616c0.883,0.208 1.545,0.522 1.987,0.943c0.436,0.426 0.654,0.958 0.654,1.597c0,0.841 -0.312,1.528 -0.938,2.061c-0.626,0.532 -1.594,0.799 -2.903,0.799c-1.335,-0 -2.321,-0.282 -2.957,-0.846c-0.636,-0.563 -0.954,-1.282 -0.954,-2.154l2.251,-0c0.047,0.395 0.149,0.675 0.304,0.841c0.276,0.296 0.785,0.444 1.528,0.444c0.436,0 0.783,-0.065 1.04,-0.194c0.257,-0.13 0.385,-0.325 0.385,-0.585c0,-0.249 -0.103,-0.439 -0.311,-0.569c-0.208,-0.129 -0.979,-0.353 -2.314,-0.67c-0.961,-0.239 -1.639,-0.537 -2.034,-0.896c-0.395,-0.353 -0.592,-0.862 -0.592,-1.527c-0,-0.784 0.308,-1.458 0.923,-2.022c0.616,-0.564 1.482,-0.845 2.599,-0.845c1.059,-0 1.924,0.21 2.594,0.631Z" style="fill-rule:nonzero;"/>
+		<path d="M84.372,20.72l-2.68,0l-2.034,-3.631l-0.919,0.959l-0,2.672l-2.182,0l0,-11.446l2.182,0l-0,6.187l2.766,-3.195l2.75,0l-2.968,3.249l3.085,5.205Z" style="fill-rule:nonzero;"/>
+		<path d="M92.725,18.227c-0.057,0.504 -0.319,1.015 -0.787,1.535c-0.727,0.826 -1.745,1.239 -3.054,1.239c-1.081,-0 -2.034,-0.348 -2.86,-1.044c-0.826,-0.696 -1.239,-1.829 -1.239,-3.398c0,-1.47 0.373,-2.597 1.118,-3.381c0.746,-0.785 1.713,-1.177 2.903,-1.177c0.706,0 1.343,0.133 1.909,0.398c0.566,0.265 1.034,0.683 1.402,1.254c0.333,0.504 0.548,1.088 0.647,1.753c0.057,0.39 0.081,0.951 0.07,1.683l-5.812,0c0.031,0.852 0.298,1.45 0.802,1.792c0.307,0.213 0.675,0.32 1.107,0.32c0.457,-0 0.828,-0.13 1.114,-0.39c0.156,-0.14 0.293,-0.335 0.413,-0.584l2.267,-0Zm-2.197,-2.603c-0.037,-0.587 -0.214,-1.032 -0.534,-1.336c-0.319,-0.304 -0.715,-0.456 -1.188,-0.456c-0.514,0 -0.913,0.161 -1.196,0.483c-0.283,0.322 -0.461,0.759 -0.534,1.309l3.452,0Z" style="fill-rule:nonzero;"/>
+		<path d="M97.782,18.492l1.753,-6.265l2.361,0l-2.914,8.353c-0.561,1.61 -1.005,2.609 -1.332,2.996c-0.328,0.387 -0.982,0.58 -1.964,0.58c-0.197,0 -0.356,-0.001 -0.475,-0.003c-0.12,-0.003 -0.299,-0.012 -0.538,-0.028l0,-1.776l0.281,0.015c0.218,0.011 0.426,0.003 0.623,-0.023c0.197,-0.026 0.364,-0.086 0.499,-0.179c0.129,-0.089 0.25,-0.273 0.362,-0.553c0.112,-0.281 0.157,-0.452 0.136,-0.515l-3.116,-8.867l2.47,0l1.854,6.265Z" style="fill-rule:nonzero;"/>
+		<path d="M109.057,12.617c0.665,0.426 1.046,1.158 1.145,2.197l-2.221,0c-0.031,-0.286 -0.111,-0.512 -0.241,-0.678c-0.244,-0.301 -0.66,-0.452 -1.247,-0.452c-0.483,0 -0.827,0.076 -1.032,0.226c-0.205,0.151 -0.308,0.328 -0.308,0.53c0,0.255 0.109,0.439 0.327,0.553c0.218,0.12 0.99,0.325 2.314,0.616c0.884,0.208 1.546,0.522 1.987,0.943c0.437,0.426 0.655,0.958 0.655,1.597c-0,0.841 -0.313,1.528 -0.939,2.061c-0.626,0.532 -1.593,0.799 -2.902,0.799c-1.335,-0 -2.321,-0.282 -2.957,-0.846c-0.637,-0.563 -0.955,-1.282 -0.955,-2.154l2.252,-0c0.047,0.395 0.148,0.675 0.304,0.841c0.275,0.296 0.784,0.444 1.527,0.444c0.436,0 0.783,-0.065 1.04,-0.194c0.257,-0.13 0.386,-0.325 0.386,-0.585c-0,-0.249 -0.104,-0.439 -0.312,-0.569c-0.208,-0.129 -0.979,-0.353 -2.314,-0.67c-0.961,-0.239 -1.639,-0.537 -2.034,-0.896c-0.394,-0.353 -0.592,-0.862 -0.592,-1.527c0,-0.784 0.308,-1.458 0.923,-2.022c0.616,-0.564 1.482,-0.845 2.599,-0.845c1.06,-0 1.925,0.21 2.595,0.631Z" style="fill-rule:nonzero;"/>
+	</g>
+</svg>
diff --git a/build/media_source/plg_multifactorauth_webauthn/joomla.asset.json b/build/media_source/plg_multifactorauth_webauthn/joomla.asset.json
index a96418c9e0e9f..df9edd101bc79 100644
--- a/build/media_source/plg_multifactorauth_webauthn/joomla.asset.json
+++ b/build/media_source/plg_multifactorauth_webauthn/joomla.asset.json
@@ -10,24 +10,11 @@
       "type": "script",
       "uri": "plg_multifactorauth_webauthn/webauthn.min.js",
       "dependencies": [
-        "plg_multifactorauth_webauthn.webauthn.es5",
         "core"
       ],
       "attributes": {
         "defer": true
       }
-    },
-    {
-      "name": "plg_multifactorauth_webauthn.webauthn.es5",
-      "type": "script",
-      "uri": "plg_multifactorauth_webauthn/webauthn-es5.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
     }
   ]
 }
diff --git a/build/media_source/plg_quickicon_eos/js/snooze.es6.js b/build/media_source/plg_quickicon_eos/js/snooze.es6.js
new file mode 100644
index 0000000000000..cda59294cbbcd
--- /dev/null
+++ b/build/media_source/plg_quickicon_eos/js/snooze.es6.js
@@ -0,0 +1,37 @@
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Quickicon.eos
+ * @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 is not properly initialised');
+}
+
+const url = new URL(`${Joomla.getOptions('system.paths').baseFull}index.php?option=com_ajax&group=quickicon&plugin=eos&format=json`);
+
+async function onMutatedMessagesContainer(mutationList, observer) {
+  // eslint-disable-next-line no-restricted-syntax
+  for (const mutation of mutationList) {
+    const nodes = Array.from(mutation.addedNodes);
+    if (!nodes.length) {
+      return;
+    }
+
+    const alerts = nodes.filter((node) => node.querySelector('.eosnotify-snooze-btn'));
+    if (!alerts.length) {
+      return;
+    }
+
+    observer.disconnect();
+    alerts[0].querySelector('.eosnotify-snooze-btn').addEventListener('click', () => fetch(url, { headers: { 'X-CSRF-Token': Joomla.getOptions('csrf.token') || '' } })
+      .then((response) => {
+        if (response.ok) {
+          alerts[0].closest('joomla-alert').close();
+        }
+      }));
+  }
+}
+
+const observer = new MutationObserver(onMutatedMessagesContainer);
+observer.observe(document.querySelector('#system-message-container'), { attributes: false, childList: true, subtree: true });
diff --git a/build/media_source/plg_system_debug/widgets/languageStrings/widget.css b/build/media_source/plg_system_debug/widgets/languageStrings/widget.css
index 928782ab263cf..dd7c8595c1679 100644
--- a/build/media_source/plg_system_debug/widgets/languageStrings/widget.css
+++ b/build/media_source/plg_system_debug/widgets/languageStrings/widget.css
@@ -44,7 +44,7 @@ table.phpdebugbar-widgets-languageStrings span.phpdebugbar-widgets-eye-dash {
 
 table.phpdebugbar-widgets-languageStrings span.phpdebugbar-widgets-eye:before,
 table.phpdebugbar-widgets-languageStrings span.phpdebugbar-widgets-eye-dash:before {
-    font-family:"Font Awesome 5 Free";
+    font-family:"Font Awesome 6 Free";
     margin-right: 4px;
     /*font-size: 12px;*/
 }
diff --git a/build/media_source/plg_system_debug/widgets/sqlqueries/widget.css b/build/media_source/plg_system_debug/widgets/sqlqueries/widget.css
index fd6350a6cc15a..ed503b2e10839 100644
--- a/build/media_source/plg_system_debug/widgets/sqlqueries/widget.css
+++ b/build/media_source/plg_system_debug/widgets/sqlqueries/widget.css
@@ -49,7 +49,7 @@ div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-eye:before,
 div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-eye-dash:before,
 div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-stmt-id:before,
 div.phpdebugbar-widgets-sqlqueries a.phpdebugbar-widgets-editor-link:before {
-    font-family: "Font Awesome 5 Free";
+    font-family: "Font Awesome 6 Free";
     margin-right: 4px;
     font-size: 12px;
     font-weight: 900;
diff --git a/build/media_source/plg_system_guidedtours/joomla.asset.json b/build/media_source/plg_system_guidedtours/joomla.asset.json
index 1177fce6061fa..39d745f41dc46 100644
--- a/build/media_source/plg_system_guidedtours/joomla.asset.json
+++ b/build/media_source/plg_system_guidedtours/joomla.asset.json
@@ -5,25 +5,12 @@
   "description": "Joomla CMS",
   "license": "GPL-2.0-or-later",
   "assets": [
-    {
-      "name": "plg_system_guidedtours.guidedtours.es5",
-      "type": "script",
-      "uri": "plg_system_guidedtours/guidedtours-es5.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
     {
       "name": "plg_system_guidedtours.guidedtours",
       "type": "script",
       "uri": "plg_system_guidedtours/guidedtours.min.js",
       "dependencies": [
-        "core",
-        "plg_system_guidedtours.guidedtours.es5"
+        "core"
       ],
       "attributes": {
         "type": "module"
diff --git a/build/media_source/plg_system_guidedtours/js/guidedtours.es6.js b/build/media_source/plg_system_guidedtours/js/guidedtours.es6.js
index c60927dacc9d4..363dfb08d0f23 100644
--- a/build/media_source/plg_system_guidedtours/js/guidedtours.es6.js
+++ b/build/media_source/plg_system_guidedtours/js/guidedtours.es6.js
@@ -160,6 +160,9 @@ function addStepToTourButton(tour, stepObj, buttons) {
           if (target.tagName.toLowerCase() === 'iframe') {
             // Give blur to the content of the iframe, as iframes don't have blur events
             target.contentWindow.document.body.addEventListener('blur', (event) => {
+              if (!sessionStorage.getItem('tourId')) {
+                return;
+              }
               setTimeout(() => {
                 setFocus(primaryButton, secondaryButton, cancelButton);
               }, 1);
@@ -167,16 +170,25 @@ function addStepToTourButton(tour, stepObj, buttons) {
             });
           } else if (target.tagName.toLowerCase() === 'joomla-field-fancy-select') {
             target.querySelector('.choices input').addEventListener('blur', (event) => {
+              if (!sessionStorage.getItem('tourId')) {
+                return;
+              }
               setFocus(primaryButton, secondaryButton, cancelButton);
               event.preventDefault();
             });
           } else if (target.parentElement.tagName.toLowerCase() === 'joomla-field-fancy-select') {
             target.querySelector('input').addEventListener('blur', (event) => {
+              if (!sessionStorage.getItem('tourId')) {
+                return;
+              }
               setFocus(primaryButton, secondaryButton, cancelButton);
               event.preventDefault();
             });
           } else {
             target.addEventListener('blur', (event) => {
+              if (!sessionStorage.getItem('tourId')) {
+                return;
+              }
               setFocus(primaryButton, secondaryButton, cancelButton);
               event.preventDefault();
             });
@@ -356,6 +368,9 @@ function startTour(obj) {
           switch (obj.steps[index].interactive_type) {
             case 'submit':
               ele.addEventListener('click', () => {
+                if (!sessionStorage.getItem('tourId')) {
+                  return;
+                }
                 sessionStorage.setItem('currentStepId', obj.steps[index].id + 1);
               });
               break;
@@ -364,6 +379,9 @@ function startTour(obj) {
               ele.step_id = index;
               if (ele.hasAttribute('required') && ['email', 'password', 'search', 'tel', 'text', 'url'].includes(ele.type)) {
                 ['input', 'focus'].forEach((eventName) => ele.addEventListener(eventName, (event) => {
+                  if (!sessionStorage.getItem('tourId')) {
+                    return;
+                  }
                   if (event.target.value.trim().length) {
                     enableButton(event);
                   } else {
@@ -374,7 +392,11 @@ function startTour(obj) {
               break;
 
             case 'button':
-              tour.next();
+              ele.addEventListener('click', () => {
+                // the button may submit a form so record the currentStepId in the session storage
+                sessionStorage.setItem('currentStepId', obj.steps[index].id + 1);
+                tour.next();
+              });
               break;
 
             case 'other':
@@ -405,8 +427,16 @@ function startTour(obj) {
 }
 
 function loadTour(tourId) {
-  if (tourId > 0) {
-    const url = `${Joomla.getOptions('system.paths').rootFull}administrator/index.php?option=com_ajax&plugin=guidedtours&group=system&format=json&id=${tourId}`;
+  const tourUid = Number.parseInt(tourId, 10) > 0 ? '' : encodeURI(tourId);
+  const tourNumber = Number.parseInt(tourId, 10) > 0 ? Number.parseInt(tourId, 10) : 0;
+
+  if (tourNumber > 0 || tourUid !== '') {
+    let url = `${Joomla.getOptions('system.paths').rootFull}administrator/index.php?option=com_ajax&plugin=guidedtours&group=system&format=json`;
+    if (tourNumber > 0) {
+      url += `&id=${tourNumber}`;
+    } else {
+      url += `&uid=${tourUid}`;
+    }
     fetch(url)
       .then((response) => response.json())
       .then((result) => {
@@ -440,19 +470,22 @@ document.querySelector('body').addEventListener('click', (event) => {
   }
 
   // Click button but missing data-id
-  if (typeof event.target.getAttribute('data-id') === 'undefined' || event.target.getAttribute('data-id') <= 0) {
+  if (
+    (!event.target.hasAttribute('data-id') || event.target.getAttribute('data-id') <= 0)
+  && (!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;
   }
 
   sessionStorage.setItem('tourToken', String(Joomla.getOptions('com_guidedtours.token')));
-  loadTour(event.target.getAttribute('data-id'));
+  loadTour(event.target.getAttribute('data-id') || event.target.getAttribute('data-gt-uid'));
 });
 
 // Start a given tour
 const tourId = sessionStorage.getItem('tourId');
 
-if (tourId > 0 && sessionStorage.getItem('tourToken') === String(Joomla.getOptions('com_guidedtours.token'))) {
+if ((Number.parseInt(tourId, 10) > 0 || tourId !== '') && sessionStorage.getItem('tourToken') === String(Joomla.getOptions('com_guidedtours.token'))) {
   loadTour(tourId);
 } else {
   emptyStorage();
diff --git a/build/media_source/plg_system_jooa11y/joomla.asset.json b/build/media_source/plg_system_jooa11y/joomla.asset.json
index 9de8cfb340884..4f39991313bae 100644
--- a/build/media_source/plg_system_jooa11y/joomla.asset.json
+++ b/build/media_source/plg_system_jooa11y/joomla.asset.json
@@ -5,24 +5,12 @@
   "description": "Joomla CMS",
   "license": "GPL-2.0-or-later",
   "assets": [
-    {
-      "name": "plg_system_jooa11y.jooa11y-es5",
-      "type": "script",
-      "uri": "plg_system_jooa11y/jooa11y-es5.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "defer": true,
-        "nomodule": true
-      }
-    },
     {
       "name": "plg_system_jooa11y.jooa11y",
       "type": "script",
       "uri": "plg_system_jooa11y/jooa11y.min.js",
       "dependencies": [
-        "plg_system_jooa11y.jooa11y-es5"
+        "core"
       ],
       "attributes": {
         "type": "module"
diff --git a/build/media_source/plg_system_schedulerunner/joomla.asset.json b/build/media_source/plg_system_schedulerunner/joomla.asset.json
index cf160fff0418f..979aecd2cbc96 100644
--- a/build/media_source/plg_system_schedulerunner/joomla.asset.json
+++ b/build/media_source/plg_system_schedulerunner/joomla.asset.json
@@ -5,24 +5,11 @@
   "description": "Joomla CMS",
   "license": "GPL-2.0-or-later",
   "assets": [
-    {
-      "name": "plg_system_schedulerunner.run-schedule.es5",
-      "type": "script",
-      "uri": "plg_system_schedulerunner/run-schedule-es5.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
     {
       "name": "plg_system_schedulerunner.run-schedule",
       "type": "script",
       "uri": "plg_system_schedulerunner/run-schedule.min.js",
       "dependencies": [
-        "plg_system_schedulerunner.run-schedule.es5",
         "core"
       ],
       "attributes": {
diff --git a/build/media_source/plg_system_schedulerunner/js/run-schedule.es6.js b/build/media_source/plg_system_schedulerunner/js/run-schedule.es6.js
index 535a02b09932d..1932cd064dcef 100644
--- a/build/media_source/plg_system_schedulerunner/js/run-schedule.es6.js
+++ b/build/media_source/plg_system_schedulerunner/js/run-schedule.es6.js
@@ -23,10 +23,10 @@ const initScheduler = () => {
   const interval = (options && options.interval ? parseInt(options.interval, 10) : 300) * 1000;
   const uri = `${paths ? `${paths.root}/index.php` : window.location.pathname}?option=com_ajax&format=raw&plugin=RunSchedulerLazy&group=system`;
 
-  setInterval(() => navigator.sendBeacon(uri), interval);
+  setInterval(() => fetch(uri, { method: 'GET' }), interval);
 
   // Run it at the beginning at least once
-  navigator.sendBeacon(uri);
+  fetch(uri, { method: 'GET' });
 };
 
 ((document) => {
diff --git a/build/media_source/plg_system_webauthn/images/fido-passkey-black.svg b/build/media_source/plg_system_webauthn/images/fido-passkey-black.svg
new file mode 100644
index 0000000000000..80d19577c876f
--- /dev/null
+++ b/build/media_source/plg_system_webauthn/images/fido-passkey-black.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" id="Passkey" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><g id="icon-passkey"><circle id="icon-passkey-head" cx="10.5" cy="6" r="4.5"/><path id="icon-passkey-key" d="M22.5,10.5a3.5,3.5,0,1,0-5,3.15V19L19,20.5,21.5,18,20,16.5,21.5,15l-1.24-1.24A3.5,3.5,0,0,0,22.5,10.5Zm-3.5,0a1,1,0,1,1,1-1A1,1,0,0,1,19,10.5Z"/><path id="icon-passkey-body" d="M14.44,12.52A6,6,0,0,0,12,12H9a6,6,0,0,0-6,6v2H16V14.49A5.16,5.16,0,0,1,14.44,12.52Z"/></g></svg>
diff --git a/build/media_source/plg_system_webauthn/scss/button.scss b/build/media_source/plg_system_webauthn/scss/button.scss
index b2d153b6525d3..26a20f1cd2dd0 100644
--- a/build/media_source/plg_system_webauthn/scss/button.scss
+++ b/build/media_source/plg_system_webauthn/scss/button.scss
@@ -1,6 +1,5 @@
 button[class*=plg_system_webauthn_login_button] {
-  max-height: 3rem;
-  padding: .25rem;
+  padding: .4rem;
 
   span[class*=icon] {
     display: inline-block;
diff --git a/build/media_source/system/joomla.asset.json b/build/media_source/system/joomla.asset.json
index ec9194a0f72d6..bd33f30bc4f07 100644
--- a/build/media_source/system/joomla.asset.json
+++ b/build/media_source/system/joomla.asset.json
@@ -11,24 +11,11 @@
       "class": "CoreAssetItem",
       "uri": "system/core.min.js"
     },
-    {
-      "name": "keepalive.es5",
-      "type": "script",
-      "dependencies": [
-        "core"
-      ],
-      "uri": "system/keepalive-es5.min.js",
-      "attributes": {
-        "defer": true,
-        "nomodule": true
-      }
-    },
     {
       "name": "keepalive",
       "type": "script",
       "class": "KeepaliveAssetItem",
       "dependencies": [
-        "keepalive.es5",
         "core"
       ],
       "uri": "system/keepalive.min.js",
@@ -39,7 +26,8 @@
     {
       "name": "messages-legacy",
       "type": "script",
-      "uri": "system/messages-es5.min.js",
+      "deprecated": true,
+      "uri": "",
       "attributes": {
         "nomodule": true,
         "defer": true
@@ -59,10 +47,39 @@
         "messages-legacy"
       ]
     },
+    {
+      "name": "editor-decorator",
+      "type": "script",
+      "uri": "system/editors/editor-decorator.min.js",
+      "importmap": true
+    },
+    {
+      "name": "editor-api",
+      "type": "script",
+      "uri": "system/editors/editor-api.min.js",
+      "importmap": true,
+      "dependencies": [
+        "editor-decorator"
+      ]
+    },
+    {
+      "name": "editors",
+      "type": "script",
+      "uri": "system/editors/editors.min.js",
+      "attributes": {
+        "type": "module"
+      },
+      "dependencies": [
+        "core",
+        "editor-decorator",
+        "editor-api"
+      ]
+    },
     {
       "name": "inlinehelp-legacy",
       "type": "script",
-      "uri": "system/inlinehelp-es5.min.js",
+      "deprecated": true,
+      "uri": "",
       "attributes": {
         "nomodule": true,
         "defer": true
@@ -121,24 +138,11 @@
       "type": "style",
       "uri": ""
     },
-    {
-      "name": "showon.es5",
-      "type": "script",
-      "dependencies": [
-        "core"
-      ],
-      "uri": "system/showon-es5.min.js",
-      "attributes": {
-        "defer": true,
-        "nomodule": true
-      }
-    },
     {
       "name": "showon",
       "type": "script",
       "dependencies": [
-        "core",
-        "showon.es5"
+        "core"
       ],
       "uri": "system/showon.min.js",
       "attributes": {
@@ -200,7 +204,8 @@
     {
       "name": "highlight-legacy",
       "type": "script",
-      "uri": "system/highlight-es5.min.js",
+      "deprecated": true,
+      "uri": "",
       "attributes": {
         "defer": true,
         "nomodule": true
@@ -286,7 +291,9 @@
       ],
       "attributes": {
         "defer": true
-      }
+      },
+      "deprecated": true,
+      "deprecatedMsg": "Use [modal-content-select-field] asset instead. To be removed in Joomla 6."
     },
     {
       "name": "joomla.batch-copymove",
@@ -299,7 +306,8 @@
     {
       "name": "webcomponent.field-fancy-select-legacy",
       "type": "script",
-      "uri": "system/fields/joomla-field-fancy-select-es5.min.js",
+      "deprecated": true,
+      "uri": "",
       "attributes": {
         "nomodule": true,
         "defer": true
@@ -334,7 +342,8 @@
     {
       "name": "webcomponent.media-select-legacy",
       "type": "script",
-      "uri": "system/fields/joomla-media-select-es5.min.js",
+      "deprecated": true,
+      "uri": "",
       "attributes": {
         "nomodule": true,
         "defer": true
@@ -357,7 +366,8 @@
     {
       "name": "webcomponent.field-media-legacy",
       "type": "script",
-      "uri": "system/fields/joomla-field-media-es5.min.js",
+      "deprecated": true,
+      "uri": "",
       "attributes": {
         "nomodule": true,
         "defer": true
@@ -380,7 +390,8 @@
     {
       "name": "webcomponent.field-module-order-legacy",
       "type": "script",
-      "uri": "system/fields/joomla-field-module-order-es5.min.js",
+      "deprecated": true,
+      "uri": "",
       "attributes": {
         "nomodule": true,
         "defer": true
@@ -408,7 +419,8 @@
     {
       "name": "webcomponent.field-permissions-legacy",
       "type": "script",
-      "uri": "system/fields/joomla-field-permissions-es5.min.js",
+      "deprecated": true,
+      "uri": "",
       "attributes": {
         "nomodule": true,
         "defer": true
@@ -431,7 +443,8 @@
     {
       "name": "webcomponent.field-send-test-mail-legacy",
       "type": "script",
-      "uri": "system/fields/joomla-field-send-test-mail-es5.min.js",
+      "deprecated": true,
+      "uri": "",
       "attributes": {
         "nomodule": true,
         "defer": true
@@ -459,7 +472,8 @@
     {
       "name": "webcomponent.field-simple-color-legacy",
       "type": "script",
-      "uri": "system/fields/joomla-field-simple-color-es5.min.js",
+      "deprecated": true,
+      "uri": "",
       "attributes": {
         "nomodule": true,
         "defer": true
@@ -482,7 +496,8 @@
     {
       "name": "webcomponent.field-subform-legacy",
       "type": "script",
-      "uri": "system/fields/joomla-field-subform-es5.min.js",
+      "deprecated": true,
+      "uri": "",
       "attributes": {
         "nomodule": true,
         "defer": true
@@ -505,7 +520,8 @@
     {
       "name": "webcomponent.field-user-legacy",
       "type": "script",
-      "uri": "system/fields/joomla-field-user-es5.min.js",
+      "deprecated": true,
+      "uri": "",
       "attributes": {
         "nomodule": true,
         "defer": true
@@ -528,7 +544,8 @@
     {
       "name": "webcomponent.core-loader-legacy",
       "type": "script",
-      "uri": "system/joomla-core-loader-es5.min.js",
+      "deprecated": true,
+      "uri": "",
       "attributes": {
         "nomodule": true,
         "defer": true
@@ -551,7 +568,8 @@
     {
       "name": "webcomponent.hidden-mail-legacy",
       "type": "script",
-      "uri": "system/joomla-hidden-mail-es5.min.js",
+      "deprecated": true,
+      "uri": "",
       "attributes": {
         "nomodule": true,
         "defer": true
@@ -574,7 +592,8 @@
     {
       "name": "webcomponent.toolbar-button-legacy",
       "type": "script",
-      "uri": "system/joomla-toolbar-button-es5.min.js",
+      "deprecated": true,
+      "uri": "",
       "attributes": {
         "nomodule": true,
         "defer": true
@@ -594,6 +613,27 @@
         "webcomponent.toolbar-button-legacy"
       ]
     },
+    {
+      "name": "joomla.dialog",
+      "type": "script",
+      "uri": "system/joomla-dialog.min.js",
+      "importmap": true,
+      "dependencies": [
+        "wcpolyfill",
+        "core"
+      ]
+    },
+    {
+      "name": "joomla.dialog-autocreate",
+      "type": "script",
+      "uri": "system/joomla-dialog-autocreate.min.js",
+      "attributes": {
+        "type": "module"
+      },
+      "dependencies": [
+        "joomla.dialog"
+      ]
+    },
     {
       "name": "list-view",
       "type": "script",
@@ -604,6 +644,29 @@
       "dependencies": [
         "core"
       ]
+    },
+    {
+      "type": "script",
+      "name": "modal-content-select",
+      "dependencies": [
+        "core"
+      ],
+      "uri": "system/modal-content-select.min.js",
+      "attributes": {
+        "type": "module"
+      }
+    },
+    {
+      "type": "script",
+      "name": "modal-content-select-field",
+      "dependencies": [
+        "core",
+        "joomla.dialog"
+      ],
+      "uri": "system/fields/modal-content-select-field.min.js",
+      "attributes": {
+        "type": "module"
+      }
     }
   ]
 }
diff --git a/build/media_source/system/js/core.es6.js b/build/media_source/system/js/core.es6.js
index a3216b9353af0..9707f1a0a9d8d 100644
--- a/build/media_source/system/js/core.es6.js
+++ b/build/media_source/system/js/core.es6.js
@@ -56,51 +56,6 @@ const DefaultAllowlist = {
 // Only define the Joomla namespace if not defined.
 window.Joomla = window.Joomla || {};
 
-// Only define editors if not defined
-window.Joomla.editors = window.Joomla.editors || {};
-
-// An object to hold each editor instance on page, only define if not defined.
-window.Joomla.editors.instances = window.Joomla.editors.instances || {
-  /**
-   * *****************************************************************
-   * All Editors MUST register, per instance, the following callbacks:
-   * *****************************************************************
-   *
-   * getValue         Type  Function  Should return the complete data from the editor
-   *                                  Example: () => { return this.element.value; }
-   * setValue         Type  Function  Should replace the complete data of the editor
-   *                                  Example: (text) => { return this.element.value = text; }
-   * getSelection     Type  Function  Should return the selected text from the editor
-   *                                  Example: function () { return this.selectedText; }
-   * disable          Type  Function  Toggles the editor into disabled mode. When the editor is
-   *                                  active then everything should be usable. When inactive the
-   *                                  editor should be unusable AND disabled for form validation
-   *                                  Example: (bool) => { return this.disable = value; }
-   * replaceSelection Type  Function  Should replace the selected text of the editor
-   *                                  If nothing selected, will insert the data at the cursor
-   *                                  Example:
-   *                                  (text) => {
-   *                                    return insertAtCursor(this.element, text);
-   *                                    }
-   *
-   * USAGE (assuming that jform_articletext is the textarea id)
-   * {
-   * To get the current editor value:
-   *  Joomla.editors.instances['jform_articletext'].getValue();
-   * To set the current editor value:
-   *  Joomla.editors.instances['jform_articletext'].setValue('Joomla! rocks');
-   * To replace(selection) or insert a value at  the current editor cursor (replaces the J3
-   * jInsertEditorText API):
-   *  replaceSelection:
-   *  Joomla.editors.instances['jform_articletext'].replaceSelection('Joomla! rocks')
-   * }
-   *
-   * *********************************************************
-   * ANY INTERACTION WITH THE EDITORS SHOULD USE THE ABOVE API
-   * *********************************************************
-   */
-};
-
 window.Joomla.Modal = window.Joomla.Modal || {
   /**
    * *****************************************************************
diff --git a/build/media_source/system/js/editors/editor-api.es6.js b/build/media_source/system/js/editors/editor-api.es6.js
new file mode 100644
index 0000000000000..4798a0e313ed9
--- /dev/null
+++ b/build/media_source/system/js/editors/editor-api.es6.js
@@ -0,0 +1,192 @@
+/**
+ * @copyright  (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// eslint-disable-next-line import/no-unresolved
+import JoomlaEditorDecorator from 'editor-decorator';
+
+/**
+ * Editor API.
+ */
+const JoomlaEditor = {
+  /**
+   * Internal! The property should not be accessed directly.
+   *
+   * List of registered editors.
+   */
+  instances: {},
+
+  /**
+   * Internal! The property should not be accessed directly.
+   *
+   * An active editor instance.
+   */
+  active: null,
+
+  /**
+   * Register editor instance.
+   *
+   * @param {JoomlaEditorDecorator} editor The editor instance.
+   *
+   * @returns {JoomlaEditor}
+   */
+  register(editor) {
+    if (!(editor instanceof JoomlaEditorDecorator)) {
+      throw new Error('Unexpected editor instance');
+    }
+
+    this.instances[editor.getId()] = editor;
+
+    // For backward compatibility
+    Joomla.editors.instances[editor.getId()] = editor;
+
+    return this;
+  },
+
+  /**
+   * Unregister editor instance.
+   *
+   * @param {JoomlaEditorDecorator|string} editor The editor instance or ID.
+   *
+   * @returns {JoomlaEditor}
+   */
+  unregister(editor) {
+    let id;
+    if (editor instanceof JoomlaEditorDecorator) {
+      id = editor.getId();
+    } else if (typeof editor === 'string') {
+      id = editor;
+    } else {
+      throw new Error('Unexpected editor instance or identifier');
+    }
+
+    if (this.active && this.active === this.instances[id]) {
+      this.active = null;
+    }
+
+    delete this.instances[id];
+
+    // For backward compatibility
+    delete Joomla.editors.instances[id];
+
+    return this;
+  },
+
+  /**
+   * Return editor instance by ID.
+   *
+   * @param {String} id
+   *
+   * @returns {JoomlaEditorDecorator|boolean}
+   */
+  get(id) {
+    return this.instances[id] || false;
+  },
+
+  /**
+   * Set currently active editor, the editor that in focus.
+   *
+   * @param {JoomlaEditorDecorator|string} editor The editor instance or ID.
+   *
+   * @returns {JoomlaEditor}
+   */
+  setActive(editor) {
+    if (editor instanceof JoomlaEditorDecorator) {
+      this.active = editor;
+    } else if (this.instances[editor]) {
+      this.active = this.instances[editor];
+    } else {
+      throw new Error('The editor instance not found or it is incorrect');
+    }
+
+    return this;
+  },
+
+  /**
+   * Return active editor, if there exist eny.
+   *
+   * @returns {JoomlaEditorDecorator}
+   */
+  getActive() {
+    return this.active;
+  },
+};
+
+/**
+ * Editor Buttons API.
+ */
+const JoomlaEditorButton = {
+  /**
+   * Internal! The property should not be accessed directly.
+   *
+   * A collection of button actions.
+   */
+  actions: {},
+
+  /**
+   * Register new button action, or override existing.
+   *
+   * @param {String} name Action name
+   * @param {Function} handler Callback that will be executed.
+   *
+   * @returns {JoomlaEditorButton}
+   */
+  registerAction(name, handler) {
+    if (!name || !handler) {
+      throw new Error('Missed values for Action registration');
+    }
+    if (!(handler instanceof Function)) {
+      throw new Error(`Unexpected handler for action "${name}", expecting Function`);
+    }
+
+    this.actions[name] = handler;
+    return this;
+  },
+
+  /**
+   * Get registered handler by action name.
+   *
+   * @param {String} name Action name
+   *
+   * @returns {Function|false}
+   */
+  getActionHandler(name) {
+    return this.actions[name] || false;
+  },
+
+  /**
+   * Execute action.
+   *
+   * @param {String} name Action name
+   * @param {Object} options An options object
+   * @param {HTMLElement} button An optional element, that triggers the action
+   *
+   * @returns {*}
+   */
+  runAction(name, options, button) {
+    const handler = this.getActionHandler(name);
+    let editor = JoomlaEditor.getActive();
+    if (!handler) {
+      throw new Error(`Handler for "${name}" action not found`);
+    }
+    // Try to find a legacy editor
+    // @TODO: Remove this section in Joomla 6
+    if (!editor && button) {
+      const parent = button.closest('fieldset, div:not(.editor-xtd-buttons)');
+      const textarea = parent ? parent.querySelector('textarea[id]') : false;
+      editor = textarea && Joomla.editors.instances[textarea.id] ? Joomla.editors.instances[textarea.id] : false;
+      if (editor) {
+        // eslint-disable-next-line no-console
+        console.warn('Legacy editors is deprecated. Set active editor instance with JoomlaEditor.setActive().');
+      }
+    }
+    if (!editor) {
+      throw new Error('An active editor are not available');
+    }
+
+    return handler(editor, options);
+  },
+};
+
+export { JoomlaEditor, JoomlaEditorButton, JoomlaEditorDecorator };
diff --git a/build/media_source/system/js/editors/editor-decorator.es6.js b/build/media_source/system/js/editors/editor-decorator.es6.js
new file mode 100644
index 0000000000000..c4a7682c85058
--- /dev/null
+++ b/build/media_source/system/js/editors/editor-decorator.es6.js
@@ -0,0 +1,136 @@
+/**
+ * @copyright  (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * A decorator for Editor instance.
+ */
+export default class JoomlaEditorDecorator {
+  /**
+   * Internal! The property should not be accessed directly.
+   * The editor instance.
+   * @type {Object}
+   */
+  // instance = null;
+
+  /**
+   * Internal! The property should not be accessed directly.
+   * The editor type/name, eg: tinymce, codemirror, none etc.
+   * @type {string}
+   */
+  // type = '';
+
+  /**
+   * Internal! The property should not be accessed directly.
+   * HTML ID of the editor.
+   * @type {string}
+   */
+  // id = '';
+
+  /**
+   * Class constructor.
+   *
+   * @param {Object} instance The editor instance
+   * @param {string} type The editor type/name
+   * @param {string} id The editor ID
+   */
+  constructor(instance, type, id) {
+    if (!instance || !type || !id) {
+      throw new Error('Missed values for class constructor');
+    }
+
+    this.instance = instance;
+    this.type = type;
+    this.id = id;
+  }
+
+  /**
+   * Returns the editor instance object.
+   *
+   * @returns {Object}
+   */
+  getRawInstance() {
+    return this.instance;
+  }
+
+  /**
+   * Returns the editor type/name.
+   *
+   * @returns {string}
+   */
+  getType() {
+    return this.type;
+  }
+
+  /**
+   * Returns the editor id.
+   *
+   * @returns {string}
+   */
+  getId() {
+    return this.id;
+  }
+
+  /**
+   * Return the complete data from the editor.
+   * Should be implemented by editor provider.
+   *
+   * @returns {string}
+   */
+  // eslint-disable-next-line class-methods-use-this
+  getValue() {
+    throw new Error('Not implemented');
+  }
+
+  /**
+   * Replace the complete data of the editor
+   * Should be implemented by editor provider.
+   *
+   * @param {string} value Value to set.
+   *
+   * @returns {JoomlaEditorDecorator}
+   */
+  // eslint-disable-next-line class-methods-use-this, no-unused-vars
+  setValue(value) {
+    throw new Error('Not implemented');
+  }
+
+  /**
+   * Return the selected text from the editor.
+   * Should be implemented by editor provider.
+   *
+   * @returns {string}
+   */
+  // eslint-disable-next-line class-methods-use-this
+  getSelection() {
+    throw new Error('Not implemented');
+  }
+
+  /**
+   * Replace the selected text. If nothing selected, will insert the data at the cursor.
+   * Should be implemented by editor provider.
+   *
+   * @param {string} value
+   *
+   * @returns {JoomlaEditorDecorator}
+   */
+  // eslint-disable-next-line class-methods-use-this, no-unused-vars
+  replaceSelection(value) {
+    throw new Error('Not implemented');
+  }
+
+  /**
+   * Toggles the editor disabled mode. When the editor is active then everything should be usable.
+   * When inactive the editor should be unusable AND disabled for form validation.
+   * Should be implemented by editor provider.
+   *
+   * @param {boolean} enable True to enable, false or undefined to disable.
+   *
+   * @returns {JoomlaEditorDecorator}
+   */
+  // eslint-disable-next-line class-methods-use-this, no-unused-vars
+  disable(enable) {
+    throw new Error('Not implemented');
+  }
+}
diff --git a/build/media_source/system/js/editors/editors.es6.js b/build/media_source/system/js/editors/editors.es6.js
new file mode 100644
index 0000000000000..43e334bd49083
--- /dev/null
+++ b/build/media_source/system/js/editors/editors.es6.js
@@ -0,0 +1,107 @@
+/**
+ * @copyright  (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// eslint-disable-next-line import/no-unresolved
+import { JoomlaEditorButton, JoomlaEditorDecorator } from 'editor-api';
+// eslint-disable-next-line import/no-unresolved
+import JoomlaDialog from 'joomla.dialog';
+
+if (!window.Joomla) {
+  throw new Error('JoomlaEditors API require Joomla to be loaded.');
+}
+
+// === The code for keep backward compatibility ===
+// Joomla.editors is deprecated use Joomla.Editor instead.
+// @TODO: Remove this section in Joomla 6.
+
+// Only define editors if not defined
+Joomla.editors = Joomla.editors || {};
+
+// An object to hold each editor instance on page, only define if not defined.
+Joomla.editors.instances = new Proxy({}, {
+  set(target, p, editor) {
+    // eslint-disable-next-line no-use-before-define
+    if (!(editor instanceof JoomlaEditorDecorator)) {
+      // Add missed method in Legacy editor
+      editor.getId = () => p;
+      // eslint-disable-next-line no-console
+      console.warn('Legacy editors is deprecated. Register the editor instance with JoomlaEditor.register().', p, editor);
+    }
+    target[p] = editor;
+    return true;
+  },
+  get(target, p) {
+    // eslint-disable-next-line no-console
+    console.warn('Direct access to Joomla.editors.instances is deprecated. Use JoomlaEditor.getActive() or JoomlaEditor.get(id) to retrieve the editor instance.');
+    return target[p];
+  },
+});
+// === End of code for keep backward compatibility ===
+
+// Register couple default actions for Editor Buttons
+// Insert static content on cursor
+JoomlaEditorButton.registerAction('insert', (editor, options) => {
+  const content = options.content || '';
+  editor.replaceSelection(content);
+});
+// Display modal dialog
+JoomlaEditorButton.registerAction('modal', (editor, options) => {
+  if (options.src && options.src[0] !== '#' && options.src[0] !== '.') {
+    // Replace editor parameter to actual editor ID
+    const url = options.src.indexOf('http') === 0 ? new URL(options.src) : new URL(options.src, window.location.origin);
+    url.searchParams.set('editor', editor.getId());
+    if (url.searchParams.has('e_name')) {
+      url.searchParams.set('e_name', editor.getId());
+    }
+    options.src = url.toString();
+  }
+
+  // Create a dialog popup
+  const dialog = new JoomlaDialog(options);
+
+  // Listener for postMessage
+  const msgListener = (event) => {
+    // Avoid cross origins
+    if (event.origin !== window.location.origin) return;
+    // Check message type
+    if (event.data.messageType === 'joomla:content-select') {
+      editor.replaceSelection(event.data.html || event.data.text);
+      dialog.close();
+    } else if (event.data.messageType === 'joomla:cancel') {
+      dialog.close();
+    }
+  };
+  // Use a JoomlaExpectingPostMessage flag to be able to distinct legacy methods
+  // @TODO: This should be removed after full transition to postMessage()
+  window.JoomlaExpectingPostMessage = true;
+  window.addEventListener('message', msgListener);
+
+  // Clean up on close
+  dialog.addEventListener('joomla-dialog:close', () => {
+    delete window.JoomlaExpectingPostMessage;
+    window.removeEventListener('message', msgListener);
+    Joomla.Modal.setCurrent(null);
+    dialog.destroy();
+  });
+  Joomla.Modal.setCurrent(dialog);
+  // Show the popup
+  dialog.show();
+});
+
+// Listen to click on Editor button, and run action.
+const btnDelegateSelector = '[data-joomla-editor-button-action]';
+const btnActionDataAttr = 'joomlaEditorButtonAction';
+const btnConfigDataAttr = 'joomlaEditorButtonOptions';
+
+document.addEventListener('click', (event) => {
+  const btn = event.target.closest(btnDelegateSelector);
+  if (!btn) return;
+  const action = btn.dataset[btnActionDataAttr];
+  const options = btn.dataset[btnConfigDataAttr] ? JSON.parse(btn.dataset[btnConfigDataAttr]) : {};
+
+  if (action) {
+    JoomlaEditorButton.runAction(action, options, btn);
+  }
+});
diff --git a/build/media_source/system/js/fields/calendar.es5.js b/build/media_source/system/js/fields/calendar.es5.js
index 122dcc562836a..fb118aa1fc9d2 100644
--- a/build/media_source/system/js/fields/calendar.es5.js
+++ b/build/media_source/system/js/fields/calendar.es5.js
@@ -126,11 +126,11 @@
 
 		// Evaluate the min year
 		if (btn.dataset.minYear) {
-			self.params.minYear = parseInt(btn.dataset.minYear, 10);
+			self.params.minYear = getBoundary(parseInt(btn.dataset.minYear, 10), self.params.dateType);
 		}
 		// Evaluate the max year
 		if (btn.dataset.maxYear) {
-			self.params.maxYear = parseInt(btn.dataset.maxYear, 10);
+			self.params.maxYear = getBoundary(parseInt(btn.dataset.maxYear, 10), self.params.dateType);
 		}
 		// Evaluate the weekend days
 		if (btn.dataset.weekend) {
diff --git a/build/media_source/system/js/fields/joomla-field-subform.w-c.es6.js b/build/media_source/system/js/fields/joomla-field-subform.w-c.es6.js
index b66c58366cabb..12de2790a5fd0 100644
--- a/build/media_source/system/js/fields/joomla-field-subform.w-c.es6.js
+++ b/build/media_source/system/js/fields/joomla-field-subform.w-c.es6.js
@@ -514,7 +514,7 @@
           event.preventDefault();
         }
 
-        // Escape is the abort keystroke (for any target element)
+        // Escape is the cancel keystroke (for any target element)
         if (event.keyCode === KEYCODE.ESC && item) {
           item.setAttribute('draggable', 'false');
           item.setAttribute('aria-grabbed', 'false');
@@ -573,7 +573,7 @@
         switchRowPositions(item, row);
       });
 
-      // dragend event to clean-up after drop or abort
+      // dragend event to clean-up after drop or cancelation
       // which fires whether or not the drop target was valid
       this.addEventListener('dragend', () => {
         if (item) {
diff --git a/build/media_source/system/js/fields/modal-content-select-field.es6.js b/build/media_source/system/js/fields/modal-content-select-field.es6.js
new file mode 100644
index 0000000000000..d7ce515d47535
--- /dev/null
+++ b/build/media_source/system/js/fields/modal-content-select-field.es6.js
@@ -0,0 +1,165 @@
+/**
+ * @copyright  (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// eslint-disable-next-line import/no-unresolved
+import JoomlaDialog from 'joomla.dialog';
+
+/**
+ * Helper method to set values on the fields, and trigger "change" event
+ *
+ * @param {object} data
+ * @param {HTMLInputElement} inputValue
+ * @param {HTMLInputElement} inputTitle
+ */
+const setValues = (data, inputValue, inputTitle) => {
+  const value = `${data.id || data.value || ''}`;
+  const isChanged = inputValue.value !== value;
+  inputValue.value = value;
+  if (inputTitle) {
+    inputTitle.value = data.title || inputValue.value;
+  }
+  if (isChanged) {
+    inputValue.dispatchEvent(new CustomEvent('change', { bubbles: true, cancelable: true }));
+  }
+};
+
+/**
+ * Show Select dialog
+ *
+ * @param {HTMLInputElement} inputValue
+ * @param {HTMLInputElement} inputTitle
+ * @param {Object} dialogConfig
+ * @returns {Promise}
+ */
+const doSelect = (inputValue, inputTitle, dialogConfig) => {
+  // Use a JoomlaExpectingPostMessage flag to be able to distinct legacy methods
+  // @TODO: This should be removed after full transition to postMessage()
+  window.JoomlaExpectingPostMessage = true;
+  // Create and show the dialog
+  const dialog = new JoomlaDialog(dialogConfig);
+  dialog.classList.add('joomla-dialog-content-select-field');
+  dialog.show();
+
+  return new Promise((resolve) => {
+    const msgListener = (event) => {
+      // Avoid cross origins
+      if (event.origin !== window.location.origin) return;
+      // Check message type
+      if (event.data.messageType === 'joomla:content-select') {
+        setValues(event.data, inputValue, inputTitle);
+        dialog.close();
+      } else if (event.data.messageType === 'joomla:cancel') {
+        dialog.close();
+      }
+    };
+
+    // Clear all when dialog is closed
+    dialog.addEventListener('joomla-dialog:close', () => {
+      delete window.JoomlaExpectingPostMessage;
+      window.removeEventListener('message', msgListener);
+      dialog.destroy();
+      resolve();
+    });
+
+    // Wait for message
+    window.addEventListener('message', msgListener);
+  });
+};
+
+/**
+ * Update view, depending if value is selected or not
+ *
+ * @param {HTMLInputElement} inputValue
+ * @param {HTMLElement} container
+ */
+const updateView = (inputValue, container) => {
+  const hasValue = !!inputValue.value;
+  container.querySelectorAll('[data-show-when-value]').forEach((el) => {
+    if (el.dataset.showWhenValue) {
+      // eslint-disable-next-line no-unused-expressions
+      hasValue ? el.removeAttribute('hidden') : el.setAttribute('hidden', '');
+    } else {
+      // eslint-disable-next-line no-unused-expressions
+      hasValue ? el.setAttribute('hidden', '') : el.removeAttribute('hidden');
+    }
+  });
+};
+
+/**
+ * Initialise the field
+ * @param {HTMLElement} container
+ */
+const setupField = (container) => {
+  const inputValue = container ? container.querySelector('.js-input-value') : null;
+  const inputTitle = container ? container.querySelector('.js-input-title') : null;
+
+  if (!container || !inputValue) {
+    throw new Error('Incomplete markup of Content dialog field');
+  }
+
+  container.addEventListener('change', () => {
+    updateView(inputValue, container);
+  });
+
+  // Bind the buttons
+  container.addEventListener('click', (event) => {
+    const button = event.target.closest('[data-button-action]');
+    if (!button) return;
+    event.preventDefault();
+
+    // Extract the data
+    const action = button.dataset.buttonAction;
+    const dialogConfig = button.dataset.modalConfig ? JSON.parse(button.dataset.modalConfig) : {};
+
+    // Handle requested action
+    let handle;
+    switch (action) {
+      case 'select':
+      case 'create':
+        handle = doSelect(inputValue, inputTitle, dialogConfig);
+        break;
+      case 'edit': {
+        // Update current value in the URL
+        const url = dialogConfig.src.indexOf('http') === 0 ? new URL(dialogConfig.src) : new URL(dialogConfig.src, window.location.origin);
+        url.searchParams.set('id', inputValue.value);
+        dialogConfig.src = url.toString();
+
+        handle = doSelect(inputValue, inputTitle, dialogConfig);
+        break;
+      }
+      case 'clear':
+        handle = (async () => setValues({ id: '', title: '' }, inputValue, inputTitle))();
+        break;
+      default:
+        throw new Error(`Unknown action ${action} for Modal select field`);
+    }
+
+    handle.then(() => {
+      // Perform checkin when needed
+      if (button.dataset.checkinUrl) {
+        const chckUrl = button.dataset.checkinUrl;
+        const url = chckUrl.indexOf('http') === 0 ? new URL(chckUrl) : new URL(chckUrl, window.location.origin);
+        // Add value to request
+        url.searchParams.set('id', inputValue.value);
+        url.searchParams.set('cid[]', inputValue.value);
+        // Also add value to POST, because Controller may expect it from there
+        const data = new FormData();
+        data.append('id', inputValue.value);
+        data.append('cid[]', inputValue.value);
+
+        Joomla.request({
+          url: url.toString(), method: 'POST', promise: true, data,
+        });
+      }
+    });
+  });
+};
+
+const setup = (container) => {
+  container.querySelectorAll('.js-modal-content-select-field').forEach((el) => setupField(el));
+};
+
+document.addEventListener('DOMContentLoaded', () => setup(document));
+document.addEventListener('joomla:updated', (event) => setup(event.target));
diff --git a/build/media_source/system/js/fields/modal-fields.es5.js b/build/media_source/system/js/fields/modal-fields.es5.js
index 5dfd7eb3ee96d..68ad76f34aa21 100644
--- a/build/media_source/system/js/fields/modal-fields.es5.js
+++ b/build/media_source/system/js/fields/modal-fields.es5.js
@@ -23,7 +23,8 @@
 	 */
 	window.processModalParent = function (fieldPrefix, id, title, catid, url, language, object)
 	{
-		var fieldId = document.getElementById(fieldPrefix + '_id'), fieldTitle = document.getElementById(fieldPrefix + '_name');
+		var fieldId = document.getElementById(fieldPrefix + '_id') || document.getElementById(fieldPrefix + '_value'),
+			fieldTitle = document.getElementById(fieldPrefix + '_name') || document.getElementById(fieldPrefix);
 
 		// Default values.
 		id       = id || '';
@@ -33,6 +34,8 @@
 		url      = url || '';
 		language = language || '';
 
+		var isChanged = fieldId.value !== id;
+
 		if (id)
 		{
 			fieldId.value    = id;
@@ -86,6 +89,10 @@
 			}
 		}
 
+		if (isChanged) {
+			fieldId.dispatchEvent(new CustomEvent('change', { bubbles: true, cancelable: true }));
+		}
+
 		if (fieldId.getAttribute('data-required') == '1')
 		{
 			document.formvalidator.validate(fieldId);
diff --git a/build/media_source/system/js/highlight.es6.js b/build/media_source/system/js/highlight.es6.js
index af90a0e6248ae..24ea4f61f55f5 100644
--- a/build/media_source/system/js/highlight.es6.js
+++ b/build/media_source/system/js/highlight.es6.js
@@ -4,12 +4,12 @@ import Mark from 'mark.js/src/vanilla';
 const defaultOptions = {
   exclude: [],
   separateWordSearch: true,
-  accuracy: 'exactly',
+  accuracy: 'partially',
   diacritics: true,
   synonyms: {},
   iframes: false,
   iframesTimeout: 5000,
-  acrossElements: false,
+  acrossElements: true,
   caseSensitive: false,
   ignoreJoiners: false,
   wildcards: 'disabled',
diff --git a/build/media_source/system/js/joomla-dialog-autocreate.es6.js b/build/media_source/system/js/joomla-dialog-autocreate.es6.js
new file mode 100644
index 0000000000000..57a2330232d63
--- /dev/null
+++ b/build/media_source/system/js/joomla-dialog-autocreate.es6.js
@@ -0,0 +1,64 @@
+/**
+ * @copyright  (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// eslint-disable-next-line import/no-unresolved
+import JoomlaDialog from 'joomla.dialog';
+
+/**
+ * Auto create a popup dynamically on click, eg:
+ *
+ * <button type="button" data-joomla-dialog='{"popupType": "iframe", "src": "content/url.html"}'>Click</button>
+ * <button type="button" data-joomla-dialog='{"popupType": "inline", "popupContent": "#id-of-content-element"}'>Click</button>
+ * <a href="content/url.html" data-joomla-dialog>Click</a>
+ */
+const delegateSelector = '[data-joomla-dialog]';
+const configDataAttr = 'joomlaDialog';
+const configCacheFlag = 'joomlaDialogCache';
+
+document.addEventListener('click', (event) => {
+  const triggerEl = event.target.closest(delegateSelector);
+  if (!triggerEl) return;
+  event.preventDefault();
+
+  // Check for cached instance
+  const cacheable = !!triggerEl.dataset[configCacheFlag];
+  if (cacheable && triggerEl.JoomlaDialogInstance) {
+    Joomla.Modal.setCurrent(triggerEl.JoomlaDialogInstance);
+    triggerEl.JoomlaDialogInstance.show();
+    return;
+  }
+  // Parse config
+  const config = triggerEl.dataset[configDataAttr] ? JSON.parse(triggerEl.dataset[configDataAttr]) : {};
+
+  // Check if the click is on anchor
+  if (triggerEl.nodeName === 'A') {
+    if (!config.popupType) {
+      config.popupType = triggerEl.hash ? 'inline' : 'iframe';
+    }
+    if (!config.src && config.popupType === 'iframe') {
+      config.src = triggerEl.href;
+    } else if (!config.src && config.popupType === 'inline') {
+      config.src = triggerEl.hash;
+    }
+  }
+
+  // Template not allowed here
+  delete config.popupTemplate;
+
+  const popup = new JoomlaDialog(config);
+  if (cacheable) {
+    triggerEl.JoomlaDialogInstance = popup;
+  }
+
+  popup.addEventListener('joomla-dialog:close', () => {
+    Joomla.Modal.setCurrent(null);
+    if (!cacheable) {
+      popup.destroy();
+    }
+  });
+
+  Joomla.Modal.setCurrent(popup);
+  popup.show();
+});
diff --git a/build/media_source/system/js/joomla-dialog.w-c.es6.js b/build/media_source/system/js/joomla-dialog.w-c.es6.js
new file mode 100644
index 0000000000000..b4dcf064d3478
--- /dev/null
+++ b/build/media_source/system/js/joomla-dialog.w-c.es6.js
@@ -0,0 +1,626 @@
+/**
+ * @copyright  (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// Default template for the popup
+const popupTemplate = `<div class="joomla-dialog-container">
+  <header class="joomla-dialog-header"></header>
+  <section class="joomla-dialog-body"></section>
+  <footer class="joomla-dialog-footer"></footer>
+</div>`;
+
+/**
+ * JoomlaDialog class for Joomla Dialog implementation.
+ * With use of <joomla-dialog> custom element as dialog holder.
+ */
+class JoomlaDialog extends HTMLElement {
+  /**
+   * The popup type, supported: inline, iframe, image, ajax.
+   * @type {string}
+   */
+  // popupType = 'inline';
+
+  /**
+   * An optional text for header.
+   * @type {string}
+   */
+  // textHeader = '';
+
+  /**
+   * An optional text for close button. Applied when no Buttons provided.
+   * @type {string}
+   */
+  // textClose = 'Close';
+
+  /**
+   * Content string (html) for inline type popup.
+   * @type {string}
+   */
+  // popupContent = '';
+
+  /**
+   * Source path for iframe, image, ajax.
+   * @type {string}
+   */
+  // src = '';
+
+  /**
+   * An optional list of buttons, to be rendered in footer or header, or bottom or top of the popup body.
+   * Example:
+   *   [{label: 'Yes', onClick: () => popup.close()},
+   *   {label: 'No', onClick: () => popup.close(), className: 'btn btn-danger'},
+   *   {label: 'Click me', onClick: () => popup.close(), location: 'header'}]
+   * @type {[]}
+   */
+  // popupButtons = [];
+
+  /**
+   * Whether popup can be closed by Esc button.
+   *
+   * @type {boolean}
+   */
+  // cancelable = true;
+
+  /**
+   * An optional limit for the popup width, any valid CSS value.
+   * @type {string}
+   */
+  // width = '';
+
+  /**
+   * An optional height for the popup, any valid CSS value.
+   * @type {string}
+   */
+  // height = '';
+
+  /**
+   * An optional Class names for header icon.
+   *
+   * @type {string}
+   */
+  // iconHeader = '';
+
+  /**
+   * A template for the popup.
+   * @type {string|HTMLTemplateElement}
+   */
+  // popupTemplate = popupTemplate;
+
+  /**
+   * The element where to attach the dialog, for cases when no parentElement exist, see show().
+   * This allows to keep the dialog in the same branch of DOM as the popupContent.
+   * @type {string|HTMLElement}
+   */
+  // preferredParent = null;
+
+  /**
+   * Class constructor
+   * @param {Object} config
+   */
+  constructor(config) {
+    super();
+
+    // Define default params (doing it here because browser support of public props)
+    this.popupType = this.getAttribute('type') || 'inline';
+    this.textHeader = this.getAttribute('text-header') || '';
+    this.iconHeader = '';
+    this.textClose = 'Close';
+    this.popupContent = '';
+    this.src = this.getAttribute('src') || '';
+    this.popupButtons = [];
+    this.cancelable = !this.hasAttribute('not-cancelable');
+    this.width = this.getAttribute('width') || '';
+    this.height = this.getAttribute('height') || '';
+    this.popupTemplate = popupTemplate;
+    this.preferredParent = null;
+    // @internal. Parent of the popupContent for cases when it is HTMLElement. Need for recovery on destroy().
+    this.popupContentSrcLocation = null;
+
+    if (!config) return;
+
+    // Check configurable properties
+    ['popupType', 'textHeader', 'textClose', 'popupContent', 'src', 'popupButtons', 'cancelable',
+      'width', 'height', 'popupTemplate', 'iconHeader', 'id', 'preferredParent'].forEach((key) => {
+      if (config[key] !== undefined) {
+        this[key] = config[key];
+      }
+    });
+
+    if (config.className) {
+      this.classList.add(...config.className.split(' '));
+    }
+  }
+
+  /**
+   * Internal. Connected Callback.
+   */
+  connectedCallback() {
+    this.renderLayout();
+  }
+
+  /**
+   * Internal. Render a main layout, based on given template.
+   * @returns {JoomlaDialog}
+   */
+  renderLayout() {
+    if (this.dialog) return this;
+
+    // On close callback
+    const onClose = () => {
+      this.dispatchEvent(new CustomEvent('joomla-dialog:close', { bubbles: true }));
+    };
+    const onCancel = (event) => {
+      if (!this.cancelable) {
+        // Prevent closing by Esc
+        event.preventDefault();
+      }
+    };
+
+    // Check for existing layout
+    if (this.firstElementChild && this.firstElementChild.nodeName === 'DIALOG') {
+      this.dialog = this.firstElementChild;
+      this.dialog.addEventListener('cancel', onCancel);
+      this.dialog.addEventListener('close', onClose);
+      this.popupTmplB = this.querySelector('.joomla-dialog-body') || this.dialog;
+      this.popupContentElement = this.popupTmplB;
+      return this;
+    }
+
+    // Render a template
+    let templateContent;
+    if (this.popupTemplate.tagName && this.popupTemplate.tagName === 'TEMPLATE') {
+      templateContent = this.popupTemplate.content.cloneNode(true);
+    } else {
+      const template = document.createElement('template');
+      template.innerHTML = this.popupTemplate;
+      templateContent = template.content;
+    }
+
+    this.dialog = document.createElement('dialog');
+    this.dialog.appendChild(templateContent);
+    this.dialog.addEventListener('cancel', onCancel);
+    this.dialog.addEventListener('close', onClose);
+    this.appendChild(this.dialog);
+
+    // Get template parts
+    this.popupTmplH = this.dialog.querySelector('.joomla-dialog-header');
+    this.popupTmplB = this.dialog.querySelector('.joomla-dialog-body');
+    this.popupTmplF = this.dialog.querySelector('.joomla-dialog-footer');
+    this.popupContentElement = null;
+
+    if (!this.popupTmplB) {
+      throw new Error('The popup body not found in the template.');
+    }
+
+    // Set the header
+    if (this.popupTmplH && this.textHeader) {
+      const h = document.createElement('h3');
+      h.insertAdjacentHTML('afterbegin', this.textHeader);
+      this.popupTmplH.insertAdjacentElement('afterbegin', h);
+
+      if (this.iconHeader) {
+        const i = document.createElement('span');
+        i.ariaHidden = true;
+        i.classList.add('header-icon');
+        i.classList.add(...this.iconHeader.split(' '));
+        this.popupTmplH.insertAdjacentElement('afterbegin', i);
+      }
+    }
+
+    // Set the body
+    this.renderBodyContent();
+    this.setAttribute('type', this.popupType);
+
+    // Create buttons if any
+    const buttons = this.popupButtons || [];
+
+    // Add at least one button to close the popup
+    if (!buttons.length) {
+      buttons.push({
+        label: '',
+        ariaLabel: this.textClose,
+        className: 'button-close btn-close',
+        onClick: () => this.close(),
+        location: 'header',
+      });
+    }
+
+    // Buttons holders
+    const btnHHolder = document.createElement('div');
+    const btnFHolder = document.createElement('div');
+    btnHHolder.classList.add('buttons-holder');
+    btnFHolder.classList.add('buttons-holder');
+
+    this.popupButtons.forEach((btnData) => {
+      const btn = document.createElement('button');
+      btn.type = 'button';
+      btn.textContent = btnData.label || '';
+      btn.ariaLabel = btnData.ariaLabel || '';
+
+      if (btnData.className) {
+        btn.classList.add(...btnData.className.split(' '));
+      } else {
+        btn.classList.add('button', 'button-primary', 'btn', 'btn-primary');
+      }
+
+      if (btnData.data) {
+        Object.entries(btnData.data).forEach(([k, v]) => {
+          btn.dataset[k] = v;
+        });
+        if (btnData.data.dialogClose !== undefined) {
+          btnData.onClick = () => this.close();
+        }
+        if (btnData.data.dialogDestroy !== undefined) {
+          btnData.onClick = () => this.destroy();
+        }
+      }
+
+      if (btnData.onClick) {
+        btn.addEventListener('click', btnData.onClick);
+      }
+
+      if (btnData.location === 'header') {
+        btnHHolder.appendChild(btn);
+      } else {
+        btnFHolder.appendChild(btn);
+      }
+    });
+
+    if (btnHHolder.children.length) {
+      if (this.popupType === 'image' && !this.textHeader) {
+        this.popupTmplB.insertAdjacentElement('afterbegin', btnHHolder);
+      } else if (this.popupTmplH) {
+        this.popupTmplH.insertAdjacentElement('beforeend', btnHHolder);
+      } else {
+        this.popupTmplB.insertAdjacentElement('afterbegin', btnHHolder);
+      }
+    }
+
+    if (btnFHolder.children.length) {
+      (this.popupTmplF || this.popupTmplB).insertAdjacentElement('beforeend', btnFHolder);
+    }
+
+    // Adjust the sizes if requested
+    if (this.width) {
+      this.dialog.style.width = '100%';
+      this.dialog.style.maxWidth = this.width;
+    }
+
+    if (this.height) {
+      this.dialog.style.height = this.height;
+    }
+
+    // Mark an empty template elements
+    if (this.popupTmplH && !this.popupTmplH.children.length) {
+      this.popupTmplH.classList.add('empty');
+    }
+
+    if (this.popupTmplF && !this.popupTmplF.children.length) {
+      this.popupTmplF.classList.add('empty');
+    }
+
+    return this;
+  }
+
+  /**
+   * Internal. Render the body content, based on popupType.
+   * @returns {JoomlaDialog}
+   */
+  renderBodyContent() {
+    if (!this.popupTmplB || this.popupContentElement) return this;
+
+    // Callback for loaded content event listener
+    const onLoad = () => {
+      this.classList.add('loaded');
+      this.classList.remove('loading');
+      this.popupContentElement.removeEventListener('load', onLoad);
+      this.dispatchEvent(new CustomEvent('joomla-dialog:load'));
+
+      if (this.popupType === 'inline' || this.popupType === 'ajax') {
+        // Dispatch joomla:updated for inline content
+        this.popupContentElement.dispatchEvent(new CustomEvent('joomla:updated', {
+          bubbles: true,
+          cancelable: true,
+        }));
+      }
+    };
+
+    this.classList.add('loading');
+
+    switch (this.popupType) {
+      // Create an Inline content
+      case 'inline': {
+        let inlineContent = this.popupContent;
+
+        // Check for content selector: src: '#content-selector' or src: '.content-selector'
+        if (!inlineContent && this.src && (this.src[0] === '.' || this.src[0] === '#')) {
+          inlineContent = document.querySelector(this.src);
+          this.popupContent = inlineContent;
+        }
+
+        if (inlineContent instanceof HTMLElement) {
+          // Render content provided as HTMLElement
+          if (inlineContent.nodeName === 'TEMPLATE') {
+            this.popupTmplB.appendChild(inlineContent.content.cloneNode(true));
+          } else {
+            // Store parent reference to be able to recover after the popup is destroyed
+            this.popupContentSrcLocation = {
+              parent: inlineContent.parentElement,
+              nextSibling: inlineContent.nextSibling,
+            };
+            this.popupTmplB.appendChild(inlineContent);
+          }
+        } else {
+          // Render content string
+          this.popupTmplB.insertAdjacentHTML('afterbegin', Joomla.sanitizeHtml(inlineContent));
+        }
+        this.popupContentElement = this.popupTmplB;
+        onLoad();
+        break;
+      }
+
+      // Create an IFrame content
+      case 'iframe': {
+        const frame = document.createElement('iframe');
+        frame.addEventListener('load', onLoad);
+        frame.src = this.src;
+        // Enlarge default size of iframe, make sure it is usable without extra styling
+        frame.width = '100%';
+        frame.height = '720';
+        if (!this.width) {
+          frame.style.maxWidth = '100%';
+          frame.width = '1024';
+        }
+        frame.classList.add('iframe-content');
+        this.popupContentElement = frame;
+        this.popupTmplB.appendChild(frame);
+        break;
+      }
+
+      // Create an Image content
+      case 'image': {
+        const img = document.createElement('img');
+        img.addEventListener('load', onLoad);
+        img.src = this.src;
+        this.popupContentElement = img;
+        this.popupTmplB.appendChild(img);
+        break;
+      }
+
+      // Create an AJAX content
+      case 'ajax': {
+        fetch(this.src)
+          .then((response) => {
+            if (response.status !== 200) {
+              throw new Error(response.statusText);
+            }
+            return response.text();
+          }).then((text) => {
+            this.popupTmplB.insertAdjacentHTML('afterbegin', Joomla.sanitizeHtml(text));
+            this.popupContentElement = this.popupTmplB;
+            onLoad();
+          }).catch((error) => {
+            throw error;
+          });
+        break;
+      }
+
+      default: {
+        throw new Error('Unknown popup type requested');
+      }
+    }
+
+    return this;
+  }
+
+  /**
+   * Internal. Find an Element to be used as parent element,
+   * for cases when Dialog does not have one already. See show().
+   *
+   * @returns {HTMLElement|boolean}
+   */
+  findPreferredParent() {
+    let parent;
+    if (this.preferredParent instanceof HTMLElement) {
+      // We have configured one already
+      parent = this.preferredParent;
+    } else if (this.preferredParent) {
+      // Query Document
+      parent = document.querySelector(this.preferredParent);
+    } else if (this.popupType === 'inline') {
+      // Pick the parent element of the Content
+      let inlineContent = this.popupContent;
+      // Check for content selector: src: '#content-selector' or src: '.content-selector'
+      if (!inlineContent && this.src && (this.src[0] === '.' || this.src[0] === '#')) {
+        inlineContent = document.querySelector(this.src);
+        parent = inlineContent ? inlineContent.parentElement : false;
+      }
+    }
+
+    return parent || false;
+  }
+
+  /**
+   * Return the popup header element.
+   * @returns {HTMLElement|boolean}
+   */
+  getHeader() {
+    this.renderLayout();
+
+    return this.popupTmplH || false;
+  }
+
+  /**
+   * Return the popup body element.
+   * @returns {HTMLElement}
+   */
+  getBody() {
+    this.renderLayout();
+
+    return this.popupTmplB;
+  }
+
+  /**
+   * Return the popup content element, or body for inline and ajax types.
+   * @returns {HTMLElement}
+   */
+  getBodyContent() {
+    this.renderLayout();
+
+    return this.popupContentElement || this.popupTmplB;
+  }
+
+  /**
+   * Return the popup footer element.
+   * @returns {HTMLElement|boolean}
+   */
+  getFooter() {
+    this.renderLayout();
+
+    return this.popupTmplF || false;
+  }
+
+  /**
+   * Open the popup as modal window.
+   * Will append the element to Document body if not appended before.
+   *
+   * @returns {JoomlaDialog}
+   */
+  show() {
+    // Check whether the element already attached to DOM
+    if (!this.parentElement) {
+      // Check for preferred parent to attach to DOM
+      const parent = this.findPreferredParent();
+      (parent || document.body).appendChild(this);
+    }
+
+    this.dialog.showModal();
+    this.dispatchEvent(new CustomEvent('joomla-dialog:open', { bubbles: true }));
+    return this;
+  }
+
+  /**
+   * Alias for show() method.
+   * @returns {JoomlaDialog}
+   */
+  open() {
+    return this.show();
+  }
+
+  /**
+   * Closes the popup
+   *
+   * @returns {JoomlaDialog}
+   */
+  close() {
+    if (!this.dialog) {
+      throw new Error('Calling close for non opened dialog is discouraged.');
+    }
+
+    this.dialog.close();
+    return this;
+  }
+
+  /**
+   * Alias for close() method.
+   * @returns {JoomlaDialog}
+   */
+  hide() {
+    return this.close();
+  }
+
+  /**
+   * Destroys the popup.
+   */
+  destroy() {
+    if (!this.dialog) {
+      return;
+    }
+
+    this.dialog.close();
+    this.removeChild(this.dialog);
+    this.parentElement.removeChild(this);
+
+    // Restore original location of the popup content element
+    if (this.popupContentSrcLocation && this.popupContent) {
+      const { parent, nextSibling } = this.popupContentSrcLocation;
+      parent.insertBefore(this.popupContent, nextSibling);
+    }
+
+    this.dialog = null;
+    this.popupTmplH = null;
+    this.popupTmplB = null;
+    this.popupTmplF = null;
+    this.popupContentElement = null;
+    this.popupContentSrcLocation = null;
+  }
+
+  /**
+   * Helper method to show an Alert.
+   *
+   * @param {String} message
+   * @param {String} title
+   * @returns {Promise}
+   */
+  static alert(message, title) {
+    return new Promise((resolve) => {
+      const popup = new this();
+      popup.popupType = 'inline';
+      popup.popupContent = message;
+      popup.textHeader = title || Joomla.Text._('INFO', 'Info');
+      popup.popupButtons = [{
+        label: Joomla.Text._('JOK', 'Okay'),
+        onClick: () => popup.close(),
+      }];
+      popup.classList.add('joomla-dialog-alert');
+      popup.addEventListener('joomla-dialog:close', () => {
+        popup.destroy();
+        resolve();
+      });
+      popup.show();
+    });
+  }
+
+  /**
+   * Helper method to show a Confirmation popup.
+   *
+   * @param {String} message
+   * @param {String} title
+   * @returns {Promise}
+   */
+  static confirm(message, title) {
+    return new Promise((resolve) => {
+      let result = false;
+      const popup = new this();
+      popup.popupType = 'inline';
+      popup.popupContent = message;
+      popup.textHeader = title || Joomla.Text._('INFO', 'Info');
+      popup.popupButtons = [
+        {
+          label: Joomla.Text._('JYES', 'Yes'),
+          onClick: () => {
+            result = true;
+            popup.destroy();
+          },
+        },
+        {
+          label: Joomla.Text._('JNO', 'No'),
+          onClick: () => {
+            result = false;
+            popup.destroy();
+          },
+          className: 'button btn btn-outline-secondary',
+        },
+      ];
+      popup.cancelable = false;
+      popup.classList.add('joomla-dialog-confirm');
+      popup.addEventListener('joomla-dialog:close', () => resolve(result));
+      popup.show();
+    });
+  }
+}
+
+customElements.define('joomla-dialog', JoomlaDialog);
+
+export default JoomlaDialog;
diff --git a/build/media_source/system/js/keepalive.es6.js b/build/media_source/system/js/keepalive.es6.js
index 120a9195d64ab..baf919bb6ae53 100644
--- a/build/media_source/system/js/keepalive.es6.js
+++ b/build/media_source/system/js/keepalive.es6.js
@@ -26,4 +26,4 @@ if (keepAliveUri === '') {
   keepAliveUri = `${(systemPaths ? `${systemPaths.root}/index.php` : window.location.pathname)}?option=com_ajax&format=json`;
 }
 
-setInterval(() => navigator.sendBeacon(keepAliveUri), keepAliveInterval);
+setInterval(() => fetch(keepAliveUri, { method: 'POST' }), keepAliveInterval);
diff --git a/build/media_source/system/js/list-view.es6.js b/build/media_source/system/js/list-view.es6.js
index d3f4e3c2890c0..28d18bd6eaedb 100644
--- a/build/media_source/system/js/list-view.es6.js
+++ b/build/media_source/system/js/list-view.es6.js
@@ -23,12 +23,10 @@ function gridItemAction(event) {
   const { itemFormId } = item.dataset;
 
   if (itemFormId) {
-    Joomla.listItemTask(itemId, itemTask);
+    Joomla.listItemTask(itemId, itemTask, itemFormId);
   } else {
     Joomla.listItemTask(itemId, itemTask);
   }
-
-  Joomla.submitform(itemTask, item.form);
 }
 
 /*
@@ -50,12 +48,10 @@ function gridTransitionItemAction(event) {
   item.form.transition_id.value = item.value;
 
   if (itemFormId) {
-    Joomla.listItemTask(itemId, itemTask);
+    Joomla.listItemTask(itemId, itemTask, itemFormId);
   } else {
     Joomla.listItemTask(itemId, itemTask);
   }
-
-  Joomla.submitform(itemTask, item.form);
 }
 
 /*
@@ -93,8 +89,18 @@ function applyIsChecked(event) {
   }
 }
 
-document.querySelectorAll('.js-grid-item-check-all').forEach((element) => element.addEventListener('click', (event) => Joomla.checkAll(event.target)));
-document.querySelectorAll('.js-grid-item-is-checked').forEach((element) => element.addEventListener('click', applyIsChecked));
-document.querySelectorAll('.js-grid-item-action').forEach((element) => element.addEventListener('click', gridItemAction));
-document.querySelectorAll('.js-grid-item-transition-action').forEach((element) => element.addEventListener('change', gridTransitionItemAction));
-document.querySelectorAll('.js-grid-button-transition-action').forEach((element) => element.addEventListener('click', gridTransitionButtonAction));
+/*
+ * Set up an interactive list elements
+ *
+ * @param {Event} event
+ */
+const setup = ({ target }) => {
+  target.querySelectorAll('.js-grid-item-check-all').forEach((element) => element.addEventListener('click', (event) => Joomla.checkAll(event.target)));
+  target.querySelectorAll('.js-grid-item-is-checked').forEach((element) => element.addEventListener('click', applyIsChecked));
+  target.querySelectorAll('.js-grid-item-action').forEach((element) => element.addEventListener('click', gridItemAction));
+  target.querySelectorAll('.js-grid-item-transition-action').forEach((element) => element.addEventListener('change', gridTransitionItemAction));
+  target.querySelectorAll('.js-grid-button-transition-action').forEach((element) => element.addEventListener('click', gridTransitionButtonAction));
+};
+
+setup({ target: document });
+document.addEventListener('joomla:updated', setup);
diff --git a/build/media_source/system/js/modal-content-select.es6.js b/build/media_source/system/js/modal-content-select.es6.js
new file mode 100644
index 0000000000000..352c1ef2f13fe
--- /dev/null
+++ b/build/media_source/system/js/modal-content-select.es6.js
@@ -0,0 +1,34 @@
+/**
+ * @copyright  (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * A helper to Post a Message
+ * @param {Object} data
+ */
+const send = (data) => {
+  // Set the message type and send it
+  data.messageType = data.messageType || 'joomla:content-select';
+  window.parent.postMessage(data);
+};
+
+// Bind the buttons
+document.addEventListener('click', (event) => {
+  const button = event.target.closest('[data-content-select]');
+  if (!button) return;
+  event.preventDefault();
+
+  // Extract the data and send
+  const data = { ...button.dataset };
+  delete data.contentSelect;
+  send(data);
+});
+
+// Check for "select on load"
+window.addEventListener('load', () => {
+  const data = Joomla.getOptions('content-select-on-load');
+  if (data) {
+    send(data);
+  }
+});
diff --git a/build/media_source/system/js/searchtools.es6.js b/build/media_source/system/js/searchtools.es6.js
index 2e7cc49e0a33c..ab5ad08a52c0b 100644
--- a/build/media_source/system/js/searchtools.es6.js
+++ b/build/media_source/system/js/searchtools.es6.js
@@ -258,7 +258,7 @@ Joomla = window.Joomla || {};
       }
 
       self.getFilterFields().forEach((i) => {
-        if (exceptElement && i === exceptElement) {
+        if ((exceptElement && i === exceptElement) || !i.closest(this.options.filterContainerSelector)) {
           return;
         }
 
@@ -303,6 +303,9 @@ Joomla = window.Joomla || {};
       let activeFilterCount = 0;
 
       this.getFilterFields().forEach((item) => {
+        if (!item.closest(this.options.filterContainerSelector)) {
+          return;
+        }
         if (item.classList.contains('active')) {
           activeFilterCount += 1;
           if (cont.filterButton) {
diff --git a/build/media_source/system/scss/joomla-fontawesome.scss b/build/media_source/system/scss/joomla-fontawesome.scss
index f94624aaffa4f..065b91451793b 100644
--- a/build/media_source/system/scss/joomla-fontawesome.scss
+++ b/build/media_source/system/scss/joomla-fontawesome.scss
@@ -2,7 +2,7 @@
 $fa-font-path: "../../../media/vendor/fontawesome-free/webfonts" !default;
 $fa-font-display: block !default;
 
-// Font Awesome 5 Free
+// 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";
diff --git a/build/media_source/templates/administrator/atum/images/select-bg-dark.svg b/build/media_source/templates/administrator/atum/images/select-bg-dark.svg
new file mode 100644
index 0000000000000..31aacfc2d4ef8
--- /dev/null
+++ b/build/media_source/templates/administrator/atum/images/select-bg-dark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1854.54 295" preserveAspectRatio="xMinYMid" width="1854.54" height="295"><path d="M1825.1,145.7l6.9,6.9c0.1,0.1,0.2,0.1,0.3,0.1c0.1,0,0.2,0,0.3-0.1l6.9-6.9c0.1-0.1,0.1-0.2,0.1-0.3c0-0.1,0-0.2-0.1-0.3l-0.7-0.7c-0.1-0.1-0.2-0.1-0.3-0.1s-0.2,0-0.3,0.1l-5.8,5.8l-5.8-5.8c-0.1-0.1-0.2-0.1-0.3-0.1c-0.1,0-0.2,0-0.3,0.1l-0.7,0.7c-0.1,0.1-0.1,0.2-0.1,0.3C1824.9,145.5,1825,145.6,1825.1,145.7z" fill="#fff"/><rect width="1810" height="295" fill="#212529"/></svg>
diff --git a/build/media_source/templates/administrator/atum/images/select-bg-rtl-dark.svg b/build/media_source/templates/administrator/atum/images/select-bg-rtl-dark.svg
new file mode 100644
index 0000000000000..7fd24d0217025
--- /dev/null
+++ b/build/media_source/templates/administrator/atum/images/select-bg-rtl-dark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1854.539" height="295" preserveAspectRatio="xMinYMin meet"><path d="M13.573 145.7l6.9 6.9c.1.1.2.1.3.1s.2 0 .3-.1l6.9-6.9c.1-.1.1-.2.1-.3s0-.2-.1-.3l-.7-.7c-.1-.1-.2-.1-.3-.1s-.2 0-.3.1l-5.8 5.8-5.8-5.8c-.1-.1-.2-.1-.3-.1s-.2 0-.3.1l-.7.7c-.1.1-.1.2-.1.3-.296.1-.195.2-.096.3h-.002z"/><path fill="#212529" d="M44.54 0h1810v295h-1810z"/></svg>
diff --git a/build/media_source/templates/administrator/atum/scss/_maps-atum.scss b/build/media_source/templates/administrator/atum/scss/_maps-atum.scss
new file mode 100644
index 0000000000000..be94436782186
--- /dev/null
+++ b/build/media_source/templates/administrator/atum/scss/_maps-atum.scss
@@ -0,0 +1,14 @@
+$theme-colors-text: map-merge((
+  "action": shade-color($base-color, 60%),
+  "error": shade-color($red-dark, 60%)
+), $theme-colors-text);
+
+$theme-colors-bg-subtle: map-merge((
+  "action": tint-color($base-color, 80%),
+  "error": tint-color($red-dark, 80%)
+), $theme-colors-bg-subtle);
+
+$theme-colors-border-subtle: map-merge((
+  "action": tint-color($base-color, 60%),
+  "error": tint-color($red-dark, 60%)
+), $theme-colors-border-subtle);
diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss
new file mode 100644
index 0000000000000..c001d405a6079
--- /dev/null
+++ b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss
@@ -0,0 +1,15 @@
+$atum-colors-dark: (
+  template-quickicon-color:        var(--template-bg-dark-5),
+  focus-shadow:                    var(--gray-800),
+  media-manager-overlay-bg:        var(--template-bg-dark-90),
+  media-manager-infobar-dt-color:  rgba(255, 255, 255, .54),
+  media-manager-overlay-header-bg: var(--template-bg-dark-80),
+) !default;
+
+$link-hover-color-dark: lighten($light-blue, 20%);
+
+$form-select-indicator-dark:       url("../images/select-bg-dark.svg");
+$form-select-indicator-rtl-dark:   url("../images/select-bg-rtl-dark.svg");
+$form-select-bg-dark:              var(--template-bg-dark);
+$form-select-background-dark:      $form-select-indicator-dark no-repeat right center / $form-select-bg-size; // Used so we can have multiple background elements (e.g. arrow and feedback icon)
+$form-select-background-rtl-dark:  $form-select-indicator-rtl-dark no-repeat left center / $form-select-bg-size; // Used so we can have multiple background elements (e.g. arrow and feedback icon)
diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss
index aebe141de1455..b25cd9131c3b2 100644
--- a/build/media_source/templates/administrator/atum/scss/_variables.scss
+++ b/build/media_source/templates/administrator/atum/scss/_variables.scss
@@ -1,3 +1,9 @@
+// Remove prefix added in BS5 for compat with Joomla beta's shipped with Betas
+$prefix: "";
+
+// Use dark mode conditionally based on media queries from the browser to match the desktop theme
+$color-mode-type: media-query;
+
 // Variables
 $white:                            #fff;
 $whiteoffset:                      #fefefe;
@@ -47,19 +53,21 @@ $theme-colors: (
   "light":                           $gray-100,
   "dark":                            $gray-900,
   "action":                          $base-color,
-  "error":                           $red-dark,
-  "alert-success":                   $green-dark) !default;
+  "error":                           $red-dark) !default;
+
+$template-background-light: #f0f4fb; //light background color, frontend dashboard background and installer body background
 
 $atum-colors: (
   template-sidebar-bg:             var(--template-bg-dark-80),
   template-sidebar-font-color:     $white,
   template-sidebar-link-color:     $white,
-  template-bg-light:               #f0f4fb, //light background color, frontend dashboard background
+  template-bg-light:               $template-background-light,
+  template-link-color:             var(--link-color),
   template-text-light:             $white,
+  template-text-dark:              $atum-text-dark,
   template-special-color:          $dark-blue,
-  template-link-color:             $light-blue,
-  template-link-hover-color:       darken($light-blue, 20%),
   template-contrast:               $light-blue,
+  template-quickicon-color:        hsl(var(--hue), 30%, 40%),
   template-bg-dark:                hsl(var(--hue), 40%, 20%),
   template-bg-dark-3:              hsl(var(--hue), 40%, 97%),
   template-bg-dark-5:              hsl(var(--hue), 40%, 95%),
@@ -75,7 +83,11 @@ $atum-colors: (
   template-bg-dark-70:             hsl(var(--hue), 40%, 30%),
   template-bg-dark-75:             hsl(var(--hue), 40%, 25%),
   template-bg-dark-80:             hsl(var(--hue), 40%, 20%),
-  template-bg-dark-90:             hsl(var(--hue), 40%, 10%)
+  template-bg-dark-90:             hsl(var(--hue), 40%, 10%),
+  media-manager-overlay-header-bg: var(--template-bg-dark-5),
+  media-manager-infobar-dt-color:  rgba(0, 0, 0, .54),
+  media-manager-content-bg:        var(--body-bg),
+  media-manager-overlay-bg:        var(--template-bg-dark-3),
 );
 
 $colors: (
@@ -147,7 +159,6 @@ $extrabold-weight:                 800;
 $black-weight:                     900;
 
 // Tables
-$table-bg:                         var(--white);
 $table-cell-padding-y:             .75rem;
 $table-cell-padding-x:             1rem;
 $table-cell-padding-y-sm:          .3rem;
@@ -173,7 +184,7 @@ $state-success-bg:                 lighten($success, 58%);
 $state-success-border:             hsl(var(--hue),50%,93%);
 
 $state-info-text:                  var(--template-bg-dark-70);
-$state-info-bg:                    var(--white);
+$state-info-bg:                    var(--body-bg);
 $state-info-border:                var(--template-bg-dark-70);
 
 $state-warning-text:               darken($warning, 24%);
@@ -215,8 +226,7 @@ $treeselect-line-height:           2.2rem;
 $treeselect-indent:                40px;
 
 // List
-$list-group-bg:                    var(--white-offset);
-$list-group-border-color:          hsl(var(--hue),40%,85%);
+$list-group-border-color:          var(--template-bg-dark-15);
 $list-group-item-padding-y:        .75rem;
 
 // Buttons
@@ -269,8 +279,8 @@ $grid-gutter-width-s:              15px;
 $breadcrumb-bg:                    var(--white);
 
 // Links
-$link-color:                       var(--template-link-color);
-$link-hover-color:                 var(--template-link-hover-color);
+$link-color:                       $light-blue;
+$link-hover-color:                 darken($light-blue, 20%);
 $link-decoration:                  none;
 
 // Z-Index list
diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_form.scss b/build/media_source/templates/administrator/atum/scss/blocks/_form.scss
index 7848c80452319..3ad725b4829f0 100644
--- a/build/media_source/templates/administrator/atum/scss/blocks/_form.scss
+++ b/build/media_source/templates/administrator/atum/scss/blocks/_form.scss
@@ -5,10 +5,19 @@
 
   &:disabled,
   &[readonly] {
-    background-color: #e8e8e8;
+    background-color: var(--gray-200);
     opacity: 1;
   }
 
+  @if $enable-dark-mode {
+    @include color-mode(dark) {
+      &:disabled,
+      &[readonly] {
+        background-color: var(--gray-800);
+      }
+    }
+  }
+
   &:hover:not(:disabled):not([readonly])::-webkit-file-upload-button,
   &:hover:not(:disabled):not([readonly])::file-selector-button {
     background-color: var(--template-bg-dark-50);
diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_global.scss b/build/media_source/templates/administrator/atum/scss/blocks/_global.scss
index a77fa0e669e09..0917936af19ed 100644
--- a/build/media_source/templates/administrator/atum/scss/blocks/_global.scss
+++ b/build/media_source/templates/administrator/atum/scss/blocks/_global.scss
@@ -20,6 +20,14 @@ body {
     background-color: var(--template-bg-dark-5);
   }
 
+  @if $enable-dark-mode {
+    @include color-mode(dark) {
+      &.admin {
+        background-color: var(--template-bg-dark-90);
+      }
+    }
+  }
+
   &.monochrome {
     filter: grayscale(1);
     &::after {
@@ -145,7 +153,7 @@ body .container-main {
 }
 
 body:not(.contentpane) .main-card {
-  background: $white;
+  background: var(--body-bg);
   border-radius: $border-radius;
   box-shadow: 0 2px 10px -8px var(--template-bg-dark-50);
 }
@@ -178,7 +186,7 @@ body:not(.contentpane) .main-card {
 // external links with icons
 a[target="_blank"]::before {
   padding-inline-end: 3px;
-  font-family: "Font Awesome 5 Free";
+  font-family: "Font Awesome 6 Free";
   font-size: 14px;
   font-weight: 900;
   content: "\f35d";
@@ -197,6 +205,14 @@ a[target="_blank"]::before {
   opacity: .7;
 }
 
+@if $enable-dark-mode {
+  @include color-mode(dark) {
+    .text-muted {
+      color: var(--template-text-light) !important;
+    }
+  }
+}
+
 .card-columns {
   display: grid;
   grid-gap: 0 15px;
diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_icons.scss b/build/media_source/templates/administrator/atum/scss/blocks/_icons.scss
index 5528b46ec864a..0841d8f677b03 100644
--- a/build/media_source/templates/administrator/atum/scss/blocks/_icons.scss
+++ b/build/media_source/templates/administrator/atum/scss/blocks/_icons.scss
@@ -73,10 +73,11 @@
 
 // WebAuthn
 .plg_system_webauthn_login_button svg {
-  margin-inline-end: 2px;
+  width: 30px;
+  margin: 4px;
 }
 
-.plg_system_webauthn_login_button svg path {
+.plg_system_webauthn_login_button svg path, .plg_system_webauthn_login_button svg circle {
   fill: var(--white);
 }
 
diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_layout.scss b/build/media_source/templates/administrator/atum/scss/blocks/_layout.scss
index fc3319a7a0e31..181f15041ccc6 100644
--- a/build/media_source/templates/administrator/atum/scss/blocks/_layout.scss
+++ b/build/media_source/templates/administrator/atum/scss/blocks/_layout.scss
@@ -11,6 +11,14 @@
     padding: 0 1rem;
     font-weight: $font-weight-bold;
     color: var(--template-text-dark);
-    background-color: $white;
+    background-color: var(--bg-color);
+  }
+
+  @if $enable-dark-mode {
+    @include color-mode(dark) {
+      > legend {
+        color: var(--template-text-light);
+      }
+    }
   }
 }
diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_login.scss b/build/media_source/templates/administrator/atum/scss/blocks/_login.scss
index e94e69510a058..b989b652db9f9 100644
--- a/build/media_source/templates/administrator/atum/scss/blocks/_login.scss
+++ b/build/media_source/templates/administrator/atum/scss/blocks/_login.scss
@@ -28,7 +28,7 @@
     padding: 30px;
     margin: 1rem;
     color: var(--template-text-dark);
-    background: var(--white);
+    background: var(--body-bg);
     border-radius: 10px;
     box-shadow: 0 4px 20px -10px var(--template-bg-dark-50);
 
@@ -102,7 +102,6 @@
 
   input:focus,
   select:focus {
-    background: $white;
     box-shadow: inset 0 0 1px 1px var(--template-contrast);
   }
 
@@ -163,6 +162,7 @@
     align-self: flex-end;
     width: 100%;
     font-size: ($font-size-base * .875);
+    --body-color: var(--template-text-light);
     color: var(--template-text-light);
     text-align: center;
 
@@ -218,6 +218,15 @@ label {
   color: $darkblue;
 }
 
+@if $enable-dark-mode {
+  @include color-mode(dark) {
+    label {
+      color: var(--white);
+    }
+  }
+}
+
+
 .com_login .sidebar-wrapper .main-brand {
   flex: 1;
   flex-basis: auto;
diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_modals.scss b/build/media_source/templates/administrator/atum/scss/blocks/_modals.scss
index 854979b697231..468693b64f0ed 100755
--- a/build/media_source/templates/administrator/atum/scss/blocks/_modals.scss
+++ b/build/media_source/templates/administrator/atum/scss/blocks/_modals.scss
@@ -165,3 +165,159 @@
     }
   }
 }
+
+// Styling for joomla-dialog element
+joomla-dialog {
+  dialog {
+    width: 96vw;
+    max-width: 1700px;
+    height: 96vh;
+    padding: 0;
+    border: 1px solid var(--border-color-translucent);
+    border-radius: .3rem;
+    box-shadow: 0 .5rem 1rem rgba(0, 0, 0, .15);
+
+    @include media-breakpoint-up(xxl) {
+      width: 80vw;
+      height: 80vh;
+    }
+  }
+
+  &[type="image"] {
+    dialog {
+      width: fit-content;
+      height: fit-content;
+    }
+  }
+
+  &[type="iframe"] {
+    dialog {
+      overflow: hidden;
+    }
+  }
+
+  iframe.iframe-content {
+    width: 100%;
+    height: 100%;
+  }
+
+  // Extra loading animation for iframe and ajax types
+  &[type="iframe"],
+  &[type="ajax"] {
+    &.loading {
+      dialog:after {
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        display: block;
+        width: 66px;
+        height: 66px;
+        content: "";
+        background: url("../../../../system/images/ajax-loader.gif") no-repeat center;
+        transform: translate(-50%, -50%);
+      }
+    }
+  }
+}
+.joomla-dialog-container {
+  position: relative;
+  box-sizing: border-box;
+  display: flex;
+  flex-flow: column;
+  height: 100%;
+
+  .buttons-holder {
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    margin-inline-start: auto;
+
+    button {
+      margin-inline: .375rem;
+    }
+  }
+}
+.joomla-dialog-header {
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 1rem;
+  border-bottom: 1px solid var(--border-color);
+
+  h3 {
+    margin: 0;
+  }
+
+  .header-icon {
+    margin-inline-end: .375rem;
+    font-size: $h3-font-size;
+  }
+
+  &.empty {
+    display: none;
+  }
+}
+.joomla-dialog-body {
+  position: relative;
+  box-sizing: border-box;
+  flex: 1 1 auto;
+
+  .buttons-holder {
+    position: absolute;
+    top: 1rem;
+    right: 1rem;
+  }
+
+  // Apply overflow for potentially large content
+  joomla-dialog[type="inline"],
+  joomla-dialog[type="ajax"] & {
+    overflow: auto;
+  }
+
+  // Content basic loading animation
+  joomla-dialog.loading & {
+    opacity: 0;
+  }
+  joomla-dialog.loaded & {
+    opacity: 1;
+    transition: opacity .4s ease;
+  }
+}
+.joomla-dialog-footer {
+  position: relative;
+  padding: 1rem;
+  border-top: 1px solid var(--border-color);
+
+  .buttons-holder button {
+    padding-inline: 22px;
+  }
+
+  &.empty {
+    display: none;
+  }
+}
+
+// Dialog alert and confirm
+.joomla-dialog-alert,
+.joomla-dialog-confirm {
+  dialog {
+    width: 600px;
+    max-width: 80vw;
+    height: fit-content;
+  }
+
+  .joomla-dialog-body {
+    padding: 1rem;
+  }
+}
+
+// Dialog for content select field
+.joomla-dialog-content-select-field {
+  dialog {
+    @include media-breakpoint-up(xxl) {
+      width: 90vw;
+      height: 90vh;
+    }
+  }
+}
diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss b/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss
index bd579aaa285e9..fccad70dde2b5 100644
--- a/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss
+++ b/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss
@@ -1,11 +1,11 @@
 // Quick Icons
 
 .quick-icons {
-  background-color: $white;
+  background-color: var(--body-bg);
 
   .nav {
     display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(190px, 1fr));
+    grid-template-columns: repeat(auto-fill, minmax(190px, 1fr));
     grid-gap: 1rem;
   }
 
@@ -18,9 +18,9 @@
   }
 
   .quickicon {
-    --text-color: hsl(var(--hue), 30%, 40%);
+    --text-color: var(--template-quickicon-color);
     --bg-color: hsl(var(--hue), 60%, 97%);
-    --icon-color: hsl(var(--hue), 30%, 40%);
+    --icon-color: var(--template-quickicon-color);
     --bg-color-hvr: var(--template-bg-dark);
 
     display: flex;
@@ -97,6 +97,16 @@
     }
   }
 
+  @if $enable-dark-mode {
+    @include color-mode(dark) {
+      .quickicon {
+        --bg-color: var(--template-bg-dark-80);
+        --bg-color-hvr: var(--template-bg-dark-65);
+      }
+    }
+  }
+
+
   .quickicon-info {
     display: flex;
     align-items: flex-end;
@@ -115,7 +125,7 @@
 
       > * {
         margin-bottom: 10px;
-        color: hsl(var(--hue), 30%, 40%);
+        color: var(--template-quickicon-color);
       }
 
       &:hover,
diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_sidebar-nav.scss b/build/media_source/templates/administrator/atum/scss/blocks/_sidebar-nav.scss
index 316e26683de0e..a323c0d3d3212 100644
--- a/build/media_source/templates/administrator/atum/scss/blocks/_sidebar-nav.scss
+++ b/build/media_source/templates/administrator/atum/scss/blocks/_sidebar-nav.scss
@@ -20,7 +20,7 @@
 
       &::before {
         margin-inline-end: .5rem;
-        font-family: "Font Awesome 5 Free";
+        font-family: "Font Awesome 6 Free";
         font-weight: 900;
         content: "\f054" #{"/*!rtl:\"\f053\"*/"};
       }
diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_sidebar.scss b/build/media_source/templates/administrator/atum/scss/blocks/_sidebar.scss
index 5a37488b07da1..7dd44cdc57c66 100644
--- a/build/media_source/templates/administrator/atum/scss/blocks/_sidebar.scss
+++ b/build/media_source/templates/administrator/atum/scss/blocks/_sidebar.scss
@@ -141,7 +141,7 @@
       align-items: center;
       justify-content: center;
       width: 2rem;
-      font-family: "Font Awesome 5 Free";
+      font-family: "Font Awesome 6 Free";
       font-weight: 900;
       content: "\f054" #{"/*!rtl:\"\f053\"*/"};
     }
@@ -255,7 +255,7 @@
 
     .navbar-toggler-icon::before {
       display: inline-block;
-      font: normal normal 900 28px/1 "Font Awesome 5 Free";
+      font: normal normal 900 28px/1 "Font Awesome 6 Free";
       color: var(--toggle-color);
       content: "\f00d";
     }
diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss b/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss
index 7a7752ea546e4..dd1704c5d7735 100644
--- a/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss
+++ b/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss
@@ -46,7 +46,7 @@
     font-size: 1rem;
     line-height: $atum-toolbar-line-height;
     color: var(--template-text-dark);
-    background: $white;
+    background: var(--bg-color);
     border-color: hsl(var(--hue),20%,80%);
 
     > span {
@@ -86,6 +86,14 @@
       --subhead-btn-accent: var(--template-bg-dark);
     }
 
+    @if $enable-dark-mode {
+      @include color-mode(dark) {
+        &.btn-info {
+          --subhead-btn-accent: var(--template-bg-light);
+        }
+      }
+    }
+
     &.btn-action {
       --subhead-btn-accent: var(--template-bg-dark);
       display: flex;
@@ -93,13 +101,21 @@
 
       &::after {
         width: 2.375rem;
-        font-family: "Font Awesome 5 Free";
+        font-family: "Font Awesome 6 Free";
         font-weight: 900;
         content: "\f078";
         border: 0;
       }
     }
 
+    @if $enable-dark-mode {
+      @include color-mode(dark) {
+        &.btn-action {
+          --subhead-btn-accent: var(--template-bg-light);
+        }
+      }
+    }
+
     &[disabled],
     &.dropdown-toggle[disabled] {
       --subhead-btn-accent: var(--template-bg-dark);
@@ -114,6 +130,16 @@
     }
   }
 
+  @if $enable-dark-mode {
+    @include color-mode(dark) {
+      .btn {
+        --subhead-btn-accent: var(--template-text-light);
+        color: var(--template-text-light);
+      }
+    }
+  }
+
+
   .dropdown-toggle {
     &.btn {
       padding-inline-end: 0;
@@ -138,6 +164,15 @@
   }
 }
 
+@if $enable-dark-mode {
+  @include color-mode(dark) {
+    .subhead {
+      background-color: var(--body-bg);
+      background-image: linear-gradient(var(--body-bg), var(--dark-bg));
+    }
+  }
+}
+
 @include media-breakpoint-down(sm) {
   joomla-tab[view=accordion] .col-md-9,
   joomla-tab[view=accordion] .col-md-3 {
@@ -163,7 +198,7 @@
     border-radius: 30px;
 
     .toggler-toolbar-icon::before {
-      font: normal normal 900 28px/1 "Font Awesome 5 Free";
+      font: normal normal 900 28px/1 "Font Awesome 6 Free";
       color: var(--toggle-color);
       content: "\f00d";
     }
diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss b/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss
index 9b4b841c950f3..9acb0d35c17d9 100644
--- a/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss
+++ b/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss
@@ -22,7 +22,7 @@
     }
 
     a {
-      color: var(--template-link-color);
+      color: var(--#{$prefix}link-color);
     }
 
     h2 {
@@ -49,7 +49,7 @@
     }
 
     a {
-      color: var(--template-link-color);
+      color: var(--#{$prefix}link-color);
     }
 
     h2 {
@@ -88,17 +88,7 @@
   }
 
   .card-header {
-    display: flex;
-    align-items: center;
-    padding: 1rem 1rem .75rem;
-    font-weight: $font-weight-bold;
-    color: var(--template-bg-dark);
-    background: hsla(0, 0%, 100%, .7); // default: var(--card-bg);
-
-    > [class^="icon-"],
-    > img {
-      margin-inline-end: .5rem;
-    }
+    --card-bg: hsla(0, 0%, 100%, .7);
 
     .btn {
       margin-top: .25em;
@@ -121,6 +111,14 @@
       padding: 0;
       color: var(--template-bg-dark-70);
     }
+
+    @if $enable-dark-mode {
+      @include color-mode(dark) {
+        > * {
+          color: var(--body-color);
+        }
+      }
+    }
   }
 
   .cpanel-add-module {
@@ -134,9 +132,9 @@
     font-size: .875rem;
     font-weight: 700;
     line-height: 1;
-    color: hsl(var(--hue),30%,40%);
-    background-color: hsl(var(--hue),35%,98%);
-    border: 1px solid hsl(var(--hue),35%,88%);
+    color: var(--template-quickicon-color);
+    background-color: var(--body-bg);
+    border: 1px solid var(--body-bg);
     border-radius: $border-radius;
     transition: all .15s ease-in;
 
@@ -154,7 +152,7 @@
 
     .cpanel-add-module-icon {
       font-size: 2rem;
-      color: hsl(var(--hue),30%,40%);
+      color: var(--template-quickicon-color);
       margin-inline-end: .5rem;
     }
   }
@@ -166,10 +164,6 @@
   }
 
   .list-group-item {
-    &:hover {
-      background: var(--toolbar-bg);
-    }
-
     a {
       font-weight: 500;
       text-decoration: underline;
@@ -187,11 +181,11 @@
         display: block;
         padding: .5rem;
         color: rgba(255, 255, 255, .9);
-        background: var(--template-link-color);
+        background: var(--#{$prefix}link-color);
         box-shadow: $atum-box-shadow;
 
         &:hover {
-          background: var(--template-link-hover-color);
+          background: var(--#{$prefix}link-hover-color);
         }
       }
     }
@@ -231,7 +225,7 @@
 
 .sample-data__title {
   font-weight: bold;
-  color: var(--primary);
+  color: var(--template-bg-dark-50);
 }
 
 .sample-data__icon {
diff --git a/build/media_source/templates/administrator/atum/scss/template.scss b/build/media_source/templates/administrator/atum/scss/template.scss
index 1c349c951e70d..735ae0a822f3f 100644
--- a/build/media_source/templates/administrator/atum/scss/template.scss
+++ b/build/media_source/templates/administrator/atum/scss/template.scss
@@ -1,14 +1,14 @@
-// Remove prefix added in BS5 for compat with Joomla beta's shipped with Betas
-$prefix: "";
-
 // Bootstrap 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 "maps-atum";
 @import "../../../../../../media/vendor/bootstrap/scss/mixins";
 @import "../../../../../../media/vendor/bootstrap/scss/utilities";
 
@@ -80,6 +80,13 @@ $prefix: "";
   }
 }
 
+@if $enable-dark-mode {
+  @include color-mode(dark, true) {
+    @each $color, $value in $atum-colors-dark {
+      --#{$prefix}#{$color}: #{$value};
+    }
+  }
+}
 
 // Forcing reduced motion when set in the user OS
 @media (prefers-reduced-motion: reduce) {
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/_codemirror.scss b/build/media_source/templates/administrator/atum/scss/vendor/_codemirror.scss
index ca4b3da34d16a..d4e29274c3a86 100644
--- a/build/media_source/templates/administrator/atum/scss/vendor/_codemirror.scss
+++ b/build/media_source/templates/administrator/atum/scss/vendor/_codemirror.scss
@@ -1,5 +1,19 @@
 // Codemirror
 
-.CodeMirror-fullscreen {
+joomla-editor-codemirror.fullscreen {
   top: 133px;
+
+  .cm-editor {
+    height: calc(90vh - 133px) !important;
+  }
+
+  @include media-breakpoint-down(sm) {
+    top: 54px;
+    z-index: 890;
+
+    .cm-editor {
+      height: 100vh !important;
+    }
+  }
 }
+
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_card.scss b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_card.scss
index bc22107416436..450bdc7419495 100644
--- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_card.scss
+++ b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_card.scss
@@ -26,14 +26,24 @@
 
   .card-header {
     display: flex;
+    align-items: center;
     padding: 1rem 1rem .75rem;
     font-weight: $font-weight-bold;
     color: var(--template-bg-dark);
-    background: var(--card-bg);
+    background-color: var(--card-bg);
 
     > [class^="icon-"],
     > img {
       margin-inline-end: .5rem;
     }
   }
+
+  @if $enable-dark-mode {
+    @include color-mode(dark) {
+      .card-header {
+        color: var(--body-color);
+        background-color: var(--body-bg);
+      }
+    }
+  }
 }
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_collapse.scss b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_collapse.scss
index 0f87686cf7051..f1dee01af7fa9 100644
--- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_collapse.scss
+++ b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_collapse.scss
@@ -10,6 +10,6 @@
   }
 
   .list-group-item {
-    color: $link-color;
+    --list-group-color: #{$link-color};
   }
 }
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss
index 933ede673b1f0..35df498cbf8b8 100644
--- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss
+++ b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss
@@ -1,3 +1,5 @@
+@import "../../variables-dark";
+
 // Custom Forms
 
 .custom-select {
@@ -8,8 +10,6 @@
   max-width: $input-max-width;
   cursor: pointer;
   background: $form-select-background #{"/* rtl:"}$form-select-background-rtl#{"*/"};;
-  background-color: $form-select-bg;
-  border: $form-select-border-width solid $form-select-border-color;
 
   &[multiple] {
     padding: 0;
@@ -36,6 +36,14 @@
       color: $form-select-color;
       background-color: var(--white-offset);
     }
+
+    @if $enable-dark-mode {
+      @include color-mode(dark) {
+        option {
+          background-color: var(--gray-800);
+        }
+      }
+    }
   }
 
   &.form-select-danger,
@@ -48,19 +56,60 @@
       color: $form-select-color;
       background-color: var(--white-offset);
     }
+
+    @if $enable-dark-mode {
+      @include color-mode(dark) {
+        option {
+          background-color: var(--gray-800);
+        }
+      }
+    }
   }
 
   &:disabled {
     cursor: default;
-    background-color: #e8e8e8;
+    background-color: var(--gray-200);
     background-image: none;
     border: 0;
     box-shadow: none;
   }
 
+  @if $enable-dark-mode {
+    @include color-mode(dark) {
+      &:disabled {
+        background-color: var(--gray-800);
+      }
+    }
+  }
+
   optgroup,
   option {
     color: var(--template-text-dark);
-    background-color: $white;
+    background-color: var(--body-bg);
+
+    &:disabled {
+      background-color: var(--template-bg-dark-5);
+    }
+  }
+
+  @if $enable-dark-mode {
+    @include color-mode(dark) {
+      option {
+        color: var(--template-text-light);
+
+        &:disabled {
+          background-color: var(--template-bg-dark-90);
+        }
+      }
+    }
+  }
+}
+
+@if $enable-dark-mode {
+  @include color-mode(dark) {
+    .form-select {
+      background: $form-select-background-dark #{"/* rtl:"}$form-select-background-rtl-dark#{"*/"};
+    }
   }
 }
+
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_lists.scss b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_lists.scss
index 29245c5361182..d0d8005b0efe4 100644
--- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_lists.scss
+++ b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_lists.scss
@@ -1,9 +1,5 @@
 // Lists
 
-.list-group-item {
-  background-color: $list-group-bg;
-}
-
 .list-unstyled .list-unstyled {
   padding-left: 20px;
 }
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss b/build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss
index 4f95802de3e72..bba4893950573 100644
--- a/build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss
+++ b/build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss
@@ -2,6 +2,7 @@
 
 // Atum Variables
 @import "../../variables";
+@import "../../variables-dark";
 
 @import "../../../../../../../../media/vendor/bootstrap/scss/variables";
 @import "../../../../../../../../media/vendor/bootstrap/scss/mixins";
@@ -125,6 +126,20 @@
       background-color: $form-select-bg;
     }
   }
+
+  @if $enable-dark-mode {
+    @include color-mode(dark) {
+      .choices__inner {
+        background: url("../../../images/select-bg-dark.svg") no-repeat 100%/116rem;
+        background-color: $form-select-bg-dark;
+
+        [dir="rtl"] & {
+          background: url("../../../images/select-bg-rtl-dark.svg") no-repeat 0/116rem;
+          background-color: $form-select-bg-dark;
+        }
+      }
+    }
+  }
 }
 
 .choices[data-type*="select-one"] {
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome.scss b/build/media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome.scss
index 9df0b7a94aac4..c7c45f6188e4b 100644
--- a/build/media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome.scss
+++ b/build/media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome.scss
@@ -2,7 +2,7 @@
 $fa-css-prefix:                    fa;
 $fa-font-path:                     "../../../../../../vendor/fontawesome-free/webfonts" !default;
 
-// Font Awesome 5 Free
+// 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";
@@ -10,6 +10,9 @@ $fa-font-path:                     "../../../../../../vendor/fontawesome-free/we
 // 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 "../../../../../../system/scss/icomoon";
 
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss b/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss
index 6efacccc73dde..7c199f4a2e76d 100644
--- a/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss
+++ b/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss
@@ -1,5 +1,6 @@
 @import "../../variables";
 @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
 
@@ -84,6 +85,12 @@
   &[type="notice"] {
     --alert-accent-color: #{$state-info-text};
     --alert-bg-color: #{$state-info-bg};
+
+    @include color-mode(dark) {
+      p {
+        color: var(--body-color);
+      }
+    }
   }
 
   &[type="warning"] {
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss b/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss
index 3f935edb49762..c4e2b90e140b7 100644
--- a/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss
+++ b/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss
@@ -8,7 +8,6 @@
 
 // Tabs
 
-
 //
 // Base styles
 //
@@ -40,7 +39,7 @@ joomla-tab {
       display: block;
       padding: .6rem 1rem;
       text-decoration: none;
-      background-color: var(--white);
+      background-color: var(--bg-color);
       border: 0;
       box-shadow: none;
 
@@ -78,6 +77,17 @@ joomla-tab {
         background: var(--template-bg-dark-3);
       }
 
+      @if $enable-dark-mode {
+        @include color-mode(dark) {
+          /* stylelint-disable max-nesting-depth */
+          &[aria-expanded=true] {
+            /* stylelint-enable max-nesting-depth */
+            color: var(--template-text-light);
+            background: var(--template-bg-dark-60);
+          }
+        }
+      }
+
       .text-muted {
         color: var(--template-text-dark) !important;
       }
@@ -109,7 +119,7 @@ joomla-tab {
     --gutter-x: 2rem;
     display: none;
     padding: 30px 2vw;
-    background-color: $white;
+    background-color: var(--body-bg);
     border: 0;
     border-radius: .25rem;
     box-shadow: none;
diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_frontend-edit.scss b/build/media_source/templates/site/cassiopeia/scss/blocks/_frontend-edit.scss
index 722b42ebdeda4..beeadefbbf72d 100644
--- a/build/media_source/templates/site/cassiopeia/scss/blocks/_frontend-edit.scss
+++ b/build/media_source/templates/site/cassiopeia/scss/blocks/_frontend-edit.scss
@@ -6,7 +6,7 @@
   right: 0;
   left: auto;
   z-index: 900;
-  color: var(--cassiopeia-color-link);
+  color: var(--#{$prefix}link-color);
   background-color: rgba(255,255,255,.5);
   border: 1px solid #58595a;
   border-radius: .25rem;
diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_global.scss b/build/media_source/templates/site/cassiopeia/scss/blocks/_global.scss
index 5b4e719388436..091c61db051eb 100644
--- a/build/media_source/templates/site/cassiopeia/scss/blocks/_global.scss
+++ b/build/media_source/templates/site/cassiopeia/scss/blocks/_global.scss
@@ -54,14 +54,14 @@ h6 {
 }
 
 a {
-  color: var(--cassiopeia-color-link);
+  color: var(--#{$prefix}link-color);
 
   &:not([class]) {
     text-decoration: underline;
   }
 
-  &:hover,
-  &:focus {
+  &:not(.btn):hover,
+  &:not(.btn):focus {
     color: var(--cassiopeia-color-hover);
   }
 
@@ -216,9 +216,9 @@ meter {
 }
 
 .page-link {
-  color: var(--cassiopeia-color-link);
+  color: var(--#{$prefix}link-color);
   &:hover {
-    color: var(--cassiopeia-color-link);
+    color: var(--#{$prefix}link-color);
   }
 }
 
diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_icons.scss b/build/media_source/templates/site/cassiopeia/scss/blocks/_icons.scss
index 73230b650c982..1e901c9909480 100644
--- a/build/media_source/templates/site/cassiopeia/scss/blocks/_icons.scss
+++ b/build/media_source/templates/site/cassiopeia/scss/blocks/_icons.scss
@@ -67,9 +67,10 @@
 
 // WebAuthn
 .plg_system_webauthn_login_button svg {
-  margin-inline-end: 2px;
+  width: 30px;
+  margin: 4px;
 }
 
-.plg_system_webauthn_login_button svg path {
+.plg_system_webauthn_login_button svg path, .plg_system_webauthn_login_button svg circle {
   fill: var(--black);
 }
diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_modals.scss b/build/media_source/templates/site/cassiopeia/scss/blocks/_modals.scss
index 98b5b17f0063c..35278ab66162a 100644
--- a/build/media_source/templates/site/cassiopeia/scss/blocks/_modals.scss
+++ b/build/media_source/templates/site/cassiopeia/scss/blocks/_modals.scss
@@ -32,3 +32,159 @@
     box-shadow: none;
   }
 }
+
+// Styling for joomla-dialog element
+joomla-dialog {
+  dialog {
+    width: 96vw;
+    max-width: 1700px;
+    height: 96vh;
+    padding: 0;
+    border: 1px solid var(--border-color-translucent);
+    border-radius: .3rem;
+    box-shadow: 0 .5rem 1rem rgba(0, 0, 0, .15);
+
+    @include media-breakpoint-up(xxl) {
+      width: 80vw;
+      height: 80vh;
+    }
+  }
+
+  &[type="image"] {
+    dialog {
+      width: fit-content;
+      height: fit-content;
+    }
+  }
+
+  &[type="iframe"] {
+    dialog {
+      overflow: hidden;
+    }
+  }
+
+  iframe.iframe-content {
+    width: 100%;
+    height: 100%;
+  }
+
+  // Extra loading animation for iframe and ajax types
+  &[type="iframe"],
+  &[type="ajax"] {
+    &.loading {
+      dialog:after {
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        display: block;
+        width: 66px;
+        height: 66px;
+        content: "";
+        background: url("../../../../system/images/ajax-loader.gif") no-repeat center;
+        transform: translate(-50%, -50%);
+      }
+    }
+  }
+}
+.joomla-dialog-container {
+  position: relative;
+  box-sizing: border-box;
+  display: flex;
+  flex-flow: column;
+  height: 100%;
+
+  .buttons-holder {
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    margin-inline-start: auto;
+
+    button {
+      margin-inline: .375rem;
+    }
+  }
+}
+.joomla-dialog-header {
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 1rem;
+  border-bottom: 1px solid var(--border-color);
+
+  h3 {
+    margin: 0;
+  }
+
+  .header-icon {
+    margin-inline-end: .375rem;
+    font-size: $h3-font-size;
+  }
+
+  &.empty {
+    display: none;
+  }
+}
+.joomla-dialog-body {
+  position: relative;
+  box-sizing: border-box;
+  flex: 1 1 auto;
+
+  .buttons-holder {
+    position: absolute;
+    top: 1rem;
+    right: 1rem;
+  }
+
+  // Apply overflow for potentially large content
+  joomla-dialog[type="inline"],
+  joomla-dialog[type="ajax"] & {
+    overflow: auto;
+  }
+
+  // Content basic loading animation
+  joomla-dialog.loading & {
+    opacity: 0;
+  }
+  joomla-dialog.loaded & {
+    opacity: 1;
+    transition: opacity .4s ease;
+  }
+}
+.joomla-dialog-footer {
+  position: relative;
+  padding: 1rem;
+  border-top: 1px solid var(--border-color);
+
+  .buttons-holder button {
+    padding-inline: 22px;
+  }
+
+  &.empty {
+    display: none;
+  }
+}
+
+// Dialog alert and confirm
+.joomla-dialog-alert,
+.joomla-dialog-confirm {
+  dialog {
+    width: 600px;
+    max-width: 80vw;
+    height: fit-content;
+  }
+
+  .joomla-dialog-body {
+    padding: 1rem;
+  }
+}
+
+// Dialog for content select field
+.joomla-dialog-content-select-field {
+  dialog {
+    @include media-breakpoint-up(xxl) {
+      width: 90vw;
+      height: 90vh;
+    }
+  }
+}
diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_toolbar.scss b/build/media_source/templates/site/cassiopeia/scss/blocks/_toolbar.scss
index cc993c9772146..9ce695bdda44c 100644
--- a/build/media_source/templates/site/cassiopeia/scss/blocks/_toolbar.scss
+++ b/build/media_source/templates/site/cassiopeia/scss/blocks/_toolbar.scss
@@ -93,7 +93,7 @@
 
       &::after {
         width: 2.375rem;
-        font-family: "Font Awesome 5 Free";
+        font-family: "Font Awesome 6 Free";
         font-weight: 900;
         content: "\f078";
         border: 0;
diff --git a/build/media_source/templates/site/cassiopeia/scss/editor.scss b/build/media_source/templates/site/cassiopeia/scss/editor.scss
index fdc549a87ee58..3fbfcc6fff95c 100644
--- a/build/media_source/templates/site/cassiopeia/scss/editor.scss
+++ b/build/media_source/templates/site/cassiopeia/scss/editor.scss
@@ -70,3 +70,24 @@ span[lang] {
     content: attr(lang);
   }
 }
+
+.float-start {
+  float: left;
+}
+
+.float-end {
+  float: right;
+}
+
+.float-none {
+  float: none;
+}
+
+.mx-auto {
+  margin-right: auto !important;
+  margin-left: auto !important;
+}
+
+.d-block {
+  display: block !important;
+}
diff --git a/build/media_source/templates/site/cassiopeia/scss/global/colors_alternative.scss b/build/media_source/templates/site/cassiopeia/scss/global/colors_alternative.scss
index 88d050087ced6..fc2863202087c 100644
--- a/build/media_source/templates/site/cassiopeia/scss/global/colors_alternative.scss
+++ b/build/media_source/templates/site/cassiopeia/scss/global/colors_alternative.scss
@@ -1,8 +1,12 @@
 // Variables, Functions and Mixins
 @import "../tools/tools";
+@import "../../../../../../../media/vendor/bootstrap/scss/functions";
 
 :root {
   --cassiopeia-color-primary: #{$alternative-color-primary};
+  // @deprecated --casiopeia-color-link is deprecated in favour of --link-color
   --cassiopeia-color-link: #{$alternative-color-link};
+  --link-color: #{$alternative-color-link};
+  --link-color-rgb: #{to-rgb($alternative-color-link)};
   --cassiopeia-color-hover: #{$alternative-color-hover};
 }
diff --git a/build/media_source/templates/site/cassiopeia/scss/global/colors_standard.scss b/build/media_source/templates/site/cassiopeia/scss/global/colors_standard.scss
index 0389ba0059ee9..487e270d9287c 100644
--- a/build/media_source/templates/site/cassiopeia/scss/global/colors_standard.scss
+++ b/build/media_source/templates/site/cassiopeia/scss/global/colors_standard.scss
@@ -1,8 +1,12 @@
 // Variables, Functions and Mixins
 @import "../tools/tools";
+@import "../../../../../../../media/vendor/bootstrap/scss/functions";
 
 :root {
   --cassiopeia-color-primary: #{$standard-color-primary};
+  // @deprecated --casiopeia-color-link is deprecated in favour of --link-color
   --cassiopeia-color-link: #{$standard-color-link};
+  --link-color: #{$standard-color-link};
+  --link-color-rgb: #{to-rgb($standard-color-link)};
   --cassiopeia-color-hover: #{$standard-color-hover};
 }
diff --git a/build/media_source/templates/site/cassiopeia/scss/template.scss b/build/media_source/templates/site/cassiopeia/scss/template.scss
index 6d8c86ea5c9b1..3d169dfe75a15 100644
--- a/build/media_source/templates/site/cassiopeia/scss/template.scss
+++ b/build/media_source/templates/site/cassiopeia/scss/template.scss
@@ -1,10 +1,8 @@
-// Remove prefix added in BS5 for compat with Joomla beta's shipped with Betas
-$prefix: "";
-
 // Bootstrap 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";
diff --git a/build/media_source/templates/site/cassiopeia/scss/tools/variables/_variables.scss b/build/media_source/templates/site/cassiopeia/scss/tools/variables/_variables.scss
index ed81bedb620c7..cce1f6ecd103f 100644
--- a/build/media_source/templates/site/cassiopeia/scss/tools/variables/_variables.scss
+++ b/build/media_source/templates/site/cassiopeia/scss/tools/variables/_variables.scss
@@ -1,3 +1,9 @@
+// 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
+$enable-dark-mode: false;
+
 // Global
 $cassiopeia-container-main-bg:        hsl(0, 0%, 95%) !default;
 $cassiopeia-border-color:             hsl(210, 14%, 89%) !default;
@@ -56,6 +62,7 @@ $cyan:                                hsl(207, 49%, 37%) !default;
 
 $colors: (
   "blue":                             $blue,
+  "black":                            $black,
   "indigo":                           $indigo,
   "purple":                           $purple,
   "pink":                             $pink,
@@ -135,8 +142,8 @@ $cassiopeia-colors: (
 ) !default;
 
 // Links
-$link-color:                          var(--cassiopeia-color-link) !default;
-$link-hover-color:                    var(--cassiopeia-color-hover) !default;
+$link-color:                          $standard-color-link !default;
+$link-hover-color:                    $standard-color-hover !default;
 
 // Breadcrumbs
 $breadcrumb-active-color:             $gray-700 !default;
@@ -203,7 +210,7 @@ $form-select-multiple-padding-y:    .3rem !default;
 
 $form-range-thumb-active-bg:        tint-color($standard-color-primary, 70%) !default;
 
-// Z-index master list
+// Z-index source list
 $zindex-negative:                     -1 !default;
 $zindex-actions:                      auto !default;
 $zindex-toolbar:                      1000 !default;
@@ -265,6 +272,7 @@ $state-danger-bg:                     $danger !default;
 $state-danger-border:                 scale-color($danger, $lightness: -5%) !default;
 
 // Mark element
+$mark-padding: .1875em 0;
 $mark-bg: #fbeea8 !default;
 
 // scss-docs-start border-radius-variables
diff --git a/build/media_source/templates/site/cassiopeia/scss/vendor/_chosen.scss b/build/media_source/templates/site/cassiopeia/scss/vendor/_chosen.scss
index 3fa4ef575e66a..ed0b79d7d20b8 100644
--- a/build/media_source/templates/site/cassiopeia/scss/vendor/_chosen.scss
+++ b/build/media_source/templates/site/cassiopeia/scss/vendor/_chosen.scss
@@ -8,7 +8,6 @@ $chosen-select-padding-y: $form-select-padding-y + .21;
 
   .chosen-single {
     display: inline-block;
-    $select-border-width: ($form-select-border-width * 2);
     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;
diff --git a/build/psr12/phpcs.joomla.report.php b/build/psr12/phpcs.joomla.report.php
index babf12ad71afe..c4d0e21bf4bbe 100644
--- a/build/psr12/phpcs.joomla.report.php
+++ b/build/psr12/phpcs.joomla.report.php
@@ -104,7 +104,6 @@ private function prepareProcessing($file, $phpcsFile, $line, $column, $error)
 
                 if (
                     strpos($fileContent, "defined('_JEXEC')") !== false
-                    || strpos($fileContent, "defined('JPATH_PLATFORM')") !== false
                     || strpos($fileContent, "defined('JPATH_BASE')") !== false
                 ) {
                     $this->preProcessing[] = [
diff --git a/cli/joomla.php b/cli/joomla.php
index c0cf73258a638..5e5364ef11619 100755
--- a/cli/joomla.php
+++ b/cli/joomla.php
@@ -43,6 +43,10 @@
     exit;
 }
 
+if (!defined('JPATH_PUBLIC')) {
+    define('JPATH_PUBLIC', JPATH_ROOT);
+}
+
 // Check if installed
 if (
     !file_exists(JPATH_CONFIGURATION . '/configuration.php')
diff --git a/components/com_ajax/ajax.php b/components/com_ajax/ajax.php
index d7b1b81ec369a..3915ebb837881 100644
--- a/components/com_ajax/ajax.php
+++ b/components/com_ajax/ajax.php
@@ -10,6 +10,7 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Event\Plugin\AjaxEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
@@ -125,13 +126,16 @@
      * (i.e. index.php?option=com_ajax&plugin=foo)
      *
      */
-    $group      = $input->get('group', 'ajax');
-    PluginHelper::importPlugin($group);
-    $plugin     = ucfirst($input->get('plugin'));
-
     try {
-        $results = Factory::getApplication()->triggerEvent('onAjax' . $plugin);
-    } catch (Exception $e) {
+        $dispatcher = $app->getDispatcher();
+        $group      = $input->get('group', 'ajax');
+        $eventName  = 'onAjax' . ucfirst($input->get('plugin', ''));
+        PluginHelper::importPlugin($group, null, true, $dispatcher);
+
+        $results = $dispatcher->dispatch($eventName, new AjaxEvent($eventName, [
+            'subject' => $app,
+        ]))->getArgument('result', []);
+    } catch (Throwable $e) {
         $results = $e;
     }
 } elseif ($input->get('template')) {
diff --git a/components/com_config/forms/modules.xml b/components/com_config/forms/modules.xml
index eddb3586ca18d..cff9c43e0c20c 100644
--- a/components/com_config/forms/modules.xml
+++ b/components/com_config/forms/modules.xml
@@ -117,7 +117,7 @@
 			type="editor"
 			label="COM_MODULES_FIELD_CONTENT_LABEL"
 			buttons="true"
-			filter="JComponentHelper::filterText"
+			filter="\Joomla\CMS\Component\ComponentHelper::filterText"
 			hide="readmore,pagebreak"
 		/>
 
diff --git a/components/com_config/src/Model/FormModel.php b/components/com_config/src/Model/FormModel.php
index 99bc337b9aca6..e6fdbaf4f4d29 100644
--- a/components/com_config/src/Model/FormModel.php
+++ b/components/com_config/src/Model/FormModel.php
@@ -236,7 +236,7 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
      * @return  mixed  Array of filtered data if valid, false otherwise.
      *
      * @see     \Joomla\CMS\Form\FormRule
-     * @see     JFilterInput
+     * @see     \Joomla\CMS\Filter\InputFilter
      * @since   3.2
      */
     public function validate($form, $data, $group = null)
diff --git a/components/com_config/src/Model/ModulesModel.php b/components/com_config/src/Model/ModulesModel.php
index ef9177147b760..f37d5a8e231aa 100644
--- a/components/com_config/src/Model/ModulesModel.php
+++ b/components/com_config/src/Model/ModulesModel.php
@@ -11,10 +11,10 @@
 namespace Joomla\Component\Config\Site\Model;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
diff --git a/components/com_config/src/Model/TemplatesModel.php b/components/com_config/src/Model/TemplatesModel.php
index f5a7a01bdf064..e7d7b0ef84673 100644
--- a/components/com_config/src/Model/TemplatesModel.php
+++ b/components/com_config/src/Model/TemplatesModel.php
@@ -12,9 +12,9 @@
 
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Text;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
diff --git a/components/com_config/src/View/Config/HtmlView.php b/components/com_config/src/View/Config/HtmlView.php
index c4cbeed183a3b..adbb16beef0d5 100644
--- a/components/com_config/src/View/Config/HtmlView.php
+++ b/components/com_config/src/View/Config/HtmlView.php
@@ -121,11 +121,11 @@ protected function _prepareDocument()
         $this->setDocumentTitle($params->get('page_title', ''));
 
         if ($params->get('menu-meta_description')) {
-            $this->document->setDescription($params->get('menu-meta_description'));
+            $this->getDocument()->setDescription($params->get('menu-meta_description'));
         }
 
         if ($params->get('robots')) {
-            $this->document->setMetaData('robots', $params->get('robots'));
+            $this->getDocument()->setMetaData('robots', $params->get('robots'));
         }
 
         // Escape strings for HTML output
diff --git a/components/com_config/src/View/Templates/HtmlView.php b/components/com_config/src/View/Templates/HtmlView.php
index 42fa606f653a4..ecaf86aed0506 100644
--- a/components/com_config/src/View/Templates/HtmlView.php
+++ b/components/com_config/src/View/Templates/HtmlView.php
@@ -15,6 +15,7 @@
 use Joomla\CMS\MVC\Factory\MVCFactory;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\Component\Config\Administrator\Controller\RequestController;
+use Joomla\Component\Templates\Administrator\View\Style\JsonView;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -91,10 +92,12 @@ public function display($tpl = null)
         /** @var MVCFactory $factory */
         $factory = $app->bootComponent('com_templates')->getMVCFactory();
 
+        /** @var JsonView $view */
         $view = $factory->createView('Style', 'Administrator', 'Json');
         $view->setModel($factory->createModel('Style', 'Administrator'), true);
+        $view->setLanguage($app->getLanguage());
 
-        $view->document = $this->document;
+        $view->document = $this->getDocument();
 
         $json = $view->display();
 
@@ -141,11 +144,11 @@ protected function _prepareDocument()
         $this->setDocumentTitle($params->get('page_title', ''));
 
         if ($params->get('menu-meta_description')) {
-            $this->document->setDescription($params->get('menu-meta_description'));
+            $this->getDocument()->setDescription($params->get('menu-meta_description'));
         }
 
         if ($params->get('robots')) {
-            $this->document->setMetaData('robots', $params->get('robots'));
+            $this->getDocument()->setMetaData('robots', $params->get('robots'));
         }
 
         // Escape strings for HTML output
diff --git a/components/com_config/tmpl/modules/default.php b/components/com_config/tmpl/modules/default.php
index 7a46f66473d10..d4473f59c51b0 100644
--- a/components/com_config/tmpl/modules/default.php
+++ b/components/com_config/tmpl/modules/default.php
@@ -85,7 +85,7 @@
 
                     <hr>
 
-                    <?php if (Factory::getUser()->authorise('core.edit.state', 'com_modules.module.' . $this->item['id'])) : ?>
+                    <?php if ($this->getCurrentUser()->authorise('core.edit.state', 'com_modules.module.' . $this->item['id'])) : ?>
                     <div class="control-group">
                         <div class="control-label">
                             <?php echo $this->form->getLabel('published'); ?>
diff --git a/components/com_config/tmpl/templates/default.php b/components/com_config/tmpl/templates/default.php
index c3531496379c3..921625d252e6e 100644
--- a/components/com_config/tmpl/templates/default.php
+++ b/components/com_config/tmpl/templates/default.php
@@ -10,12 +10,11 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
-$user = Factory::getUser();
+$user = $this->getCurrentUser();
 
 /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
 $wa = $this->document->getWebAssetManager();
diff --git a/components/com_contact/forms/filter_contacts.xml b/components/com_contact/forms/filter_contacts.xml
index 4cd4ef560e965..06c568d1dbc8d 100644
--- a/components/com_contact/forms/filter_contacts.xml
+++ b/components/com_contact/forms/filter_contacts.xml
@@ -98,8 +98,8 @@
 			<option value="a.published DESC">JSTATUS_DESC</option>
 			<option value="a.featured ASC">JFEATURED_ASC</option>
 			<option value="a.featured DESC">JFEATURED_DESC</option>
-			<option value="a.name ASC">JGLOBAL_TITLE_ASC</option>
-			<option value="a.name DESC">JGLOBAL_TITLE_DESC</option>
+			<option value="a.name ASC">JGLOBAL_NAME_ASC</option>
+			<option value="a.name DESC">JGLOBAL_NAME_DESC</option>
 			<option value="category_title ASC">JCATEGORY_ASC</option>
 			<option value="category_title DESC">JCATEGORY_DESC</option>
 			<option value="ul.name ASC">COM_CONTACT_FIELD_LINKED_USER_LABEL_ASC</option>
diff --git a/components/com_contact/forms/form.xml b/components/com_contact/forms/form.xml
index bd5429db8cea3..44050713afa85 100644
--- a/components/com_contact/forms/form.xml
+++ b/components/com_contact/forms/form.xml
@@ -32,7 +32,7 @@
 			name="misc"
 			type="editor"
 			label="COM_CONTACT_FIELD_INFORMATION_MISC_LABEL"
-			filter="JComponentHelper::filterText"
+			filter="\Joomla\CMS\Component\ComponentHelper::filterText"
 			buttons="true"
 			hide="readmore,pagebreak"
 		/>
diff --git a/components/com_contact/layouts/field/render.php b/components/com_contact/layouts/field/render.php
new file mode 100644
index 0000000000000..9aed26e588310
--- /dev/null
+++ b/components/com_contact/layouts/field/render.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   (C) 2016 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;
+
+if (!array_key_exists('field', $displayData)) {
+    return;
+}
+
+$field = $displayData['field'];
+
+// Do nothing when not in mail context, like that the default rendering is used
+if ($field->context !== 'com_contact.mail') {
+    return;
+}
+
+// Prepare the value for the contact form mail
+$value = html_entity_decode($field->value);
+
+echo ($field->params->get('showlabel') ? Text::_($field->label) . ': ' : '') . $value . "\r\n";
diff --git a/components/com_contact/layouts/fields/render.php b/components/com_contact/layouts/fields/render.php
new file mode 100644
index 0000000000000..a5c963ff5e05b
--- /dev/null
+++ b/components/com_contact/layouts/fields/render.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   (C) 2016 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\Component\Fields\Administrator\Helper\FieldsHelper;
+
+// Check if we have all the data
+if (!array_key_exists('item', $displayData) || !array_key_exists('context', $displayData)) {
+    return;
+}
+
+// Setting up for display
+$item = $displayData['item'];
+
+if (!$item) {
+    return;
+}
+
+$context = $displayData['context'];
+
+if (!$context) {
+    return;
+}
+
+$parts     = explode('.', $context);
+$component = $parts[0];
+$fields    = null;
+
+if (array_key_exists('fields', $displayData)) {
+    $fields = $displayData['fields'];
+} else {
+    $fields = $item->jcfields ?: FieldsHelper::getFields($context, $item, true);
+}
+
+// Do nothing when not in mail context, like that the default rendering is used
+if (!$fields || reset($fields)->context !== 'com_contact.mail') {
+    return;
+}
+
+// Loop through the fields and print them
+foreach ($fields as $field) {
+    // If the value is empty do nothing
+    if (!strlen($field->value)) {
+        continue;
+    }
+
+    $layout = $field->params->get('layout', 'render');
+    echo FieldsHelper::render($context, 'field.' . $layout, ['field' => $field]);
+}
diff --git a/components/com_contact/src/Controller/ContactController.php b/components/com_contact/src/Controller/ContactController.php
index d86ee9cc7bfa9..b772db60b9892 100644
--- a/components/com_contact/src/Controller/ContactController.php
+++ b/components/com_contact/src/Controller/ContactController.php
@@ -10,6 +10,8 @@
 
 namespace Joomla\Component\Contact\Site\Controller;
 
+use Joomla\CMS\Event\Contact\SubmitContactEvent;
+use Joomla\CMS\Event\Contact\ValidateContactEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
@@ -17,10 +19,12 @@
 use Joomla\CMS\Mail\MailTemplate;
 use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\Proxy\ArrayProxy;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\String\PunycodeHelper;
 use Joomla\CMS\Uri\Uri;
-use Joomla\CMS\User\User;
+use Joomla\CMS\User\UserFactoryAwareInterface;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\CMS\Versioning\VersionableControllerTrait;
 use Joomla\Component\Fields\Administrator\Helper\FieldsHelper;
 use Joomla\Utilities\ArrayHelper;
@@ -35,8 +39,9 @@
  *
  * @since  1.5.19
  */
-class ContactController extends FormController
+class ContactController extends FormController implements UserFactoryAwareInterface
 {
+    use UserFactoryAwareTrait;
     use VersionableControllerTrait;
 
     /**
@@ -169,7 +174,11 @@ public function submit()
         }
 
         // Validation succeeded, continue with custom handlers
-        $results = $this->app->triggerEvent('onValidateContact', [&$contact, &$data]);
+        $eventData = new ArrayProxy($data);
+        $results   = $this->getDispatcher()->dispatch('onValidateContact', new ValidateContactEvent('onValidateContact', [
+            'subject' => $contact,
+            'data'    => $eventData,
+        ]))->getArgument('result', []);
 
         foreach ($results as $result) {
             if ($result instanceof \Exception) {
@@ -178,7 +187,10 @@ public function submit()
         }
 
         // Passed Validation: Process the contact plugins to integrate with other applications
-        $this->app->triggerEvent('onSubmitContact', [&$contact, &$data]);
+        $this->getDispatcher()->dispatch('onSubmitContact', new SubmitContactEvent('onSubmitContact', [
+            'subject' => $contact,
+            'data'    => $eventData,
+        ]));
 
         // Send the email
         $sent = false;
@@ -223,7 +235,7 @@ private function _sendEmail($data, $contact, $emailCopyToSender)
         $app = $this->app;
 
         if ($contact->email_to == '' && $contact->user_id != 0) {
-            $contact_user      = User::getInstance($contact->user_id);
+            $contact_user      = $this->getUserFactory()->loadUserById($contact->user_id);
             $contact->email_to = $contact_user->get('email');
         }
 
diff --git a/components/com_contact/src/Controller/DisplayController.php b/components/com_contact/src/Controller/DisplayController.php
index 076f65a14061e..74fce34b4da98 100644
--- a/components/com_contact/src/Controller/DisplayController.php
+++ b/components/com_contact/src/Controller/DisplayController.php
@@ -52,7 +52,8 @@ public function __construct($config = [], MVCFactoryInterface $factory = null, $
      * Method to display a view.
      *
      * @param   boolean  $cachable   If true, the view output will be cached
-     * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link \JFilterInput::clean()}.
+     * @param   array    $urlparams  An array of safe URL parameters and their variable types.
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  DisplayController  This object to support chaining.
      *
diff --git a/components/com_contact/src/Model/ContactModel.php b/components/com_contact/src/Model/ContactModel.php
index 98bcbb3099b47..3d8366042633a 100644
--- a/components/com_contact/src/Model/ContactModel.php
+++ b/components/com_contact/src/Model/ContactModel.php
@@ -47,10 +47,10 @@ class ContactModel extends FormModel
     /**
      * A loaded item
      *
-     * @var    \stdClass
+     * @var    \stdClass[]
      * @since  1.6
      */
-    protected $_item = null;
+    protected $_item = [];
 
     /**
      * Model context string.
@@ -111,7 +111,7 @@ public function getForm($data = [], $loadData = true)
         }
 
         $temp    = clone $this->getState('params');
-        $contact = $this->_item[$this->getState('contact.id')];
+        $contact = $this->getItem($this->getState('contact.id'));
         $active  = Factory::getContainer()->get(SiteApplication::class)->getMenu()->getActive();
 
         if ($active) {
@@ -177,10 +177,6 @@ public function getItem($pk = null)
     {
         $pk = $pk ?: (int) $this->getState('contact.id');
 
-        if ($this->_item === null) {
-            $this->_item = [];
-        }
-
         if (!isset($this->_item[$pk])) {
             try {
                 $db    = $this->getDatabase();
@@ -335,7 +331,7 @@ protected function buildContactExtendedData($contact)
 
             // Filter per language if plugin published
             if (Multilanguage::isEnabled()) {
-                $language = [Factory::getLanguage()->getTag(), $db->quote('*')];
+                $language = [Factory::getLanguage()->getTag(), '*'];
                 $query->whereIn($db->quoteName('a.language'), $language, ParameterType::STRING);
             }
 
diff --git a/components/com_contact/src/Model/FormModel.php b/components/com_contact/src/Model/FormModel.php
index 9402652367993..446dea89a5c34 100644
--- a/components/com_contact/src/Model/FormModel.php
+++ b/components/com_contact/src/Model/FormModel.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Component\Contact\Site\Model;
 
-use Exception;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Helper\TagsHelper;
@@ -84,7 +83,7 @@ public function getForm($data = [], $loadData = true)
      *
      * @return  mixed  Contact item data object on success, false on failure.
      *
-     * @throws  Exception
+     * @throws  \Exception
      *
      * @since   4.0.0
      */
@@ -100,7 +99,7 @@ public function getItem($itemId = null)
             if (!$table->load($itemId)) {
                 return false;
             }
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             Factory::getApplication()->enqueueMessage($e->getMessage());
 
             return false;
@@ -146,7 +145,7 @@ public function getReturnPage()
      *
      * @since   4.0.0
      *
-     * @throws  Exception
+     * @throws  \Exception
      */
     public function save($data)
     {
@@ -174,7 +173,7 @@ public function save($data)
      *
      * @since   4.0.0
      *
-     * @throws  Exception
+     * @throws  \Exception
      */
     protected function populateState()
     {
@@ -229,7 +228,7 @@ protected function preprocessForm(Form $form, $data, $group = 'contact')
      *
      * @since   4.0.0
 
-     * @throws  Exception
+     * @throws  \Exception
      */
     public function getTable($name = 'Contact', $prefix = 'Administrator', $options = [])
     {
diff --git a/components/com_contact/src/View/Contact/HtmlView.php b/components/com_contact/src/View/Contact/HtmlView.php
index 17c55854414ad..7ed59308def36 100644
--- a/components/com_contact/src/View/Contact/HtmlView.php
+++ b/components/com_contact/src/View/Contact/HtmlView.php
@@ -18,6 +18,8 @@
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Router\Route;
+use Joomla\CMS\User\UserFactoryAwareInterface;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\Component\Contact\Site\Helper\RouteHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -29,8 +31,10 @@
  *
  * @since  1.5
  */
-class HtmlView extends BaseHtmlView
+class HtmlView extends BaseHtmlView implements UserFactoryAwareInterface
 {
+    use UserFactoryAwareTrait;
+
     /**
      * The item model state
      *
@@ -348,7 +352,7 @@ public function display($tpl = null)
 
         $contactUser = null;
 
-        if ($item->params->get('show_user_custom_fields') && $item->user_id && $contactUser = Factory::getUser($item->user_id)) {
+        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]);
 
@@ -447,20 +451,20 @@ protected function _prepareDocument()
         $this->setDocumentTitle($title);
 
         if ($this->item->metadesc) {
-            $this->document->setDescription($this->item->metadesc);
+            $this->getDocument()->setDescription($this->item->metadesc);
         } elseif ($this->params->get('menu-meta_description')) {
-            $this->document->setDescription($this->params->get('menu-meta_description'));
+            $this->getDocument()->setDescription($this->params->get('menu-meta_description'));
         }
 
         if ($this->params->get('robots')) {
-            $this->document->setMetaData('robots', $this->params->get('robots'));
+            $this->getDocument()->setMetaData('robots', $this->params->get('robots'));
         }
 
         $mdata = $this->item->metadata->toArray();
 
         foreach ($mdata as $k => $v) {
             if ($v) {
-                $this->document->setMetaData($k, $v);
+                $this->getDocument()->setMetaData($k, $v);
             }
         }
     }
diff --git a/components/com_contact/src/View/Contact/VcfView.php b/components/com_contact/src/View/Contact/VcfView.php
index 45312326317b5..40821068062ca 100644
--- a/components/com_contact/src/View/Contact/VcfView.php
+++ b/components/com_contact/src/View/Contact/VcfView.php
@@ -51,7 +51,7 @@ public function display($tpl = null)
             throw new GenericDataException(implode("\n", $errors), 500);
         }
 
-        $this->document->setMimeEncoding('text/directory', true);
+        $this->getDocument()->setMimeEncoding('text/directory', true);
 
         // Compute lastname, firstname and middlename
         $item->name = trim($item->name);
diff --git a/components/com_contact/src/View/Featured/HtmlView.php b/components/com_contact/src/View/Featured/HtmlView.php
index 86afcf5a3253f..51ef02becb4f8 100644
--- a/components/com_contact/src/View/Featured/HtmlView.php
+++ b/components/com_contact/src/View/Featured/HtmlView.php
@@ -163,11 +163,11 @@ protected function _prepareDocument()
         $this->setDocumentTitle($this->params->get('page_title', ''));
 
         if ($this->params->get('menu-meta_description')) {
-            $this->document->setDescription($this->params->get('menu-meta_description'));
+            $this->getDocument()->setDescription($this->params->get('menu-meta_description'));
         }
 
         if ($this->params->get('robots')) {
-            $this->document->setMetaData('robots', $this->params->get('robots'));
+            $this->getDocument()->setMetaData('robots', $this->params->get('robots'));
         }
     }
 }
diff --git a/components/com_contact/src/View/Form/HtmlView.php b/components/com_contact/src/View/Form/HtmlView.php
index 89b86683ed6a8..7c428a75a405a 100644
--- a/components/com_contact/src/View/Form/HtmlView.php
+++ b/components/com_contact/src/View/Form/HtmlView.php
@@ -124,7 +124,7 @@ public function display($tpl = null)
 
         // Propose current language as default when creating new contact
         if (empty($this->item->id) && Multilanguage::isEnabled()) {
-            $lang = Factory::getLanguage()->getTag();
+            $lang = $this->getLanguage()->getTag();
             $this->form->setFieldAttribute('language', 'default', $lang);
         }
 
@@ -164,15 +164,15 @@ protected function _prepareDocument()
         $pathway->addItem($title, '');
 
         if ($this->params->get('menu-meta_description')) {
-            $this->document->setDescription($this->params->get('menu-meta_description'));
+            $this->getDocument()->setDescription($this->params->get('menu-meta_description'));
         }
 
         if ($this->params->get('menu-meta_keywords')) {
-            $this->document->setMetaData('keywords', $this->params->get('menu-meta_keywords'));
+            $this->getDocument()->setMetaData('keywords', $this->params->get('menu-meta_keywords'));
         }
 
         if ($this->params->get('robots')) {
-            $this->document->setMetaData('robots', $this->params->get('robots'));
+            $this->getDocument()->setMetaData('robots', $this->params->get('robots'));
         }
     }
 }
diff --git a/components/com_contact/tmpl/category/default_items.php b/components/com_contact/tmpl/category/default_items.php
index 54dacc00a4d2e..131bac771f415 100644
--- a/components/com_contact/tmpl/category/default_items.php
+++ b/components/com_contact/tmpl/category/default_items.php
@@ -26,7 +26,7 @@
 
 $canDo   = ContactHelper::getActions('com_contact', 'category', $this->category->id);
 $canEdit = $canDo->get('core.edit');
-$userId  = Factory::getUser()->id;
+$userId  = $this->getCurrentUser()->id;
 
 $showEditColumn = false;
 if ($canEdit) {
@@ -85,23 +85,21 @@ class="inputbox" onchange="document.adminForm.submit();"
                 <caption class="visually-hidden">
                     <?php echo Text::_('COM_CONTACT_TABLE_CAPTION'); ?>,
                 </caption>
-                <?php if ($this->params->get('show_headings')) : ?>
-                    <thead>
-                        <tr>
-                            <th scope="col" id="categorylist_header_title">
-                                <?php echo HTMLHelper::_('grid.sort', 'JGLOBAL_TITLE', 'a.name', $listDirn, $listOrder, null, 'asc', '', 'adminForm'); ?>
-                            </th>
+                <thead<?php echo $this->params->get('show_headings', '1') ? '' : ' class="visually-hidden"'; ?>>
+                    <tr>
+                        <th scope="col" id="categorylist_header_title">
+                            <?php echo HTMLHelper::_('grid.sort', 'COM_CONTACT_FIELD_NAME_LABEL', 'a.name', $listDirn, $listOrder, null, 'asc', '', 'adminForm'); ?>
+                        </th>
+                        <th scope="col">
+                            <?php echo Text::_('COM_CONTACT_CONTACT_DETAILS'); ?>
+                        </th>
+                        <?php if ($showEditColumn) : ?>
                             <th scope="col">
-                                <?php echo Text::_('COM_CONTACT_CONTACT_DETAILS'); ?>
+                                <?php echo Text::_('COM_CONTACT_EDIT_CONTACT'); ?>
                             </th>
-                            <?php if ($showEditColumn) : ?>
-                                <th scope="col">
-                                    <?php echo Text::_('COM_CONTACT_EDIT_CONTACT'); ?>
-                                </th>
-                            <?php endif; ?>
-                        </tr>
-                    </thead>
-                <?php endif; ?>
+                        <?php endif; ?>
+                    </tr>
+                </thead>
                 <tbody>
                     <?php foreach ($this->items as $i => $item) : ?>
                         <?php if ($this->items[$i]->published == 0) : ?>
diff --git a/components/com_contact/tmpl/contact/default.php b/components/com_contact/tmpl/contact/default.php
index d319e92d9109a..0f7645d5d1106 100644
--- a/components/com_contact/tmpl/contact/default.php
+++ b/components/com_contact/tmpl/contact/default.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
@@ -22,11 +21,13 @@
 
 $tparams = $this->item->params;
 $canDo   = ContentHelper::getActions('com_contact', 'category', $this->item->catid);
-$canEdit = $canDo->get('core.edit') || ($canDo->get('core.edit.own') && $this->item->created_by === Factory::getUser()->id);
+$canEdit = $canDo->get('core.edit') || ($canDo->get('core.edit.own') && $this->item->created_by === $this->getCurrentUser()->id);
 $htag    = $tparams->get('show_page_heading') ? 'h2' : 'h1';
+$htag2   = ($tparams->get('show_page_heading') && $tparams->get('show_name')) ? 'h3' : 'h2';
+
 ?>
 
-<div class="com-contact contact" itemscope itemtype="https://schema.org/Person">
+<div class="com-contact contact">
     <?php if ($tparams->get('show_page_heading')) : ?>
         <h1>
             <?php echo $this->escape($tparams->get('page_heading')); ?>
@@ -39,7 +40,7 @@
                 <?php if ($this->item->published == 0) : ?>
                     <span class="badge bg-warning text-light"><?php echo Text::_('JUNPUBLISHED'); ?></span>
                 <?php endif; ?>
-                <span class="contact-name" itemprop="name"><?php echo $this->item->name; ?></span>
+                <span class="contact-name"><?php echo $this->item->name; ?></span>
             </<?php echo $htag; ?>>
         </div>
     <?php endif; ?>
@@ -57,16 +58,16 @@
     <?php $show_contact_category = $tparams->get('show_contact_category'); ?>
 
     <?php if ($show_contact_category === 'show_no_link') : ?>
-        <h3>
+        <<?php echo $htag2; ?>>
             <span class="contact-category"><?php echo $this->item->category_title; ?></span>
-        </h3>
+        </<?php echo $htag2; ?>>
     <?php elseif ($show_contact_category === 'show_with_link') : ?>
         <?php $contactLink = RouteHelper::getCategoryRoute($this->item->catid, $this->item->language); ?>
-        <h3>
+        <<?php echo $htag2; ?>>
             <span class="contact-category"><a href="<?php echo $contactLink; ?>">
                 <?php echo $this->escape($this->item->category_title); ?></a>
             </span>
-        </h3>
+        </<?php echo $htag2; ?>>
     <?php endif; ?>
 
     <?php echo $this->item->event->afterDisplayTitle; ?>
@@ -98,7 +99,7 @@
 
     <?php if ($this->params->get('show_info', 1)) : ?>
         <div class="com-contact__container">
-            <?php echo '<h3>' . Text::_('COM_CONTACT_DETAILS') . '</h3>'; ?>
+            <?php echo '<' . $htag2 . '>' . Text::_('COM_CONTACT_DETAILS') . '</' . $htag2 . '>'; ?>
 
             <?php if ($this->item->image && $tparams->get('show_image')) : ?>
                 <div class="com-contact__thumbnail thumbnail">
@@ -107,7 +108,6 @@
                         [
                             'src'      => $this->item->image,
                             'alt'      => $this->item->name,
-                            'itemprop' => 'image',
                         ]
                     ); ?>
                 </div>
@@ -116,7 +116,7 @@
             <?php if ($this->item->con_position && $tparams->get('show_position')) : ?>
                 <dl class="com-contact__position contact-position dl-horizontal">
                     <dt><?php echo Text::_('COM_CONTACT_POSITION'); ?>:</dt>
-                    <dd itemprop="jobTitle">
+                    <dd>
                         <?php echo $this->item->con_position; ?>
                     </dd>
                 </dl>
@@ -136,23 +136,25 @@
     <?php endif; ?>
 
     <?php if ($tparams->get('show_email_form') && ($this->item->email_to || $this->item->user_id)) : ?>
-        <?php echo '<h3>' . Text::_('COM_CONTACT_EMAIL_FORM') . '</h3>'; ?>
+        <?php echo '<' . $htag2 . '>' . Text::_('COM_CONTACT_EMAIL_FORM') . '</' . $htag2 . '>'; ?>
 
         <?php echo $this->loadTemplate('form'); ?>
     <?php endif; ?>
 
     <?php if ($tparams->get('show_links')) : ?>
+        <?php echo '<' . $htag2 . '>' . Text::_('COM_CONTACT_LINKS') . '</' . $htag2 . '>'; ?>
+
         <?php echo $this->loadTemplate('links'); ?>
     <?php endif; ?>
 
     <?php if ($tparams->get('show_articles') && $this->item->user_id && $this->item->articles) : ?>
-        <?php echo '<h3>' . Text::_('JGLOBAL_ARTICLES') . '</h3>'; ?>
+        <?php echo '<' . $htag2 . '>' . Text::_('JGLOBAL_ARTICLES') . '</' . $htag2 . '>'; ?>
 
         <?php echo $this->loadTemplate('articles'); ?>
     <?php endif; ?>
 
     <?php if ($tparams->get('show_profile') && $this->item->user_id && PluginHelper::isEnabled('user', 'profile')) : ?>
-        <?php echo '<h3>' . Text::_('COM_CONTACT_PROFILE') . '</h3>'; ?>
+        <?php echo '<' . $htag2 . '>' . Text::_('COM_CONTACT_PROFILE') . '</' . $htag2 . '>'; ?>
 
         <?php echo $this->loadTemplate('profile'); ?>
     <?php endif; ?>
@@ -162,7 +164,7 @@
     <?php endif; ?>
 
     <?php if ($this->item->misc && $tparams->get('show_misc')) : ?>
-        <?php echo '<h3>' . Text::_('COM_CONTACT_OTHER_INFORMATION') . '</h3>'; ?>
+        <?php echo '<' . $htag2 . '>' . Text::_('COM_CONTACT_OTHER_INFORMATION') . '</' . $htag2 . '>'; ?>
 
         <div class="com-contact__miscinfo contact-miscinfo">
             <dl class="dl-horizontal">
diff --git a/components/com_contact/tmpl/contact/default_address.php b/components/com_contact/tmpl/contact/default_address.php
index 8133fb9b0cc68..5c858ff9d4730 100644
--- a/components/com_contact/tmpl/contact/default_address.php
+++ b/components/com_contact/tmpl/contact/default_address.php
@@ -20,7 +20,7 @@
  * jicon-text, jicon-none, jicon-icon
  */
 ?>
-<dl class="com-contact__address contact-address dl-horizontal" itemprop="address" itemscope itemtype="https://schema.org/PostalAddress">
+<dl class="com-contact__address contact-address dl-horizontal">
     <?php
     if (
         ($this->params->get('address_check') > 0) &&
@@ -38,7 +38,7 @@
 
         <?php if ($this->item->address && $this->params->get('show_street_address')) : ?>
             <dd>
-                <span class="contact-street" itemprop="streetAddress">
+                <span class="contact-street">
                     <?php echo nl2br($this->item->address, false); ?>
                 </span>
             </dd>
@@ -46,28 +46,28 @@
 
         <?php if ($this->item->suburb && $this->params->get('show_suburb')) : ?>
             <dd>
-                <span class="contact-suburb" itemprop="addressLocality">
+                <span class="contact-suburb">
                     <?php echo $this->item->suburb; ?>
                 </span>
             </dd>
         <?php endif; ?>
         <?php if ($this->item->state && $this->params->get('show_state')) : ?>
             <dd>
-                <span class="contact-state" itemprop="addressRegion">
+                <span class="contact-state">
                     <?php echo $this->item->state; ?>
                 </span>
             </dd>
         <?php endif; ?>
         <?php if ($this->item->postcode && $this->params->get('show_postcode')) : ?>
             <dd>
-                <span class="contact-postcode" itemprop="postalCode">
+                <span class="contact-postcode">
                     <?php echo $this->item->postcode; ?>
                 </span>
             </dd>
         <?php endif; ?>
         <?php if ($this->item->country && $this->params->get('show_country')) : ?>
             <dd>
-                <span class="contact-country" itemprop="addressCountry">
+                <span class="contact-country">
                     <?php echo $this->item->country; ?>
                 </span>
             </dd>
@@ -102,7 +102,7 @@
         <?php endif; ?>
     </dt>
     <dd>
-        <span class="contact-telephone" itemprop="telephone">
+        <span class="contact-telephone">
             <?php echo $this->item->telephone; ?>
         </span>
     </dd>
@@ -118,7 +118,7 @@
         <?php endif; ?>
     </dt>
     <dd>
-        <span class="contact-fax" itemprop="faxNumber">
+        <span class="contact-fax">
         <?php echo $this->item->fax; ?>
         </span>
     </dd>
@@ -134,7 +134,7 @@
         <?php endif; ?>
     </dt>
     <dd>
-        <span class="contact-mobile" itemprop="telephone">
+        <span class="contact-mobile">
             <?php echo $this->item->mobile; ?>
         </span>
     </dd>
@@ -151,7 +151,7 @@
     </dt>
     <dd>
         <span class="contact-webpage">
-            <a href="<?php echo $this->item->webpage; ?>" target="_blank" rel="noopener noreferrer" itemprop="url">
+            <a href="<?php echo $this->item->webpage; ?>" target="_blank" rel="noopener noreferrer">
             <?php echo PunycodeHelper::urlToUTF8($this->item->webpage); ?></a>
         </span>
     </dd>
diff --git a/components/com_contact/tmpl/contact/default_links.php b/components/com_contact/tmpl/contact/default_links.php
index 0b95aae7448cb..e1cb32b65cd8e 100644
--- a/components/com_contact/tmpl/contact/default_links.php
+++ b/components/com_contact/tmpl/contact/default_links.php
@@ -13,8 +13,6 @@
 use Joomla\CMS\Language\Text;
 
 ?>
-<?php echo '<h3>' . Text::_('COM_CONTACT_LINKS') . '</h3>'; ?>
-
 <div class="com-contact__links contact-links">
     <ul class="list-unstyled">
         <?php
@@ -34,7 +32,7 @@
             $label = $label ?: $link;
             ?>
             <li>
-                <a href="<?php echo $link; ?>" itemprop="url" rel="noopener noreferrer">
+                <a href="<?php echo $link; ?>" rel="noopener noreferrer">
                     <?php echo $label; ?>
                 </a>
             </li>
diff --git a/components/com_contact/tmpl/featured/default_items.php b/components/com_contact/tmpl/featured/default_items.php
index 1fd0130ad96ce..1eb6fbec3431e 100644
--- a/components/com_contact/tmpl/featured/default_items.php
+++ b/components/com_contact/tmpl/featured/default_items.php
@@ -64,8 +64,7 @@ class="inputbox" onchange="document.adminForm.submit();"
             <caption class="visually-hidden">
                 <?php echo Text::_('COM_CONTACT_TABLE_CAPTION'); ?>,
             </caption>
-            <?php if ($this->params->get('show_headings')) : ?>
-                <thead>
+                <thead<?php echo $this->params->get('show_headings', '1') ? '' : ' class="visually-hidden"'; ?>>
                     <tr>
                         <th scope="col" class="item-title">
                             <?php echo HTMLHelper::_('grid.sort', 'JGLOBAL_TITLE', 'a.name', $listDirn, $listOrder); ?>
@@ -120,17 +119,16 @@ class="inputbox" onchange="document.adminForm.submit();"
                         <?php endif; ?>
                     </tr>
                 </thead>
-            <?php endif; ?>
             <tbody>
                 <?php foreach ($this->items as $i => $item) : ?>
                     <?php if ($this->items[$i]->published == 0) : ?>
                         <tr class="system-unpublished featured-list-row<?php echo $i % 2; ?>">
                     <?php else : ?>
-                        <tr class="featured-list-row<?php echo $i % 2; ?>" itemscope itemtype="https://schema.org/Person">
+                        <tr class="featured-list-row<?php echo $i % 2; ?>">
                     <?php endif; ?>
                     <th scope="row" class="list-title">
-                        <a href="<?php echo Route::_(RouteHelper::getContactRoute($item->slug, $item->catid, $item->language)); ?>" itemprop="url">
-                            <span itemprop="name"><?php echo $this->escape($item->name); ?></span>
+                        <a href="<?php echo Route::_(RouteHelper::getContactRoute($item->slug, $item->catid, $item->language)); ?>">
+                            <span><?php echo $this->escape($item->name); ?></span>
                         </a>
                         <?php if ($item->published == 0) : ?>
                             <div>
@@ -142,50 +140,50 @@ class="inputbox" onchange="document.adminForm.submit();"
                     </th>
 
                     <?php if ($this->params->get('show_position_headings')) : ?>
-                        <td class="item-position" itemprop="jobTitle">
+                        <td class="item-position">
                             <?php echo $item->con_position; ?>
                         </td>
                     <?php endif; ?>
 
                     <?php if ($this->params->get('show_email_headings')) : ?>
-                        <td class="item-email" itemprop="email">
+                        <td class="item-email">
                             <?php echo $item->email_to; ?>
                         </td>
                     <?php endif; ?>
 
                     <?php if ($this->params->get('show_telephone_headings')) : ?>
-                        <td class="item-phone" itemprop="telephone">
+                        <td class="item-phone">
                             <?php echo $item->telephone; ?>
                         </td>
                     <?php endif; ?>
 
                     <?php if ($this->params->get('show_mobile_headings')) : ?>
-                        <td class="item-phone" itemprop="telephone">
+                        <td class="item-phone">
                             <?php echo $item->mobile; ?>
                         </td>
                     <?php endif; ?>
 
                     <?php if ($this->params->get('show_fax_headings')) : ?>
-                        <td class="item-phone" itemprop="faxNumber">
+                        <td class="item-phone">
                             <?php echo $item->fax; ?>
                         </td>
                     <?php endif; ?>
 
                     <?php if ($this->params->get('show_suburb_headings')) : ?>
-                        <td class="item-suburb" itemprop="address" itemscope itemtype="https://schema.org/PostalAddress">
-                            <span itemprop="addressLocality"><?php echo $item->suburb; ?></span>
+                        <td class="item-suburb">
+                            <span><?php echo $item->suburb; ?></span>
                         </td>
                     <?php endif; ?>
 
                     <?php if ($this->params->get('show_state_headings')) : ?>
-                        <td class="item-state" itemprop="address" itemscope itemtype="https://schema.org/PostalAddress">
-                            <span itemprop="addressRegion"><?php echo $item->state; ?></span>
+                        <td class="item-state">
+                            <span><?php echo $item->state; ?></span>
                         </td>
                     <?php endif; ?>
 
                     <?php if ($this->params->get('show_country_headings')) : ?>
-                        <td class="item-state" itemprop="address" itemscope itemtype="https://schema.org/PostalAddress">
-                            <span itemprop="addressCountry"><?php echo $item->country; ?></span>
+                        <td class="item-state">
+                            <span><?php echo $item->country; ?></span>
                         </td>
                     <?php endif; ?>
                 <?php endforeach; ?>
diff --git a/components/com_content/forms/article.xml b/components/com_content/forms/article.xml
index 730691c9aa3e7..9257415a4387f 100644
--- a/components/com_content/forms/article.xml
+++ b/components/com_content/forms/article.xml
@@ -46,7 +46,7 @@
 			label="COM_CONTENT_FIELD_ARTICLETEXT_LABEL"
 			hiddenLabel="true"
 			buttons="true"
-			filter="JComponentHelper::filterText"
+			filter="\Joomla\CMS\Component\ComponentHelper::filterText"
 			asset_id="com_content"
 		/>
 
@@ -247,6 +247,7 @@
 				label="COM_CONTENT_FIELD_IMAGE_CLASS_LABEL"
 				size="20"
 				useglobal="true"
+				validate="CssIdentifier"
 			/>
 		</fieldset>
 		<fieldset name="image-full">
@@ -283,6 +284,7 @@
 				label="COM_CONTENT_FIELD_IMAGE_CLASS_LABEL"
 				size="20"
 				useglobal="true"
+				validate="CssIdentifier"
 			/>
 		</fieldset>
 	</fields>
diff --git a/components/com_content/src/Controller/DisplayController.php b/components/com_content/src/Controller/DisplayController.php
index 627fa62534297..20ede3f6f5510 100644
--- a/components/com_content/src/Controller/DisplayController.php
+++ b/components/com_content/src/Controller/DisplayController.php
@@ -56,7 +56,8 @@ public function __construct($config = [], MVCFactoryInterface $factory = null, $
      * Method to display a view.
      *
      * @param   boolean  $cachable   If true, the view output will be cached.
-     * @param   boolean  $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+     * @param   boolean  $urlparams  An array of safe URL parameters and their variable types.
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  DisplayController  This object to support chaining.
      *
diff --git a/components/com_content/src/Model/ArchiveModel.php b/components/com_content/src/Model/ArchiveModel.php
index 3920d073d189e..66df84c761dd0 100644
--- a/components/com_content/src/Model/ArchiveModel.php
+++ b/components/com_content/src/Model/ArchiveModel.php
@@ -82,7 +82,7 @@ protected function populateState($ordering = null, $direction = null)
     }
 
     /**
-     * Get the master query for retrieving a list of articles subject to the model state.
+     * Get the main query for retrieving a list of articles subject to the model state.
      *
      * @return  \Joomla\Database\DatabaseQuery
      *
diff --git a/components/com_content/src/Model/ArticleModel.php b/components/com_content/src/Model/ArticleModel.php
index bedd32f0e43ba..5e91e340afd09 100644
--- a/components/com_content/src/Model/ArticleModel.php
+++ b/components/com_content/src/Model/ArticleModel.php
@@ -294,7 +294,7 @@ public function hit($pk = 0)
         if ($hitcount) {
             $pk = (!empty($pk)) ? $pk : (int) $this->getState('article.id');
 
-            $table = Table::getInstance('Content', 'JTable');
+            $table = Table::getInstance('Content', '\\Joomla\\CMS\\Table\\');
             $table->hit($pk);
         }
 
diff --git a/components/com_content/src/Model/CategoryModel.php b/components/com_content/src/Model/CategoryModel.php
index c4ea3e2d4ff62..5793b014e8aa4 100644
--- a/components/com_content/src/Model/CategoryModel.php
+++ b/components/com_content/src/Model/CategoryModel.php
@@ -464,7 +464,7 @@ public function hit($pk = 0)
         if ($hitcount) {
             $pk = (!empty($pk)) ? $pk : (int) $this->getState('category.id');
 
-            $table = Table::getInstance('Category', 'JTable');
+            $table = Table::getInstance('Category', '\\Joomla\\CMS\\Table\\');
             $table->hit($pk);
         }
 
diff --git a/components/com_content/src/View/Archive/HtmlView.php b/components/com_content/src/View/Archive/HtmlView.php
index 07b2903317a01..a027142f17a6b 100644
--- a/components/com_content/src/View/Archive/HtmlView.php
+++ b/components/com_content/src/View/Archive/HtmlView.php
@@ -31,7 +31,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var   \Joomla\CMS\Object\CMSObject
+     * @var   \Joomla\Registry\Registry
      */
     protected $state = null;
 
@@ -245,11 +245,11 @@ protected function _prepareDocument()
         $this->setDocumentTitle($this->params->get('page_title', ''));
 
         if ($this->params->get('menu-meta_description')) {
-            $this->document->setDescription($this->params->get('menu-meta_description'));
+            $this->getDocument()->setDescription($this->params->get('menu-meta_description'));
         }
 
         if ($this->params->get('robots')) {
-            $this->document->setMetaData('robots', $this->params->get('robots'));
+            $this->getDocument()->setMetaData('robots', $this->params->get('robots'));
         }
     }
 }
diff --git a/components/com_content/src/View/Article/HtmlView.php b/components/com_content/src/View/Article/HtmlView.php
index 2f5d933208580..cc4521607a2f9 100644
--- a/components/com_content/src/View/Article/HtmlView.php
+++ b/components/com_content/src/View/Article/HtmlView.php
@@ -11,6 +11,7 @@
 namespace Joomla\Component\Content\Site\View\Article;
 
 use Joomla\CMS\Categories\Categories;
+use Joomla\CMS\Event\Content;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\TagsHelper;
 use Joomla\CMS\Language\Associations;
@@ -23,7 +24,6 @@
 use Joomla\CMS\Uri\Uri;
 use Joomla\Component\Content\Site\Helper\AssociationHelper;
 use Joomla\Component\Content\Site\Helper\RouteHelper;
-use Joomla\Event\Event;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -62,7 +62,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var   \Joomla\CMS\Object\CMSObject
+     * @var   \Joomla\Registry\Registry
      */
     protected $state;
 
@@ -173,7 +173,7 @@ public function display($tpl = null)
             }
         }
 
-        $offset = $this->state->get('list.offset');
+        $offset = (int) $this->state->get('list.offset');
 
         // Check the view access to the article (the model has already computed the values).
         if ($item->params->get('access-view') == false && ($item->params->get('show_noauth', '0') == '0')) {
@@ -222,19 +222,33 @@ public function display($tpl = null)
             $item->associations = AssociationHelper::displayAssociations($item->id);
         }
 
+        $dispatcher = $this->getDispatcher();
+
         // Process the content plugins.
-        PluginHelper::importPlugin('content');
-        $this->dispatchEvent(new Event('onContentPrepare', ['com_content.article', &$item, &$item->params, $offset]));
+        PluginHelper::importPlugin('content', null, true, $dispatcher);
+
+        $contentEventArguments = [
+            'context' => 'com_content.article',
+            'subject' => $item,
+            'params'  => $item->params,
+            'page'    => $offset,
+        ];
+
+        $dispatcher->dispatch('onContentPrepare', new Content\ContentPrepareEvent('onContentPrepare', $contentEventArguments));
 
-        $item->event                    = new \stdClass();
-        $results                        = Factory::getApplication()->triggerEvent('onContentAfterTitle', ['com_content.article', &$item, &$item->params, $offset]);
-        $item->event->afterDisplayTitle = trim(implode("\n", $results));
+        // Extra content from events
+        $item->event   = new \stdClass();
+        $contentEvents = [
+            'afterDisplayTitle'    => new Content\AfterTitleEvent('onContentAfterTitle', $contentEventArguments),
+            'beforeDisplayContent' => new Content\BeforeDisplayEvent('onContentBeforeDisplay', $contentEventArguments),
+            'afterDisplayContent'  => new Content\AfterDisplayEvent('onContentAfterDisplay', $contentEventArguments),
+        ];
 
-        $results                           = Factory::getApplication()->triggerEvent('onContentBeforeDisplay', ['com_content.article', &$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                          = Factory::getApplication()->triggerEvent('onContentAfterDisplay', ['com_content.article', &$item, &$item->params, $offset]);
-        $item->event->afterDisplayContent = trim(implode("\n", $results));
+            $item->event->{$resultKey} = $results ? trim(implode("\n", $results)) : '';
+        }
 
         // Escape strings for HTML output
         $this->pageclass_sfx = htmlspecialchars($this->item->params->get('pageclass_sfx', ''));
@@ -266,12 +280,10 @@ protected function _prepareDocument()
             $this->params->def('page_heading', Text::_('JGLOBAL_ARTICLES'));
         }
 
-        $title = $this->params->get('page_title', '');
-
         // If the menu item is not linked to this article
         if (!$this->menuItemMatchArticle) {
             // If a browser page title is defined, use that, then fall back to the article title if set, then fall back to the page_title option
-            $title = $this->item->params->get('article_page_title', $this->item->title ?: $title);
+            $title = $this->item->params->get('article_page_title', $this->item->title);
 
             // Get ID of the category from active menu item
             if (
@@ -296,39 +308,43 @@ protected function _prepareDocument()
             foreach ($path as $item) {
                 $pathway->addItem($item['title'], $item['link']);
             }
-        }
-
-        if (empty($title)) {
+        } else {
             /**
-             * This happens when the current active menu item is linked to the article without browser
-             * page title set, so we use Browser Page Title in article and fallback to article title
-             * if that is not set
+             * This case the menu item links directly to the article, browser will be determined by following
+             * order:
+             * 1. Browser page title set from menu item itself
+             * 2. Browser page title set for the article
+             * 3. Article title
              */
-            $title = $this->item->params->get('article_page_title', $this->item->title);
+            $menuItemParams = $menu->getParams();
+            $title          = $menuItemParams->get(
+                'page_title',
+                $this->item->params->get('article_page_title', $this->item->title)
+            );
         }
 
         $this->setDocumentTitle($title);
 
         if ($this->item->metadesc) {
-            $this->document->setDescription($this->item->metadesc);
+            $this->getDocument()->setDescription($this->item->metadesc);
         } elseif ($this->params->get('menu-meta_description')) {
-            $this->document->setDescription($this->params->get('menu-meta_description'));
+            $this->getDocument()->setDescription($this->params->get('menu-meta_description'));
         }
 
         if ($this->params->get('robots')) {
-            $this->document->setMetaData('robots', $this->params->get('robots'));
+            $this->getDocument()->setMetaData('robots', $this->params->get('robots'));
         }
 
         if ($app->get('MetaAuthor') == '1') {
             $author = $this->item->created_by_alias ?: $this->item->author;
-            $this->document->setMetaData('author', $author);
+            $this->getDocument()->setMetaData('author', $author);
         }
 
         $mdata = $this->item->metadata->toArray();
 
         foreach ($mdata as $k => $v) {
             if ($v) {
-                $this->document->setMetaData($k, $v);
+                $this->getDocument()->setMetaData($k, $v);
             }
         }
 
@@ -341,7 +357,7 @@ protected function _prepareDocument()
         }
 
         if ($this->print) {
-            $this->document->setMetaData('robots', 'noindex, nofollow');
+            $this->getDocument()->setMetaData('robots', 'noindex, nofollow');
         }
     }
 }
diff --git a/components/com_content/src/View/Category/HtmlView.php b/components/com_content/src/View/Category/HtmlView.php
index 6183348601d93..3fb4c8779b6d0 100644
--- a/components/com_content/src/View/Category/HtmlView.php
+++ b/components/com_content/src/View/Category/HtmlView.php
@@ -154,13 +154,13 @@ public function display($tpl = null)
         $this->setDocumentTitle($title);
 
         if ($this->category->metadesc) {
-            $this->document->setDescription($this->category->metadesc);
+            $this->getDocument()->setDescription($this->category->metadesc);
         } elseif ($this->params->get('menu-meta_description')) {
-            $this->document->setDescription($this->params->get('menu-meta_description'));
+            $this->getDocument()->setDescription($this->params->get('menu-meta_description'));
         }
 
         if ($this->params->get('robots')) {
-            $this->document->setMetaData('robots', $this->params->get('robots'));
+            $this->getDocument()->setMetaData('robots', $this->params->get('robots'));
         }
 
         if (!is_object($this->category->metadata)) {
@@ -168,14 +168,14 @@ public function display($tpl = null)
         }
 
         if (($app->get('MetaAuthor') == '1') && $this->category->get('author', '')) {
-            $this->document->setMetaData('author', $this->category->get('author', ''));
+            $this->getDocument()->setMetaData('author', $this->category->get('author', ''));
         }
 
         $mdata = $this->category->metadata->toArray();
 
         foreach ($mdata as $k => $v) {
             if ($v) {
-                $this->document->setMetaData($k, $v);
+                $this->getDocument()->setMetaData($k, $v);
             }
         }
 
diff --git a/components/com_content/src/View/Featured/FeedView.php b/components/com_content/src/View/Featured/FeedView.php
index 1e260f2169a1f..9f8e7a38b6d25 100644
--- a/components/com_content/src/View/Featured/FeedView.php
+++ b/components/com_content/src/View/Featured/FeedView.php
@@ -45,7 +45,7 @@ public function display($tpl = null)
         $feedEmail = $app->get('feed_email', 'none');
         $siteEmail = $app->get('mailfrom');
 
-        $this->document->link = Route::_('index.php?option=com_content&view=featured');
+        $this->getDocument()->link = Route::_('index.php?option=com_content&view=featured');
 
         // Get some data from the model
         $app->getInput()->set('limit', $app->get('feed_limit'));
@@ -109,7 +109,7 @@ public function display($tpl = null)
             $item->description = '<div class="feed-description">' . $description . '</div>';
 
             // Loads item info into rss array
-            $this->document->addItem($item);
+            $this->getDocument()->addItem($item);
         }
     }
 }
diff --git a/components/com_content/src/View/Featured/HtmlView.php b/components/com_content/src/View/Featured/HtmlView.php
index af4a759bc45ad..110dae0d2aa22 100644
--- a/components/com_content/src/View/Featured/HtmlView.php
+++ b/components/com_content/src/View/Featured/HtmlView.php
@@ -31,7 +31,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var  \Joomla\CMS\Object\CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $state = null;
 
@@ -229,20 +229,20 @@ protected function _prepareDocument()
         $this->setDocumentTitle($this->params->get('page_title', ''));
 
         if ($this->params->get('menu-meta_description')) {
-            $this->document->setDescription($this->params->get('menu-meta_description'));
+            $this->getDocument()->setDescription($this->params->get('menu-meta_description'));
         }
 
         if ($this->params->get('robots')) {
-            $this->document->setMetaData('robots', $this->params->get('robots'));
+            $this->getDocument()->setMetaData('robots', $this->params->get('robots'));
         }
 
         // Add feed links
         if ($this->params->get('show_feed_link', 1)) {
             $link    = '&format=feed&limitstart=';
-            $attribs = ['type' => 'application/rss+xml', 'title' => 'RSS 2.0'];
-            $this->document->addHeadLink(Route::_($link . '&type=rss'), 'alternate', 'rel', $attribs);
-            $attribs = ['type' => 'application/atom+xml', 'title' => 'Atom 1.0'];
-            $this->document->addHeadLink(Route::_($link . '&type=atom'), 'alternate', 'rel', $attribs);
+            $attribs = ['type' => 'application/rss+xml', 'title' => htmlspecialchars($this->getDocument()->getTitle())];
+            $this->getDocument()->addHeadLink(Route::_($link . '&type=rss'), 'alternate', 'rel', $attribs);
+            $attribs = ['type' => 'application/atom+xml', 'title' => htmlspecialchars($this->getDocument()->getTitle())];
+            $this->getDocument()->addHeadLink(Route::_($link . '&type=atom'), 'alternate', 'rel', $attribs);
         }
     }
 }
diff --git a/components/com_content/src/View/Form/HtmlView.php b/components/com_content/src/View/Form/HtmlView.php
index 2e5f08a67337d..e6b2253198fb2 100644
--- a/components/com_content/src/View/Form/HtmlView.php
+++ b/components/com_content/src/View/Form/HtmlView.php
@@ -53,7 +53,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var  \Joomla\CMS\Object\CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $state;
 
@@ -171,7 +171,7 @@ public function display($tpl = null)
 
         // Propose current language as default when creating new article
         if (empty($this->item->id) && Multilanguage::isEnabled() && $params->get('enable_category') != 1) {
-            $lang = Factory::getLanguage()->getTag();
+            $lang = $this->getLanguage()->getTag();
             $this->form->setFieldAttribute('language', 'default', $lang);
         }
 
@@ -223,11 +223,11 @@ protected function _prepareDocument()
         $app->getPathway()->addItem($title);
 
         if ($this->params->get('menu-meta_description')) {
-            $this->document->setDescription($this->params->get('menu-meta_description'));
+            $this->getDocument()->setDescription($this->params->get('menu-meta_description'));
         }
 
         if ($this->params->get('robots')) {
-            $this->document->setMetaData('robots', $this->params->get('robots'));
+            $this->getDocument()->setMetaData('robots', $this->params->get('robots'));
         }
     }
 }
diff --git a/components/com_content/tmpl/archive/default.php b/components/com_content/tmpl/archive/default.php
index e749e93a4554b..116715a1985b4 100644
--- a/components/com_content/tmpl/archive/default.php
+++ b/components/com_content/tmpl/archive/default.php
@@ -25,29 +25,35 @@
 
 <form id="adminForm" action="<?php echo Route::_('index.php'); ?>" method="post" class="com-content-archive__form">
     <fieldset class="com-content-archive__filters filters">
-    <div class="filter-search form-inline">
-        <?php if ($this->params->get('filter_field') !== 'hide') : ?>
-        <div class="me-2">
-            <label class="filter-search-lbl visually-hidden" for="filter-search"><?php echo Text::_('COM_CONTENT_TITLE_FILTER_LABEL') . '&#160;'; ?></label>
-            <input type="text" name="filter-search" id="filter-search" value="<?php echo $this->escape($this->filter); ?>" class="inputbox col-md-2" onchange="document.getElementById('adminForm').submit();" placeholder="<?php echo Text::_('COM_CONTENT_TITLE_FILTER_LABEL'); ?>">
-        </div>
-        <?php endif; ?>
+        <legend class="visually-hidden">
+            <?php echo Text::_('COM_CONTENT_FORM_FILTER_LEGEND'); ?>
+        </legend>
+        <div class="filter-search form-inline">
+            <?php if ($this->params->get('filter_field') !== 'hide') : ?>
+            <div class="mb-2">
+                <label class="filter-search-lbl visually-hidden" for="filter-search"><?php echo Text::_('COM_CONTENT_TITLE_FILTER_LABEL') . '&#160;'; ?></label>
+                <input type="text" name="filter-search" id="filter-search" value="<?php echo $this->escape($this->filter); ?>" class="inputbox col-md-2" onchange="document.getElementById('adminForm').submit();" placeholder="<?php echo Text::_('COM_CONTENT_TITLE_FILTER_LABEL'); ?>">
+            </div>
+            <?php endif; ?>
 
-        <span class="me-2">
-        <?php echo $this->form->monthField; ?>
-        </span>
-        <span class="me-2">
-        <?php echo $this->form->yearField; ?>
-        </span>
-        <span class="me-2">
-        <?php echo $this->form->limitField; ?>
-        </span>
+            <span class="me-2">
+                <label class="visually-hidden" for="month"><?php echo Text::_('JMONTH'); ?></label>
+                <?php echo $this->form->monthField; ?>
+            </span>
+            <span class="me-2">
+                <label class="visually-hidden" for="year"><?php echo Text::_('JYEAR'); ?></label>
+                <?php echo $this->form->yearField; ?>
+            </span>
+            <span class="me-2">
+                <label class="visually-hidden" for="limit"><?php echo Text::_('JGLOBAL_DISPLAY_NUM'); ?></label>
+                <?php echo $this->form->limitField; ?>
+            </span>
 
-        <button type="submit" class="btn btn-primary" style="vertical-align: top;"><?php echo Text::_('JGLOBAL_FILTER_BUTTON'); ?></button>
-        <input type="hidden" name="view" value="archive">
-        <input type="hidden" name="option" value="com_content">
-        <input type="hidden" name="limitstart" value="0">
-    </div>
+            <button type="submit" class="btn btn-primary" style="vertical-align: top;"><?php echo Text::_('JGLOBAL_FILTER_BUTTON'); ?></button>
+            <input type="hidden" name="view" value="archive">
+            <input type="hidden" name="option" value="com_content">
+            <input type="hidden" name="limitstart" value="0">
+        </div>
     </fieldset>
 </form>
 <?php echo $this->loadTemplate('items'); ?>
diff --git a/components/com_content/tmpl/archive/default_items.php b/components/com_content/tmpl/archive/default_items.php
index b21bf53c83ef7..e18de37cf1598 100644
--- a/components/com_content/tmpl/archive/default_items.php
+++ b/components/com_content/tmpl/archive/default_items.php
@@ -20,11 +20,11 @@
 <div id="archive-items" class="com-content-archive__items">
     <?php foreach ($this->items as $i => $item) : ?>
         <?php $info = $item->params->get('info_block_position', 0); ?>
-        <div class="row<?php echo $i % 2; ?>" itemscope itemtype="https://schema.org/Article">
+        <div class="row<?php echo $i % 2; ?>">
             <div class="page-header">
-                <h2 itemprop="headline">
+                <h2>
                     <?php if ($params->get('link_titles')) : ?>
-                        <a href="<?php echo Route::_(RouteHelper::getArticleRoute($item->slug, $item->catid, $item->language)); ?>" itemprop="url">
+                        <a href="<?php echo Route::_(RouteHelper::getArticleRoute($item->slug, $item->catid, $item->language)); ?>" >
                             <?php echo $this->escape($item->title); ?>
                         </a>
                     <?php else : ?>
@@ -36,9 +36,9 @@
                 <?php echo $item->event->afterDisplayTitle; ?>
 
                 <?php if ($params->get('show_author') && !empty($item->author)) : ?>
-                    <div class="createdby" itemprop="author" itemscope itemtype="https://schema.org/Person">
+                    <div class="createdby">
                     <?php $author = $item->created_by_alias ?: $item->author; ?>
-                    <?php $author = '<span itemprop="name">' . $author . '</span>'; ?>
+                    <?php $author = '<span>' . $author . '</span>'; ?>
                         <?php if (!empty($item->contact_link) && $params->get('link_author') == true) : ?>
                             <?php echo Text::sprintf('COM_CONTENT_WRITTEN_BY', HTMLHelper::_('link', $this->item->contact_link, $author, ['itemprop' => 'url'])); ?>
                         <?php else : ?>
@@ -64,10 +64,10 @@
                                 <?php $url = '<a href="' . Route::_(
                                     RouteHelper::getCategoryRoute($item->parent_id, $item->parent_language)
                                 )
-                                    . '" itemprop="genre">' . $title . '</a>'; ?>
+                                    . '">' . $title . '</a>'; ?>
                                 <?php echo Text::sprintf('COM_CONTENT_PARENT', $url); ?>
                             <?php else : ?>
-                                <?php echo Text::sprintf('COM_CONTENT_PARENT', '<span itemprop="genre">' . $title . '</span>'); ?>
+                                <?php echo Text::sprintf('COM_CONTENT_PARENT', '<span>' . $title . '</span>'); ?>
                             <?php endif; ?>
                         </div>
                     </dd>
@@ -80,10 +80,10 @@
                                 <?php $url = '<a href="' . Route::_(
                                     RouteHelper::getCategoryRoute($item->catid, $item->category_language)
                                 )
-                                    . '" itemprop="genre">' . $title . '</a>'; ?>
+                                    . '">' . $title . '</a>'; ?>
                                 <?php echo Text::sprintf('COM_CONTENT_CATEGORY', $url); ?>
                             <?php else : ?>
-                                <?php echo Text::sprintf('COM_CONTENT_CATEGORY', '<span itemprop="genre">' . $title . '</span>'); ?>
+                                <?php echo Text::sprintf('COM_CONTENT_CATEGORY', '<span>' . $title . '</span>'); ?>
                             <?php endif; ?>
                         </div>
                     </dd>
@@ -93,7 +93,7 @@
                     <dd>
                         <div class="published">
                             <span class="icon-calendar-alt" aria-hidden="true"></span>
-                            <time datetime="<?php echo HTMLHelper::_('date', $item->publish_up, 'c'); ?>" itemprop="datePublished">
+                            <time datetime="<?php echo HTMLHelper::_('date', $item->publish_up, 'c'); ?>">
                                 <?php echo Text::sprintf('COM_CONTENT_PUBLISHED_DATE_ON', HTMLHelper::_('date', $item->publish_up, Text::_('DATE_FORMAT_LC3'))); ?>
                             </time>
                         </div>
@@ -105,7 +105,7 @@
                         <dd>
                             <div class="modified">
                                 <span class="icon-calendar-alt" aria-hidden="true"></span>
-                                <time datetime="<?php echo HTMLHelper::_('date', $item->modified, 'c'); ?>" itemprop="dateModified">
+                                <time datetime="<?php echo HTMLHelper::_('date', $item->modified, 'c'); ?>">
                                     <?php echo Text::sprintf('COM_CONTENT_LAST_UPDATED', HTMLHelper::_('date', $item->modified, Text::_('DATE_FORMAT_LC3'))); ?>
                                 </time>
                             </div>
@@ -115,7 +115,7 @@
                         <dd>
                             <div class="create">
                                 <span class="icon-calendar-alt" aria-hidden="true"></span>
-                                <time datetime="<?php echo HTMLHelper::_('date', $item->created, 'c'); ?>" itemprop="dateCreated">
+                                <time datetime="<?php echo HTMLHelper::_('date', $item->created, 'c'); ?>">
                                     <?php echo Text::sprintf('COM_CONTENT_CREATED_DATE_ON', HTMLHelper::_('date', $item->created, Text::_('DATE_FORMAT_LC3'))); ?>
                                 </time>
                             </div>
@@ -126,7 +126,7 @@
                         <dd>
                             <div class="hits">
                                 <span class="icon-eye"></span>
-                                <meta itemprop="interactionCount" content="UserPageVisits:<?php echo $item->hits; ?>">
+                                <meta content="UserPageVisits:<?php echo $item->hits; ?>">
                                 <?php echo Text::sprintf('COM_CONTENT_ARTICLE_HITS', $item->hits); ?>
                             </div>
                         </dd>
@@ -139,7 +139,7 @@
         <?php // Content is generated by content plugin event "onContentBeforeDisplay" ?>
         <?php echo $item->event->beforeDisplayContent; ?>
         <?php if ($params->get('show_intro')) : ?>
-            <div class="intro" itemprop="articleBody"> <?php echo HTMLHelper::_('string.truncateComplex', $item->introtext, $params->get('introtext_limit')); ?> </div>
+            <div class="intro" > <?php echo HTMLHelper::_('string.truncateComplex', $item->introtext, $params->get('introtext_limit')); ?> </div>
         <?php endif; ?>
 
         <?php if ($useDefList && ($info == 1 || $info == 2)) : ?>
@@ -156,10 +156,10 @@
                                     <?php $url = '<a href="' . Route::_(
                                         RouteHelper::getCategoryRoute($item->parent_id, $item->parent_language)
                                     )
-                                        . '" itemprop="genre">' . $title . '</a>'; ?>
+                                        . '">' . $title . '</a>'; ?>
                                     <?php echo Text::sprintf('COM_CONTENT_PARENT', $url); ?>
                                 <?php else : ?>
-                                    <?php echo Text::sprintf('COM_CONTENT_PARENT', '<span itemprop="genre">' . $title . '</span>'); ?>
+                                    <?php echo Text::sprintf('COM_CONTENT_PARENT', '<span>' . $title . '</span>'); ?>
                                 <?php endif; ?>
                             </div>
                         </dd>
@@ -172,10 +172,10 @@
                                     <?php $url = '<a href="' . Route::_(
                                         RouteHelper::getCategoryRoute($item->catid, $item->category_language)
                                     )
-                                        . '" itemprop="genre">' . $title . '</a>'; ?>
+                                        . '">' . $title . '</a>'; ?>
                                     <?php echo Text::sprintf('COM_CONTENT_CATEGORY', $url); ?>
                                 <?php else : ?>
-                                    <?php echo Text::sprintf('COM_CONTENT_CATEGORY', '<span itemprop="genre">' . $title . '</span>'); ?>
+                                    <?php echo Text::sprintf('COM_CONTENT_CATEGORY', '<span>' . $title . '</span>'); ?>
                                 <?php endif; ?>
                             </div>
                         </dd>
@@ -184,7 +184,7 @@
                         <dd>
                             <div class="published">
                                 <span class="icon-calendar-alt" aria-hidden="true"></span>
-                                <time datetime="<?php echo HTMLHelper::_('date', $item->publish_up, 'c'); ?>" itemprop="datePublished">
+                                <time datetime="<?php echo HTMLHelper::_('date', $item->publish_up, 'c'); ?>">
                                     <?php echo Text::sprintf('COM_CONTENT_PUBLISHED_DATE_ON', HTMLHelper::_('date', $item->publish_up, Text::_('DATE_FORMAT_LC3'))); ?>
                                 </time>
                             </div>
@@ -196,7 +196,7 @@
                     <dd>
                         <div class="create">
                             <span class="icon-calendar-alt" aria-hidden="true"></span>
-                            <time datetime="<?php echo HTMLHelper::_('date', $item->created, 'c'); ?>" itemprop="dateCreated">
+                            <time datetime="<?php echo HTMLHelper::_('date', $item->created, 'c'); ?>">
                                 <?php echo Text::sprintf('COM_CONTENT_CREATED_DATE_ON', HTMLHelper::_('date', $item->modified, Text::_('DATE_FORMAT_LC3'))); ?>
                             </time>
                         </div>
@@ -206,7 +206,7 @@
                     <dd>
                         <div class="modified">
                             <span class="icon-calendar-alt" aria-hidden="true"></span>
-                            <time datetime="<?php echo HTMLHelper::_('date', $item->modified, 'c'); ?>" itemprop="dateModified">
+                            <time datetime="<?php echo HTMLHelper::_('date', $item->modified, 'c'); ?>">
                                 <?php echo Text::sprintf('COM_CONTENT_LAST_UPDATED', HTMLHelper::_('date', $item->modified, Text::_('DATE_FORMAT_LC3'))); ?>
                             </time>
                         </div>
@@ -216,7 +216,7 @@
                     <dd>
                         <div class="hits">
                             <span class="icon-eye"></span>
-                            <meta content="UserPageVisits:<?php echo $item->hits; ?>" itemprop="interactionCount">
+                            <meta content="UserPageVisits:<?php echo $item->hits; ?>">
                             <?php echo Text::sprintf('COM_CONTENT_ARTICLE_HITS', $item->hits); ?>
                         </div>
                     </dd>
diff --git a/components/com_content/tmpl/article/default.php b/components/com_content/tmpl/article/default.php
index 7122b1e5750e7..78ff809a21465 100644
--- a/components/com_content/tmpl/article/default.php
+++ b/components/com_content/tmpl/article/default.php
@@ -24,7 +24,7 @@
 // Create shortcuts to some parameters.
 $params  = $this->item->params;
 $canEdit = $params->get('access-edit');
-$user    = Factory::getUser();
+$user    = $this->getCurrentUser();
 $info    = $params->get('info_block_position', 0);
 $htag    = $this->params->get('show_page_heading') ? 'h2' : 'h1';
 
@@ -34,8 +34,8 @@
 $isNotPublishedYet = $this->item->publish_up > $currentDate;
 $isExpired         = !is_null($this->item->publish_down) && $this->item->publish_down < $currentDate;
 ?>
-<div class="com-content-article item-page<?php echo $this->pageclass_sfx; ?>" itemscope itemtype="https://schema.org/Article">
-    <meta itemprop="inLanguage" content="<?php echo ($this->item->language === '*') ? Factory::getApplication()->get('language') : $this->item->language; ?>">
+<div class="com-content-article item-page<?php echo $this->pageclass_sfx; ?>">
+    <meta content="<?php echo ($this->item->language === '*') ? Factory::getApplication()->get('language') : $this->item->language; ?>">
     <?php if ($this->params->get('show_page_heading')) : ?>
     <div class="page-header">
         <h1> <?php echo $this->escape($this->params->get('page_heading')); ?> </h1>
@@ -51,7 +51,7 @@
 
     <?php if ($params->get('show_title')) : ?>
     <div class="page-header">
-        <<?php echo $htag; ?> itemprop="headline">
+        <<?php echo $htag; ?>>
             <?php echo $this->escape($this->item->title); ?>
         </<?php echo $htag; ?>>
         <?php if ($this->item->state == ContentComponent::CONDITION_UNPUBLISHED) : ?>
@@ -98,7 +98,7 @@
         <?php if (isset($this->item->toc)) :
             echo $this->item->toc;
         endif; ?>
-    <div itemprop="articleBody" class="com-content-article__body">
+    <div class="com-content-article__body">
         <?php echo $this->item->text; ?>
     </div>
 
diff --git a/components/com_content/tmpl/category/blog.php b/components/com_content/tmpl/category/blog.php
index 2e933da9fbfe6..9546739d3a3e3 100644
--- a/components/com_content/tmpl/category/blog.php
+++ b/components/com_content/tmpl/category/blog.php
@@ -34,7 +34,7 @@
 $htag    = $this->params->get('show_page_heading') ? 'h2' : 'h1';
 
 ?>
-<div class="com-content-category-blog blog" itemscope itemtype="https://schema.org/Blog">
+<div class="com-content-category-blog blog">
     <?php if ($this->params->get('show_page_heading')) : ?>
         <div class="page-header">
             <h1> <?php echo $this->escape($this->params->get('page_heading')); ?> </h1>
@@ -84,7 +84,7 @@
     <?php if (!empty($this->lead_items)) : ?>
         <div class="com-content-category-blog__items blog-items items-leading <?php echo $this->params->get('blog_class_leading'); ?>">
             <?php foreach ($this->lead_items as &$item) : ?>
-                <div class="com-content-category-blog__item blog-item" itemprop="blogPost" itemscope itemtype="https://schema.org/BlogPosting">
+                <div class="com-content-category-blog__item blog-item">
                     <?php
                     $this->item = &$item;
                     echo $this->loadTemplate('item');
@@ -102,8 +102,7 @@
         <?php endif; ?>
         <div class="com-content-category-blog__items blog-items <?php echo $blogClass; ?>">
         <?php foreach ($this->intro_items as $key => &$item) : ?>
-            <div class="com-content-category-blog__item blog-item"
-                itemprop="blogPost" itemscope itemtype="https://schema.org/BlogPosting">
+            <div class="com-content-category-blog__item blog-item">
                     <?php
                     $this->item = & $item;
                     echo $this->loadTemplate('item');
@@ -129,7 +128,7 @@
     <?php if (($this->params->def('show_pagination', 1) == 1 || ($this->params->get('show_pagination') == 2)) && ($this->pagination->pagesTotal > 1)) : ?>
         <div class="com-content-category-blog__navigation w-100">
             <?php if ($this->params->def('show_pagination_results', 1)) : ?>
-                <p class="com-content-category-blog__counter counter float-end pt-3 pe-2">
+                <p class="com-content-category-blog__counter counter float-md-end pt-3 pe-2">
                     <?php echo $this->pagination->getPagesCounter(); ?>
                 </p>
             <?php endif; ?>
diff --git a/components/com_content/tmpl/category/blog.xml b/components/com_content/tmpl/category/blog.xml
index 984a4f4e90a7a..e369680ca62c8 100644
--- a/components/com_content/tmpl/category/blog.xml
+++ b/components/com_content/tmpl/category/blog.xml
@@ -178,6 +178,8 @@
 				type="number"
 				label="JGLOBAL_NUM_LEADING_ARTICLES_LABEL"
 				filter="integer"
+				validate="number"
+				min="0"
 				useglobal="true"
 				parentclass="stack span-1"
 			/>
@@ -196,6 +198,8 @@
 				type="number"
 				label="JGLOBAL_NUM_INTRO_ARTICLES_LABEL"
 				filter="integer"
+				validate="number"
+				min="0"
 				useglobal="true"
 				parentclass="stack span-1"
 			/>
@@ -215,6 +219,8 @@
 				type="number"
 				label="JGLOBAL_NUM_COLUMNS_LABEL"
 				filter="integer"
+				validate="number"
+				min="0"
 				parentclass="stack span-1-inline"
 				useglobal="true"
 			/>
@@ -236,6 +242,8 @@
 				type="number"
 				label="JGLOBAL_NUM_LINKS_LABEL"
 				filter="integer"
+				validate="number"
+				min="0"
 				parentclass="stack span-1"
 				useglobal="true"
 			/>
diff --git a/components/com_content/tmpl/category/blog_children.php b/components/com_content/tmpl/category/blog_children.php
index 6757330021bb8..94c81752f4440 100644
--- a/components/com_content/tmpl/category/blog_children.php
+++ b/components/com_content/tmpl/category/blog_children.php
@@ -10,14 +10,13 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 use Joomla\Component\Content\Site\Helper\RouteHelper;
 
-$lang   = Factory::getLanguage();
-$user   = Factory::getUser();
+$lang   = $this->getLanguage();
+$user   = $this->getCurrentUser();
 $groups = $user->getAuthorisedViewLevels();
 
 if ($this->maxLevel != 0 && count($this->children[$this->category->id]) > 0) : ?>
diff --git a/components/com_content/tmpl/category/default_articles.php b/components/com_content/tmpl/category/default_articles.php
index 5eba5e184d5be..68407df6edc0f 100644
--- a/components/com_content/tmpl/category/default_articles.php
+++ b/components/com_content/tmpl/category/default_articles.php
@@ -123,49 +123,47 @@
             <caption class="visually-hidden">
                 <?php echo Text::_('COM_CONTENT_ARTICLES_TABLE_CAPTION'); ?>
             </caption>
-            <?php if ($this->params->get('show_headings')) : ?>
-                <thead>
-                    <tr>
-                        <th scope="col" id="categorylist_header_title">
-                            <?php echo HTMLHelper::_('grid.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder, null, 'asc', '', 'adminForm'); ?>
+            <thead<?php echo $this->params->get('show_headings', '1') ? '' : ' class="visually-hidden"'; ?>>
+                <tr>
+                    <th scope="col" id="categorylist_header_title">
+                        <?php echo HTMLHelper::_('grid.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder, null, 'asc', '', 'adminForm'); ?>
+                    </th>
+                    <?php if ($date = $this->params->get('list_show_date')) : ?>
+                        <th scope="col" id="categorylist_header_date">
+                            <?php if ($date === 'created') : ?>
+                                <?php echo HTMLHelper::_('grid.sort', 'COM_CONTENT_' . $date . '_DATE', 'a.created', $listDirn, $listOrder); ?>
+                            <?php elseif ($date === 'modified') : ?>
+                                <?php echo HTMLHelper::_('grid.sort', 'COM_CONTENT_' . $date . '_DATE', 'a.modified', $listDirn, $listOrder); ?>
+                            <?php elseif ($date === 'published') : ?>
+                                <?php echo HTMLHelper::_('grid.sort', 'COM_CONTENT_' . $date . '_DATE', 'a.publish_up', $listDirn, $listOrder); ?>
+                            <?php endif; ?>
                         </th>
-                        <?php if ($date = $this->params->get('list_show_date')) : ?>
-                            <th scope="col" id="categorylist_header_date">
-                                <?php if ($date === 'created') : ?>
-                                    <?php echo HTMLHelper::_('grid.sort', 'COM_CONTENT_' . $date . '_DATE', 'a.created', $listDirn, $listOrder); ?>
-                                <?php elseif ($date === 'modified') : ?>
-                                    <?php echo HTMLHelper::_('grid.sort', 'COM_CONTENT_' . $date . '_DATE', 'a.modified', $listDirn, $listOrder); ?>
-                                <?php elseif ($date === 'published') : ?>
-                                    <?php echo HTMLHelper::_('grid.sort', 'COM_CONTENT_' . $date . '_DATE', 'a.publish_up', $listDirn, $listOrder); ?>
-                                <?php endif; ?>
-                            </th>
-                        <?php endif; ?>
-                        <?php if ($this->params->get('list_show_author')) : ?>
-                            <th scope="col" id="categorylist_header_author">
-                                <?php echo HTMLHelper::_('grid.sort', 'JAUTHOR', 'author', $listDirn, $listOrder); ?>
-                            </th>
-                        <?php endif; ?>
-                        <?php if ($this->params->get('list_show_hits')) : ?>
-                            <th scope="col" id="categorylist_header_hits">
-                                <?php echo HTMLHelper::_('grid.sort', 'JGLOBAL_HITS', 'a.hits', $listDirn, $listOrder); ?>
-                            </th>
-                        <?php endif; ?>
-                        <?php if ($this->params->get('list_show_votes', 0) && $this->vote) : ?>
-                            <th scope="col" id="categorylist_header_votes">
-                                <?php echo HTMLHelper::_('grid.sort', 'COM_CONTENT_VOTES', 'rating_count', $listDirn, $listOrder); ?>
-                            </th>
-                        <?php endif; ?>
-                        <?php if ($this->params->get('list_show_ratings', 0) && $this->vote) : ?>
-                            <th scope="col" id="categorylist_header_ratings">
-                                <?php echo HTMLHelper::_('grid.sort', 'COM_CONTENT_RATINGS', 'rating', $listDirn, $listOrder); ?>
-                            </th>
-                        <?php endif; ?>
-                        <?php if ($isEditable) : ?>
-                            <th scope="col" id="categorylist_header_edit"><?php echo Text::_('COM_CONTENT_EDIT_ITEM'); ?></th>
-                        <?php endif; ?>
-                    </tr>
-                </thead>
-            <?php endif; ?>
+                    <?php endif; ?>
+                    <?php if ($this->params->get('list_show_author')) : ?>
+                        <th scope="col" id="categorylist_header_author">
+                            <?php echo HTMLHelper::_('grid.sort', 'JAUTHOR', 'author', $listDirn, $listOrder); ?>
+                        </th>
+                    <?php endif; ?>
+                    <?php if ($this->params->get('list_show_hits')) : ?>
+                        <th scope="col" id="categorylist_header_hits">
+                            <?php echo HTMLHelper::_('grid.sort', 'JGLOBAL_HITS', 'a.hits', $listDirn, $listOrder); ?>
+                        </th>
+                    <?php endif; ?>
+                    <?php if ($this->params->get('list_show_votes', 0) && $this->vote) : ?>
+                        <th scope="col" id="categorylist_header_votes">
+                            <?php echo HTMLHelper::_('grid.sort', 'COM_CONTENT_VOTES', 'rating_count', $listDirn, $listOrder); ?>
+                        </th>
+                    <?php endif; ?>
+                    <?php if ($this->params->get('list_show_ratings', 0) && $this->vote) : ?>
+                        <th scope="col" id="categorylist_header_ratings">
+                            <?php echo HTMLHelper::_('grid.sort', 'COM_CONTENT_RATINGS', 'rating', $listDirn, $listOrder); ?>
+                        </th>
+                    <?php endif; ?>
+                    <?php if ($isEditable) : ?>
+                        <th scope="col" id="categorylist_header_edit"><?php echo Text::_('COM_CONTENT_EDIT_ITEM'); ?></th>
+                    <?php endif; ?>
+                </tr>
+            </thead>
             <tbody>
             <?php foreach ($this->items as $i => $article) : ?>
                 <?php if ($this->items[$i]->state == ContentComponent::CONDITION_UNPUBLISHED) : ?>
diff --git a/components/com_content/tmpl/category/default_children.php b/components/com_content/tmpl/category/default_children.php
index 21d741a432e5d..a353fb4aa1227 100644
--- a/components/com_content/tmpl/category/default_children.php
+++ b/components/com_content/tmpl/category/default_children.php
@@ -10,14 +10,13 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 use Joomla\Component\Content\Site\Helper\RouteHelper;
 
-$lang   = Factory::getLanguage();
-$user   = Factory::getUser();
+$lang   = $this->getLanguage();
+$user   = $this->getCurrentUser();
 $groups = $user->getAuthorisedViewLevels();
 ?>
 
diff --git a/components/com_content/tmpl/featured/default.php b/components/com_content/tmpl/featured/default.php
index fd98ab1f5284d..673be2f868ad8 100644
--- a/components/com_content/tmpl/featured/default.php
+++ b/components/com_content/tmpl/featured/default.php
@@ -11,7 +11,7 @@
 defined('_JEXEC') or die;
 
 ?>
-<div class="blog-featured" itemscope itemtype="https://schema.org/Blog">
+<div class="blog-featured">
     <?php if ($this->params->get('show_page_heading') != 0) : ?>
     <div class="page-header">
         <h1>
@@ -23,8 +23,7 @@
     <?php if (!empty($this->lead_items)) : ?>
         <div class="blog-items items-leading <?php echo $this->params->get('blog_class_leading'); ?>">
             <?php foreach ($this->lead_items as &$item) : ?>
-                <div class="blog-item"
-                    itemprop="blogPost" itemscope itemtype="https://schema.org/BlogPosting">
+                <div class="blog-item">
                         <?php
                         $this->item = & $item;
                         echo $this->loadTemplate('item');
@@ -42,8 +41,7 @@
         <?php endif; ?>
         <div class="blog-items <?php echo $blogClass; ?>">
         <?php foreach ($this->intro_items as $key => &$item) : ?>
-            <div class="blog-item"
-                itemprop="blogPost" itemscope itemtype="https://schema.org/BlogPosting">
+            <div class="blog-item">
                     <?php
                     $this->item = & $item;
                     echo $this->loadTemplate('item');
diff --git a/components/com_content/tmpl/featured/default.xml b/components/com_content/tmpl/featured/default.xml
index 5830b5805eef3..c102644d7517d 100644
--- a/components/com_content/tmpl/featured/default.xml
+++ b/components/com_content/tmpl/featured/default.xml
@@ -35,6 +35,8 @@
 				type="number"
 				label="JGLOBAL_NUM_LEADING_ARTICLES_LABEL"
 				filter="integer"
+				validate="number"
+				min="0"
 				useglobal="true"
 				parentclass="stack span-1"
 			/>
@@ -53,6 +55,8 @@
 				type="number"
 				label="JGLOBAL_NUM_INTRO_ARTICLES_LABEL"
 				filter="integer"
+				validate="number"
+				min="0"
 				useglobal="true"
 				parentclass="stack span-1"
 			/>
@@ -72,6 +76,8 @@
 				type="number"
 				label="JGLOBAL_NUM_COLUMNS_LABEL"
 				filter="integer"
+				validate="number"
+				min="0"
 				parentclass="stack span-1-inline"
 				useglobal="true"
 			/>
@@ -93,6 +99,8 @@
 				type="number"
 				label="JGLOBAL_NUM_LINKS_LABEL"
 				filter="integer"
+				validate="number"
+				min="0"
 				parentclass="stack span-1"
 				useglobal="true"
 			/>
diff --git a/components/com_content/tmpl/featured/default_item.php b/components/com_content/tmpl/featured/default_item.php
index 468e2df021fe1..a993f47ac8ef7 100644
--- a/components/com_content/tmpl/featured/default_item.php
+++ b/components/com_content/tmpl/featured/default_item.php
@@ -41,9 +41,9 @@
     <?php endif; ?>
 
     <?php if ($params->get('show_title')) : ?>
-        <h2 class="item-title" itemprop="headline">
+        <h2 class="item-title">
         <?php if ($params->get('link_titles') && $params->get('access-view')) : ?>
-            <a href="<?php echo Route::_(RouteHelper::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language)); ?>" itemprop="url">
+            <a href="<?php echo Route::_(RouteHelper::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language)); ?>">
                 <?php echo $this->escape($this->item->title); ?>
             </a>
         <?php else : ?>
diff --git a/components/com_content/tmpl/featured/default_links.php b/components/com_content/tmpl/featured/default_links.php
index 083f2b9f89afc..a9eca0f39be34 100644
--- a/components/com_content/tmpl/featured/default_links.php
+++ b/components/com_content/tmpl/featured/default_links.php
@@ -14,11 +14,11 @@
 use Joomla\Component\Content\Site\Helper\RouteHelper;
 
 ?>
-<ol class="com-content-blog__links">
+<ul class="com-content-blog__links">
     <?php foreach ($this->link_items as $item) : ?>
         <li class="com-content-blog__link">
             <a href="<?php echo Route::_(RouteHelper::getArticleRoute($item->slug, $item->catid, $item->language)); ?>">
                 <?php echo $item->title; ?></a>
         </li>
     <?php endforeach; ?>
-</ol>
+</ul>
diff --git a/components/com_contenthistory/src/Controller/DisplayController.php b/components/com_contenthistory/src/Controller/DisplayController.php
index 66f8195de3960..bffb0d31e856d 100644
--- a/components/com_contenthistory/src/Controller/DisplayController.php
+++ b/components/com_contenthistory/src/Controller/DisplayController.php
@@ -20,7 +20,7 @@
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * History manager master display controller.
+ * History manager display controller.
  *
  * @since  4.0.0
  */
diff --git a/components/com_finder/src/Controller/DisplayController.php b/components/com_finder/src/Controller/DisplayController.php
index cc9138f25f996..7293c1bcd3865 100644
--- a/components/com_finder/src/Controller/DisplayController.php
+++ b/components/com_finder/src/Controller/DisplayController.php
@@ -28,8 +28,8 @@ class DisplayController extends BaseController
      * Method to display a view.
      *
      * @param   boolean  $cachable   If true, the view output will be cached. [optional]
-     * @param   array    $urlparams  An array of safe URL parameters and their variable types,
-     *                               for valid values see {@link \JFilterInput::clean()}. [optional]
+     * @param   array    $urlparams  An array of safe URL parameters and their variable types. Optional.
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  static  This object is to support chaining.
      *
diff --git a/components/com_finder/src/Helper/FinderHelper.php b/components/com_finder/src/Helper/FinderHelper.php
index 78ddde5249097..c7ce9e84b1571 100644
--- a/components/com_finder/src/Helper/FinderHelper.php
+++ b/components/com_finder/src/Helper/FinderHelper.php
@@ -16,7 +16,7 @@
 use Joomla\Database\ParameterType;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/components/com_finder/src/Model/SearchModel.php b/components/com_finder/src/Model/SearchModel.php
index ed5d7b472f388..9df36d2329cd0 100644
--- a/components/com_finder/src/Model/SearchModel.php
+++ b/components/com_finder/src/Model/SearchModel.php
@@ -469,7 +469,7 @@ protected function populateState($ordering = null, $direction = null)
         $input    = $app->getInput();
         $params   = $app->getParams();
         $user     = $this->getCurrentUser();
-        $language = Factory::getLanguage();
+        $language = $app->getLanguage();
 
         $this->setState('filter.language', Multilanguage::isEnabled());
 
diff --git a/components/com_finder/src/View/Search/FeedView.php b/components/com_finder/src/View/Search/FeedView.php
index fa891ae860e8c..b0a0959ccf3db 100644
--- a/components/com_finder/src/View/Search/FeedView.php
+++ b/components/com_finder/src/View/Search/FeedView.php
@@ -59,11 +59,11 @@ public function display($tpl = null)
 
         // Configure the document description.
         if (!empty($explained)) {
-            $this->document->setDescription(html_entity_decode(strip_tags($explained), ENT_QUOTES, 'UTF-8'));
+            $this->getDocument()->setDescription(html_entity_decode(strip_tags($explained), ENT_QUOTES, 'UTF-8'));
         }
 
         // Set the document link.
-        $this->document->link = Route::_($query->toUri());
+        $this->getDocument()->link = Route::_($query->toUri());
 
         // If we don't have any results, we are done.
         if (empty($results)) {
@@ -82,7 +82,7 @@ public function display($tpl = null)
             $item->date        = (int) $result->start_date ? HTMLHelper::_('date', $result->start_date, 'U') : $result->indexdate;
 
             // Loads item info into RSS array
-            $this->document->addItem($item);
+            $this->getDocument()->addItem($item);
         }
     }
 }
diff --git a/components/com_finder/src/View/Search/HtmlView.php b/components/com_finder/src/View/Search/HtmlView.php
index 28842d3f51cff..c15e3384b4bd6 100644
--- a/components/com_finder/src/View/Search/HtmlView.php
+++ b/components/com_finder/src/View/Search/HtmlView.php
@@ -10,8 +10,8 @@
 
 namespace Joomla\Component\Finder\Site\View\Search;
 
+use Joomla\CMS\Event\Finder\ResultEvent;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
@@ -25,6 +25,7 @@
 use Joomla\CMS\Uri\Uri;
 use Joomla\Component\Finder\Administrator\Indexer\Query;
 use Joomla\Component\Finder\Site\Helper\FinderHelper;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -58,7 +59,7 @@ class HtmlView extends BaseHtmlView implements SiteRouterAwareInterface
     /**
      * The model state
      *
-     * @var  \Joomla\CMS\Object\CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $state;
 
@@ -175,11 +176,16 @@ public function display($tpl = null)
 
         // Run an event on each result item
         if (is_array($this->results)) {
+            $dispatcher = $this->getDispatcher();
+
             // Import Finder plugins
-            PluginHelper::importPlugin('finder');
+            PluginHelper::importPlugin('finder', null, true, $dispatcher);
 
             foreach ($this->results as $result) {
-                $app->triggerEvent('onFinderResult', [&$result, &$this->query]);
+                $dispatcher->dispatch('onFinderResult', new ResultEvent('onFinderResult', [
+                    'subject' => $result,
+                    'query'   => $this->query,
+                ]));
             }
         }
 
@@ -295,13 +301,13 @@ protected function prepareDocument()
         // Configure the document meta-description.
         if (!empty($this->explained)) {
             $explained = $this->escape(html_entity_decode(strip_tags($this->explained), ENT_QUOTES, 'UTF-8'));
-            $this->document->setDescription($explained);
+            $this->getDocument()->setDescription($explained);
         } elseif ($this->params->get('menu-meta_description')) {
-            $this->document->setDescription($this->params->get('menu-meta_description'));
+            $this->getDocument()->setDescription($this->params->get('menu-meta_description'));
         }
 
         if ($this->params->get('robots')) {
-            $this->document->setMetaData('robots', $this->params->get('robots'));
+            $this->getDocument()->setMetaData('robots', $this->params->get('robots'));
         }
 
         // Check for OpenSearch
@@ -310,7 +316,7 @@ protected function prepareDocument()
                 'opensearch_name',
                 Text::_('COM_FINDER_OPENSEARCH_NAME') . ' ' . $app->get('sitename')
             );
-            $this->document->addHeadLink(
+            $this->getDocument()->addHeadLink(
                 Uri::getInstance()->toString(['scheme', 'host', 'port']) . Route::_('index.php?option=com_finder&view=search&format=opensearch'),
                 'search',
                 'rel',
@@ -321,14 +327,14 @@ protected function prepareDocument()
         // Add feed link to the document head.
         if ($this->params->get('show_feed_link', 1) == 1) {
             // Add the RSS link.
-            $props = ['type' => 'application/rss+xml', 'title' => 'RSS 2.0'];
+            $props = ['type' => 'application/rss+xml', 'title' => htmlspecialchars($this->getDocument()->getTitle())];
             $route = Route::_($this->query->toUri() . '&format=feed&type=rss');
-            $this->document->addHeadLink($route, 'alternate', 'rel', $props);
+            $this->getDocument()->addHeadLink($route, 'alternate', 'rel', $props);
 
             // Add the ATOM link.
-            $props = ['type' => 'application/atom+xml', 'title' => 'Atom 1.0'];
+            $props = ['type' => 'application/atom+xml', 'title' => htmlspecialchars($this->getDocument()->getTitle())];
             $route = Route::_($this->query->toUri() . '&format=feed&type=atom');
-            $this->document->addHeadLink($route, 'alternate', 'rel', $props);
+            $this->getDocument()->addHeadLink($route, 'alternate', 'rel', $props);
         }
     }
 }
diff --git a/components/com_finder/src/View/Search/OpensearchView.php b/components/com_finder/src/View/Search/OpensearchView.php
index 795a85e2ef375..d690bf11224ae 100644
--- a/components/com_finder/src/View/Search/OpensearchView.php
+++ b/components/com_finder/src/View/Search/OpensearchView.php
@@ -42,8 +42,8 @@ public function display($tpl = null)
         $app = Factory::getApplication();
 
         $params = ComponentHelper::getParams('com_finder');
-        $this->document->setShortName($params->get('opensearch_name', $app->get('sitename', '')));
-        $this->document->setDescription($params->get('opensearch_description', $app->get('MetaDesc', '')));
+        $this->getDocument()->setShortName($params->get('opensearch_name', $app->get('sitename', '')));
+        $this->getDocument()->setDescription($params->get('opensearch_description', $app->get('MetaDesc', '')));
 
         // Prevent any output when OpenSearch Support is disabled
         if (!$params->get('opensearch', 1)) {
@@ -64,26 +64,26 @@ public function display($tpl = null)
         // Add the HTML result view
         $htmlSearch           = new OpensearchUrl();
         $htmlSearch->template = $baseUrl . Route::_($searchUri, false);
-        $this->document->addUrl($htmlSearch);
+        $this->getDocument()->addUrl($htmlSearch);
 
         // Add the RSS result view
         $htmlSearch           = new OpensearchUrl();
         $htmlSearch->template = $baseUrl . Route::_($searchUri . '&format=feed&type=rss', false);
         $htmlSearch->type     = 'application/rss+xml';
-        $this->document->addUrl($htmlSearch);
+        $this->getDocument()->addUrl($htmlSearch);
 
         // Add the Atom result view
         $htmlSearch           = new OpensearchUrl();
         $htmlSearch->template = $baseUrl . Route::_($searchUri . '&format=feed&type=atom', false);
         $htmlSearch->type     = 'application/atom+xml';
-        $this->document->addUrl($htmlSearch);
+        $this->getDocument()->addUrl($htmlSearch);
 
         // Add suggestions URL
         if ($params->get('show_autosuggest', 1)) {
             $htmlSearch           = new OpensearchUrl();
             $htmlSearch->template = $baseUrl . Route::_($suggestionsUri, false);
             $htmlSearch->type     = 'application/x-suggestions+json';
-            $this->document->addUrl($htmlSearch);
+            $this->getDocument()->addUrl($htmlSearch);
         }
     }
 }
diff --git a/components/com_finder/tmpl/search/default_result.php b/components/com_finder/tmpl/search/default_result.php
index 5d70bfe7c4519..d468219945ce2 100644
--- a/components/com_finder/tmpl/search/default_result.php
+++ b/components/com_finder/tmpl/search/default_result.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
@@ -20,7 +19,7 @@
 use Joomla\Component\Finder\Administrator\Indexer\Taxonomy;
 use Joomla\String\StringHelper;
 
-$user             = Factory::getApplication()->getIdentity();
+$user             = $this->getCurrentUser();
 $show_description = $this->params->get('show_description', 1);
 
 if ($show_description) {
diff --git a/components/com_finder/tmpl/search/default_results.php b/components/com_finder/tmpl/search/default_results.php
index d54470559c899..6d7983aaa1021 100644
--- a/components/com_finder/tmpl/search/default_results.php
+++ b/components/com_finder/tmpl/search/default_results.php
@@ -66,7 +66,7 @@
     ?>
 <?php endif; ?>
 <?php // Display a list of results ?>
-<ol id="search-result-list" class="js-highlight com-finder__results-list" start="<?php echo (int) $this->pagination->limitstart + 1; ?>">
+<ul id="search-result-list" class="js-highlight com-finder__results-list" start="<?php echo (int) $this->pagination->limitstart + 1; ?>">
     <?php $this->baseUrl = Uri::getInstance()->toString(['scheme', 'host', 'port']); ?>
     <?php foreach ($this->results as $i => $result) : ?>
         <?php $this->result = &$result; ?>
@@ -74,7 +74,7 @@
         <?php $layout = $this->getLayoutFile($this->result->layout); ?>
         <?php echo $this->loadTemplate($layout); ?>
     <?php endforeach; ?>
-</ol>
+</ul>
 <?php // Display the pagination ?>
 <div class="com-finder__navigation search-pagination">
     <?php if ($this->params->get('show_pagination', 1) > 0) : ?>
diff --git a/components/com_modules/src/Controller/DisplayController.php b/components/com_modules/src/Controller/DisplayController.php
index 9057dffd609cd..7123321240811 100644
--- a/components/com_modules/src/Controller/DisplayController.php
+++ b/components/com_modules/src/Controller/DisplayController.php
@@ -21,7 +21,7 @@
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Modules manager master display controller.
+ * Modules manager display controller.
  *
  * @since  3.5
  */
diff --git a/components/com_newsfeeds/src/Controller/DisplayController.php b/components/com_newsfeeds/src/Controller/DisplayController.php
index a30c6d2377ab6..6cbbd207ad257 100644
--- a/components/com_newsfeeds/src/Controller/DisplayController.php
+++ b/components/com_newsfeeds/src/Controller/DisplayController.php
@@ -27,7 +27,8 @@ class DisplayController extends BaseController
      * Method to show a newsfeeds view
      *
      * @param   boolean  $cachable   If true, the view output will be cached
-     * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link \JFilterInput::clean()}.
+     * @param   array    $urlparams  An array of safe URL parameters and their variable types.
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  static  This object to support chaining.
      *
diff --git a/components/com_newsfeeds/src/Model/CategoryModel.php b/components/com_newsfeeds/src/Model/CategoryModel.php
index 041fb0e205645..284d750dfbc8e 100644
--- a/components/com_newsfeeds/src/Model/CategoryModel.php
+++ b/components/com_newsfeeds/src/Model/CategoryModel.php
@@ -404,7 +404,7 @@ public function hit($pk = 0)
 
         if ($hitcount) {
             $pk    = (!empty($pk)) ? $pk : (int) $this->getState('category.id');
-            $table = Table::getInstance('Category', 'JTable');
+            $table = Table::getInstance('Category', '\\Joomla\\CMS\\Table\\');
             $table->hit($pk);
         }
 
diff --git a/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php b/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php
index e3f4dd187b81a..e02e4a038db43 100644
--- a/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php
+++ b/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php
@@ -281,24 +281,24 @@ protected function _prepareDocument()
         $this->setDocumentTitle($title);
 
         if ($this->item->metadesc) {
-            $this->document->setDescription($this->item->metadesc);
+            $this->getDocument()->setDescription($this->item->metadesc);
         } elseif ($this->params->get('menu-meta_description')) {
-            $this->document->setDescription($this->params->get('menu-meta_description'));
+            $this->getDocument()->setDescription($this->params->get('menu-meta_description'));
         }
 
         if ($this->params->get('robots')) {
-            $this->document->setMetaData('robots', $this->params->get('robots'));
+            $this->getDocument()->setMetaData('robots', $this->params->get('robots'));
         }
 
         if ($app->get('MetaAuthor') == '1') {
-            $this->document->setMetaData('author', $this->item->author);
+            $this->getDocument()->setMetaData('author', $this->item->author);
         }
 
         $mdata = $this->item->metadata->toArray();
 
         foreach ($mdata as $k => $v) {
             if ($v) {
-                $this->document->setMetaData($k, $v);
+                $this->getDocument()->setMetaData($k, $v);
             }
         }
     }
diff --git a/components/com_newsfeeds/tmpl/newsfeed/default.php b/components/com_newsfeeds/tmpl/newsfeed/default.php
index 6ee290eec2e7d..9e0fd9e1c7328 100644
--- a/components/com_newsfeeds/tmpl/newsfeed/default.php
+++ b/components/com_newsfeeds/tmpl/newsfeed/default.php
@@ -10,19 +10,18 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
-use Joomla\CMS\Filter\OutputFilter;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\FileLayout;
 use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\Filter\OutputFilter;
 
 ?>
 
 <?php if (!empty($this->msg)) : ?>
     <?php echo $this->msg; ?>
 <?php else : ?>
-    <?php $lang      = Factory::getLanguage(); ?>
+    <?php $lang      = $this->getLanguage(); ?>
     <?php $myrtl     = $this->item->rtl; ?>
     <?php $direction = ' '; ?>
     <?php $isRtl     = $lang->isRtl(); ?>
@@ -121,7 +120,7 @@
 
         <!-- Show items -->
         <?php if (!empty($this->rssDoc[0])) : ?>
-            <ol class="com-newsfeeds-newsfeed__items">
+            <ul class="com-newsfeeds-newsfeed__items">
                 <?php for ($i = 0; $i < $this->item->numarticles; $i++) : ?>
                     <?php if (empty($this->rssDoc[$i])) : ?>
                         <?php break; ?>
@@ -151,7 +150,7 @@
                         <?php endif; ?>
                     </li>
                 <?php endfor; ?>
-            </ol>
+            </ul>
         <?php endif; ?>
     </div>
 <?php endif; ?>
diff --git a/components/com_privacy/src/Controller/DisplayController.php b/components/com_privacy/src/Controller/DisplayController.php
index 03d5c30dca11b..579b37a1237df 100644
--- a/components/com_privacy/src/Controller/DisplayController.php
+++ b/components/com_privacy/src/Controller/DisplayController.php
@@ -28,7 +28,8 @@ class DisplayController extends BaseController
      * Method to display a view.
      *
      * @param   boolean  $cachable   If true, the view output will be cached
-     * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+     * @param   array    $urlparams  An array of safe URL parameters and their variable types.
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  $this
      *
diff --git a/components/com_privacy/src/View/Confirm/HtmlView.php b/components/com_privacy/src/View/Confirm/HtmlView.php
index 636d8e3348f4d..798848aefbdb8 100644
--- a/components/com_privacy/src/View/Confirm/HtmlView.php
+++ b/components/com_privacy/src/View/Confirm/HtmlView.php
@@ -15,7 +15,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -56,7 +55,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The state information
      *
-     * @var    CMSObject
+     * @var    \Joomla\Registry\Registry
      * @since  3.9.0
      */
     protected $state;
@@ -114,11 +113,11 @@ protected function prepareDocument()
         $this->setDocumentTitle($this->params->get('page_title', ''));
 
         if ($this->params->get('menu-meta_description')) {
-            $this->document->setDescription($this->params->get('menu-meta_description'));
+            $this->getDocument()->setDescription($this->params->get('menu-meta_description'));
         }
 
         if ($this->params->get('robots')) {
-            $this->document->setMetaData('robots', $this->params->get('robots'));
+            $this->getDocument()->setMetaData('robots', $this->params->get('robots'));
         }
     }
 }
diff --git a/components/com_privacy/src/View/Remind/HtmlView.php b/components/com_privacy/src/View/Remind/HtmlView.php
index 9428da823a463..b0edb354f21f2 100644
--- a/components/com_privacy/src/View/Remind/HtmlView.php
+++ b/components/com_privacy/src/View/Remind/HtmlView.php
@@ -15,7 +15,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -56,7 +55,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The state information
      *
-     * @var    CMSObject
+     * @var    \Joomla\Registry\Registry
      * @since  3.9.0
      */
     protected $state;
@@ -114,11 +113,11 @@ protected function prepareDocument()
         $this->setDocumentTitle($this->params->get('page_title', ''));
 
         if ($this->params->get('menu-meta_description')) {
-            $this->document->setDescription($this->params->get('menu-meta_description'));
+            $this->getDocument()->setDescription($this->params->get('menu-meta_description'));
         }
 
         if ($this->params->get('robots')) {
-            $this->document->setMetaData('robots', $this->params->get('robots'));
+            $this->getDocument()->setMetaData('robots', $this->params->get('robots'));
         }
     }
 }
diff --git a/components/com_privacy/src/View/Request/HtmlView.php b/components/com_privacy/src/View/Request/HtmlView.php
index ade6303122827..ff20fe80af0a1 100644
--- a/components/com_privacy/src/View/Request/HtmlView.php
+++ b/components/com_privacy/src/View/Request/HtmlView.php
@@ -15,7 +15,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -64,7 +63,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The state information
      *
-     * @var    CMSObject
+     * @var    \Joomla\Registry\Registry
      * @since  3.9.0
      */
     protected $state;
@@ -123,11 +122,11 @@ protected function prepareDocument()
         $this->setDocumentTitle($this->params->get('page_title', ''));
 
         if ($this->params->get('menu-meta_description')) {
-            $this->document->setDescription($this->params->get('menu-meta_description'));
+            $this->getDocument()->setDescription($this->params->get('menu-meta_description'));
         }
 
         if ($this->params->get('robots')) {
-            $this->document->setMetaData('robots', $this->params->get('robots'));
+            $this->getDocument()->setMetaData('robots', $this->params->get('robots'));
         }
     }
 }
diff --git a/components/com_tags/src/Controller/DisplayController.php b/components/com_tags/src/Controller/DisplayController.php
index 6ddfade271019..d50b974a9b3e6 100644
--- a/components/com_tags/src/Controller/DisplayController.php
+++ b/components/com_tags/src/Controller/DisplayController.php
@@ -28,8 +28,8 @@ class DisplayController extends BaseController
      * Method to display a view.
      *
      * @param   boolean        $cachable   If true, the view output will be cached
-     * @param   mixed|boolean  $urlparams  An array of safe URL parameters and their
-     *                                     variable types, for valid values see {@link \JFilterInput::clean()}.
+     * @param   mixed|boolean  $urlparams  An array of safe URL parameters and their variable types.
+     *                         @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  static  This object to support chaining.
      *
diff --git a/components/com_tags/src/Helper/RouteHelper.php b/components/com_tags/src/Helper/RouteHelper.php
index b9138ab189139..78b51fd233064 100644
--- a/components/com_tags/src/Helper/RouteHelper.php
+++ b/components/com_tags/src/Helper/RouteHelper.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Component\Tags\Site\Helper;
 
-use Exception;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Helper\RouteHelper as CMSRouteHelper;
 use Joomla\CMS\Menu\AbstractMenu;
@@ -85,7 +84,7 @@ public static function getItemRoute($contentItemId, $contentItemAlias, $contentC
      * @return  string  URL link to pass to the router
      *
      * @since      3.1
-     * @throws     Exception
+     * @throws     \Exception
      *
      * @deprecated  4.3 will be removed in 6.0
      *              Use RouteHelper::getComponentTagRoute() instead
@@ -106,7 +105,7 @@ public static function getTagRoute($id)
      * @return  string  URL link to pass to the router
      *
      * @since   4.2.0
-     * @throws  Exception
+     * @throws  \Exception
      */
     public static function getComponentTagRoute(string $id, string $language = '*'): string
     {
@@ -140,7 +139,7 @@ public static function getComponentTagRoute(string $id, string $language = '*'):
      * @return  string  URL link to pass to the router
      *
      * @since      3.7
-     * @throws     Exception
+     * @throws     \Exception
      *
      * @deprecated  4.3 will be removed in 6.0
      *              Use RouteHelper::getComponentTagsRoute() instead
@@ -161,7 +160,7 @@ public static function getTagsRoute()
      * @return  string  URL link to pass to the router
      *
      * @since   4.2.0
-     * @throws  Exception
+     * @throws  \Exception
      */
     public static function getComponentTagsRoute(string $language = '*'): string
     {
@@ -177,7 +176,7 @@ public static function getComponentTagsRoute(string $language = '*'): string
      *
      * @return null
      *
-     * @throws Exception
+     * @throws \Exception
      */
     protected static function _findItem($needles = null)
     {
diff --git a/components/com_tags/src/Model/TagsModel.php b/components/com_tags/src/Model/TagsModel.php
index 0fcab821f6d31..b9f45501c4ed1 100644
--- a/components/com_tags/src/Model/TagsModel.php
+++ b/components/com_tags/src/Model/TagsModel.php
@@ -16,7 +16,6 @@
 use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\Database\DatabaseQuery;
 use Joomla\Database\ParameterType;
-use Joomla\Database\QueryInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
diff --git a/components/com_tags/src/Service/Router.php b/components/com_tags/src/Service/Router.php
index 2d8bf7a329324..c5e771d07db83 100644
--- a/components/com_tags/src/Service/Router.php
+++ b/components/com_tags/src/Service/Router.php
@@ -89,47 +89,59 @@ public function preprocess($query)
         }
 
         // Get query language
-        $language = isset($query['lang']) ? $query['lang'] : '*';
+        $lang = isset($query['lang']) ? $query['lang'] : '*';
 
         // Set the language to the current one when multilang is enabled and item is tagged to ALL
-        if (Multilanguage::isEnabled() && $language === '*') {
-            $language = $this->app->get('language');
+        if (Multilanguage::isEnabled() && $lang === '*') {
+            $lang = $this->app->get('language');
         }
 
-        if (isset($query['view']) && $query['view'] == 'tags') {
-            if (isset($query['parent_id']) && isset($this->lookup[$language]['tags'][$query['parent_id']])) {
-                $query['Itemid'] = $this->lookup[$language]['tags'][$query['parent_id']];
-            } elseif (isset($this->lookup[$language]['tags'][0])) {
-                $query['Itemid'] = $this->lookup[$language]['tags'][0];
-            }
-        } elseif (isset($query['view']) && $query['view'] == 'tag') {
-            if (isset($query['id'])) {
-                if (!is_array($query['id'])) {
-                    $query['id'] = [$query['id']];
-                }
-
-                $id = ArrayHelper::toInteger($query['id']);
-                sort($id);
-
-                if (isset($this->lookup[$language]['tag'][implode(',', $id)])) {
-                    $query['Itemid'] = $this->lookup[$language]['tag'][implode(',', $id)];
+        foreach (array_unique([$lang, '*']) as $language) {
+            if (isset($query['view']) && $query['view'] == 'tags') {
+                if (isset($query['parent_id']) && isset($this->lookup[$language]['tags'][$query['parent_id']])) {
+                    $query['Itemid'] = $this->lookup[$language]['tags'][$query['parent_id']];
+                    break;
                 } elseif (isset($this->lookup[$language]['tags'][0])) {
                     $query['Itemid'] = $this->lookup[$language]['tags'][0];
+                    break;
+                }
+            } elseif (isset($query['view']) && $query['view'] == 'tag') {
+                if (isset($query['id'])) {
+                    if (!is_array($query['id'])) {
+                        $query['id'] = [$query['id']];
+                    }
+
+                    $id = ArrayHelper::toInteger($query['id']);
+                    sort($id);
+
+                    if (isset($this->lookup[$language]['tag'][implode(',', $id)])) {
+                        $query['Itemid'] = $this->lookup[$language]['tag'][implode(',', $id)];
+                        break;
+                    } else {
+                        foreach ($id as $i) {
+                            if (isset($this->lookup[$language]['tag'][$i])) {
+                                $query['Itemid'] = $this->lookup[$language]['tag'][$i];
+                                break 2;
+                            }
+                        }
+                    }
+
+                    if (isset($this->lookup[$language]['tags'][implode(',', $id)])) {
+                        $query['Itemid'] = $this->lookup[$language]['tags'][implode(',', $id)];
+                        break;
+                    }
+
+                    if (isset($this->lookup[$language]['tags'][0])) {
+                        $query['Itemid'] = $this->lookup[$language]['tags'][0];
+                        break;
+                    }
                 }
             }
         }
 
-        // Check if the active menuitem matches the requested language
-        if (
-            !isset($query['Itemid']) && ($active && $active->component === 'com_tags'
-            && ($language === '*' || \in_array($active->language, ['*', $language]) || !Multilanguage::isEnabled()))
-        ) {
-            $query['Itemid'] = $active->id;
-        }
-
         // If not found, return language specific home link
         if (!isset($query['Itemid'])) {
-            $default = $this->menu->getDefault($language);
+            $default = $this->menu->getDefault($lang);
 
             if (!empty($default->id)) {
                 $query['Itemid'] = $default->id;
@@ -152,9 +164,9 @@ public function build(&$query)
     {
         $segments = [];
 
-        $menuItem = $this->menu->getItem($query['Itemid']);
+        $menuItem = !empty($query['Itemid']) ? $this->menu->getItem($query['Itemid']) : false;
 
-        if ($menuItem->query['option'] == 'com_tags') {
+        if ($menuItem && $menuItem->query['option'] == 'com_tags') {
             if ($menuItem->query['view'] == 'tags' && isset($query['id'])) {
                 $ids = $query['id'];
 
@@ -168,12 +180,18 @@ public function build(&$query)
 
                 unset($query['id']);
             } elseif ($menuItem->query['view'] == 'tag') {
-                $ids = $query['id'];
-                $ids = ArrayHelper::toInteger($ids);
-                $ids = array_diff($ids, $menuItem->query['id']);
-
-                foreach ($ids as $id) {
-                    $segments[] = $id;
+                $ids     = $query['id'];
+                $int_ids = ArrayHelper::toInteger($ids);
+                $mIds    = (array) $menuItem->query['id'];
+
+                /**
+                 * We check if there is a difference between the tags of the menu item and the query.
+                 * If they are identical, we exactly match the menu item. Otherwise we append all tags to the URL
+                 */
+                if (count(array_diff($int_ids, $mIds)) > 0 || count(array_diff($mIds, $int_ids)) > 0) {
+                    foreach ($ids as $id) {
+                        $segments[] = $id;
+                    }
                 }
 
                 unset($query['id']);
@@ -182,7 +200,7 @@ public function build(&$query)
             unset($query['view']);
         } else {
             $segments[] = $query['view'];
-            unset($query['view']);
+            unset($query['view'], $query['Itemid']);
 
             if (isset($query['id']) && is_array($query['id'])) {
                 foreach ($query['id'] as $id) {
@@ -271,6 +289,10 @@ protected function buildLookup()
                 $id = $item->query['id'];
                 sort($id);
                 $this->lookup[$item->language]['tag'][implode(',', $id)] = $item->id;
+
+                foreach ($id as $i) {
+                    $this->lookup[$item->language]['tag'][$i] = $item->id;
+                }
             }
 
             if ($item->query['view'] == 'tags') {
@@ -278,6 +300,37 @@ protected function buildLookup()
                 $this->lookup[$item->language]['tags'][$id] = $item->id;
             }
         }
+
+        foreach ($this->lookup as $language => $items) {
+            // We have tags views with parent_id set and need to load child tags to be assigned to this menu item
+            if (
+                count($this->lookup[$language]['tags']) > 1
+                || (count($this->lookup[$language]['tags']) == 1 && !isset($this->lookup[$language]['tags'][0]))
+            ) {
+                foreach ($this->lookup[$language]['tags'] as $id => $menu) {
+                    if ($id === 0) {
+                        continue;
+                    }
+
+                    $query = $this->db->getQuery(true);
+                    $query->select($this->db->quoteName('a.id'))
+                        ->from($this->db->quoteName('#__tags', 'a'))
+                        ->leftJoin(
+                            $this->db->quoteName('#__tags', 'b')
+                            . ' ON ' . $this->db->quoteName('b.lft') . ' < ' . $this->db->quoteName('a.lft')
+                            . ' AND ' . $this->db->quoteName('a.rgt') . ' < ' . $this->db->quoteName('b.rgt')
+                        )
+                        ->where($this->db->quoteName('b.id') . ' = :id')
+                        ->bind(':id', $id);
+                    $this->db->setQuery($query);
+                    $ids = (array) $this->db->loadColumn();
+
+                    foreach ($ids as $i) {
+                        $this->lookup[$language]['tags'][$i] = $menu;
+                    }
+                }
+            }
+        }
     }
 
     /**
diff --git a/components/com_tags/src/View/Tag/FeedView.php b/components/com_tags/src/View/Tag/FeedView.php
index 89a4042fc7f0e..739a1aeeb599c 100644
--- a/components/com_tags/src/View/Tag/FeedView.php
+++ b/components/com_tags/src/View/Tag/FeedView.php
@@ -53,17 +53,17 @@ public function display($tpl = null)
             $i++;
         }
 
-        $this->document->link = Route::_('index.php?option=com_tags&view=tag&' . $tagIds);
+        $this->getDocument()->link = Route::_('index.php?option=com_tags&view=tag&' . $tagIds);
 
         $app->getInput()->set('limit', $app->get('feed_limit'));
         $siteEmail = $app->get('mailfrom');
         $fromName  = $app->get('fromname');
         $feedEmail = $app->get('feed_email', 'none');
 
-        $this->document->editor = $fromName;
+        $this->getDocument()->editor = $fromName;
 
         if ($feedEmail !== 'none') {
-            $this->document->editorEmail = $siteEmail;
+            $this->getDocument()->editorEmail = $siteEmail;
         }
 
         // Get some data from the model
@@ -96,7 +96,7 @@ public function display($tpl = null)
                 }
 
                 // Loads item info into RSS array
-                $this->document->addItem($feeditem);
+                $this->getDocument()->addItem($feeditem);
             }
         }
     }
diff --git a/components/com_tags/src/View/Tag/HtmlView.php b/components/com_tags/src/View/Tag/HtmlView.php
index 26ee11ad1bbbf..ea7fe01455d10 100644
--- a/components/com_tags/src/View/Tag/HtmlView.php
+++ b/components/com_tags/src/View/Tag/HtmlView.php
@@ -34,7 +34,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var    CMSObject
+     * @var    \Joomla\Registry\Registry
      *
      * @since  3.1
      */
@@ -279,30 +279,30 @@ protected function _prepareDocument()
 
         foreach ($this->item as $itemElement) {
             if ($itemElement->metadesc) {
-                $this->document->setDescription($itemElement->metadesc);
+                $this->getDocument()->setDescription($itemElement->metadesc);
             } elseif ($this->params->get('menu-meta_description')) {
-                $this->document->setDescription($this->params->get('menu-meta_description'));
+                $this->getDocument()->setDescription($this->params->get('menu-meta_description'));
             }
 
             if ($this->params->get('robots')) {
-                $this->document->setMetaData('robots', $this->params->get('robots'));
+                $this->getDocument()->setMetaData('robots', $this->params->get('robots'));
             }
         }
 
         if (count($this->item) === 1) {
             foreach ($this->item[0]->metadata->toArray() as $k => $v) {
                 if ($v) {
-                    $this->document->setMetaData($k, $v);
+                    $this->getDocument()->setMetaData($k, $v);
                 }
             }
         }
 
         if ($this->params->get('show_feed_link', 1) == 1) {
             $link    = '&format=feed&limitstart=';
-            $attribs = ['type' => 'application/rss+xml', 'title' => 'RSS 2.0'];
-            $this->document->addHeadLink(Route::_($link . '&type=rss'), 'alternate', 'rel', $attribs);
-            $attribs = ['type' => 'application/atom+xml', 'title' => 'Atom 1.0'];
-            $this->document->addHeadLink(Route::_($link . '&type=atom'), 'alternate', 'rel', $attribs);
+            $attribs = ['type' => 'application/rss+xml', 'title' => htmlspecialchars($this->getDocument()->getTitle())];
+            $this->getDocument()->addHeadLink(Route::_($link . '&type=rss'), 'alternate', 'rel', $attribs);
+            $attribs = ['type' => 'application/atom+xml', 'title' => htmlspecialchars($this->getDocument()->getTitle())];
+            $this->getDocument()->addHeadLink(Route::_($link . '&type=atom'), 'alternate', 'rel', $attribs);
         }
     }
 
diff --git a/components/com_tags/src/View/Tags/FeedView.php b/components/com_tags/src/View/Tags/FeedView.php
index 33105c288e8ab..9035bdad85c0e 100644
--- a/components/com_tags/src/View/Tags/FeedView.php
+++ b/components/com_tags/src/View/Tags/FeedView.php
@@ -35,18 +35,18 @@ class FeedView extends BaseHtmlView
      */
     public function display($tpl = null)
     {
-        $app                  = Factory::getApplication();
-        $this->document->link = Route::_('index.php?option=com_tags&view=tags');
+        $app                       = Factory::getApplication();
+        $this->getDocument()->link = Route::_('index.php?option=com_tags&view=tags');
 
         $app->getInput()->set('limit', $app->get('feed_limit'));
         $siteEmail = $app->get('mailfrom');
         $fromName  = $app->get('fromname');
         $feedEmail = $app->get('feed_email', 'none');
 
-        $this->document->editor = $fromName;
+        $this->getDocument()->editor = $fromName;
 
         if ($feedEmail !== 'none') {
-            $this->document->editorEmail = $siteEmail;
+            $this->getDocument()->editorEmail = $siteEmail;
         }
 
         // Get some data from the model
@@ -80,7 +80,7 @@ public function display($tpl = null)
             }
 
             // Loads item info into RSS array
-            $this->document->addItem($feeditem);
+            $this->getDocument()->addItem($feeditem);
         }
     }
 }
diff --git a/components/com_tags/src/View/Tags/HtmlView.php b/components/com_tags/src/View/Tags/HtmlView.php
index b5d9d525189ea..3782ab138a2af 100644
--- a/components/com_tags/src/View/Tags/HtmlView.php
+++ b/components/com_tags/src/View/Tags/HtmlView.php
@@ -31,7 +31,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var    \Joomla\CMS\Object\CMSObject
+     * @var   \Joomla\Registry\Registry
      *
      * @since  3.1
      */
@@ -151,23 +151,23 @@ protected function _prepareDocument()
 
         // Set metadata for all tags menu item
         if ($this->params->get('menu-meta_description')) {
-            $this->document->setDescription($this->params->get('menu-meta_description'));
+            $this->getDocument()->setDescription($this->params->get('menu-meta_description'));
         }
 
         if ($this->params->get('robots')) {
-            $this->document->setMetaData('robots', $this->params->get('robots'));
+            $this->getDocument()->setMetaData('robots', $this->params->get('robots'));
         }
 
         // Respect configuration Sitename Before/After for TITLE in views All Tags.
-        $this->setDocumentTitle($this->document->getTitle());
+        $this->setDocumentTitle($this->getDocument()->getTitle());
 
         // Add alternative feed link
         if ($this->params->get('show_feed_link', 1) == 1) {
             $link    = '&format=feed&limitstart=';
-            $attribs = ['type' => 'application/rss+xml', 'title' => 'RSS 2.0'];
-            $this->document->addHeadLink(Route::_($link . '&type=rss'), 'alternate', 'rel', $attribs);
-            $attribs = ['type' => 'application/atom+xml', 'title' => 'Atom 1.0'];
-            $this->document->addHeadLink(Route::_($link . '&type=atom'), 'alternate', 'rel', $attribs);
+            $attribs = ['type' => 'application/rss+xml', 'title' => htmlspecialchars($this->getDocument()->getTitle())];
+            $this->getDocument()->addHeadLink(Route::_($link . '&type=rss'), 'alternate', 'rel', $attribs);
+            $attribs = ['type' => 'application/atom+xml', 'title' => htmlspecialchars($this->getDocument()->getTitle())];
+            $this->getDocument()->addHeadLink(Route::_($link . '&type=atom'), 'alternate', 'rel', $attribs);
         }
     }
 }
diff --git a/components/com_tags/tmpl/tag/default_items.php b/components/com_tags/tmpl/tag/default_items.php
index 62e5185845fa2..0e109cdddb75a 100644
--- a/components/com_tags/tmpl/tag/default_items.php
+++ b/components/com_tags/tmpl/tag/default_items.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\Router\Route;
@@ -22,7 +21,7 @@
 $wa->useScript('com_tags.tag-default');
 
 // Get the user object.
-$user = Factory::getUser();
+$user = $this->getCurrentUser();
 
 // Check if user is allowed to add/edit based on tags permissions.
 // Do we really have to make it so people can see unpublished tags???
diff --git a/components/com_tags/tmpl/tag/list_items.php b/components/com_tags/tmpl/tag/list_items.php
index 777091a953cad..3a609a3b315ca 100644
--- a/components/com_tags/tmpl/tag/list_items.php
+++ b/components/com_tags/tmpl/tag/list_items.php
@@ -57,26 +57,24 @@ class="inputbox" onchange="document.adminForm.submit();"
             </div>
         <?php else : ?>
             <table class="com-tags-tag-list__category category table table-striped table-bordered table-hover">
-                <?php if ($this->params->get('show_headings')) : ?>
-                    <thead>
-                        <tr>
-                            <th scope="col" id="categorylist_header_title">
-                                <?php echo HTMLHelper::_('grid.sort', 'JGLOBAL_TITLE', 'c.core_title', $listDirn, $listOrder); ?>
+                <thead<?php echo $this->params->get('show_headings', '1') ? '' : ' class="visually-hidden"'; ?>>
+                    <tr>
+                        <th scope="col" id="categorylist_header_title">
+                            <?php echo HTMLHelper::_('grid.sort', 'JGLOBAL_TITLE', 'c.core_title', $listDirn, $listOrder); ?>
+                        </th>
+                        <?php if ($date = $this->params->get('tag_list_show_date')) : ?>
+                            <th scope="col" id="categorylist_header_date">
+                                <?php if ($date === 'created') : ?>
+                                    <?php echo HTMLHelper::_('grid.sort', 'COM_TAGS_' . $date . '_DATE', 'c.core_created_time', $listDirn, $listOrder); ?>
+                                <?php elseif ($date === 'modified') : ?>
+                                    <?php echo HTMLHelper::_('grid.sort', 'COM_TAGS_' . $date . '_DATE', 'c.core_modified_time', $listDirn, $listOrder); ?>
+                                <?php elseif ($date === 'published') : ?>
+                                    <?php echo HTMLHelper::_('grid.sort', 'COM_TAGS_' . $date . '_DATE', 'c.core_publish_up', $listDirn, $listOrder); ?>
+                                <?php endif; ?>
                             </th>
-                            <?php if ($date = $this->params->get('tag_list_show_date')) : ?>
-                                <th scope="col" id="categorylist_header_date">
-                                    <?php if ($date === 'created') : ?>
-                                        <?php echo HTMLHelper::_('grid.sort', 'COM_TAGS_' . $date . '_DATE', 'c.core_created_time', $listDirn, $listOrder); ?>
-                                    <?php elseif ($date === 'modified') : ?>
-                                        <?php echo HTMLHelper::_('grid.sort', 'COM_TAGS_' . $date . '_DATE', 'c.core_modified_time', $listDirn, $listOrder); ?>
-                                    <?php elseif ($date === 'published') : ?>
-                                        <?php echo HTMLHelper::_('grid.sort', 'COM_TAGS_' . $date . '_DATE', 'c.core_publish_up', $listDirn, $listOrder); ?>
-                                    <?php endif; ?>
-                                </th>
-                            <?php endif; ?>
-                        </tr>
-                    </thead>
-                <?php endif; ?>
+                        <?php endif; ?>
+                    </tr>
+                </thead>
                 <tbody>
                     <?php foreach ($this->items as $i => $item) : ?>
                         <?php if ($item->core_state == 0) : ?>
diff --git a/components/com_tags/tmpl/tags/default_items.php b/components/com_tags/tmpl/tags/default_items.php
index 4d115e68e2af4..627a19903016a 100644
--- a/components/com_tags/tmpl/tags/default_items.php
+++ b/components/com_tags/tmpl/tags/default_items.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\Router\Route;
@@ -22,7 +21,7 @@
 $wa->useScript('com_tags.tags-default');
 
 // Get the user object.
-$user = Factory::getUser();
+$user = $this->getCurrentUser();
 
 // Check if user is allowed to add/edit based on tags permissions.
 $canEdit      = $user->authorise('core.edit', 'com_tags');
diff --git a/components/com_users/forms/profile.xml b/components/com_users/forms/profile.xml
index 7af61736cdf99..f1edcbb77388a 100644
--- a/components/com_users/forms/profile.xml
+++ b/components/com_users/forms/profile.xml
@@ -37,6 +37,9 @@
 			filter="raw"
 			size="30"
 			validate="password"
+			strengthmeter="true"
+			rules="true"
+			force="on"
 		/>
 
 		<field
diff --git a/components/com_users/src/Controller/DisplayController.php b/components/com_users/src/Controller/DisplayController.php
index 32e183978cc89..2cb7fb34465fc 100644
--- a/components/com_users/src/Controller/DisplayController.php
+++ b/components/com_users/src/Controller/DisplayController.php
@@ -29,8 +29,8 @@ class DisplayController extends BaseController
      * Method to display a view.
      *
      * @param   boolean        $cachable   If true, the view output will be cached
-     * @param   array|boolean  $urlparams  An array of safe URL parameters and their variable types,
-     *                                     for valid values see {@link \Joomla\CMS\Filter\InputFilter::clean()}.
+     * @param   array|boolean  $urlparams  An array of safe URL parameters and their variable types.
+     *                         @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  void
      *
diff --git a/components/com_users/src/Controller/ProfileController.php b/components/com_users/src/Controller/ProfileController.php
index 1d830f8f8bda9..4ee53fa500af9 100644
--- a/components/com_users/src/Controller/ProfileController.php
+++ b/components/com_users/src/Controller/ProfileController.php
@@ -10,6 +10,7 @@
 
 namespace Joomla\Component\Users\Site\Controller;
 
+use Joomla\CMS\Event\Model;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\Router\Route;
@@ -105,9 +106,13 @@ public function save()
 
         // Send an object which can be modified through the plugin event
         $objData = (object) $requestData;
-        $app->triggerEvent(
+        $this->getDispatcher()->dispatch(
             'onContentNormaliseRequestData',
-            ['com_users.user', $objData, $form]
+            new Model\NormaliseRequestDataEvent('onContentNormaliseRequestData', [
+                'context' => 'com_users.user',
+                'data'    => $objData,
+                'subject' => $form,
+            ])
         );
         $requestData = (array) $objData;
 
diff --git a/components/com_users/src/Controller/RegistrationController.php b/components/com_users/src/Controller/RegistrationController.php
index a1c6fc76584ea..95c3895f1a589 100644
--- a/components/com_users/src/Controller/RegistrationController.php
+++ b/components/com_users/src/Controller/RegistrationController.php
@@ -11,10 +11,11 @@
 namespace Joomla\Component\Users\Site\Controller;
 
 use Joomla\CMS\Component\ComponentHelper;
-use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\Router\Route;
+use Joomla\CMS\User\UserFactoryAwareInterface;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -25,8 +26,10 @@
  *
  * @since  1.6
  */
-class RegistrationController extends BaseController
+class RegistrationController extends BaseController implements UserFactoryAwareInterface
 {
+    use UserFactoryAwareTrait;
+
     /**
      * Method to activate a user.
      *
@@ -73,7 +76,7 @@ public function activate()
         }
 
         // Get the user we want to activate
-        $userToActivate = Factory::getUser($userIdToActivate);
+        $userToActivate = $this->getUserFactory()->loadUserById($userIdToActivate);
 
         // Admin activation is on and admin is activating the account
         if (($uParams->get('useractivation') == 2) && $userToActivate->getParam('activate', 0)) {
diff --git a/components/com_users/src/Controller/UserController.php b/components/com_users/src/Controller/UserController.php
index 8c64e509a9914..78ee13fb0afe3 100644
--- a/components/com_users/src/Controller/UserController.php
+++ b/components/com_users/src/Controller/UserController.php
@@ -105,9 +105,6 @@ public function login()
 
         $this->app->setUserState('users.login.form.data', []);
 
-        // Show a message when a user is logged in.
-        $this->app->enqueueMessage(Text::_('COM_USERS_FRONTEND_LOGIN_SUCCESS'), 'message');
-
         $this->app->redirect(Route::_($this->app->getUserState('users.login.form.return'), false));
     }
 
diff --git a/components/com_users/src/Model/RegistrationModel.php b/components/com_users/src/Model/RegistrationModel.php
index 42c793d8af89c..de1c73683c794 100644
--- a/components/com_users/src/Model/RegistrationModel.php
+++ b/components/com_users/src/Model/RegistrationModel.php
@@ -27,6 +27,8 @@
 use Joomla\CMS\String\PunycodeHelper;
 use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\User\User;
+use Joomla\CMS\User\UserFactoryAwareInterface;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\CMS\User\UserHelper;
 use Joomla\Database\ParameterType;
 
@@ -39,8 +41,10 @@
  *
  * @since  1.6
  */
-class RegistrationModel extends FormModel
+class RegistrationModel extends FormModel implements UserFactoryAwareInterface
 {
+    use UserFactoryAwareTrait;
+
     /**
      * @var    object  The user registration data.
      * @since  1.6
@@ -127,7 +131,7 @@ public function activate($token)
         PluginHelper::importPlugin('user');
 
         // Activate the user.
-        $user = Factory::getUser($userId);
+        $user = $this->getUserFactory()->loadUserById($userId);
 
         // Admin activation is on and user is verifying their email
         if (($userParams->get('useractivation') == 2) && !$user->getParam('activate', 0)) {
@@ -171,7 +175,7 @@ public function activate($token)
 
             // Send mail to all users with users creating permissions and receiving system emails
             foreach ($rows as $row) {
-                $usercreator = Factory::getUser($row->id);
+                $usercreator = $this->getUserFactory()->loadUserById($row->id);
 
                 if ($usercreator->authorise('core.create', 'com_users') && $usercreator->authorise('core.manage', 'com_users')) {
                     try {
@@ -544,7 +548,7 @@ public function register($temp)
 
             // Send mail to all superadministrators id
             foreach ($rows as $row) {
-                $usercreator = Factory::getUser($row->id);
+                $usercreator = $this->getUserFactory()->loadUserById($row->id);
 
                 if (!$usercreator->authorise('core.create', 'com_users') || !$usercreator->authorise('core.manage', 'com_users')) {
                     continue;
diff --git a/components/com_users/src/Model/RemindModel.php b/components/com_users/src/Model/RemindModel.php
index 5a0c0920221bf..937147d5402cd 100644
--- a/components/com_users/src/Model/RemindModel.php
+++ b/components/com_users/src/Model/RemindModel.php
@@ -10,6 +10,7 @@
 
 namespace Joomla\Component\Users\Site\Model;
 
+use Joomla\CMS\Event\User\AfterRemindEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Text;
@@ -201,7 +202,9 @@ public function processRemindRequest($data)
             return false;
         }
 
-        Factory::getApplication()->triggerEvent('onUserAfterRemind', [$user]);
+        $this->getDispatcher()->dispatch('onUserAfterRemind', new AfterRemindEvent('onUserAfterRemind', [
+            'subject' => $user,
+        ]));
 
         return true;
     }
diff --git a/components/com_users/src/Model/ResetModel.php b/components/com_users/src/Model/ResetModel.php
index 043ed2b46dc42..4e1061aea5b13 100644
--- a/components/com_users/src/Model/ResetModel.php
+++ b/components/com_users/src/Model/ResetModel.php
@@ -21,6 +21,8 @@
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\String\PunycodeHelper;
 use Joomla\CMS\User\User;
+use Joomla\CMS\User\UserFactoryAwareInterface;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\CMS\User\UserHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -32,8 +34,10 @@
  *
  * @since  1.5
  */
-class ResetModel extends FormModel
+class ResetModel extends FormModel implements UserFactoryAwareInterface
 {
+    use UserFactoryAwareTrait;
+
     /**
      * Method to get the password reset request form.
      *
@@ -193,7 +197,7 @@ public function processResetComplete($data)
         }
 
         // Get the user object.
-        $user = User::getInstance($userId);
+        $user = $this->getUserFactory()->loadUserById($userId);
 
         $event = AbstractEvent::create(
             'onUserBeforeResetComplete',
@@ -417,7 +421,7 @@ public function processResetRequest($data)
         }
 
         // Get the user object.
-        $user = User::getInstance($userId);
+        $user = $this->getUserFactory()->loadUserById($userId);
 
         // Make sure the user isn't blocked.
         if ($user->block) {
diff --git a/components/com_users/src/Rule/LoginUniqueFieldRule.php b/components/com_users/src/Rule/LoginUniqueFieldRule.php
index 2a29e749020b6..ee3bee40f781e 100644
--- a/components/com_users/src/Rule/LoginUniqueFieldRule.php
+++ b/components/com_users/src/Rule/LoginUniqueFieldRule.php
@@ -15,7 +15,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/components/com_users/src/Rule/LogoutUniqueFieldRule.php b/components/com_users/src/Rule/LogoutUniqueFieldRule.php
index e028c59ef27d9..7e26ca78a4961 100644
--- a/components/com_users/src/Rule/LogoutUniqueFieldRule.php
+++ b/components/com_users/src/Rule/LogoutUniqueFieldRule.php
@@ -15,7 +15,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/components/com_users/src/View/Login/HtmlView.php b/components/com_users/src/View/Login/HtmlView.php
index f38e7bf104ad9..b88d4e92e29ca 100644
--- a/components/com_users/src/View/Login/HtmlView.php
+++ b/components/com_users/src/View/Login/HtmlView.php
@@ -15,7 +15,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\User\User;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -46,7 +45,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var  CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $state;
 
@@ -149,11 +148,11 @@ protected function prepareDocument()
         $this->setDocumentTitle($this->params->get('page_title', ''));
 
         if ($this->params->get('menu-meta_description')) {
-            $this->document->setDescription($this->params->get('menu-meta_description'));
+            $this->getDocument()->setDescription($this->params->get('menu-meta_description'));
         }
 
         if ($this->params->get('robots')) {
-            $this->document->setMetaData('robots', $this->params->get('robots'));
+            $this->getDocument()->setMetaData('robots', $this->params->get('robots'));
         }
     }
 }
diff --git a/components/com_users/src/View/Profile/HtmlView.php b/components/com_users/src/View/Profile/HtmlView.php
index 64d6151b6c59c..06f7c89b34074 100644
--- a/components/com_users/src/View/Profile/HtmlView.php
+++ b/components/com_users/src/View/Profile/HtmlView.php
@@ -56,7 +56,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var  CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $state;
 
@@ -179,11 +179,11 @@ protected function prepareDocument()
         $this->setDocumentTitle($this->params->get('page_title', ''));
 
         if ($this->params->get('menu-meta_description')) {
-            $this->document->setDescription($this->params->get('menu-meta_description'));
+            $this->getDocument()->setDescription($this->params->get('menu-meta_description'));
         }
 
         if ($this->params->get('robots')) {
-            $this->document->setMetaData('robots', $this->params->get('robots'));
+            $this->getDocument()->setMetaData('robots', $this->params->get('robots'));
         }
     }
 }
diff --git a/components/com_users/src/View/Registration/HtmlView.php b/components/com_users/src/View/Registration/HtmlView.php
index 08840947af8bf..ea2985e85a518 100644
--- a/components/com_users/src/View/Registration/HtmlView.php
+++ b/components/com_users/src/View/Registration/HtmlView.php
@@ -15,7 +15,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Plugin\PluginHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -53,7 +52,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var  CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $state;
 
@@ -151,11 +150,11 @@ protected function prepareDocument()
         $this->setDocumentTitle($this->params->get('page_title', ''));
 
         if ($this->params->get('menu-meta_description')) {
-            $this->document->setDescription($this->params->get('menu-meta_description'));
+            $this->getDocument()->setDescription($this->params->get('menu-meta_description'));
         }
 
         if ($this->params->get('robots')) {
-            $this->document->setMetaData('robots', $this->params->get('robots'));
+            $this->getDocument()->setMetaData('robots', $this->params->get('robots'));
         }
     }
 }
diff --git a/components/com_users/src/View/Remind/HtmlView.php b/components/com_users/src/View/Remind/HtmlView.php
index e35f15092a57c..dbee8ab10e461 100644
--- a/components/com_users/src/View/Remind/HtmlView.php
+++ b/components/com_users/src/View/Remind/HtmlView.php
@@ -14,7 +14,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -44,7 +43,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var  CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $state;
 
@@ -116,11 +115,11 @@ protected function prepareDocument()
         $this->setDocumentTitle($this->params->get('page_title', ''));
 
         if ($this->params->get('menu-meta_description')) {
-            $this->document->setDescription($this->params->get('menu-meta_description'));
+            $this->getDocument()->setDescription($this->params->get('menu-meta_description'));
         }
 
         if ($this->params->get('robots')) {
-            $this->document->setMetaData('robots', $this->params->get('robots'));
+            $this->getDocument()->setMetaData('robots', $this->params->get('robots'));
         }
     }
 }
diff --git a/components/com_users/src/View/Reset/HtmlView.php b/components/com_users/src/View/Reset/HtmlView.php
index 16675307b7d96..2c469bf6b1c4d 100644
--- a/components/com_users/src/View/Reset/HtmlView.php
+++ b/components/com_users/src/View/Reset/HtmlView.php
@@ -14,7 +14,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -44,7 +43,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The model state
      *
-     * @var  CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $state;
 
@@ -122,11 +121,11 @@ protected function prepareDocument()
         $this->setDocumentTitle($this->params->get('page_title', ''));
 
         if ($this->params->get('menu-meta_description')) {
-            $this->document->setDescription($this->params->get('menu-meta_description'));
+            $this->getDocument()->setDescription($this->params->get('menu-meta_description'));
         }
 
         if ($this->params->get('robots')) {
-            $this->document->setMetaData('robots', $this->params->get('robots'));
+            $this->getDocument()->setMetaData('robots', $this->params->get('robots'));
         }
     }
 }
diff --git a/components/com_users/tmpl/captive/default.php b/components/com_users/tmpl/captive/default.php
index f656fbaaa02b9..64595e5c90c21 100644
--- a/components/com_users/tmpl/captive/default.php
+++ b/components/com_users/tmpl/captive/default.php
@@ -20,12 +20,10 @@
  * @var HtmlView     $this  View object
  * @var CaptiveModel $model The model
  */
-$model           = $this->getModel();
+$model = $this->getModel();
 
-if ($this->renderOptions['field_type'] !== 'custom') {
-    $this->document->getWebAssetManager()
-            ->useScript('com_users.two-factor-focus');
-}
+$this->document->getWebAssetManager()
+    ->useScript('com_users.two-factor-focus');
 
 ?>
 <div class="users-mfa-captive card card-body">
@@ -81,12 +79,13 @@ class="form-horizontal"
                     <?php
                     $attributes = array_merge(
                         [
-                            'type'        => $this->renderOptions['input_type'],
-                            'name'        => 'code',
-                            'value'       => '',
-                            'placeholder' => $this->renderOptions['placeholder'] ?? null,
-                            'id'          => 'users-mfa-code',
-                            'class'       => 'form-control'
+                            'type'         => $this->renderOptions['input_type'],
+                            'name'         => 'code',
+                            'value'        => '',
+                            'placeholder'  => $this->renderOptions['placeholder'] ?? null,
+                            'id'           => 'users-mfa-code',
+                            'class'        => 'form-control',
+                            'autocomplete' => $this->renderOptions['autocomplete'] ?? 'one-time-code'
                         ],
                         $this->renderOptions['input_attributes']
                     );
diff --git a/components/com_users/tmpl/profile/default.php b/components/com_users/tmpl/profile/default.php
index a534e5b458e82..10c9a08fe1ce2 100644
--- a/components/com_users/tmpl/profile/default.php
+++ b/components/com_users/tmpl/profile/default.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
@@ -24,7 +23,7 @@
         </div>
     <?php endif; ?>
 
-    <?php if (Factory::getUser()->id == $this->data->id) : ?>
+    <?php if ($this->getCurrentUser()->id == $this->data->id) : ?>
         <ul class="com-users-profile__edit btn-toolbar float-end">
             <li class="btn-group">
                 <a class="btn btn-primary" href="<?php echo Route::_('index.php?option=com_users&task=profile.edit&user_id=' . (int) $this->data->id); ?>">
diff --git a/components/com_users/tmpl/profile/edit.php b/components/com_users/tmpl/profile/edit.php
index 357a4f52d426f..a304a8175fae4 100644
--- a/components/com_users/tmpl/profile/edit.php
+++ b/components/com_users/tmpl/profile/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\Router\Route;
@@ -20,7 +19,7 @@
 HTMLHelper::_('bootstrap.tooltip', '.hasTooltip');
 
 // Load user_profile plugin language
-$lang = Factory::getLanguage();
+$lang = $this->getLanguage();
 $lang->load('plg_user_profile', JPATH_ADMINISTRATOR);
 
 /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
diff --git a/components/com_wrapper/src/Controller/DisplayController.php b/components/com_wrapper/src/Controller/DisplayController.php
index 39df15d177834..5779bcfdc13a5 100644
--- a/components/com_wrapper/src/Controller/DisplayController.php
+++ b/components/com_wrapper/src/Controller/DisplayController.php
@@ -27,7 +27,8 @@ class DisplayController extends BaseController
      * Method to display a view.
      *
      * @param   boolean  $cachable   If true, the view output will be cached
-     * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+     * @param   array    $urlparams  An array of safe URL parameters and their variable types.
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  BaseController  This object to support chaining.
      *
diff --git a/components/com_wrapper/src/View/Wrapper/HtmlView.php b/components/com_wrapper/src/View/Wrapper/HtmlView.php
index 4af7c5d084085..8b1da760f87f4 100644
--- a/components/com_wrapper/src/View/Wrapper/HtmlView.php
+++ b/components/com_wrapper/src/View/Wrapper/HtmlView.php
@@ -68,11 +68,11 @@ public function display($tpl = null)
         $this->setDocumentTitle($params->get('page_title', ''));
 
         if ($params->get('menu-meta_description')) {
-            $this->document->setDescription($params->get('menu-meta_description'));
+            $this->getDocument()->setDescription($params->get('menu-meta_description'));
         }
 
         if ($params->get('robots')) {
-            $this->document->setMetaData('robots', $params->get('robots'));
+            $this->getDocument()->setMetaData('robots', $params->get('robots'));
         }
 
         $wrapper = new \stdClass();
diff --git a/composer.json b/composer.json
index c2dec9b230340..51ab5fa5dfd1d 100644
--- a/composer.json
+++ b/composer.json
@@ -57,6 +57,7 @@
         "joomla/filesystem": "~3.0.x-dev",
         "joomla/http": "~3.0.x-dev",
         "joomla/input": "~3.0.x-dev",
+        "joomla/language": "~3.0.x-dev",
         "joomla/oauth1": "~3.0.x-dev",
         "joomla/oauth2": "~3.0.x-dev",
         "joomla/registry": "~3.0.x-dev",
@@ -66,24 +67,24 @@
         "joomla/uri": "~3.0.x-dev",
         "joomla/utilities": "~3.0.x-dev",
         "algo26-matthias/idna-convert": "^3.1.0",
-        "defuse/php-encryption": "^2.3.1",
+        "defuse/php-encryption": "^2.4.0",
         "doctrine/inflector": "^1.4.4",
-        "fig/link-util": "^1.1.2",
-        "google/recaptcha": "^1.2.4",
-        "laminas/laminas-diactoros": "^2.4.1",
-        "paragonie/sodium_compat": "^1.19",
+        "fig/link-util": "^1.2.0",
+        "google/recaptcha": "^1.3.0",
+        "laminas/laminas-diactoros": "^2.25.2",
+        "paragonie/sodium_compat": "^1.20",
         "phpmailer/phpmailer": "^6.8.0",
-        "psr/link": "~1.1.0",
-        "symfony/console": "^6.2.7",
-        "symfony/error-handler": "^6.2.7",
-        "symfony/ldap": "^6.2.7",
-        "symfony/options-resolver": "^6.2.7",
+        "psr/link": "~1.1.1",
+        "symfony/console": "^6.3.2",
+        "symfony/error-handler": "^6.3.2",
+        "symfony/ldap": "^6.3.0",
+        "symfony/options-resolver": "^6.3.0",
         "symfony/polyfill-mbstring": "^1.27.0",
-        "symfony/web-link": "^6.2.7",
-        "symfony/yaml": "^6.2.7",
+        "symfony/web-link": "^6.3.0",
+        "symfony/yaml": "^6.3.3",
         "typo3/phar-stream-wrapper": "^3.1.7",
-        "wamania/php-stemmer": "^3.0",
-        "maximebf/debugbar": "dev-master",
+        "wamania/php-stemmer": "^3.0.1",
+        "maximebf/debugbar": "^1.18.2",
         "tobscure/json-api": "dev-joomla-backports",
         "willdurand/negotiation": "^3.1.0",
         "ext-json": "*",
@@ -92,17 +93,17 @@
         "ext-gd": "*",
         "web-auth/webauthn-lib": "4.3.0",
         "ext-dom": "*",
-        "composer/ca-bundle": "^1.3.5",
-        "dragonmantank/cron-expression": "^3.3.2",
+        "composer/ca-bundle": "^1.3.6",
+        "dragonmantank/cron-expression": "^3.3.3",
         "enshrined/svg-sanitize": "^0.15.4",
-        "lcobucci/jwt": "^4.2.1",
-        "web-token/signature-pack": "^3.1.2",
+        "lcobucci/jwt": "^4.3.0",
+        "web-token/signature-pack": "^3.2.7",
         "phpseclib/bcmath_compat": "^2.0.1",
-        "jfcherng/php-diff": "^6.10.11",
-        "voku/portable-utf8": "6.0.12 as 5.4.0"
+        "jfcherng/php-diff": "^6.15.3",
+        "voku/portable-utf8": "^6.0.13"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.6.6",
+        "phpunit/phpunit": "^9.6.11",
         "friendsofphp/php-cs-fixer": "~3.4.0",
         "squizlabs/php_codesniffer": "~3.7.2",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.2",
diff --git a/composer.lock b/composer.lock
index 117642e6be704..55342ce47cf65 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "dcbca2aa9f7ec08b3dc7a252fcaa3f30",
+    "content-hash": "0054fbb71885b95bc08a4e8487f95a94",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
@@ -119,16 +119,16 @@
         },
         {
             "name": "composer/ca-bundle",
-            "version": "1.3.5",
+            "version": "1.3.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/ca-bundle.git",
-                "reference": "74780ccf8c19d6acb8d65c5f39cd72110e132bbd"
+                "reference": "90d087e988ff194065333d16bc5cf649872d9cdb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/74780ccf8c19d6acb8d65c5f39cd72110e132bbd",
-                "reference": "74780ccf8c19d6acb8d65c5f39cd72110e132bbd",
+                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/90d087e988ff194065333d16bc5cf649872d9cdb",
+                "reference": "90d087e988ff194065333d16bc5cf649872d9cdb",
                 "shasum": ""
             },
             "require": {
@@ -175,7 +175,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.3.5"
+                "source": "https://github.com/composer/ca-bundle/tree/1.3.6"
             },
             "funding": [
                 {
@@ -191,20 +191,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-11T08:27:00+00:00"
+            "time": "2023-06-06T12:02:59+00:00"
         },
         {
             "name": "defuse/php-encryption",
-            "version": "v2.3.1",
+            "version": "v2.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/defuse/php-encryption.git",
-                "reference": "77880488b9954b7884c25555c2a0ea9e7053f9d2"
+                "reference": "f53396c2d34225064647a05ca76c1da9d99e5828"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/defuse/php-encryption/zipball/77880488b9954b7884c25555c2a0ea9e7053f9d2",
-                "reference": "77880488b9954b7884c25555c2a0ea9e7053f9d2",
+                "url": "https://api.github.com/repos/defuse/php-encryption/zipball/f53396c2d34225064647a05ca76c1da9d99e5828",
+                "reference": "f53396c2d34225064647a05ca76c1da9d99e5828",
                 "shasum": ""
             },
             "require": {
@@ -213,7 +213,8 @@
                 "php": ">=5.6.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4|^5|^6|^7|^8|^9"
+                "phpunit/phpunit": "^5|^6|^7|^8|^9|^10",
+                "yoast/phpunit-polyfills": "^2.0.0"
             },
             "bin": [
                 "bin/generate-defuse-key"
@@ -255,9 +256,9 @@
             ],
             "support": {
                 "issues": "https://github.com/defuse/php-encryption/issues",
-                "source": "https://github.com/defuse/php-encryption/tree/v2.3.1"
+                "source": "https://github.com/defuse/php-encryption/tree/v2.4.0"
             },
-            "time": "2021-04-09T23:57:26+00:00"
+            "time": "2023-06-19T06:10:36+00:00"
         },
         {
             "name": "doctrine/inflector",
@@ -357,16 +358,16 @@
         },
         {
             "name": "dragonmantank/cron-expression",
-            "version": "v3.3.2",
+            "version": "v3.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dragonmantank/cron-expression.git",
-                "reference": "782ca5968ab8b954773518e9e49a6f892a34b2a8"
+                "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/782ca5968ab8b954773518e9e49a6f892a34b2a8",
-                "reference": "782ca5968ab8b954773518e9e49a6f892a34b2a8",
+                "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/adfb1f505deb6384dc8b39804c5065dd3c8c8c0a",
+                "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a",
                 "shasum": ""
             },
             "require": {
@@ -406,7 +407,7 @@
             ],
             "support": {
                 "issues": "https://github.com/dragonmantank/cron-expression/issues",
-                "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.2"
+                "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.3"
             },
             "funding": [
                 {
@@ -414,7 +415,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-09-10T18:51:20+00:00"
+            "time": "2023-08-10T19:36:49+00:00"
         },
         {
             "name": "enshrined/svg-sanitize",
@@ -748,22 +749,22 @@
         },
         {
             "name": "jfcherng/php-diff",
-            "version": "6.14.2",
+            "version": "6.15.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/jfcherng/php-diff.git",
-                "reference": "8b2bd0c987f69835a816642193d62a7c3664ca96"
+                "reference": "39be09756f8eda115299add3f34dc64b4bc32b66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jfcherng/php-diff/zipball/8b2bd0c987f69835a816642193d62a7c3664ca96",
-                "reference": "8b2bd0c987f69835a816642193d62a7c3664ca96",
+                "url": "https://api.github.com/repos/jfcherng/php-diff/zipball/39be09756f8eda115299add3f34dc64b4bc32b66",
+                "reference": "39be09756f8eda115299add3f34dc64b4bc32b66",
                 "shasum": ""
             },
             "require": {
                 "jfcherng/php-color-output": "^3",
-                "jfcherng/php-mb-string": "^1.4.6",
-                "jfcherng/php-sequence-matcher": "^3.2.9",
+                "jfcherng/php-mb-string": "^1.4.6 || ^2",
+                "jfcherng/php-sequence-matcher": "^3.2.10 || ^4",
                 "php": ">=7.4"
             },
             "require-dev": {
@@ -802,7 +803,7 @@
             ],
             "support": {
                 "issues": "https://github.com/jfcherng/php-diff/issues",
-                "source": "https://github.com/jfcherng/php-diff/tree/6.14.2"
+                "source": "https://github.com/jfcherng/php-diff/tree/6.15.3"
             },
             "funding": [
                 {
@@ -810,30 +811,34 @@
                     "type": "custom"
                 }
             ],
-            "time": "2023-03-15T19:26:28+00:00"
+            "time": "2023-06-15T12:29:57+00:00"
         },
         {
             "name": "jfcherng/php-mb-string",
-            "version": "1.4.7",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/jfcherng/php-mb-string.git",
-                "reference": "08194ae9de7d22e4555d311e0e88c2492009035d"
+                "reference": "8407bfefde47849c9e7c9594e6de2ac85a0f845d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jfcherng/php-mb-string/zipball/08194ae9de7d22e4555d311e0e88c2492009035d",
-                "reference": "08194ae9de7d22e4555d311e0e88c2492009035d",
+                "url": "https://api.github.com/repos/jfcherng/php-mb-string/zipball/8407bfefde47849c9e7c9594e6de2ac85a0f845d",
+                "reference": "8407bfefde47849c9e7c9594e6de2ac85a0f845d",
                 "shasum": ""
             },
             "require": {
                 "ext-iconv": "*",
-                "php": ">=7.1.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.18",
-                "phan/phan": "^2 || ^3 || ^4",
-                "phpunit/phpunit": "^7.2 || ^8 || ^9"
+                "friendsofphp/php-cs-fixer": "^3",
+                "phan/phan": "^5",
+                "phpunit/phpunit": "^9 || ^10"
+            },
+            "suggest": {
+                "ext-iconv": "Either \"ext-iconv\" or \"ext-mbstring\" is requried.",
+                "ext-mbstring": "Either \"ext-iconv\" or \"ext-mbstring\" is requried."
             },
             "type": "library",
             "autoload": {
@@ -854,7 +859,7 @@
             "description": "A high performance multibytes sting implementation for frequently reading/writing operations.",
             "support": {
                 "issues": "https://github.com/jfcherng/php-mb-string/issues",
-                "source": "https://github.com/jfcherng/php-mb-string/tree/1.4.7"
+                "source": "https://github.com/jfcherng/php-mb-string/tree/2.0.1"
             },
             "funding": [
                 {
@@ -862,30 +867,30 @@
                     "type": "custom"
                 }
             ],
-            "time": "2023-02-26T16:51:55+00:00"
+            "time": "2023-04-17T14:23:16+00:00"
         },
         {
             "name": "jfcherng/php-sequence-matcher",
-            "version": "3.2.9",
+            "version": "4.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/jfcherng/php-sequence-matcher.git",
-                "reference": "5de2243aa611a66395d85ba1a9169b439bd13e4d"
+                "reference": "d2038ac29627340a7458609072a8ba355e80ec5b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jfcherng/php-sequence-matcher/zipball/5de2243aa611a66395d85ba1a9169b439bd13e4d",
-                "reference": "5de2243aa611a66395d85ba1a9169b439bd13e4d",
+                "url": "https://api.github.com/repos/jfcherng/php-sequence-matcher/zipball/d2038ac29627340a7458609072a8ba355e80ec5b",
+                "reference": "d2038ac29627340a7458609072a8ba355e80ec5b",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.19",
-                "phan/phan": "^2.5 || ^3 || ^4 || ^5",
-                "phpunit/phpunit": ">=7 <10",
-                "squizlabs/php_codesniffer": "^3.5"
+                "friendsofphp/php-cs-fixer": "^3",
+                "phan/phan": "^5",
+                "phpunit/phpunit": "^9 || ^10",
+                "squizlabs/php_codesniffer": "^3.7"
             },
             "type": "library",
             "autoload": {
@@ -910,7 +915,7 @@
             "description": "A longest sequence matcher. The logic is primarily based on the Python difflib package.",
             "support": {
                 "issues": "https://github.com/jfcherng/php-sequence-matcher/issues",
-                "source": "https://github.com/jfcherng/php-sequence-matcher/tree/3.2.9"
+                "source": "https://github.com/jfcherng/php-sequence-matcher/tree/4.0.3"
             },
             "funding": [
                 {
@@ -918,7 +923,7 @@
                     "type": "custom"
                 }
             ],
-            "time": "2023-03-11T06:56:44+00:00"
+            "time": "2023-05-21T07:57:08+00:00"
         },
         {
             "name": "joomla/application",
@@ -926,12 +931,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/application.git",
-                "reference": "11bc028b251682ee2ec9292e1fad5594dbab9073"
+                "reference": "2a83022ffe4b271d7fb8cb9542cd0935f4c56b06"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/application/zipball/11bc028b251682ee2ec9292e1fad5594dbab9073",
-                "reference": "11bc028b251682ee2ec9292e1fad5594dbab9073",
+                "url": "https://api.github.com/repos/joomla-framework/application/zipball/2a83022ffe4b271d7fb8cb9542cd0935f4c56b06",
+                "reference": "2a83022ffe4b271d7fb8cb9542cd0935f4c56b06",
                 "shasum": ""
             },
             "require": {
@@ -941,7 +946,7 @@
                 "php": "^8.1.0",
                 "psr/http-message": "^1.0",
                 "psr/log": "^1.0|^2.0|^3.0",
-                "symfony/deprecation-contracts": "^3"
+                "symfony/deprecation-contracts": "^2|^3"
             },
             "require-dev": {
                 "ext-json": "*",
@@ -1015,7 +1020,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-03-23T07:25:33+00:00"
+            "time": "2023-06-12T11:12:26+00:00"
         },
         {
             "name": "joomla/archive",
@@ -1161,12 +1166,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/console.git",
-                "reference": "41c566b42c85bc7f94dc9866d55ce5b4d94bb4df"
+                "reference": "3dfb97a222b50e49c2140b4e0ffcdf5582b0b8e7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/console/zipball/41c566b42c85bc7f94dc9866d55ce5b4d94bb4df",
-                "reference": "41c566b42c85bc7f94dc9866d55ce5b4d94bb4df",
+                "url": "https://api.github.com/repos/joomla-framework/console/zipball/3dfb97a222b50e49c2140b4e0ffcdf5582b0b8e7",
+                "reference": "3dfb97a222b50e49c2140b4e0ffcdf5582b0b8e7",
                 "shasum": ""
             },
             "require": {
@@ -1225,7 +1230,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-03-22T13:04:09+00:00"
+            "time": "2023-06-16T08:27:32+00:00"
         },
         {
             "name": "joomla/crypt",
@@ -1369,18 +1374,18 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/database.git",
-                "reference": "403fca058753a57876075d56b89def6ebb5d4fcf"
+                "reference": "c6d741a00b01be07684af3ae313f32d080c7c348"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/database/zipball/403fca058753a57876075d56b89def6ebb5d4fcf",
-                "reference": "403fca058753a57876075d56b89def6ebb5d4fcf",
+                "url": "https://api.github.com/repos/joomla-framework/database/zipball/c6d741a00b01be07684af3ae313f32d080c7c348",
+                "reference": "c6d741a00b01be07684af3ae313f32d080c7c348",
                 "shasum": ""
             },
             "require": {
                 "joomla/event": "3.0.x-dev",
                 "php": "^8.1.0",
-                "symfony/deprecation-contracts": "^3"
+                "symfony/deprecation-contracts": "^2|^3"
             },
             "require-dev": {
                 "joomla/archive": "3.0.x-dev",
@@ -1444,7 +1449,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-03-23T07:25:47+00:00"
+            "time": "2023-04-19T11:47:38+00:00"
         },
         {
             "name": "joomla/di",
@@ -1452,18 +1457,18 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/di.git",
-                "reference": "2c76bf8d2f841ac59ff94d7bd6cd0e5e962f6e12"
+                "reference": "951947f2b4ad883778d19cb7c4bbfe837305e0ed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/di/zipball/2c76bf8d2f841ac59ff94d7bd6cd0e5e962f6e12",
-                "reference": "2c76bf8d2f841ac59ff94d7bd6cd0e5e962f6e12",
+                "url": "https://api.github.com/repos/joomla-framework/di/zipball/951947f2b4ad883778d19cb7c4bbfe837305e0ed",
+                "reference": "951947f2b4ad883778d19cb7c4bbfe837305e0ed",
                 "shasum": ""
             },
             "require": {
                 "php": "^8.1.0",
                 "psr/container": "^1.0",
-                "symfony/deprecation-contracts": "^3"
+                "symfony/deprecation-contracts": "^2|^3"
             },
             "provide": {
                 "psr/container-implementation": "~1.0"
@@ -1515,7 +1520,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-03-23T07:25:58+00:00"
+            "time": "2023-06-05T07:20:22+00:00"
         },
         {
             "name": "joomla/event",
@@ -1523,17 +1528,17 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/event.git",
-                "reference": "c3e275a4bf8723acf1b33b5f92414af06a2c8f07"
+                "reference": "8d12de5fc231507d2295ee61f513baf642443427"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/event/zipball/c3e275a4bf8723acf1b33b5f92414af06a2c8f07",
-                "reference": "c3e275a4bf8723acf1b33b5f92414af06a2c8f07",
+                "url": "https://api.github.com/repos/joomla-framework/event/zipball/8d12de5fc231507d2295ee61f513baf642443427",
+                "reference": "8d12de5fc231507d2295ee61f513baf642443427",
                 "shasum": ""
             },
             "require": {
                 "php": "^8.1.0",
-                "symfony/deprecation-contracts": "^3"
+                "symfony/deprecation-contracts": "^2|^3"
             },
             "require-dev": {
                 "joomla/console": "3.0.x-dev",
@@ -1584,7 +1589,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-03-23T07:26:12+00:00"
+            "time": "2023-06-05T07:19:26+00:00"
         },
         {
             "name": "joomla/filesystem",
@@ -1592,12 +1597,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/filesystem.git",
-                "reference": "5f30315797c010ad5669e30a1d2a3ffb63dd8e8f"
+                "reference": "9aa46b4627a4c9398da9d8c5cdad381673f6e172"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/filesystem/zipball/5f30315797c010ad5669e30a1d2a3ffb63dd8e8f",
-                "reference": "5f30315797c010ad5669e30a1d2a3ffb63dd8e8f",
+                "url": "https://api.github.com/repos/joomla-framework/filesystem/zipball/9aa46b4627a4c9398da9d8c5cdad381673f6e172",
+                "reference": "9aa46b4627a4c9398da9d8c5cdad381673f6e172",
                 "shasum": ""
             },
             "require": {
@@ -1648,7 +1653,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-03-22T12:55:18+00:00"
+            "time": "2023-06-05T07:21:03+00:00"
         },
         {
             "name": "joomla/filter",
@@ -1656,12 +1661,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/filter.git",
-                "reference": "0ed141506cd7b5fc68b2068962bddd3247ad15f2"
+                "reference": "9a447fafdbfffad5b820cdedbf790587fb612910"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/filter/zipball/0ed141506cd7b5fc68b2068962bddd3247ad15f2",
-                "reference": "0ed141506cd7b5fc68b2068962bddd3247ad15f2",
+                "url": "https://api.github.com/repos/joomla-framework/filter/zipball/9a447fafdbfffad5b820cdedbf790587fb612910",
+                "reference": "9a447fafdbfffad5b820cdedbf790587fb612910",
                 "shasum": ""
             },
             "require": {
@@ -1715,7 +1720,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-03-22T11:57:11+00:00"
+            "time": "2023-06-05T19:58:35+00:00"
         },
         {
             "name": "joomla/http",
@@ -1723,12 +1728,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/http.git",
-                "reference": "a7881f1aab51658c8c52ddec8f6bec538d26da9d"
+                "reference": "0c8e9ea8783a8b7136d36f5fc15024c2f718fd75"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/http/zipball/a7881f1aab51658c8c52ddec8f6bec538d26da9d",
-                "reference": "a7881f1aab51658c8c52ddec8f6bec538d26da9d",
+                "url": "https://api.github.com/repos/joomla-framework/http/zipball/0c8e9ea8783a8b7136d36f5fc15024c2f718fd75",
+                "reference": "0c8e9ea8783a8b7136d36f5fc15024c2f718fd75",
                 "shasum": ""
             },
             "require": {
@@ -1786,7 +1791,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-03-22T13:59:56+00:00"
+            "time": "2023-06-12T11:12:09+00:00"
         },
         {
             "name": "joomla/input",
@@ -1794,18 +1799,18 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/input.git",
-                "reference": "79d60b88b58a772c3064b6179dc63fdbc98fa93d"
+                "reference": "fa75e7a8caa148fd5ebfc3f79334d3d101d0e94a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/input/zipball/79d60b88b58a772c3064b6179dc63fdbc98fa93d",
-                "reference": "79d60b88b58a772c3064b6179dc63fdbc98fa93d",
+                "url": "https://api.github.com/repos/joomla-framework/input/zipball/fa75e7a8caa148fd5ebfc3f79334d3d101d0e94a",
+                "reference": "fa75e7a8caa148fd5ebfc3f79334d3d101d0e94a",
                 "shasum": ""
             },
             "require": {
                 "joomla/filter": "3.0.x-dev",
                 "php": "^8.1.0",
-                "symfony/deprecation-contracts": "^3"
+                "symfony/deprecation-contracts": "^2|^3"
             },
             "require-dev": {
                 "joomla/test": "3.0.x-dev",
@@ -1851,7 +1856,78 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-03-23T07:26:24+00:00"
+            "time": "2023-04-19T11:50:38+00:00"
+        },
+        {
+            "name": "joomla/language",
+            "version": "dev-3.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/joomla-framework/language.git",
+                "reference": "aadf23374f38fd3157b66a6de2f71ae19e405798"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/joomla-framework/language/zipball/aadf23374f38fd3157b66a6de2f71ae19e405798",
+                "reference": "aadf23374f38fd3157b66a6de2f71ae19e405798",
+                "shasum": ""
+            },
+            "require": {
+                "ext-xml": "*",
+                "joomla/string": "3.0.x-dev",
+                "php": "^8.1.0",
+                "symfony/deprecation-contracts": "^2|^3"
+            },
+            "require-dev": {
+                "joomla/di": "3.0.x-dev",
+                "joomla/registry": "3.0.x-dev",
+                "joomla/test": "3.0.x-dev",
+                "phan/phan": "^5.4.2",
+                "phpstan/phpstan": "^1.10.7",
+                "phpunit/phpunit": "^9.5.28",
+                "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/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "description": "Joomla Language Package",
+            "homepage": "https://github.com/joomla-framework/language",
+            "keywords": [
+                "framework",
+                "joomla",
+                "language"
+            ],
+            "support": {
+                "issues": "https://github.com/joomla-framework/language/issues",
+                "source": "https://github.com/joomla-framework/language/tree/3.x-dev"
+            },
+            "funding": [
+                {
+                    "url": "https://community.joomla.org/sponsorship-campaigns.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/joomla",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-04-19T11:42:22+00:00"
         },
         {
             "name": "joomla/oauth1",
@@ -1996,12 +2072,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/registry.git",
-                "reference": "e67bb304ec42e2e399466101a5ab557143ab08cb"
+                "reference": "ec21243f2cee4867b40269ba80bd4af783d35395"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/registry/zipball/e67bb304ec42e2e399466101a5ab557143ab08cb",
-                "reference": "e67bb304ec42e2e399466101a5ab557143ab08cb",
+                "url": "https://api.github.com/repos/joomla-framework/registry/zipball/ec21243f2cee4867b40269ba80bd4af783d35395",
+                "reference": "ec21243f2cee4867b40269ba80bd4af783d35395",
                 "shasum": ""
             },
             "require": {
@@ -2057,7 +2133,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-03-24T18:15:24+00:00"
+            "time": "2023-06-12T11:12:35+00:00"
         },
         {
             "name": "joomla/router",
@@ -2136,17 +2212,17 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/session.git",
-                "reference": "294a846bdfbef830895beb81214b52237674e9c0"
+                "reference": "95c74bd3c8546b73c49440c426eef734a30ea97b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/session/zipball/294a846bdfbef830895beb81214b52237674e9c0",
-                "reference": "294a846bdfbef830895beb81214b52237674e9c0",
+                "url": "https://api.github.com/repos/joomla-framework/session/zipball/95c74bd3c8546b73c49440c426eef734a30ea97b",
+                "reference": "95c74bd3c8546b73c49440c426eef734a30ea97b",
                 "shasum": ""
             },
             "require": {
                 "php": "^8.1.0",
-                "symfony/deprecation-contracts": "^3"
+                "symfony/deprecation-contracts": "^2|^3"
             },
             "require-dev": {
                 "joomla/console": "3.0.x-dev",
@@ -2208,7 +2284,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-03-23T07:26:34+00:00"
+            "time": "2023-04-19T11:52:02+00:00"
         },
         {
             "name": "joomla/string",
@@ -2216,17 +2292,17 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/string.git",
-                "reference": "f49897623a4d0f4b50623524a3d2b394d11a78e6"
+                "reference": "5f37f609a7ab646ae408730457804a163958b406"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/string/zipball/f49897623a4d0f4b50623524a3d2b394d11a78e6",
-                "reference": "f49897623a4d0f4b50623524a3d2b394d11a78e6",
+                "url": "https://api.github.com/repos/joomla-framework/string/zipball/5f37f609a7ab646ae408730457804a163958b406",
+                "reference": "5f37f609a7ab646ae408730457804a163958b406",
                 "shasum": ""
             },
             "require": {
                 "php": "^8.1.0",
-                "symfony/deprecation-contracts": "^3"
+                "symfony/deprecation-contracts": "^2|^3"
             },
             "conflict": {
                 "doctrine/inflector": "<1.2"
@@ -2297,7 +2373,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-03-23T07:26:43+00:00"
+            "time": "2023-04-19T11:52:40+00:00"
         },
         {
             "name": "joomla/uri",
@@ -2305,12 +2381,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/uri.git",
-                "reference": "0b0a8b6b9a4933fc699231e791667a3a2f3aa307"
+                "reference": "307ba6ba4e4bbe6981d3bc7417bbc5d0d46fca0e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/uri/zipball/0b0a8b6b9a4933fc699231e791667a3a2f3aa307",
-                "reference": "0b0a8b6b9a4933fc699231e791667a3a2f3aa307",
+                "url": "https://api.github.com/repos/joomla-framework/uri/zipball/307ba6ba4e4bbe6981d3bc7417bbc5d0d46fca0e",
+                "reference": "307ba6ba4e4bbe6981d3bc7417bbc5d0d46fca0e",
                 "shasum": ""
             },
             "require": {
@@ -2362,7 +2438,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-03-22T08:04:27+00:00"
+            "time": "2023-06-05T13:47:46+00:00"
         },
         {
             "name": "joomla/utilities",
@@ -2370,12 +2446,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/utilities.git",
-                "reference": "395d2152ab2c65745f269d56d1a9abd98e05b124"
+                "reference": "25e5fd2d7977dfd3e778b3541f825707b51d0c51"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/utilities/zipball/395d2152ab2c65745f269d56d1a9abd98e05b124",
-                "reference": "395d2152ab2c65745f269d56d1a9abd98e05b124",
+                "url": "https://api.github.com/repos/joomla-framework/utilities/zipball/25e5fd2d7977dfd3e778b3541f825707b51d0c51",
+                "reference": "25e5fd2d7977dfd3e778b3541f825707b51d0c51",
                 "shasum": ""
             },
             "require": {
@@ -2425,26 +2501,26 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-03-22T11:28:59+00:00"
+            "time": "2023-06-12T11:11:59+00:00"
         },
         {
             "name": "laminas/laminas-diactoros",
-            "version": "2.24.0",
+            "version": "2.25.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-diactoros.git",
-                "reference": "6028af6c3b5ced4d063a680d2483cce67578b902"
+                "reference": "9f3f4bf5b99c9538b6f1dbcc20f6fec357914f9e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/6028af6c3b5ced4d063a680d2483cce67578b902",
-                "reference": "6028af6c3b5ced4d063a680d2483cce67578b902",
+                "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/9f3f4bf5b99c9538b6f1dbcc20f6fec357914f9e",
+                "reference": "9f3f4bf5b99c9538b6f1dbcc20f6fec357914f9e",
                 "shasum": ""
             },
             "require": {
                 "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
                 "psr/http-factory": "^1.0",
-                "psr/http-message": "^1.0"
+                "psr/http-message": "^1.1"
             },
             "conflict": {
                 "zendframework/zend-diactoros": "*"
@@ -2459,11 +2535,11 @@
                 "ext-gd": "*",
                 "ext-libxml": "*",
                 "http-interop/http-factory-tests": "^0.9.0",
-                "laminas/laminas-coding-standard": "^2.4.0",
+                "laminas/laminas-coding-standard": "^2.5",
                 "php-http/psr7-integration-tests": "^1.2",
-                "phpunit/phpunit": "^9.5.27",
+                "phpunit/phpunit": "^9.5.28",
                 "psalm/plugin-phpunit": "^0.18.4",
-                "vimeo/psalm": "^5.4"
+                "vimeo/psalm": "^5.6"
             },
             "type": "library",
             "extra": {
@@ -2522,7 +2598,7 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2022-12-20T12:22:40+00:00"
+            "time": "2023-04-17T15:44:17+00:00"
         },
         {
             "name": "lcobucci/clock",
@@ -2664,16 +2740,16 @@
         },
         {
             "name": "maximebf/debugbar",
-            "version": "dev-master",
+            "version": "v1.18.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/maximebf/php-debugbar.git",
-                "reference": "ea5bfc41e54b8ea924e30dcac3d25e1b2c3b0f31"
+                "reference": "17dcf3f6ed112bb85a37cf13538fd8de49f5c274"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/ea5bfc41e54b8ea924e30dcac3d25e1b2c3b0f31",
-                "reference": "ea5bfc41e54b8ea924e30dcac3d25e1b2c3b0f31",
+                "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/17dcf3f6ed112bb85a37cf13538fd8de49f5c274",
+                "reference": "17dcf3f6ed112bb85a37cf13538fd8de49f5c274",
                 "shasum": ""
             },
             "require": {
@@ -2690,7 +2766,6 @@
                 "monolog/monolog": "Log using Monolog",
                 "predis/predis": "Redis storage"
             },
-            "default-branch": true,
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -2725,9 +2800,9 @@
             ],
             "support": {
                 "issues": "https://github.com/maximebf/php-debugbar/issues",
-                "source": "https://github.com/maximebf/php-debugbar/tree/master"
+                "source": "https://github.com/maximebf/php-debugbar/tree/v1.18.2"
             },
-            "time": "2023-02-06T15:35:37+00:00"
+            "time": "2023-02-04T15:27:00+00:00"
         },
         {
             "name": "paragonie/constant_time_encoding",
@@ -2798,16 +2873,16 @@
         },
         {
             "name": "paragonie/sodium_compat",
-            "version": "v1.19.0",
+            "version": "v1.20.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/sodium_compat.git",
-                "reference": "cb15e403ecbe6a6cc515f855c310eb6b1872a933"
+                "reference": "e592a3e06d1fa0d43988c7c7d9948ca836f644b6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/cb15e403ecbe6a6cc515f855c310eb6b1872a933",
-                "reference": "cb15e403ecbe6a6cc515f855c310eb6b1872a933",
+                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/e592a3e06d1fa0d43988c7c7d9948ca836f644b6",
+                "reference": "e592a3e06d1fa0d43988c7c7d9948ca836f644b6",
                 "shasum": ""
             },
             "require": {
@@ -2878,9 +2953,9 @@
             ],
             "support": {
                 "issues": "https://github.com/paragonie/sodium_compat/issues",
-                "source": "https://github.com/paragonie/sodium_compat/tree/v1.19.0"
+                "source": "https://github.com/paragonie/sodium_compat/tree/v1.20.0"
             },
-            "time": "2022-09-26T03:40:35+00:00"
+            "time": "2023-04-30T00:54:53+00:00"
         },
         {
             "name": "phpmailer/phpmailer",
@@ -3026,16 +3101,16 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "3.0.19",
+            "version": "3.0.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "cc181005cf548bfd8a4896383bb825d859259f95"
+                "reference": "4580645d3fc05c189024eb3b834c6c1e4f0f30a1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/cc181005cf548bfd8a4896383bb825d859259f95",
-                "reference": "cc181005cf548bfd8a4896383bb825d859259f95",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/4580645d3fc05c189024eb3b834c6c1e4f0f30a1",
+                "reference": "4580645d3fc05c189024eb3b834c6c1e4f0f30a1",
                 "shasum": ""
             },
             "require": {
@@ -3116,7 +3191,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.19"
+                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.21"
             },
             "funding": [
                 {
@@ -3132,7 +3207,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-05T17:13:09+00:00"
+            "time": "2023-07-09T15:24:48+00:00"
         },
         {
             "name": "psr/clock",
@@ -3232,21 +3307,21 @@
         },
         {
             "name": "psr/http-client",
-            "version": "1.0.1",
+            "version": "1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-client.git",
-                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"
+                "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
-                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
+                "url": "https://api.github.com/repos/php-fig/http-client/zipball/0955afe48220520692d2d09f7ab7e0f93ffd6a31",
+                "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.0 || ^8.0",
-                "psr/http-message": "^1.0"
+                "psr/http-message": "^1.0 || ^2.0"
             },
             "type": "library",
             "extra": {
@@ -3266,7 +3341,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for HTTP clients",
@@ -3278,27 +3353,27 @@
                 "psr-18"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-client/tree/master"
+                "source": "https://github.com/php-fig/http-client/tree/1.0.2"
             },
-            "time": "2020-06-29T06:28:15+00:00"
+            "time": "2023-04-10T20:12:12+00:00"
         },
         {
             "name": "psr/http-factory",
-            "version": "1.0.1",
+            "version": "1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-factory.git",
-                "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be"
+                "reference": "e616d01114759c4c489f93b099585439f795fe35"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
-                "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
+                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35",
+                "reference": "e616d01114759c4c489f93b099585439f795fe35",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.0.0",
-                "psr/http-message": "^1.0"
+                "psr/http-message": "^1.0 || ^2.0"
             },
             "type": "library",
             "extra": {
@@ -3318,7 +3393,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interfaces for PSR-7 HTTP message factories",
@@ -3333,31 +3408,31 @@
                 "response"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-factory/tree/master"
+                "source": "https://github.com/php-fig/http-factory/tree/1.0.2"
             },
-            "time": "2019-04-30T12:38:16+00:00"
+            "time": "2023-04-10T20:10:41+00:00"
         },
         {
             "name": "psr/http-message",
-            "version": "1.0.1",
+            "version": "1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-message.git",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+                "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
+                "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.1.x-dev"
                 }
             },
             "autoload": {
@@ -3386,9 +3461,9 @@
                 "response"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-message/tree/master"
+                "source": "https://github.com/php-fig/http-message/tree/1.1"
             },
-            "time": "2016-08-06T14:39:51+00:00"
+            "time": "2023-04-04T09:50:52+00:00"
         },
         {
             "name": "psr/link",
@@ -3735,23 +3810,23 @@
         },
         {
             "name": "symfony/console",
-            "version": "v6.2.8",
+            "version": "v6.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "3582d68a64a86ec25240aaa521ec8bc2342b369b"
+                "reference": "aa5d64ad3f63f2e48964fc81ee45cb318a723898"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/3582d68a64a86ec25240aaa521ec8bc2342b369b",
-                "reference": "3582d68a64a86ec25240aaa521ec8bc2342b369b",
+                "url": "https://api.github.com/repos/symfony/console/zipball/aa5d64ad3f63f2e48964fc81ee45cb318a723898",
+                "reference": "aa5d64ad3f63f2e48964fc81ee45cb318a723898",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
-                "symfony/deprecation-contracts": "^2.1|^3",
+                "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-mbstring": "~1.0",
-                "symfony/service-contracts": "^1.1|^2|^3",
+                "symfony/service-contracts": "^2.5|^3",
                 "symfony/string": "^5.4|^6.0"
             },
             "conflict": {
@@ -3773,12 +3848,6 @@
                 "symfony/process": "^5.4|^6.0",
                 "symfony/var-dumper": "^5.4|^6.0"
             },
-            "suggest": {
-                "psr/log": "For using the console logger",
-                "symfony/event-dispatcher": "",
-                "symfony/lock": "",
-                "symfony/process": ""
-            },
             "type": "library",
             "autoload": {
                 "psr-4": {
@@ -3811,7 +3880,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v6.2.8"
+                "source": "https://github.com/symfony/console/tree/v6.3.2"
             },
             "funding": [
                 {
@@ -3827,20 +3896,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-29T21:42:15+00:00"
+            "time": "2023-07-19T20:17:28+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v3.2.1",
+            "version": "v3.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e"
+                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e",
-                "reference": "e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf",
+                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf",
                 "shasum": ""
             },
             "require": {
@@ -3849,7 +3918,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.3-dev"
+                    "dev-main": "3.4-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -3878,7 +3947,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.2.1"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.0"
             },
             "funding": [
                 {
@@ -3894,20 +3963,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-01T10:25:55+00:00"
+            "time": "2023-05-23T14:45:45+00:00"
         },
         {
             "name": "symfony/error-handler",
-            "version": "v6.2.7",
+            "version": "v6.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "61e90f94eb014054000bc902257d2763fac09166"
+                "reference": "85fd65ed295c4078367c784e8a5a6cee30348b7a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/61e90f94eb014054000bc902257d2763fac09166",
-                "reference": "61e90f94eb014054000bc902257d2763fac09166",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/85fd65ed295c4078367c784e8a5a6cee30348b7a",
+                "reference": "85fd65ed295c4078367c784e8a5a6cee30348b7a",
                 "shasum": ""
             },
             "require": {
@@ -3915,8 +3984,11 @@
                 "psr/log": "^1|^2|^3",
                 "symfony/var-dumper": "^5.4|^6.0"
             },
+            "conflict": {
+                "symfony/deprecation-contracts": "<2.5"
+            },
             "require-dev": {
-                "symfony/deprecation-contracts": "^2.1|^3",
+                "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/http-kernel": "^5.4|^6.0",
                 "symfony/serializer": "^5.4|^6.0"
             },
@@ -3949,7 +4021,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.2.7"
+                "source": "https://github.com/symfony/error-handler/tree/v6.3.2"
             },
             "funding": [
                 {
@@ -3965,26 +4037,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-02-14T08:44:56+00:00"
+            "time": "2023-07-16T17:05:46+00:00"
         },
         {
             "name": "symfony/ldap",
-            "version": "v6.2.8",
+            "version": "v6.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/ldap.git",
-                "reference": "d04bcfde5c825c779dd93d4eca306dca80a0c1cb"
+                "reference": "5f1308de5d3a1ca9e5c6ef6bb4b736e5dd6f3508"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/ldap/zipball/d04bcfde5c825c779dd93d4eca306dca80a0c1cb",
-                "reference": "d04bcfde5c825c779dd93d4eca306dca80a0c1cb",
+                "url": "https://api.github.com/repos/symfony/ldap/zipball/5f1308de5d3a1ca9e5c6ef6bb4b736e5dd6f3508",
+                "reference": "5f1308de5d3a1ca9e5c6ef6bb4b736e5dd6f3508",
                 "shasum": ""
             },
             "require": {
                 "ext-ldap": "*",
                 "php": ">=8.1",
-                "symfony/deprecation-contracts": "^2.1|^3",
+                "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/options-resolver": "^5.4|^6.0"
             },
             "conflict": {
@@ -4025,7 +4097,7 @@
                 "ldap"
             ],
             "support": {
-                "source": "https://github.com/symfony/ldap/tree/v6.2.8"
+                "source": "https://github.com/symfony/ldap/tree/v6.3.0"
             },
             "funding": [
                 {
@@ -4041,25 +4113,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-14T15:00:05+00:00"
+            "time": "2023-04-28T15:57:00+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v6.2.7",
+            "version": "v6.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "aa0e85b53bbb2b4951960efd61d295907eacd629"
+                "reference": "a10f19f5198d589d5c33333cffe98dc9820332dd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/aa0e85b53bbb2b4951960efd61d295907eacd629",
-                "reference": "aa0e85b53bbb2b4951960efd61d295907eacd629",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/a10f19f5198d589d5c33333cffe98dc9820332dd",
+                "reference": "a10f19f5198d589d5c33333cffe98dc9820332dd",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
-                "symfony/deprecation-contracts": "^2.1|^3"
+                "symfony/deprecation-contracts": "^2.5|^3"
             },
             "type": "library",
             "autoload": {
@@ -4092,7 +4164,7 @@
                 "options"
             ],
             "support": {
-                "source": "https://github.com/symfony/options-resolver/tree/v6.2.7"
+                "source": "https://github.com/symfony/options-resolver/tree/v6.3.0"
             },
             "funding": [
                 {
@@ -4108,7 +4180,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-02-14T08:44:56+00:00"
+            "time": "2023-05-12T14:21:09+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -4690,16 +4762,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v6.2.8",
+            "version": "v6.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "193e83bbd6617d6b2151c37fff10fa7168ebddef"
+                "reference": "53d1a83225002635bca3482fcbf963001313fb68"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/193e83bbd6617d6b2151c37fff10fa7168ebddef",
-                "reference": "193e83bbd6617d6b2151c37fff10fa7168ebddef",
+                "url": "https://api.github.com/repos/symfony/string/zipball/53d1a83225002635bca3482fcbf963001313fb68",
+                "reference": "53d1a83225002635bca3482fcbf963001313fb68",
                 "shasum": ""
             },
             "require": {
@@ -4710,13 +4782,13 @@
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
-                "symfony/translation-contracts": "<2.0"
+                "symfony/translation-contracts": "<2.5"
             },
             "require-dev": {
                 "symfony/error-handler": "^5.4|^6.0",
                 "symfony/http-client": "^5.4|^6.0",
                 "symfony/intl": "^6.2",
-                "symfony/translation-contracts": "^2.0|^3.0",
+                "symfony/translation-contracts": "^2.5|^3.0",
                 "symfony/var-exporter": "^5.4|^6.0"
             },
             "type": "library",
@@ -4756,7 +4828,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.2.8"
+                "source": "https://github.com/symfony/string/tree/v6.3.2"
             },
             "funding": [
                 {
@@ -4772,20 +4844,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-20T16:06:02+00:00"
+            "time": "2023-07-05T08:41:27+00:00"
         },
         {
             "name": "symfony/uid",
-            "version": "v6.2.7",
+            "version": "v6.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/uid.git",
-                "reference": "d30c72a63897cfa043e1de4d4dd2ffa9ecefcdc0"
+                "reference": "01b0f20b1351d997711c56f1638f7a8c3061e384"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/uid/zipball/d30c72a63897cfa043e1de4d4dd2ffa9ecefcdc0",
-                "reference": "d30c72a63897cfa043e1de4d4dd2ffa9ecefcdc0",
+                "url": "https://api.github.com/repos/symfony/uid/zipball/01b0f20b1351d997711c56f1638f7a8c3061e384",
+                "reference": "01b0f20b1351d997711c56f1638f7a8c3061e384",
                 "shasum": ""
             },
             "require": {
@@ -4830,7 +4902,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/uid/tree/v6.2.7"
+                "source": "https://github.com/symfony/uid/tree/v6.3.0"
             },
             "funding": [
                 {
@@ -4846,42 +4918,38 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-02-14T08:44:56+00:00"
+            "time": "2023-04-08T07:25:02+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v6.2.8",
+            "version": "v6.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "d37ab6787be2db993747b6218fcc96e8e3bb4bd0"
+                "reference": "77fb4f2927f6991a9843633925d111147449ee7a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/d37ab6787be2db993747b6218fcc96e8e3bb4bd0",
-                "reference": "d37ab6787be2db993747b6218fcc96e8e3bb4bd0",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/77fb4f2927f6991a9843633925d111147449ee7a",
+                "reference": "77fb4f2927f6991a9843633925d111147449ee7a",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
-                "phpunit/phpunit": "<5.4.3",
                 "symfony/console": "<5.4"
             },
             "require-dev": {
                 "ext-iconv": "*",
                 "symfony/console": "^5.4|^6.0",
+                "symfony/http-kernel": "^5.4|^6.0",
                 "symfony/process": "^5.4|^6.0",
                 "symfony/uid": "^5.4|^6.0",
                 "twig/twig": "^2.13|^3.0.4"
             },
-            "suggest": {
-                "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",
-                "ext-intl": "To show region name in time zone dump",
-                "symfony/console": "To use the ServerDumpCommand and/or the bin/var-dump-server script"
-            },
             "bin": [
                 "Resources/bin/var-dump-server"
             ],
@@ -4918,7 +4986,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v6.2.8"
+                "source": "https://github.com/symfony/var-dumper/tree/v6.3.3"
             },
             "funding": [
                 {
@@ -4934,20 +5002,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-29T21:42:15+00:00"
+            "time": "2023-07-31T07:08:24+00:00"
         },
         {
             "name": "symfony/web-link",
-            "version": "v6.2.7",
+            "version": "v6.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/web-link.git",
-                "reference": "410aac2034608ac661cdca1968e3c56d4164abc8"
+                "reference": "0989ca617d0703cdca501a245f10e194ff22315b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/web-link/zipball/410aac2034608ac661cdca1968e3c56d4164abc8",
-                "reference": "410aac2034608ac661cdca1968e3c56d4164abc8",
+                "url": "https://api.github.com/repos/symfony/web-link/zipball/0989ca617d0703cdca501a245f10e194ff22315b",
+                "reference": "0989ca617d0703cdca501a245f10e194ff22315b",
                 "shasum": ""
             },
             "require": {
@@ -4963,9 +5031,6 @@
             "require-dev": {
                 "symfony/http-kernel": "^5.4|^6.0"
             },
-            "suggest": {
-                "symfony/http-kernel": ""
-            },
             "type": "library",
             "autoload": {
                 "psr-4": {
@@ -5004,7 +5069,7 @@
                 "push"
             ],
             "support": {
-                "source": "https://github.com/symfony/web-link/tree/v6.2.7"
+                "source": "https://github.com/symfony/web-link/tree/v6.3.0"
             },
             "funding": [
                 {
@@ -5020,24 +5085,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-02-14T08:44:56+00:00"
+            "time": "2023-04-21T14:41:17+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v6.2.7",
+            "version": "v6.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "e8e6a1d59e050525f27a1f530aa9703423cb7f57"
+                "reference": "e23292e8c07c85b971b44c1c4b87af52133e2add"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/e8e6a1d59e050525f27a1f530aa9703423cb7f57",
-                "reference": "e8e6a1d59e050525f27a1f530aa9703423cb7f57",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/e23292e8c07c85b971b44c1c4b87af52133e2add",
+                "reference": "e23292e8c07c85b971b44c1c4b87af52133e2add",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-ctype": "^1.8"
             },
             "conflict": {
@@ -5046,9 +5112,6 @@
             "require-dev": {
                 "symfony/console": "^5.4|^6.0"
             },
-            "suggest": {
-                "symfony/console": "For validating YAML files using the lint command"
-            },
             "bin": [
                 "Resources/bin/yaml-lint"
             ],
@@ -5078,7 +5141,7 @@
             "description": "Loads and dumps YAML files",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/yaml/tree/v6.2.7"
+                "source": "https://github.com/symfony/yaml/tree/v6.3.3"
             },
             "funding": [
                 {
@@ -5094,7 +5157,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-02-16T09:57:23+00:00"
+            "time": "2023-07-31T07:08:24+00:00"
         },
         {
             "name": "tobscure/json-api",
@@ -5283,16 +5346,16 @@
         },
         {
             "name": "voku/portable-utf8",
-            "version": "6.0.12",
+            "version": "6.0.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/voku/portable-utf8.git",
-                "reference": "db0583727bb17666bbd2ba238c85babb973fd165"
+                "reference": "b8ce36bf26593e5c2e81b1850ef0ffb299d2043f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/voku/portable-utf8/zipball/db0583727bb17666bbd2ba238c85babb973fd165",
-                "reference": "db0583727bb17666bbd2ba238c85babb973fd165",
+                "url": "https://api.github.com/repos/voku/portable-utf8/zipball/b8ce36bf26593e5c2e81b1850ef0ffb299d2043f",
+                "reference": "b8ce36bf26593e5c2e81b1850ef0ffb299d2043f",
                 "shasum": ""
             },
             "require": {
@@ -5358,7 +5421,7 @@
             ],
             "support": {
                 "issues": "https://github.com/voku/portable-utf8/issues",
-                "source": "https://github.com/voku/portable-utf8/tree/6.0.12"
+                "source": "https://github.com/voku/portable-utf8/tree/6.0.13"
             },
             "funding": [
                 {
@@ -5382,25 +5445,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-11T12:26:16+00:00"
+            "time": "2023-03-08T08:35:38+00:00"
         },
         {
             "name": "wamania/php-stemmer",
-            "version": "v3.0.0",
+            "version": "v3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/wamania/php-stemmer.git",
-                "reference": "eab7b93465eb3d5da372806c8e1b01da5766aea5"
+                "reference": "8ea32b6fa27d6888587fe860b64a8763525c5a66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/wamania/php-stemmer/zipball/eab7b93465eb3d5da372806c8e1b01da5766aea5",
-                "reference": "eab7b93465eb3d5da372806c8e1b01da5766aea5",
+                "url": "https://api.github.com/repos/wamania/php-stemmer/zipball/8ea32b6fa27d6888587fe860b64a8763525c5a66",
+                "reference": "8ea32b6fa27d6888587fe860b64a8763525c5a66",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.3",
-                "voku/portable-utf8": "^5.4"
+                "voku/portable-utf8": "^5.4|^6.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.0"
@@ -5429,22 +5492,22 @@
             ],
             "support": {
                 "issues": "https://github.com/wamania/php-stemmer/issues",
-                "source": "https://github.com/wamania/php-stemmer/tree/v3.0.0"
+                "source": "https://github.com/wamania/php-stemmer/tree/v3.0.1"
             },
-            "time": "2021-08-17T18:16:34+00:00"
+            "time": "2023-05-11T10:50:27+00:00"
         },
         {
             "name": "web-auth/cose-lib",
-            "version": "4.2.0",
+            "version": "4.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/web-auth/cose-lib.git",
-                "reference": "9e0cc49810b445ed0aa50d122ee82c63882af9a0"
+                "reference": "0ecad86d2d034ea22e2205d81c8cdec13d93a991"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/web-auth/cose-lib/zipball/9e0cc49810b445ed0aa50d122ee82c63882af9a0",
-                "reference": "9e0cc49810b445ed0aa50d122ee82c63882af9a0",
+                "url": "https://api.github.com/repos/web-auth/cose-lib/zipball/0ecad86d2d034ea22e2205d81c8cdec13d93a991",
+                "reference": "0ecad86d2d034ea22e2205d81c8cdec13d93a991",
                 "shasum": ""
             },
             "require": {
@@ -5457,17 +5520,18 @@
             },
             "require-dev": {
                 "ekino/phpstan-banned-code": "^1.0",
-                "infection/infection": "^0.26.12",
+                "infection/infection": "^0.27",
                 "php-parallel-lint/php-parallel-lint": "^1.3",
+                "phpstan/extension-installer": "^1.3",
                 "phpstan/phpstan": "^1.7",
                 "phpstan/phpstan-deprecation-rules": "^1.0",
                 "phpstan/phpstan-phpunit": "^1.1",
                 "phpstan/phpstan-strict-rules": "^1.2",
-                "phpunit/phpunit": "^10.0",
+                "phpunit/phpunit": "^10.1",
                 "qossmic/deptrac-shim": "^1.0",
-                "rector/rector": "^0.15",
+                "rector/rector": "^0.17",
                 "symfony/phpunit-bridge": "^6.1",
-                "symplify/easy-coding-standard": "^11.0"
+                "symplify/easy-coding-standard": "^12.0"
             },
             "suggest": {
                 "ext-bcmath": "For better performance, please install either GMP (recommended) or BCMath extension",
@@ -5501,7 +5565,7 @@
             ],
             "support": {
                 "issues": "https://github.com/web-auth/cose-lib/issues",
-                "source": "https://github.com/web-auth/cose-lib/tree/4.2.0"
+                "source": "https://github.com/web-auth/cose-lib/tree/4.2.3"
             },
             "funding": [
                 {
@@ -5513,7 +5577,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2023-02-28T18:05:22+00:00"
+            "time": "2023-07-26T13:32:03+00:00"
         },
         {
             "name": "web-auth/metadata-service",
@@ -5670,16 +5734,16 @@
         },
         {
             "name": "web-token/jwt-core",
-            "version": "3.1.7",
+            "version": "3.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/web-token/jwt-core.git",
-                "reference": "ec2580e8cdd17410016216fbf1b645052c35f644"
+                "reference": "db58b6ebbe1a7d5869688e989b1cf110c6ab888f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/web-token/jwt-core/zipball/ec2580e8cdd17410016216fbf1b645052c35f644",
-                "reference": "ec2580e8cdd17410016216fbf1b645052c35f644",
+                "url": "https://api.github.com/repos/web-token/jwt-core/zipball/db58b6ebbe1a7d5869688e989b1cf110c6ab888f",
+                "reference": "db58b6ebbe1a7d5869688e989b1cf110c6ab888f",
                 "shasum": ""
             },
             "require": {
@@ -5734,7 +5798,7 @@
                 "symfony"
             ],
             "support": {
-                "source": "https://github.com/web-token/jwt-core/tree/3.1.7"
+                "source": "https://github.com/web-token/jwt-core/tree/3.2.7"
             },
             "funding": [
                 {
@@ -5742,25 +5806,25 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2023-02-02T17:25:26+00:00"
+            "time": "2023-02-02T17:35:17+00:00"
         },
         {
             "name": "web-token/jwt-signature",
-            "version": "3.1.7",
+            "version": "3.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/web-token/jwt-signature.git",
-                "reference": "14b71230d9632564e356b785366ad36880964190"
+                "reference": "156e0b0ef534e53eecf23a32a92ee6d8cb4fdac4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/web-token/jwt-signature/zipball/14b71230d9632564e356b785366ad36880964190",
-                "reference": "14b71230d9632564e356b785366ad36880964190",
+                "url": "https://api.github.com/repos/web-token/jwt-signature/zipball/156e0b0ef534e53eecf23a32a92ee6d8cb4fdac4",
+                "reference": "156e0b0ef534e53eecf23a32a92ee6d8cb4fdac4",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
-                "web-token/jwt-core": "^3.0"
+                "web-token/jwt-core": "^3.2"
             },
             "suggest": {
                 "web-token/jwt-signature-algorithm-ecdsa": "ECDSA Based Signature Algorithms",
@@ -5811,7 +5875,7 @@
                 "symfony"
             ],
             "support": {
-                "source": "https://github.com/web-token/jwt-signature/tree/3.1.7"
+                "source": "https://github.com/web-token/jwt-signature/tree/3.2.7"
             },
             "funding": [
                 {
@@ -5819,26 +5883,26 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2023-02-02T17:25:26+00:00"
+            "time": "2023-05-18T16:20:51+00:00"
         },
         {
             "name": "web-token/jwt-signature-algorithm-ecdsa",
-            "version": "3.1.7",
+            "version": "3.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/web-token/jwt-signature-algorithm-ecdsa.git",
-                "reference": "e09159600f19832cf4a68921e7299e564bc0eaf9"
+                "reference": "34b119d6b5eca53914ad3b96660e5bd7fb5538b9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/web-token/jwt-signature-algorithm-ecdsa/zipball/e09159600f19832cf4a68921e7299e564bc0eaf9",
-                "reference": "e09159600f19832cf4a68921e7299e564bc0eaf9",
+                "url": "https://api.github.com/repos/web-token/jwt-signature-algorithm-ecdsa/zipball/34b119d6b5eca53914ad3b96660e5bd7fb5538b9",
+                "reference": "34b119d6b5eca53914ad3b96660e5bd7fb5538b9",
                 "shasum": ""
             },
             "require": {
                 "ext-openssl": "*",
                 "php": ">=8.1",
-                "web-token/jwt-signature": "^3.0"
+                "web-token/jwt-signature": "^3.2"
             },
             "type": "library",
             "autoload": {
@@ -5881,7 +5945,7 @@
                 "symfony"
             ],
             "support": {
-                "source": "https://github.com/web-token/jwt-signature-algorithm-ecdsa/tree/3.1.7"
+                "source": "https://github.com/web-token/jwt-signature-algorithm-ecdsa/tree/3.2.7"
             },
             "funding": [
                 {
@@ -5889,26 +5953,26 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2022-08-04T21:04:09+00:00"
+            "time": "2023-05-18T16:20:51+00:00"
         },
         {
             "name": "web-token/jwt-signature-algorithm-eddsa",
-            "version": "3.1.7",
+            "version": "3.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/web-token/jwt-signature-algorithm-eddsa.git",
-                "reference": "fda411d70c26de26e74c7ae2d9e5dc78e0012589"
+                "reference": "2ee185c4378671e5b0fd0a47021f3df74246f9b3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/web-token/jwt-signature-algorithm-eddsa/zipball/fda411d70c26de26e74c7ae2d9e5dc78e0012589",
-                "reference": "fda411d70c26de26e74c7ae2d9e5dc78e0012589",
+                "url": "https://api.github.com/repos/web-token/jwt-signature-algorithm-eddsa/zipball/2ee185c4378671e5b0fd0a47021f3df74246f9b3",
+                "reference": "2ee185c4378671e5b0fd0a47021f3df74246f9b3",
                 "shasum": ""
             },
             "require": {
                 "ext-sodium": "*",
                 "php": ">=8.1",
-                "web-token/jwt-signature": "^3.0"
+                "web-token/jwt-signature": "^3.2"
             },
             "type": "library",
             "autoload": {
@@ -5951,7 +6015,7 @@
                 "symfony"
             ],
             "support": {
-                "source": "https://github.com/web-token/jwt-signature-algorithm-eddsa/tree/3.1.7"
+                "source": "https://github.com/web-token/jwt-signature-algorithm-eddsa/tree/3.2.7"
             },
             "funding": [
                 {
@@ -5959,26 +6023,26 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2022-12-23T13:35:01+00:00"
+            "time": "2023-05-18T16:20:51+00:00"
         },
         {
             "name": "web-token/jwt-signature-algorithm-experimental",
-            "version": "3.1.7",
+            "version": "3.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/web-token/jwt-signature-algorithm-experimental.git",
-                "reference": "fa0d25d9b5566e6676b0da280ec0cbc08caad820"
+                "reference": "5839b18e271440121ca950c5bc126c1c2163dcc2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/web-token/jwt-signature-algorithm-experimental/zipball/fa0d25d9b5566e6676b0da280ec0cbc08caad820",
-                "reference": "fa0d25d9b5566e6676b0da280ec0cbc08caad820",
+                "url": "https://api.github.com/repos/web-token/jwt-signature-algorithm-experimental/zipball/5839b18e271440121ca950c5bc126c1c2163dcc2",
+                "reference": "5839b18e271440121ca950c5bc126c1c2163dcc2",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
-                "web-token/jwt-signature-algorithm-hmac": "^3.0",
-                "web-token/jwt-signature-algorithm-rsa": "^3.0"
+                "web-token/jwt-signature-algorithm-hmac": "^3.2",
+                "web-token/jwt-signature-algorithm-rsa": "^3.2"
             },
             "type": "library",
             "autoload": {
@@ -6021,7 +6085,7 @@
                 "symfony"
             ],
             "support": {
-                "source": "https://github.com/web-token/jwt-signature-algorithm-experimental/tree/3.1.7"
+                "source": "https://github.com/web-token/jwt-signature-algorithm-experimental/tree/3.2.7"
             },
             "funding": [
                 {
@@ -6029,25 +6093,25 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2022-08-23T17:48:33+00:00"
+            "time": "2023-05-18T16:20:51+00:00"
         },
         {
             "name": "web-token/jwt-signature-algorithm-hmac",
-            "version": "3.1.7",
+            "version": "3.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/web-token/jwt-signature-algorithm-hmac.git",
-                "reference": "1d5fb68752fbf2fbc63f58892abce10d1be82597"
+                "reference": "16b091bb8d41bd0f0897f04195ce1e99b24ca15b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/web-token/jwt-signature-algorithm-hmac/zipball/1d5fb68752fbf2fbc63f58892abce10d1be82597",
-                "reference": "1d5fb68752fbf2fbc63f58892abce10d1be82597",
+                "url": "https://api.github.com/repos/web-token/jwt-signature-algorithm-hmac/zipball/16b091bb8d41bd0f0897f04195ce1e99b24ca15b",
+                "reference": "16b091bb8d41bd0f0897f04195ce1e99b24ca15b",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
-                "web-token/jwt-signature": "^3.0"
+                "web-token/jwt-signature": "^3.2"
             },
             "type": "library",
             "autoload": {
@@ -6090,7 +6154,7 @@
                 "symfony"
             ],
             "support": {
-                "source": "https://github.com/web-token/jwt-signature-algorithm-hmac/tree/3.1.7"
+                "source": "https://github.com/web-token/jwt-signature-algorithm-hmac/tree/3.2.7"
             },
             "funding": [
                 {
@@ -6098,25 +6162,25 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2022-08-04T21:04:09+00:00"
+            "time": "2023-05-18T16:20:51+00:00"
         },
         {
             "name": "web-token/jwt-signature-algorithm-none",
-            "version": "3.1.7",
+            "version": "3.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/web-token/jwt-signature-algorithm-none.git",
-                "reference": "926a29cf139e865e2e6538eb9250a6b12c1c94dd"
+                "reference": "db776b4b44e0ae1aaf78e58d28a899c4c0fd4c7b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/web-token/jwt-signature-algorithm-none/zipball/926a29cf139e865e2e6538eb9250a6b12c1c94dd",
-                "reference": "926a29cf139e865e2e6538eb9250a6b12c1c94dd",
+                "url": "https://api.github.com/repos/web-token/jwt-signature-algorithm-none/zipball/db776b4b44e0ae1aaf78e58d28a899c4c0fd4c7b",
+                "reference": "db776b4b44e0ae1aaf78e58d28a899c4c0fd4c7b",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
-                "web-token/jwt-signature": "^3.0"
+                "web-token/jwt-signature": "^3.2"
             },
             "type": "library",
             "autoload": {
@@ -6159,7 +6223,7 @@
                 "symfony"
             ],
             "support": {
-                "source": "https://github.com/web-token/jwt-signature-algorithm-none/tree/3.1.7"
+                "source": "https://github.com/web-token/jwt-signature-algorithm-none/tree/3.2.7"
             },
             "funding": [
                 {
@@ -6167,27 +6231,27 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2022-08-04T21:04:09+00:00"
+            "time": "2023-05-18T16:20:51+00:00"
         },
         {
             "name": "web-token/jwt-signature-algorithm-rsa",
-            "version": "3.1.7",
+            "version": "3.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/web-token/jwt-signature-algorithm-rsa.git",
-                "reference": "a6670583b86be33c556b41406aa154aa913dd6e7"
+                "reference": "1015c68cc4e7d7a355e40bba6beeee3fe21b5572"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/web-token/jwt-signature-algorithm-rsa/zipball/a6670583b86be33c556b41406aa154aa913dd6e7",
-                "reference": "a6670583b86be33c556b41406aa154aa913dd6e7",
+                "url": "https://api.github.com/repos/web-token/jwt-signature-algorithm-rsa/zipball/1015c68cc4e7d7a355e40bba6beeee3fe21b5572",
+                "reference": "1015c68cc4e7d7a355e40bba6beeee3fe21b5572",
                 "shasum": ""
             },
             "require": {
                 "brick/math": "^0.9|^0.10|^0.11",
                 "ext-openssl": "*",
                 "php": ">=8.1",
-                "web-token/jwt-signature": "^3.0"
+                "web-token/jwt-signature": "^3.2"
             },
             "suggest": {
                 "ext-bcmath": "GMP or BCMath is highly recommended to improve the library performance",
@@ -6234,7 +6298,7 @@
                 "symfony"
             ],
             "support": {
-                "source": "https://github.com/web-token/jwt-signature-algorithm-rsa/tree/3.1.7"
+                "source": "https://github.com/web-token/jwt-signature-algorithm-rsa/tree/3.2.7"
             },
             "funding": [
                 {
@@ -6242,29 +6306,29 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2023-02-02T13:35:41+00:00"
+            "time": "2023-05-18T16:20:51+00:00"
         },
         {
             "name": "web-token/signature-pack",
-            "version": "3.1.7",
+            "version": "3.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/web-token/signature-pack.git",
-                "reference": "b28eefdb9e05d39726b1002716d0b08a8769b6bf"
+                "reference": "c41146a621cbb3a1b3053be4a7d05912d6d23de7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/web-token/signature-pack/zipball/b28eefdb9e05d39726b1002716d0b08a8769b6bf",
-                "reference": "b28eefdb9e05d39726b1002716d0b08a8769b6bf",
+                "url": "https://api.github.com/repos/web-token/signature-pack/zipball/c41146a621cbb3a1b3053be4a7d05912d6d23de7",
+                "reference": "c41146a621cbb3a1b3053be4a7d05912d6d23de7",
                 "shasum": ""
             },
             "require": {
-                "web-token/jwt-signature-algorithm-ecdsa": "^3.0",
-                "web-token/jwt-signature-algorithm-eddsa": "^3.0",
-                "web-token/jwt-signature-algorithm-experimental": "^3.0",
-                "web-token/jwt-signature-algorithm-hmac": "^3.0",
-                "web-token/jwt-signature-algorithm-none": "^3.0",
-                "web-token/jwt-signature-algorithm-rsa": "^3.0"
+                "web-token/jwt-signature-algorithm-ecdsa": "^3.2",
+                "web-token/jwt-signature-algorithm-eddsa": "^3.2",
+                "web-token/jwt-signature-algorithm-experimental": "^3.2",
+                "web-token/jwt-signature-algorithm-hmac": "^3.2",
+                "web-token/jwt-signature-algorithm-none": "^3.2",
+                "web-token/jwt-signature-algorithm-rsa": "^3.2"
             },
             "type": "symfony-pack",
             "notification-url": "https://packagist.org/downloads/",
@@ -6273,7 +6337,7 @@
             ],
             "description": "A pack with all signature algorithms for the web-token/jwt-signature package",
             "support": {
-                "source": "https://github.com/web-token/signature-pack/tree/3.1.7"
+                "source": "https://github.com/web-token/signature-pack/tree/3.2.7"
             },
             "funding": [
                 {
@@ -6281,7 +6345,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2022-08-04T21:04:09+00:00"
+            "time": "2023-05-18T16:20:51+00:00"
         },
         {
             "name": "webmozart/assert",
@@ -6770,25 +6834,29 @@
         },
         {
             "name": "doctrine/deprecations",
-            "version": "v1.0.0",
+            "version": "v1.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/deprecations.git",
-                "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de"
+                "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de",
-                "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de",
+                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/612a3ee5ab0d5dd97b7cf3874a6efe24325efac3",
+                "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1|^8.0"
+                "php": "^7.1 || ^8.0"
             },
             "require-dev": {
                 "doctrine/coding-standard": "^9",
-                "phpunit/phpunit": "^7.5|^8.5|^9.5",
-                "psr/log": "^1|^2|^3"
+                "phpstan/phpstan": "1.4.10 || 1.10.15",
+                "phpstan/phpstan-phpunit": "^1.0",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "psalm/plugin-phpunit": "0.18.4",
+                "psr/log": "^1 || ^2 || ^3",
+                "vimeo/psalm": "4.30.0 || 5.12.0"
             },
             "suggest": {
                 "psr/log": "Allows logging deprecations via PSR-3 logger implementation"
@@ -6807,9 +6875,9 @@
             "homepage": "https://www.doctrine-project.org/",
             "support": {
                 "issues": "https://github.com/doctrine/deprecations/issues",
-                "source": "https://github.com/doctrine/deprecations/tree/v1.0.0"
+                "source": "https://github.com/doctrine/deprecations/tree/v1.1.1"
             },
-            "time": "2022-05-02T15:47:09+00:00"
+            "time": "2023-06-03T09:27:29+00:00"
         },
         {
             "name": "doctrine/instantiator",
@@ -7167,12 +7235,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/test.git",
-                "reference": "f863e80419c6c40166f6dab8d75f564de5fc0b38"
+                "reference": "8183dbe97e81aac3351411e5e0d464de1825da69"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/test/zipball/f863e80419c6c40166f6dab8d75f564de5fc0b38",
-                "reference": "f863e80419c6c40166f6dab8d75f564de5fc0b38",
+                "url": "https://api.github.com/repos/joomla-framework/test/zipball/8183dbe97e81aac3351411e5e0d464de1825da69",
+                "reference": "8183dbe97e81aac3351411e5e0d464de1825da69",
                 "shasum": ""
             },
             "require": {
@@ -7231,7 +7299,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-03-22T07:52:31+00:00"
+            "time": "2023-06-05T13:47:19+00:00"
         },
         {
             "name": "microsoft/tolerant-php-parser",
@@ -7339,16 +7407,16 @@
         },
         {
             "name": "netresearch/jsonmapper",
-            "version": "v4.1.0",
+            "version": "v4.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cweiske/jsonmapper.git",
-                "reference": "cfa81ea1d35294d64adb9c68aa4cb9e92400e53f"
+                "reference": "f60565f8c0566a31acf06884cdaa591867ecc956"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/cfa81ea1d35294d64adb9c68aa4cb9e92400e53f",
-                "reference": "cfa81ea1d35294d64adb9c68aa4cb9e92400e53f",
+                "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/f60565f8c0566a31acf06884cdaa591867ecc956",
+                "reference": "f60565f8c0566a31acf06884cdaa591867ecc956",
                 "shasum": ""
             },
             "require": {
@@ -7384,22 +7452,22 @@
             "support": {
                 "email": "cweiske@cweiske.de",
                 "issues": "https://github.com/cweiske/jsonmapper/issues",
-                "source": "https://github.com/cweiske/jsonmapper/tree/v4.1.0"
+                "source": "https://github.com/cweiske/jsonmapper/tree/v4.2.0"
             },
-            "time": "2022-12-08T20:46:14+00:00"
+            "time": "2023-04-09T17:37:40+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.15.4",
+            "version": "v4.17.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290"
+                "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6bb5176bc4af8bcb7d926f88718db9b96a2d4290",
-                "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d",
+                "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d",
                 "shasum": ""
             },
             "require": {
@@ -7440,9 +7508,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.4"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1"
             },
-            "time": "2023-03-05T19:49:14+00:00"
+            "time": "2023-08-13T19:53:39+00:00"
         },
         {
             "name": "phan/phan",
@@ -7799,16 +7867,16 @@
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.7.1",
+            "version": "1.7.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "dfc078e8af9c99210337325ff5aa152872c98714"
+                "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/dfc078e8af9c99210337325ff5aa152872c98714",
-                "reference": "dfc078e8af9c99210337325ff5aa152872c98714",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419",
+                "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419",
                 "shasum": ""
             },
             "require": {
@@ -7851,28 +7919,30 @@
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
             "support": {
                 "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.1"
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.3"
             },
-            "time": "2023-03-27T19:02:04+00:00"
+            "time": "2023-08-12T11:01:26+00:00"
         },
         {
             "name": "phpstan/phpdoc-parser",
-            "version": "1.16.1",
+            "version": "1.23.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "e27e92d939e2e3636f0a1f0afaba59692c0bf571"
+                "reference": "846ae76eef31c6d7790fac9bc399ecee45160b26"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/e27e92d939e2e3636f0a1f0afaba59692c0bf571",
-                "reference": "e27e92d939e2e3636f0a1f0afaba59692c0bf571",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/846ae76eef31c6d7790fac9bc399ecee45160b26",
+                "reference": "846ae76eef31c6d7790fac9bc399ecee45160b26",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2 || ^8.0"
             },
             "require-dev": {
+                "doctrine/annotations": "^2.0",
+                "nikic/php-parser": "^4.15",
                 "php-parallel-lint/php-parallel-lint": "^1.2",
                 "phpstan/extension-installer": "^1.0",
                 "phpstan/phpstan": "^1.5",
@@ -7896,22 +7966,22 @@
             "description": "PHPDoc parser with support for nullable, intersection and generic types",
             "support": {
                 "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.16.1"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.23.1"
             },
-            "time": "2023-02-07T18:11:17+00:00"
+            "time": "2023-08-03T16:32:59+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.26",
+            "version": "9.2.27",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1"
+                "reference": "b0a88255cb70d52653d80c890bd7f38740ea50d1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/443bc6912c9bd5b409254a40f4b0f4ced7c80ea1",
-                "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/b0a88255cb70d52653d80c890bd7f38740ea50d1",
+                "reference": "b0a88255cb70d52653d80c890bd7f38740ea50d1",
                 "shasum": ""
             },
             "require": {
@@ -7967,7 +8037,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.26"
+                "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.27"
             },
             "funding": [
                 {
@@ -7975,7 +8046,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-03-06T12:58:08+00:00"
+            "time": "2023-07-26T13:44:30+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -8220,16 +8291,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.6.6",
+            "version": "9.6.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "b65d59a059d3004a040c16a82e07bbdf6cfdd115"
+                "reference": "810500e92855eba8a7a5319ae913be2da6f957b0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b65d59a059d3004a040c16a82e07bbdf6cfdd115",
-                "reference": "b65d59a059d3004a040c16a82e07bbdf6cfdd115",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/810500e92855eba8a7a5319ae913be2da6f957b0",
+                "reference": "810500e92855eba8a7a5319ae913be2da6f957b0",
                 "shasum": ""
             },
             "require": {
@@ -8303,7 +8374,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.6"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.11"
             },
             "funding": [
                 {
@@ -8319,7 +8390,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-27T11:43:46+00:00"
+            "time": "2023-08-19T07:10:56+00:00"
         },
         {
             "name": "psr/cache",
@@ -8786,16 +8857,16 @@
         },
         {
             "name": "sebastian/diff",
-            "version": "4.0.4",
+            "version": "4.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d"
+                "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d",
-                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
+                "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
                 "shasum": ""
             },
             "require": {
@@ -8840,7 +8911,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4"
+                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5"
             },
             "funding": [
                 {
@@ -8848,7 +8919,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:10:38+00:00"
+            "time": "2023-05-07T05:35:17+00:00"
         },
         {
             "name": "sebastian/environment",
@@ -8992,16 +9063,16 @@
         },
         {
             "name": "sebastian/global-state",
-            "version": "5.0.5",
+            "version": "5.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2"
+                "reference": "bde739e7565280bda77be70044ac1047bc007e34"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2",
-                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34",
+                "reference": "bde739e7565280bda77be70044ac1047bc007e34",
                 "shasum": ""
             },
             "require": {
@@ -9044,7 +9115,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5"
+                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6"
             },
             "funding": [
                 {
@@ -9052,7 +9123,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-02-14T08:28:10+00:00"
+            "time": "2023-08-02T09:26:13+00:00"
         },
         {
             "name": "sebastian/lines-of-code",
@@ -9509,24 +9580,25 @@
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v6.2.8",
+            "version": "v6.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "04046f35fd7d72f9646e721fc2ecb8f9c67d3339"
+                "reference": "adb01fe097a4ee930db9258a3cc906b5beb5cf2e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/04046f35fd7d72f9646e721fc2ecb8f9c67d3339",
-                "reference": "04046f35fd7d72f9646e721fc2ecb8f9c67d3339",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/adb01fe097a4ee930db9258a3cc906b5beb5cf2e",
+                "reference": "adb01fe097a4ee930db9258a3cc906b5beb5cf2e",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
-                "symfony/event-dispatcher-contracts": "^2|^3"
+                "symfony/event-dispatcher-contracts": "^2.5|^3"
             },
             "conflict": {
-                "symfony/dependency-injection": "<5.4"
+                "symfony/dependency-injection": "<5.4",
+                "symfony/service-contracts": "<2.5"
             },
             "provide": {
                 "psr/event-dispatcher-implementation": "1.0",
@@ -9539,13 +9611,9 @@
                 "symfony/error-handler": "^5.4|^6.0",
                 "symfony/expression-language": "^5.4|^6.0",
                 "symfony/http-foundation": "^5.4|^6.0",
-                "symfony/service-contracts": "^1.1|^2|^3",
+                "symfony/service-contracts": "^2.5|^3",
                 "symfony/stopwatch": "^5.4|^6.0"
             },
-            "suggest": {
-                "symfony/dependency-injection": "",
-                "symfony/http-kernel": ""
-            },
             "type": "library",
             "autoload": {
                 "psr-4": {
@@ -9572,7 +9640,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.2.8"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v6.3.2"
             },
             "funding": [
                 {
@@ -9588,33 +9656,30 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-20T16:06:02+00:00"
+            "time": "2023-07-06T06:56:43+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v3.2.1",
+            "version": "v3.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "0ad3b6f1e4e2da5690fefe075cd53a238646d8dd"
+                "reference": "a76aed96a42d2b521153fb382d418e30d18b59df"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/0ad3b6f1e4e2da5690fefe075cd53a238646d8dd",
-                "reference": "0ad3b6f1e4e2da5690fefe075cd53a238646d8dd",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/a76aed96a42d2b521153fb382d418e30d18b59df",
+                "reference": "a76aed96a42d2b521153fb382d418e30d18b59df",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
                 "psr/event-dispatcher": "^1"
             },
-            "suggest": {
-                "symfony/event-dispatcher-implementation": ""
-            },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.3-dev"
+                    "dev-main": "3.4-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -9651,7 +9716,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.2.1"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.3.0"
             },
             "funding": [
                 {
@@ -9667,20 +9732,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-01T10:32:47+00:00"
+            "time": "2023-05-23T14:45:45+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v6.2.7",
+            "version": "v6.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "82b6c62b959f642d000456f08c6d219d749215b3"
+                "reference": "edd36776956f2a6fcf577edb5b05eb0e3bdc52ae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/82b6c62b959f642d000456f08c6d219d749215b3",
-                "reference": "82b6c62b959f642d000456f08c6d219d749215b3",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/edd36776956f2a6fcf577edb5b05eb0e3bdc52ae",
+                "reference": "edd36776956f2a6fcf577edb5b05eb0e3bdc52ae",
                 "shasum": ""
             },
             "require": {
@@ -9714,7 +9779,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v6.2.7"
+                "source": "https://github.com/symfony/filesystem/tree/v6.3.1"
             },
             "funding": [
                 {
@@ -9730,20 +9795,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-02-14T08:44:56+00:00"
+            "time": "2023-06-01T08:30:39+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v6.2.7",
+            "version": "v6.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "20808dc6631aecafbe67c186af5dcb370be3a0eb"
+                "reference": "9915db259f67d21eefee768c1abcf1cc61b1fc9e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/20808dc6631aecafbe67c186af5dcb370be3a0eb",
-                "reference": "20808dc6631aecafbe67c186af5dcb370be3a0eb",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/9915db259f67d21eefee768c1abcf1cc61b1fc9e",
+                "reference": "9915db259f67d21eefee768c1abcf1cc61b1fc9e",
                 "shasum": ""
             },
             "require": {
@@ -9778,7 +9843,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v6.2.7"
+                "source": "https://github.com/symfony/finder/tree/v6.3.3"
             },
             "funding": [
                 {
@@ -9794,20 +9859,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-02-16T09:57:23+00:00"
+            "time": "2023-07-31T08:31:44+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v6.2.8",
+            "version": "v6.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "75ed64103df4f6615e15a7fe38b8111099f47416"
+                "reference": "c5ce962db0d9b6e80247ca5eb9af6472bd4d7b5d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/75ed64103df4f6615e15a7fe38b8111099f47416",
-                "reference": "75ed64103df4f6615e15a7fe38b8111099f47416",
+                "url": "https://api.github.com/repos/symfony/process/zipball/c5ce962db0d9b6e80247ca5eb9af6472bd4d7b5d",
+                "reference": "c5ce962db0d9b6e80247ca5eb9af6472bd4d7b5d",
                 "shasum": ""
             },
             "require": {
@@ -9839,7 +9904,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v6.2.8"
+                "source": "https://github.com/symfony/process/tree/v6.3.2"
             },
             "funding": [
                 {
@@ -9855,25 +9920,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-09T16:20:02+00:00"
+            "time": "2023-07-12T16:00:22+00:00"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v6.2.7",
+            "version": "v6.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "f3adc98c1061875dd2edcd45e5b04e63d0e29f8f"
+                "reference": "fc47f1015ec80927ff64ba9094dfe8b9d48fe9f2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/f3adc98c1061875dd2edcd45e5b04e63d0e29f8f",
-                "reference": "f3adc98c1061875dd2edcd45e5b04e63d0e29f8f",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/fc47f1015ec80927ff64ba9094dfe8b9d48fe9f2",
+                "reference": "fc47f1015ec80927ff64ba9094dfe8b9d48fe9f2",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
-                "symfony/service-contracts": "^1|^2|^3"
+                "symfony/service-contracts": "^2.5|^3"
             },
             "type": "library",
             "autoload": {
@@ -9901,7 +9966,7 @@
             "description": "Provides a way to profile code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/stopwatch/tree/v6.2.7"
+                "source": "https://github.com/symfony/stopwatch/tree/v6.3.0"
             },
             "funding": [
                 {
@@ -9917,7 +9982,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-02-14T08:44:56+00:00"
+            "time": "2023-02-16T10:14:28+00:00"
         },
         {
             "name": "theseer/tokenizer",
@@ -10032,14 +10097,7 @@
             "time": "2022-08-31T12:59:22+00:00"
         }
     ],
-    "aliases": [
-        {
-            "package": "voku/portable-utf8",
-            "version": "6.0.12.0",
-            "alias": "5.4.0",
-            "alias_normalized": "5.4.0.0"
-        }
-    ],
+    "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
         "joomla/application": 20,
@@ -10055,6 +10113,7 @@
         "joomla/filesystem": 20,
         "joomla/http": 20,
         "joomla/input": 20,
+        "joomla/language": 20,
         "joomla/oauth1": 20,
         "joomla/oauth2": 20,
         "joomla/registry": 20,
@@ -10063,7 +10122,6 @@
         "joomla/string": 20,
         "joomla/uri": 20,
         "joomla/utilities": 20,
-        "maximebf/debugbar": 20,
         "tobscure/json-api": 20,
         "joomla/mediawiki": 20,
         "joomla/test": 20
diff --git a/cypress.config.dist.js b/cypress.config.dist.js
index a4b957a12be53..c402c269e5db0 100644
--- a/cypress.config.dist.js
+++ b/cypress.config.dist.js
@@ -33,10 +33,13 @@ module.exports = defineConfig({
     password: 'joomla-17082005',
     db_type: 'MySQLi',
     db_host: 'localhost',
+    db_port: '',
     db_name: 'test_joomla',
     db_user: 'root',
     db_password: '',
     db_prefix: 'jos_',
+    smtp_host: 'localhost',
+    smtp_port: '1025',
     cmsPath: '.',
   },
 });
diff --git a/includes/app.php b/includes/app.php
index b50005044fb99..53a25b9c8f0f4 100644
--- a/includes/app.php
+++ b/includes/app.php
@@ -22,8 +22,12 @@
     require_once JPATH_BASE . '/includes/defines.php';
 }
 
+if (!defined('JPATH_PUBLIC')) {
+    define('JPATH_PUBLIC', JPATH_ROOT);
+}
+
 // Check for presence of vendor dependencies not included in the git repository
-if (!file_exists(JPATH_LIBRARIES . '/vendor/autoload.php') || !is_dir(JPATH_ROOT . '/media/vendor')) {
+if (!file_exists(JPATH_LIBRARIES . '/vendor/autoload.php') || !is_dir(JPATH_PUBLIC . '/media/vendor')) {
     echo file_get_contents(JPATH_ROOT . '/templates/system/build_incomplete.html');
 
     exit;
diff --git a/includes/defines.php b/includes/defines.php
index a0d6d924b5516..179cb9b9d89a2 100644
--- a/includes/defines.php
+++ b/includes/defines.php
@@ -16,6 +16,7 @@
 define('JPATH_ROOT', implode(DIRECTORY_SEPARATOR, $parts));
 define('JPATH_SITE', JPATH_ROOT);
 define('JPATH_CONFIGURATION', JPATH_ROOT);
+define('JPATH_PUBLIC', JPATH_ROOT);
 define('JPATH_ADMINISTRATOR', JPATH_ROOT . DIRECTORY_SEPARATOR . 'administrator');
 define('JPATH_LIBRARIES', JPATH_ROOT . DIRECTORY_SEPARATOR . 'libraries');
 define('JPATH_PLUGINS', JPATH_ROOT . DIRECTORY_SEPARATOR . 'plugins');
diff --git a/includes/framework.php b/includes/framework.php
index 69130d7cfe395..47f179c555eb1 100644
--- a/includes/framework.php
+++ b/includes/framework.php
@@ -15,21 +15,27 @@
 // System includes
 require_once JPATH_LIBRARIES . '/bootstrap.php';
 
-// Installation check, and check on removal of the install directory.
+// Installation check, and check on removal of the install directory
 if (
     !file_exists(JPATH_CONFIGURATION . '/configuration.php')
     || (filesize(JPATH_CONFIGURATION . '/configuration.php') < 10)
     || (file_exists(JPATH_INSTALLATION . '/index.php') && (false === (new Version())->isInDevelopmentState()))
 ) {
-    if (file_exists(JPATH_INSTALLATION . '/index.php')) {
-        header('Location: ' . substr($_SERVER['REQUEST_URI'], 0, strpos($_SERVER['REQUEST_URI'], 'index.php')) . 'installation/index.php');
+    if (!file_exists(JPATH_INSTALLATION . '/index.php')) {
+        echo 'No configuration file found and no installation code available. Exiting...';
 
         exit;
-    } else {
-        echo 'No configuration file found and no installation code available. Exiting...';
+    }
+
+    if (JPATH_ROOT === JPATH_PUBLIC) {
+        header('Location: ' . substr($_SERVER['REQUEST_URI'], 0, strpos($_SERVER['REQUEST_URI'], 'index.php')) . 'installation/index.php');
 
         exit;
     }
+
+    echo 'Installation from a public folder is not supported, revert your Server configuration to point at Joomla\'s root folder to continue.';
+
+    exit;
 }
 
 // Pre-Load configuration. Don't remove the Output Buffering due to BOM issues, see JCode 26026
diff --git a/includes/incompatible.html b/includes/incompatible.html
new file mode 100644
index 0000000000000..b293278b74687
--- /dev/null
+++ b/includes/incompatible.html
@@ -0,0 +1,38 @@
+<html>
+<head>
+	<meta charset="utf-8">
+	<meta http-equiv="Content-Language" content="en-GB">
+	<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:radial-gradient(ellipse at center,#f1f1f1 0,#ee2a00 100%);background-attachment:fixed;background-repeat:no-repeat}body{background-color:transparent;color:#555;font:14px/18px sans-serif}body,ol,ul{margin:0;padding:0}ol,ul{list-style:none}a{color:#0084b4;text-decoration:none}a:focus,a:hover{text-decoration:underline}p a{line-height:inherit}.container{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-box-pack:center;-ms-flex-pack:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;height:100vh;justify-content:center;margin:0 auto;overflow:hidden;position:relative;width:100%}.alert-main{background:#fff;border:1px solid rgba(0,0,0,.1);border-radius:5px;-webkit-box-shadow:0 0 10px rgba(0,0,0,.05);box-shadow:0 0 10px rgba(0,0,0,.05);display:block;margin:0 20px;padding:20px 60px;position:relative}svg{bottom:-120px;position:absolute;right:-70px;-webkit-transform:rotate(10deg);transform:rotate(10deg);width:400px;z-index:-1}h1,p{position:relative;text-align:center;text-rendering:optimizeLegibility;z-index:10}h1{font-size:40px;font-weight:200;line-height:1;margin:18px 0 0;text-shadow:0 1px 2px rgba(0,0,0,.2)}label,p{color:#777;font-size:18px;font-weight:300;line-height:25px;margin:10px 0 20px}p a{color:#1c3d5c;font-weight:700}.link-help{background-color:#f5f5f5;border:1px solid rgba(0,0,0,.1);border-radius:.25rem;font-size:1rem;font-weight:400;padding:.4rem .85rem;text-decoration:none}.link-help:hover{background-color:#eee;text-decoration:none}.footer{font-size:11px;margin:8px 20px;text-align:left}.footer ul{margin-bottom:5px}.footer li{display:inline;line-height:20px;margin:0 5px}.footer a,.footer li{color:#1c3d5c}.footer a:hover{color:#59b0ff}.links{display:block;font-size:1rem;margin-left:auto;margin-right:auto;margin-top:4rem;text-align:center}.links li{display:inline-block;margin-top:20px}@media screen and (max-width:480px){.container{height:auto;padding-bottom:20px;padding-top: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":"ساعدني في حل هذا"},"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","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","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","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","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","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":"پارسی","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-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","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"},"id-ID":{"language":"Bahasa Indonesia ID","header":"Maaf, versi PHP anda tidak mendukung.","text1":"Host anda memerlukan PHP versi {{phpversion}} atau yang terbaru untuk menjalankan versi Joomla ini.","help-url-text":"Bantu saya menyelesaikan masalah ini"},"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":"Бұл мәселені шешуге көмектес"},"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 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":"Допоможіть мені це вирішити"},"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">
+	<div class="container-main">
+		<div class="alert-main">
+			<h1 id="headerText">Sorry, your PHP version is not supported</h1><!-- Sets the page header, IMPORTANT DO NOT REMOVE -->
+			<p><span id="descText1">Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla!</span></p><!-- Sets the page description, IMPORTANT DO NOT REMOVE -->
+			<p><a id="linkHelp" class="link-help" target="_blank" rel="noreferrer noopener" href="https://docs.joomla.org/Special:MyLanguage/J4.x:Unsupported_PHP_Version">Help me resolve this</a></p><!-- Sets the help page link, IMPORTANT DO NOT REMOVE -->
+			<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 74.8 74.8" enable-background="new 0 0 74.8 74.8" xml:space="preserve">
+        <g id="brandmark">
+          <path id="j-green" fill="#fff" d="M13.5,37.7L12,36.3c-4.5-4.5-5.8-10.8-4.2-16.5c-4.5-1-7.8-5-7.8-9.8c0-5.5,4.5-10,10-10 c5,0,9.1,3.6,9.9,8.4c5.4-1.3,11.3,0.2,15.5,4.4l0.6,0.6l-7.4,7.4l-0.6-0.6c-2.4-2.4-6.3-2.4-8.7,0c-2.4,2.4-2.4,6.3,0,8.7l1.4,1.4 l7.4,7.4l7.8,7.8l-7.4,7.4l-7.8-7.8L13.5,37.7L13.5,37.7z"/>
+			<path id="j-orange" fill="#fff" d="M21.8,29.5l7.8-7.8l7.4-7.4l1.4-1.4C42.9,8.4,49.2,7,54.8,8.6C55.5,3.8,59.7,0,64.8,0 c5.5,0,10,4.5,10,10c0,5.1-3.8,9.3-8.7,9.9c1.6,5.6,0.2,11.9-4.2,16.3l-0.6,0.6l-7.4-7.4l0.6-0.6c2.4-2.4,2.4-6.3,0-8.7 c-2.4-2.4-6.3-2.4-8.7,0l-1.4,1.4L37,29l-7.8,7.8L21.8,29.5L21.8,29.5z"/>
+			<path id="j-red" fill="#fff" d="M55,66.8c-5.7,1.7-12.1,0.4-16.6-4.1l-0.6-0.6l7.4-7.4l0.6,0.6c2.4,2.4,6.3,2.4,8.7,0 c2.4-2.4,2.4-6.3,0-8.7L53,45.1l-7.4-7.4l-7.8-7.8l7.4-7.4l7.8,7.8l7.4,7.4l1.5,1.5c4.2,4.2,5.7,10.2,4.4,15.7 c4.9,0.7,8.6,4.9,8.6,9.9c0,5.5-4.5,10-10,10C60,74.8,56,71.3,55,66.8L55,66.8z"/>
+			<path id="j-blue" fill="#fff" d="M52.2,46l-7.8,7.8L37,61.2l-1.4,1.4c-4.3,4.3-10.3,5.7-15.7,4.4c-1,4.5-5,7.8-9.8,7.8 c-5.5,0-10-4.5-10-10C0,60,3.3,56.1,7.7,55C6.3,49.5,7.8,43.5,12,39.2l0.6-0.6L20,46l-0.6,0.6c-2.4,2.4-2.4,6.3,0,8.7 c2.4,2.4,6.3,2.4,8.7,0l1.4-1.4l7.4-7.4l7.8-7.8L52.2,46L52.2,46z"/>
+        </g>
+      </svg>
+		</div>
+		<div class="footer">
+			<select id="translatedLanguagesSelect"></select>
+			<ul class="links">
+				<li><a href="https://www.joomla.org/">Joomla</a></li> -
+				<li><a href="https://docs.joomla.org/">Help</a></li>
+			</ul>
+		</div>
+	</div>
+</div>
+<script>var errorLocale=window.errorLocale||null;!function(e,t){"use strict";if(t){var n=e.getElementById("headerText");Object.keys(t).forEach((function(a){var r=e.getElementById("translatedLanguagesSelect"),l=e.createElement("option");l.text=t[a].language,l.value=a,"en-GB"===a&&l.setAttribute("selected","selected"),e.getElementById("translatedLanguagesSelect").addEventListener("change",(function(a){var r,l,u=a.target.value;u&&(n.innerHTML=t[u].header),(r=e.getElementById("linkHelp"))&&(r.innerText=t[u]["help-url-text"]),(l=e.querySelector('[http-equiv="Content-Language"]'))&&l.setAttribute("content",u)})),r.appendChild(l)})),Object.keys(t).forEach((function(a){if(navigator.language===a){e.querySelector('#translatedLanguagesSelect option[value="en-GB"]').removeAttribute("selected"),e.querySelector('#translatedLanguagesSelect option[value="'+a+'"]').setAttribute("selected","selected"),n.innerHTML=t[a].header;var r,l=e.getElementById("linkHelp");l&&(l.innerText=t[a]["help-url-text"]),(r=e.querySelector('[http-equiv="Content-Language"]'))&&r.setAttribute("content",a)}}))}}(document,errorLocale);</script><!-- Sets the script, IMPORTANT DO NOT REMOVE -->
+</body>
+</html>
diff --git a/index.php b/index.php
index e3f4ef5d4530a..85daa024dce05 100644
--- a/index.php
+++ b/index.php
@@ -17,7 +17,7 @@
         str_replace(
             '{{phpversion}}',
             JOOMLA_MINIMUM_PHP,
-            file_get_contents(dirname(__FILE__) . '/templates/system/incompatible.html')
+            file_get_contents(dirname(__FILE__) . '/includes/incompatible.html')
         )
     );
 }
diff --git a/installation/configuration.php-dist b/installation/configuration.php-dist
index 7526d28687205..477c13c15c192 100644
--- a/installation/configuration.php-dist
+++ b/installation/configuration.php-dist
@@ -58,7 +58,7 @@ class JConfig
 	public $helpurl = 'https://help.joomla.org/proxy?keyref=Help{major}{minor}:{keyref}&lang={langcode}';
 	public $tmp_path = '/tmp';                // This path needs to be writable by Joomla!
 	public $log_path = '/administrator/logs'; // This path needs to be writable by Joomla!
-	public $live_site = '';                   // Optional, full URL to Joomla install.
+	public $live_site = '';                   // Optional, full URL to Joomla install eg https://www.example.com
 	public $force_ssl = 0;                    // Force areas of the site to be SSL ONLY.  0 = None, 1 = Administrator, 2 = Both Site and Administrator
 
 	/* Locale Settings */
diff --git a/installation/includes/app.php b/installation/includes/app.php
index e0c017994148e..5378d6ae1fa16 100644
--- a/installation/includes/app.php
+++ b/installation/includes/app.php
@@ -60,5 +60,10 @@
     ->alias(\Joomla\Session\Session::class, 'session.web.installation')
     ->alias(\Joomla\Session\SessionInterface::class, 'session.web.installation');
 
+/** @var \Joomla\CMS\Installation\Application\InstallationApplication $app */
+$app = $container->get(\Joomla\CMS\Installation\Application\InstallationApplication::class);
+
+\Joomla\CMS\Factory::$application = $app;
+
 // Instantiate and execute the application
-$container->get(\Joomla\CMS\Installation\Application\InstallationApplication::class)->execute();
+$app->execute();
diff --git a/installation/includes/cli.php b/installation/includes/cli.php
index 3cae791c469c1..e305bf09bd4be 100644
--- a/installation/includes/cli.php
+++ b/installation/includes/cli.php
@@ -59,5 +59,10 @@
     ->alias(\Joomla\Session\Session::class, 'session.cli')
     ->alias(\Joomla\Session\SessionInterface::class, 'session.cli');
 
+/** @var \Joomla\CMS\Installation\Application\CliInstallationApplication $app */
+$app = $container->get(\Joomla\CMS\Installation\Application\CliInstallationApplication::class);
+
+\Joomla\CMS\Factory::$application = $app;
+
 // Instantiate and execute the application
-$container->get(\Joomla\CMS\Installation\Application\CliInstallationApplication::class)->execute();
+$app->execute();
diff --git a/installation/includes/defines.php b/installation/includes/defines.php
index 9ae71a84dc859..1f94b7a344471 100644
--- a/installation/includes/defines.php
+++ b/installation/includes/defines.php
@@ -17,6 +17,7 @@
 // Defines
 define('JPATH_ROOT', implode(DIRECTORY_SEPARATOR, $parts));
 define('JPATH_SITE', JPATH_ROOT);
+define('JPATH_PUBLIC', JPATH_ROOT);
 define('JPATH_CONFIGURATION', JPATH_ROOT);
 define('JPATH_ADMINISTRATOR', JPATH_ROOT . DIRECTORY_SEPARATOR . 'administrator');
 define('JPATH_LIBRARIES', JPATH_ROOT . DIRECTORY_SEPARATOR . 'libraries');
diff --git a/installation/language/af-ZA/joomla.ini b/installation/language/af-ZA/joomla.ini
index 3e7d1ad96482d..0e7540e8f6947 100644
--- a/installation/language/af-ZA/joomla.ini
+++ b/installation/language/af-ZA/joomla.ini
@@ -81,6 +81,7 @@ INSTL_DATABASE_NAME_MSG_POSTGRES="Die databasisnaam is ongeldig. Dit moet begin
 INSTL_DATABASE_NO_SCHEMA="Geen databasisskema bestaan ​​vir hierdie tipe databasis nie."
 INSTL_DATABASE_PASSWORD_DESC="Óf 'n wagwoord wat jy geskep het, óf 'n wagwoord wat jou gasheer verskaf."
 INSTL_DATABASE_PREFIX_DESC="Voer 'n tabelvoorvoegsel in of gebruik die lukraak gegenereerde een."
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="As jy 'n bestaande databasis met tabelle met dieselfde voorvoegsel gebruik, sal Joomla daardie bestaande tabelle hernoem deur die voorvoegsel \"bak_\" by te voeg."
 INSTL_DATABASE_PREFIX_MSG="Die tabelvoorvoegsel moet met 'n letter begin, optioneel gevolg deur alfanumeriese karakters en 'n onderstreep karakter"
 INSTL_DATABASE_RESPONSE_ERROR="Die installasieproses het misluk."
 INSTL_DATABASE_TYPE_DESC="Kies die tipe databasis."
diff --git a/installation/language/af-ZA/langmetadata.xml b/installation/language/af-ZA/langmetadata.xml
index 593f4f18d8507..9fc30270d9567 100644
--- a/installation/language/af-ZA/langmetadata.xml
+++ b/installation/language/af-ZA/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Afrikaans (Suid-Afrika)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Afrikaans Translation Team</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/ar-AA/langmetadata.xml b/installation/language/ar-AA/langmetadata.xml
index f352079493b32..5053fff3e436e 100644
--- a/installation/language/ar-AA/langmetadata.xml
+++ b/installation/language/ar-AA/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Arabic (اللغة العربية)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Dr. Ashraf Damra</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/bg-BG/joomla.ini b/installation/language/bg-BG/joomla.ini
index a27f12ed17d3e..4c567cdc4b89f 100644
--- a/installation/language/bg-BG/joomla.ini
+++ b/installation/language/bg-BG/joomla.ini
@@ -81,10 +81,11 @@ 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_MSG="Префиксът на таблицата трябва да започва с буква и по избор да бъде последван от буквено -цифрови знаци и долна черта"
 INSTL_DATABASE_RESPONSE_ERROR="Инсталирането е неуспешно."
 INSTL_DATABASE_TYPE_DESC="Изберете тип база данни."
-INSTL_DATABASE_USER_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\">wiki</a> за повече информация."
 
 INSTL_CONNECT_DB="Настройка на връзка с база данни"
diff --git a/installation/language/bg-BG/langmetadata.xml b/installation/language/bg-BG/langmetadata.xml
index 93161dbce1769..0893e80933312 100644
--- a/installation/language/bg-BG/langmetadata.xml
+++ b/installation/language/bg-BG/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Bulgarian (bg-BG)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Joomla! Bulgaria</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/ca-ES/langmetadata.xml b/installation/language/ca-ES/langmetadata.xml
index a94a1f402e3a5..181621f4a36a3 100644
--- a/installation/language/ca-ES/langmetadata.xml
+++ b/installation/language/ca-ES/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Catalan (ca-ES)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Catalan Translation Team</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/cs-CZ/joomla.ini b/installation/language/cs-CZ/joomla.ini
index 037d0be0e9675..598ed0c1071e1 100644
--- a/installation/language/cs-CZ/joomla.ini
+++ b/installation/language/cs-CZ/joomla.ini
@@ -81,6 +81,7 @@ INSTL_DATABASE_NAME_MSG_POSTGRES="Název databáze je neplatný. Musí začínat
 INSTL_DATABASE_NO_SCHEMA="Pro tento typ databáze neexistuje žádné schéma databáze."
 INSTL_DATABASE_PASSWORD_DESC="Vytvořené heslo, nebo heslo zadané hostitelem."
 INSTL_DATABASE_PREFIX_DESC="Zadejte prefix tabulky nebo použijte náhodně vygenerovaný prefix tabulky."
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Pokud používáte existující databázi s tabulkami se stejnou předponou, Joomla tyto existující tabulky přejmenuje přidáním předpony \"bak_\"."
 INSTL_DATABASE_PREFIX_MSG="Předpona tabulky musí začínat písmenem, volitelně následují alfanumerické znaky a podtržítko"
 INSTL_DATABASE_RESPONSE_ERROR="Instalační proces selhal."
 INSTL_DATABASE_TYPE_DESC="Vyberte typ databáze."
diff --git a/installation/language/cs-CZ/langmetadata.xml b/installation/language/cs-CZ/langmetadata.xml
index 23a9331ca1d38..b31013aee06d5 100644
--- a/installation/language/cs-CZ/langmetadata.xml
+++ b/installation/language/cs-CZ/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Czech (Čeština)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Czech Translation Team</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/cy-GB/joomla.ini b/installation/language/cy-GB/joomla.ini
index 3b25938913190..ea2e4fd4a62d4 100644
--- a/installation/language/cy-GB/joomla.ini
+++ b/installation/language/cy-GB/joomla.ini
@@ -81,6 +81,7 @@ INSTL_DATABASE_NAME_MSG_POSTGRES="Mae enw'r gronfa ddata yn annilys. Rhaid iddo
 INSTL_DATABASE_NO_SCHEMA="Nid oes sgema cronfa ddata yn bodoli ar gyfer y math hwn o gronfa ddata."
 INSTL_DATABASE_PASSWORD_DESC="Rhowch gyfrinair a grëwyd gennych chi neu un a roddwyd gan eich lletywr."
 INSTL_DATABASE_PREFIX_DESC="Rhowch ragddodiad tabl neu defnyddiwch yr un a grëwyd ar hap."
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Os ydych yn defnyddio cronfa ddata sy'n bodoli'n barod gyda thablau gyda'r un rhagddodiad bydd Joomla yn ailenwi y tablau hynny drwy ychwanegu'r rhagddodiad \"bak_\"."
 INSTL_DATABASE_PREFIX_MSG="Rhaid i’r rhagddodiad tabl dechrau efo llythyren yna, yn ddewisol, ei ddilyn gan nodau alffaniwmerig a/neu tanlinell."
 INSTL_DATABASE_RESPONSE_ERROR="Mae'r broses gosod wedi methu."
 INSTL_DATABASE_TYPE_DESC="Dewiswch math y gronfa ddata."
diff --git a/installation/language/cy-GB/langmetadata.xml b/installation/language/cy-GB/langmetadata.xml
index 7ab08d8d3bb2e..73e119f1cc0d7 100644
--- a/installation/language/cy-GB/langmetadata.xml
+++ b/installation/language/cy-GB/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Welsh (United Kingdom)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Joomla! Project - Welsh Translation Team</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/da-DK/joomla.ini b/installation/language/da-DK/joomla.ini
index 286ea1b6d32c1..014e7e61a8f95 100644
--- a/installation/language/da-DK/joomla.ini
+++ b/installation/language/da-DK/joomla.ini
@@ -81,11 +81,12 @@ INSTL_DATABASE_NAME_MSG_POSTGRES="Databasenavnet er ugyldigt. Det skal starte me
 INSTL_DATABASE_NO_SCHEMA="Intet databaseskema eksisterer for denne databasetype"
 INSTL_DATABASE_PASSWORD_DESC="Enten en adgangskode som du har oprettet eller en adgangskode leveret af din udbyder."
 INSTL_DATABASE_PREFIX_DESC="Angiv et tabelpræfiks eller anvend det tilfældigt genererede."
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Hvis du anvende en eksisterende database med tabeller med det samme præfiks, så vil Joomla omdøbe disse eksisterende tabeller ved at tilføje præfikset \"bak_\"."
 INSTL_DATABASE_PREFIX_MSG="Tabelpræfikset skal starte med et bogstav, og valgfrit efterfulgt af alfanumeriske karakterer og en underscore"
 INSTL_DATABASE_RESPONSE_ERROR="Installationsprocessen fejlede."
 INSTL_DATABASE_TYPE_DESC="Vælg databasetypen."
 INSTL_DATABASE_USER_DESC="Enten et brugernavn som du oprettede eller et brugernavn leveret af din udbyder."
-INSTL_DATABASE_VALIDATION_ERROR="Kontroller dine database detaljer, databasetype, databasenavn eller hostname. Hvis du har installeret MySQL 8, så læs venligst denne <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\">wiki</a> for mere information."
+INSTL_DATABASE_VALIDATION_ERROR="Kontroller dine database legitimationsoplysninger, databasetype, databasenavn eller hostname. Hvis du har installeret MySQL 8, så læs venligst denne <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\">wiki</a> for mere information."
 
 INSTL_CONNECT_DB="Opsæt databaseforbindelse"
 INSTL_INSTALL_JOOMLA="Installer Joomla"
diff --git a/installation/language/da-DK/langmetadata.xml b/installation/language/da-DK/langmetadata.xml
index 639ccaa70f593..7dad2a7427491 100644
--- a/installation/language/da-DK/langmetadata.xml
+++ b/installation/language/da-DK/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Danish (Danmark)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Danish Translation Team (Transl.: Ronny Buelund)</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-AT/joomla.cli.ini b/installation/language/de-AT/joomla.cli.ini
new file mode 100644
index 0000000000000..fe40a3b71fce6
--- /dev/null
+++ b/installation/language/de-AT/joomla.cli.ini
@@ -0,0 +1,41 @@
+; Author J!German (Joomla! German Translation Team)
+; (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
+; (C) Translation 2008 - 2023 J!German <https://www.jgerman.de>
+; License GNU General Public License version 2 or later; see LICENSE.txt
+; Note : All ini files need to be saved as UTF-8
+
+INSTL_ADMIN_EMAIL_DESC="Die E-Mail-Adresse des Super Benutzers der Website eingeben"
+INSTL_ADMIN_EMAIL_DESC_SHORT="E-Mail-Adresse des Super Benutzers der Website"
+INSTL_ADMIN_PASSWORD_DESC="Das Passwort für den Super Benutzer festlegen"
+INSTL_ADMIN_PASSWORD_DESC_SHORT="Passwort für den Super Benutzer"
+INSTL_ADMIN_USERNAME_DESC="Den Benutzernamen für den Super Benutzer festlegen"
+INSTL_ADMIN_USERNAME_DESC_SHORT="Benutzernamen für den Super Benutzer"
+INSTL_ADMIN_USER_DESC="Den echten Namen des Super Benutzers eingeben"
+INSTL_ADMIN_USER_DESC_SHORT="Echter Name des Super Benutzers"
+INSTL_DATABASE_COULD_NOT_CONNECT="%s"
+INSTL_DATABASE_ENCRYPTION_CA_LABEL="Pfad zur CA-Datei, anhand derer die Verschlüsselung überprüft werden soll"
+INSTL_DATABASE_ENCRYPTION_CA_LABEL_SHORT="Pfad zur CA-Datei, anhand derer die Verschlüsselung überprüft werden soll"
+INSTL_DATABASE_ENCRYPTION_CERT_LABEL="Pfad zum SSL-Zertifikat für die Datenbankverbindung. Erfordert, dass die Verschlüsselungsoption auf 2 eingestellt ist."
+INSTL_DATABASE_ENCRYPTION_CERT_LABEL_SHORT="Pfad zum SSL-Zertifikat für die Datenbankverbindung. Erfordert, dass die Verschlüsselungsoption auf 2 eingestellt ist."
+INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL="Unterstützte Cipher Suite (optional)"
+INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL_SHORT="Unterstützte Cipher Suite (optional)"
+INSTL_DATABASE_ENCRYPTION_KEY_LABEL="SSL-Schlüssel für die Datenbankverbindung. Erfordert, dass die Verschlüsselungsoption auf 2 gesetzt wird"
+INSTL_DATABASE_ENCRYPTION_KEY_LABEL_SHORT="SSL-Schlüssel für die Datenbankverbindung. Erfordert, dass die Verschlüsselungsoption auf 2 gesetzt wird"
+INSTL_DATABASE_ENCRYPTION_MODE_LABEL="Verschlüsselung für die Datenbankverbindung. Werte: 0=Keine, 1=Einweg, 2=Zwei-Weg"
+INSTL_DATABASE_ENCRYPTION_MODE_LABEL_SHORT="Verschlüsselung für die Datenbankverbindung. Werte: 0=Keine, 1=Einweg, 2=Zwei-Weg"
+INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="Das SSL-Zertifikat für die Datenbankverbindung überprüfen. Werte: 0=Nein, 1=Ja. Erfordert, dass die Verschlüsselungsoption auf 1 oder 2 gesetzt wird."
+INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL_SHORT="Das SSL-Zertifikat für die Datenbankverbindung überprüfen. Werte: 0=Nein, 1=Ja. Erfordert, dass die Verschlüsselungsoption auf 1 oder 2 gesetzt wird."
+INSTL_DATABASE_HOST_DESC="Datenbankserver"
+INSTL_DATABASE_HOST_DESC_SHORT="Datenbankserver"
+INSTL_DATABASE_NAME_DESC="Datenbankname"
+INSTL_DATABASE_NAME_DESC_SHORT="Datenbankname"
+INSTL_DATABASE_PASSWORD_DESC="Datenbank Passwort"
+INSTL_DATABASE_PASSWORD_DESC_SHORT="Datenbank Paswort"
+INSTL_DATABASE_PREFIX_DESC="Tabellenpräfix (wie generiert oder selbst vergeben)"
+INSTL_DATABASE_PREFIX_DESC_SHORT="Tabellenpräfix (wie generiert oder selbst vergeben)"
+INSTL_DATABASE_TYPE_DESC="Datenbanktyp. Unterstützt: mysql, mysqli, pgsql"
+INSTL_DATABASE_TYPE_DESC_SHORT="Datenbanktyp. Unterstützt von Joomla: mysql (=MySQL (PDO)), mysqli (=MySQLi), pgsql (=PostgreSQL (PDO))"
+INSTL_DATABASE_USER_DESC="Datenbank Benutzer"
+INSTL_DATABASE_USER_DESC_SHORT="Datenbank Benutzer"
+INSTL_SITE_NAME_DESC="Geben Sie den Namen Ihrer Joomla-Website ein"
+INSTL_SITE_NAME_DESC_SHORT="Name der Website"
diff --git a/installation/language/de-AT/joomla.ini b/installation/language/de-AT/joomla.ini
index 678ed412036ee..00da0117a1feb 100644
--- a/installation/language/de-AT/joomla.ini
+++ b/installation/language/de-AT/joomla.ini
@@ -91,6 +91,7 @@ INSTL_DATABASE_NAME_MSG_POSTGRES="Der Datenbankname ist ungültig. Der Datenbank
 INSTL_DATABASE_NO_SCHEMA="Für diesen Datenbanktyp existiert kein Datenbankschema."
 INSTL_DATABASE_PASSWORD_DESC="Datenbank Passwort"
 INSTL_DATABASE_PREFIX_DESC="Tabellenpräfix (wie generiert oder selbst vergeben)"
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Wenn in der Datenbank bereits Tabellen mit dem gleichen Präfix existieren, wird Joomla diese bestehenden Tabellen umbenennen, indem das Präfix 'bak_' vorrangestellt wird."
 INSTL_DATABASE_PREFIX_MSG="Der Tabellenpräfix muss mit einem Buchstaben beginnen. Danach können optional alphanumerische Zeichen folgen. Er muss mit einem Unterstrich enden."
 INSTL_DATABASE_RESPONSE_ERROR="Der Installationsvorgang ist fehlgeschlagen."
 INSTL_DATABASE_TYPE_DESC="Datenbanktyp auswählen"
diff --git a/installation/language/de-AT/langmetadata.xml b/installation/language/de-AT/langmetadata.xml
index 3d02b83605ccc..9390b89831df3 100644
--- a/installation/language/de-AT/langmetadata.xml
+++ b/installation/language/de-AT/langmetadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>German (Austria)</name>
-	<version>4.2.8</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.3</version>
+	<creationDate>2023-07</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>
 	<files>
+		<filename>joomla.cli.ini</filename>
 		<filename>joomla.ini</filename>
 	</files>
 	<metadata>
diff --git a/installation/language/de-CH/joomla.cli.ini b/installation/language/de-CH/joomla.cli.ini
new file mode 100644
index 0000000000000..fe40a3b71fce6
--- /dev/null
+++ b/installation/language/de-CH/joomla.cli.ini
@@ -0,0 +1,41 @@
+; Author J!German (Joomla! German Translation Team)
+; (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
+; (C) Translation 2008 - 2023 J!German <https://www.jgerman.de>
+; License GNU General Public License version 2 or later; see LICENSE.txt
+; Note : All ini files need to be saved as UTF-8
+
+INSTL_ADMIN_EMAIL_DESC="Die E-Mail-Adresse des Super Benutzers der Website eingeben"
+INSTL_ADMIN_EMAIL_DESC_SHORT="E-Mail-Adresse des Super Benutzers der Website"
+INSTL_ADMIN_PASSWORD_DESC="Das Passwort für den Super Benutzer festlegen"
+INSTL_ADMIN_PASSWORD_DESC_SHORT="Passwort für den Super Benutzer"
+INSTL_ADMIN_USERNAME_DESC="Den Benutzernamen für den Super Benutzer festlegen"
+INSTL_ADMIN_USERNAME_DESC_SHORT="Benutzernamen für den Super Benutzer"
+INSTL_ADMIN_USER_DESC="Den echten Namen des Super Benutzers eingeben"
+INSTL_ADMIN_USER_DESC_SHORT="Echter Name des Super Benutzers"
+INSTL_DATABASE_COULD_NOT_CONNECT="%s"
+INSTL_DATABASE_ENCRYPTION_CA_LABEL="Pfad zur CA-Datei, anhand derer die Verschlüsselung überprüft werden soll"
+INSTL_DATABASE_ENCRYPTION_CA_LABEL_SHORT="Pfad zur CA-Datei, anhand derer die Verschlüsselung überprüft werden soll"
+INSTL_DATABASE_ENCRYPTION_CERT_LABEL="Pfad zum SSL-Zertifikat für die Datenbankverbindung. Erfordert, dass die Verschlüsselungsoption auf 2 eingestellt ist."
+INSTL_DATABASE_ENCRYPTION_CERT_LABEL_SHORT="Pfad zum SSL-Zertifikat für die Datenbankverbindung. Erfordert, dass die Verschlüsselungsoption auf 2 eingestellt ist."
+INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL="Unterstützte Cipher Suite (optional)"
+INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL_SHORT="Unterstützte Cipher Suite (optional)"
+INSTL_DATABASE_ENCRYPTION_KEY_LABEL="SSL-Schlüssel für die Datenbankverbindung. Erfordert, dass die Verschlüsselungsoption auf 2 gesetzt wird"
+INSTL_DATABASE_ENCRYPTION_KEY_LABEL_SHORT="SSL-Schlüssel für die Datenbankverbindung. Erfordert, dass die Verschlüsselungsoption auf 2 gesetzt wird"
+INSTL_DATABASE_ENCRYPTION_MODE_LABEL="Verschlüsselung für die Datenbankverbindung. Werte: 0=Keine, 1=Einweg, 2=Zwei-Weg"
+INSTL_DATABASE_ENCRYPTION_MODE_LABEL_SHORT="Verschlüsselung für die Datenbankverbindung. Werte: 0=Keine, 1=Einweg, 2=Zwei-Weg"
+INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="Das SSL-Zertifikat für die Datenbankverbindung überprüfen. Werte: 0=Nein, 1=Ja. Erfordert, dass die Verschlüsselungsoption auf 1 oder 2 gesetzt wird."
+INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL_SHORT="Das SSL-Zertifikat für die Datenbankverbindung überprüfen. Werte: 0=Nein, 1=Ja. Erfordert, dass die Verschlüsselungsoption auf 1 oder 2 gesetzt wird."
+INSTL_DATABASE_HOST_DESC="Datenbankserver"
+INSTL_DATABASE_HOST_DESC_SHORT="Datenbankserver"
+INSTL_DATABASE_NAME_DESC="Datenbankname"
+INSTL_DATABASE_NAME_DESC_SHORT="Datenbankname"
+INSTL_DATABASE_PASSWORD_DESC="Datenbank Passwort"
+INSTL_DATABASE_PASSWORD_DESC_SHORT="Datenbank Paswort"
+INSTL_DATABASE_PREFIX_DESC="Tabellenpräfix (wie generiert oder selbst vergeben)"
+INSTL_DATABASE_PREFIX_DESC_SHORT="Tabellenpräfix (wie generiert oder selbst vergeben)"
+INSTL_DATABASE_TYPE_DESC="Datenbanktyp. Unterstützt: mysql, mysqli, pgsql"
+INSTL_DATABASE_TYPE_DESC_SHORT="Datenbanktyp. Unterstützt von Joomla: mysql (=MySQL (PDO)), mysqli (=MySQLi), pgsql (=PostgreSQL (PDO))"
+INSTL_DATABASE_USER_DESC="Datenbank Benutzer"
+INSTL_DATABASE_USER_DESC_SHORT="Datenbank Benutzer"
+INSTL_SITE_NAME_DESC="Geben Sie den Namen Ihrer Joomla-Website ein"
+INSTL_SITE_NAME_DESC_SHORT="Name der Website"
diff --git a/installation/language/de-CH/joomla.ini b/installation/language/de-CH/joomla.ini
index f404b9f95313f..9344cef25a9c9 100644
--- a/installation/language/de-CH/joomla.ini
+++ b/installation/language/de-CH/joomla.ini
@@ -91,6 +91,7 @@ INSTL_DATABASE_NAME_MSG_POSTGRES="Der Datenbankname ist ungültig. Der Datenbank
 INSTL_DATABASE_NO_SCHEMA="Für diesen Datenbanktyp existiert kein Datenbankschema."
 INSTL_DATABASE_PASSWORD_DESC="Datenbank Passwort"
 INSTL_DATABASE_PREFIX_DESC="Tabellenpräfix (wie generiert oder selbst vergeben)"
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Wenn in der Datenbank bereits Tabellen mit dem gleichen Präfix existieren, wird Joomla diese bestehenden Tabellen umbenennen, indem das Präfix 'bak_' vorrangestellt wird."
 INSTL_DATABASE_PREFIX_MSG="Der Tabellenpräfix muss mit einem Buchstaben beginnen. Danach können optional alphanumerische Zeichen folgen. Er muss mit einem Unterstrich enden."
 INSTL_DATABASE_RESPONSE_ERROR="Der Installationsvorgang ist fehlgeschlagen."
 INSTL_DATABASE_TYPE_DESC="Datenbanktyp auswählen"
diff --git a/installation/language/de-CH/langmetadata.xml b/installation/language/de-CH/langmetadata.xml
index 336ace7cffec5..cfad61dc8f75b 100644
--- a/installation/language/de-CH/langmetadata.xml
+++ b/installation/language/de-CH/langmetadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>German (Switzerland)</name>
-	<version>4.2.8</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.3</version>
+	<creationDate>2023-07</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>
 	<files>
+		<filename>joomla.cli.ini</filename>
 		<filename>joomla.ini</filename>
 	</files>
 	<metadata>
diff --git a/installation/language/de-DE/joomla.cli.ini b/installation/language/de-DE/joomla.cli.ini
new file mode 100644
index 0000000000000..fe40a3b71fce6
--- /dev/null
+++ b/installation/language/de-DE/joomla.cli.ini
@@ -0,0 +1,41 @@
+; Author J!German (Joomla! German Translation Team)
+; (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
+; (C) Translation 2008 - 2023 J!German <https://www.jgerman.de>
+; License GNU General Public License version 2 or later; see LICENSE.txt
+; Note : All ini files need to be saved as UTF-8
+
+INSTL_ADMIN_EMAIL_DESC="Die E-Mail-Adresse des Super Benutzers der Website eingeben"
+INSTL_ADMIN_EMAIL_DESC_SHORT="E-Mail-Adresse des Super Benutzers der Website"
+INSTL_ADMIN_PASSWORD_DESC="Das Passwort für den Super Benutzer festlegen"
+INSTL_ADMIN_PASSWORD_DESC_SHORT="Passwort für den Super Benutzer"
+INSTL_ADMIN_USERNAME_DESC="Den Benutzernamen für den Super Benutzer festlegen"
+INSTL_ADMIN_USERNAME_DESC_SHORT="Benutzernamen für den Super Benutzer"
+INSTL_ADMIN_USER_DESC="Den echten Namen des Super Benutzers eingeben"
+INSTL_ADMIN_USER_DESC_SHORT="Echter Name des Super Benutzers"
+INSTL_DATABASE_COULD_NOT_CONNECT="%s"
+INSTL_DATABASE_ENCRYPTION_CA_LABEL="Pfad zur CA-Datei, anhand derer die Verschlüsselung überprüft werden soll"
+INSTL_DATABASE_ENCRYPTION_CA_LABEL_SHORT="Pfad zur CA-Datei, anhand derer die Verschlüsselung überprüft werden soll"
+INSTL_DATABASE_ENCRYPTION_CERT_LABEL="Pfad zum SSL-Zertifikat für die Datenbankverbindung. Erfordert, dass die Verschlüsselungsoption auf 2 eingestellt ist."
+INSTL_DATABASE_ENCRYPTION_CERT_LABEL_SHORT="Pfad zum SSL-Zertifikat für die Datenbankverbindung. Erfordert, dass die Verschlüsselungsoption auf 2 eingestellt ist."
+INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL="Unterstützte Cipher Suite (optional)"
+INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL_SHORT="Unterstützte Cipher Suite (optional)"
+INSTL_DATABASE_ENCRYPTION_KEY_LABEL="SSL-Schlüssel für die Datenbankverbindung. Erfordert, dass die Verschlüsselungsoption auf 2 gesetzt wird"
+INSTL_DATABASE_ENCRYPTION_KEY_LABEL_SHORT="SSL-Schlüssel für die Datenbankverbindung. Erfordert, dass die Verschlüsselungsoption auf 2 gesetzt wird"
+INSTL_DATABASE_ENCRYPTION_MODE_LABEL="Verschlüsselung für die Datenbankverbindung. Werte: 0=Keine, 1=Einweg, 2=Zwei-Weg"
+INSTL_DATABASE_ENCRYPTION_MODE_LABEL_SHORT="Verschlüsselung für die Datenbankverbindung. Werte: 0=Keine, 1=Einweg, 2=Zwei-Weg"
+INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="Das SSL-Zertifikat für die Datenbankverbindung überprüfen. Werte: 0=Nein, 1=Ja. Erfordert, dass die Verschlüsselungsoption auf 1 oder 2 gesetzt wird."
+INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL_SHORT="Das SSL-Zertifikat für die Datenbankverbindung überprüfen. Werte: 0=Nein, 1=Ja. Erfordert, dass die Verschlüsselungsoption auf 1 oder 2 gesetzt wird."
+INSTL_DATABASE_HOST_DESC="Datenbankserver"
+INSTL_DATABASE_HOST_DESC_SHORT="Datenbankserver"
+INSTL_DATABASE_NAME_DESC="Datenbankname"
+INSTL_DATABASE_NAME_DESC_SHORT="Datenbankname"
+INSTL_DATABASE_PASSWORD_DESC="Datenbank Passwort"
+INSTL_DATABASE_PASSWORD_DESC_SHORT="Datenbank Paswort"
+INSTL_DATABASE_PREFIX_DESC="Tabellenpräfix (wie generiert oder selbst vergeben)"
+INSTL_DATABASE_PREFIX_DESC_SHORT="Tabellenpräfix (wie generiert oder selbst vergeben)"
+INSTL_DATABASE_TYPE_DESC="Datenbanktyp. Unterstützt: mysql, mysqli, pgsql"
+INSTL_DATABASE_TYPE_DESC_SHORT="Datenbanktyp. Unterstützt von Joomla: mysql (=MySQL (PDO)), mysqli (=MySQLi), pgsql (=PostgreSQL (PDO))"
+INSTL_DATABASE_USER_DESC="Datenbank Benutzer"
+INSTL_DATABASE_USER_DESC_SHORT="Datenbank Benutzer"
+INSTL_SITE_NAME_DESC="Geben Sie den Namen Ihrer Joomla-Website ein"
+INSTL_SITE_NAME_DESC_SHORT="Name der Website"
diff --git a/installation/language/de-DE/joomla.ini b/installation/language/de-DE/joomla.ini
index 32de6bcc8212f..fd991f5319162 100644
--- a/installation/language/de-DE/joomla.ini
+++ b/installation/language/de-DE/joomla.ini
@@ -91,6 +91,7 @@ INSTL_DATABASE_NAME_MSG_POSTGRES="Der Datenbankname ist ungültig. Der Datenbank
 INSTL_DATABASE_NO_SCHEMA="Für diesen Datenbanktyp existiert kein Datenbankschema."
 INSTL_DATABASE_PASSWORD_DESC="Datenbank Passwort"
 INSTL_DATABASE_PREFIX_DESC="Tabellenpräfix (wie generiert oder selbst vergeben)"
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Wenn in der Datenbank bereits Tabellen mit dem gleichen Präfix existieren, wird Joomla diese bestehenden Tabellen umbenennen, indem das Präfix 'bak_' vorrangestellt wird."
 INSTL_DATABASE_PREFIX_MSG="Der Tabellenpräfix muss mit einem Buchstaben beginnen. Danach können optional alphanumerische Zeichen folgen. Er muss mit einem Unterstrich enden."
 INSTL_DATABASE_RESPONSE_ERROR="Der Installationsvorgang ist fehlgeschlagen."
 INSTL_DATABASE_TYPE_DESC="Datenbanktyp auswählen"
diff --git a/installation/language/de-DE/langmetadata.xml b/installation/language/de-DE/langmetadata.xml
index 18453782fb536..8e743d9ef457f 100644
--- a/installation/language/de-DE/langmetadata.xml
+++ b/installation/language/de-DE/langmetadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>German (Germany)</name>
-	<version>4.2.8</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.3</version>
+	<creationDate>2023-07</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>
 	<files>
+		<filename>joomla.cli.ini</filename>
 		<filename>joomla.ini</filename>
 	</files>
 	<metadata>
diff --git a/installation/language/de-LI/joomla.cli.ini b/installation/language/de-LI/joomla.cli.ini
new file mode 100644
index 0000000000000..fe40a3b71fce6
--- /dev/null
+++ b/installation/language/de-LI/joomla.cli.ini
@@ -0,0 +1,41 @@
+; Author J!German (Joomla! German Translation Team)
+; (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
+; (C) Translation 2008 - 2023 J!German <https://www.jgerman.de>
+; License GNU General Public License version 2 or later; see LICENSE.txt
+; Note : All ini files need to be saved as UTF-8
+
+INSTL_ADMIN_EMAIL_DESC="Die E-Mail-Adresse des Super Benutzers der Website eingeben"
+INSTL_ADMIN_EMAIL_DESC_SHORT="E-Mail-Adresse des Super Benutzers der Website"
+INSTL_ADMIN_PASSWORD_DESC="Das Passwort für den Super Benutzer festlegen"
+INSTL_ADMIN_PASSWORD_DESC_SHORT="Passwort für den Super Benutzer"
+INSTL_ADMIN_USERNAME_DESC="Den Benutzernamen für den Super Benutzer festlegen"
+INSTL_ADMIN_USERNAME_DESC_SHORT="Benutzernamen für den Super Benutzer"
+INSTL_ADMIN_USER_DESC="Den echten Namen des Super Benutzers eingeben"
+INSTL_ADMIN_USER_DESC_SHORT="Echter Name des Super Benutzers"
+INSTL_DATABASE_COULD_NOT_CONNECT="%s"
+INSTL_DATABASE_ENCRYPTION_CA_LABEL="Pfad zur CA-Datei, anhand derer die Verschlüsselung überprüft werden soll"
+INSTL_DATABASE_ENCRYPTION_CA_LABEL_SHORT="Pfad zur CA-Datei, anhand derer die Verschlüsselung überprüft werden soll"
+INSTL_DATABASE_ENCRYPTION_CERT_LABEL="Pfad zum SSL-Zertifikat für die Datenbankverbindung. Erfordert, dass die Verschlüsselungsoption auf 2 eingestellt ist."
+INSTL_DATABASE_ENCRYPTION_CERT_LABEL_SHORT="Pfad zum SSL-Zertifikat für die Datenbankverbindung. Erfordert, dass die Verschlüsselungsoption auf 2 eingestellt ist."
+INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL="Unterstützte Cipher Suite (optional)"
+INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL_SHORT="Unterstützte Cipher Suite (optional)"
+INSTL_DATABASE_ENCRYPTION_KEY_LABEL="SSL-Schlüssel für die Datenbankverbindung. Erfordert, dass die Verschlüsselungsoption auf 2 gesetzt wird"
+INSTL_DATABASE_ENCRYPTION_KEY_LABEL_SHORT="SSL-Schlüssel für die Datenbankverbindung. Erfordert, dass die Verschlüsselungsoption auf 2 gesetzt wird"
+INSTL_DATABASE_ENCRYPTION_MODE_LABEL="Verschlüsselung für die Datenbankverbindung. Werte: 0=Keine, 1=Einweg, 2=Zwei-Weg"
+INSTL_DATABASE_ENCRYPTION_MODE_LABEL_SHORT="Verschlüsselung für die Datenbankverbindung. Werte: 0=Keine, 1=Einweg, 2=Zwei-Weg"
+INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="Das SSL-Zertifikat für die Datenbankverbindung überprüfen. Werte: 0=Nein, 1=Ja. Erfordert, dass die Verschlüsselungsoption auf 1 oder 2 gesetzt wird."
+INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL_SHORT="Das SSL-Zertifikat für die Datenbankverbindung überprüfen. Werte: 0=Nein, 1=Ja. Erfordert, dass die Verschlüsselungsoption auf 1 oder 2 gesetzt wird."
+INSTL_DATABASE_HOST_DESC="Datenbankserver"
+INSTL_DATABASE_HOST_DESC_SHORT="Datenbankserver"
+INSTL_DATABASE_NAME_DESC="Datenbankname"
+INSTL_DATABASE_NAME_DESC_SHORT="Datenbankname"
+INSTL_DATABASE_PASSWORD_DESC="Datenbank Passwort"
+INSTL_DATABASE_PASSWORD_DESC_SHORT="Datenbank Paswort"
+INSTL_DATABASE_PREFIX_DESC="Tabellenpräfix (wie generiert oder selbst vergeben)"
+INSTL_DATABASE_PREFIX_DESC_SHORT="Tabellenpräfix (wie generiert oder selbst vergeben)"
+INSTL_DATABASE_TYPE_DESC="Datenbanktyp. Unterstützt: mysql, mysqli, pgsql"
+INSTL_DATABASE_TYPE_DESC_SHORT="Datenbanktyp. Unterstützt von Joomla: mysql (=MySQL (PDO)), mysqli (=MySQLi), pgsql (=PostgreSQL (PDO))"
+INSTL_DATABASE_USER_DESC="Datenbank Benutzer"
+INSTL_DATABASE_USER_DESC_SHORT="Datenbank Benutzer"
+INSTL_SITE_NAME_DESC="Geben Sie den Namen Ihrer Joomla-Website ein"
+INSTL_SITE_NAME_DESC_SHORT="Name der Website"
diff --git a/installation/language/de-LI/joomla.ini b/installation/language/de-LI/joomla.ini
index 76ba7f376e407..0a08be15b0d14 100644
--- a/installation/language/de-LI/joomla.ini
+++ b/installation/language/de-LI/joomla.ini
@@ -91,6 +91,7 @@ INSTL_DATABASE_NAME_MSG_POSTGRES="Der Datenbankname ist ungültig. Der Datenbank
 INSTL_DATABASE_NO_SCHEMA="Für diesen Datenbanktyp existiert kein Datenbankschema."
 INSTL_DATABASE_PASSWORD_DESC="Datenbank Passwort"
 INSTL_DATABASE_PREFIX_DESC="Tabellenpräfix (wie generiert oder selbst vergeben)"
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Wenn in der Datenbank bereits Tabellen mit dem gleichen Präfix existieren, wird Joomla diese bestehenden Tabellen umbenennen, indem das Präfix 'bak_' vorrangestellt wird."
 INSTL_DATABASE_PREFIX_MSG="Der Tabellenpräfix muss mit einem Buchstaben beginnen. Danach können optional alphanumerische Zeichen folgen. Er muss mit einem Unterstrich enden."
 INSTL_DATABASE_RESPONSE_ERROR="Der Installationsvorgang ist fehlgeschlagen."
 INSTL_DATABASE_TYPE_DESC="Datenbanktyp auswählen"
@@ -155,7 +156,7 @@ INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Die Sprache mit dem Sprach-Tag „%s
 INSTL_DEFAULTLANGUAGE_SET_DEFAULT_LANGUAGE="Standardsprache konfigurieren"
 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 (Lichtenstein)" ; 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="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
 
 ; Database Model
 INSTL_DATABASE_COULD_NOT_CONNECT="Es konnte keine Verbindung zur Datenbank hergestellt werden. Der Konnektor gab folgenden Fehler zurück: %s."
diff --git a/installation/language/de-LI/langmetadata.xml b/installation/language/de-LI/langmetadata.xml
index 7f8ce917864e3..ee432fd7a7fd1 100644
--- a/installation/language/de-LI/langmetadata.xml
+++ b/installation/language/de-LI/langmetadata.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
-	<name>German (Lichtenstein)</name>
-	<version>4.2.8</version>
-	<creationDate>2023-02</creationDate>
+	<name>German (Liechtenstein)</name>
+	<version>4.3.3</version>
+	<creationDate>2023-07</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>
 	<files>
+		<filename>joomla.cli.ini</filename>
 		<filename>joomla.ini</filename>
 	</files>
 	<metadata>
-		<name>German (Lichtenstein)</name>
-		<nativeName>Deutsch (Lichtenstein)</nativeName>
+		<name>German (Liechtenstein)</name>
+		<nativeName>Deutsch (Liechtenstein)</nativeName>
 		<tag>de-LI</tag>
 		<rtl>0</rtl>
 	</metadata>
diff --git a/installation/language/de-LU/joomla.cli.ini b/installation/language/de-LU/joomla.cli.ini
new file mode 100644
index 0000000000000..fe40a3b71fce6
--- /dev/null
+++ b/installation/language/de-LU/joomla.cli.ini
@@ -0,0 +1,41 @@
+; Author J!German (Joomla! German Translation Team)
+; (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
+; (C) Translation 2008 - 2023 J!German <https://www.jgerman.de>
+; License GNU General Public License version 2 or later; see LICENSE.txt
+; Note : All ini files need to be saved as UTF-8
+
+INSTL_ADMIN_EMAIL_DESC="Die E-Mail-Adresse des Super Benutzers der Website eingeben"
+INSTL_ADMIN_EMAIL_DESC_SHORT="E-Mail-Adresse des Super Benutzers der Website"
+INSTL_ADMIN_PASSWORD_DESC="Das Passwort für den Super Benutzer festlegen"
+INSTL_ADMIN_PASSWORD_DESC_SHORT="Passwort für den Super Benutzer"
+INSTL_ADMIN_USERNAME_DESC="Den Benutzernamen für den Super Benutzer festlegen"
+INSTL_ADMIN_USERNAME_DESC_SHORT="Benutzernamen für den Super Benutzer"
+INSTL_ADMIN_USER_DESC="Den echten Namen des Super Benutzers eingeben"
+INSTL_ADMIN_USER_DESC_SHORT="Echter Name des Super Benutzers"
+INSTL_DATABASE_COULD_NOT_CONNECT="%s"
+INSTL_DATABASE_ENCRYPTION_CA_LABEL="Pfad zur CA-Datei, anhand derer die Verschlüsselung überprüft werden soll"
+INSTL_DATABASE_ENCRYPTION_CA_LABEL_SHORT="Pfad zur CA-Datei, anhand derer die Verschlüsselung überprüft werden soll"
+INSTL_DATABASE_ENCRYPTION_CERT_LABEL="Pfad zum SSL-Zertifikat für die Datenbankverbindung. Erfordert, dass die Verschlüsselungsoption auf 2 eingestellt ist."
+INSTL_DATABASE_ENCRYPTION_CERT_LABEL_SHORT="Pfad zum SSL-Zertifikat für die Datenbankverbindung. Erfordert, dass die Verschlüsselungsoption auf 2 eingestellt ist."
+INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL="Unterstützte Cipher Suite (optional)"
+INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL_SHORT="Unterstützte Cipher Suite (optional)"
+INSTL_DATABASE_ENCRYPTION_KEY_LABEL="SSL-Schlüssel für die Datenbankverbindung. Erfordert, dass die Verschlüsselungsoption auf 2 gesetzt wird"
+INSTL_DATABASE_ENCRYPTION_KEY_LABEL_SHORT="SSL-Schlüssel für die Datenbankverbindung. Erfordert, dass die Verschlüsselungsoption auf 2 gesetzt wird"
+INSTL_DATABASE_ENCRYPTION_MODE_LABEL="Verschlüsselung für die Datenbankverbindung. Werte: 0=Keine, 1=Einweg, 2=Zwei-Weg"
+INSTL_DATABASE_ENCRYPTION_MODE_LABEL_SHORT="Verschlüsselung für die Datenbankverbindung. Werte: 0=Keine, 1=Einweg, 2=Zwei-Weg"
+INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="Das SSL-Zertifikat für die Datenbankverbindung überprüfen. Werte: 0=Nein, 1=Ja. Erfordert, dass die Verschlüsselungsoption auf 1 oder 2 gesetzt wird."
+INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL_SHORT="Das SSL-Zertifikat für die Datenbankverbindung überprüfen. Werte: 0=Nein, 1=Ja. Erfordert, dass die Verschlüsselungsoption auf 1 oder 2 gesetzt wird."
+INSTL_DATABASE_HOST_DESC="Datenbankserver"
+INSTL_DATABASE_HOST_DESC_SHORT="Datenbankserver"
+INSTL_DATABASE_NAME_DESC="Datenbankname"
+INSTL_DATABASE_NAME_DESC_SHORT="Datenbankname"
+INSTL_DATABASE_PASSWORD_DESC="Datenbank Passwort"
+INSTL_DATABASE_PASSWORD_DESC_SHORT="Datenbank Paswort"
+INSTL_DATABASE_PREFIX_DESC="Tabellenpräfix (wie generiert oder selbst vergeben)"
+INSTL_DATABASE_PREFIX_DESC_SHORT="Tabellenpräfix (wie generiert oder selbst vergeben)"
+INSTL_DATABASE_TYPE_DESC="Datenbanktyp. Unterstützt: mysql, mysqli, pgsql"
+INSTL_DATABASE_TYPE_DESC_SHORT="Datenbanktyp. Unterstützt von Joomla: mysql (=MySQL (PDO)), mysqli (=MySQLi), pgsql (=PostgreSQL (PDO))"
+INSTL_DATABASE_USER_DESC="Datenbank Benutzer"
+INSTL_DATABASE_USER_DESC_SHORT="Datenbank Benutzer"
+INSTL_SITE_NAME_DESC="Geben Sie den Namen Ihrer Joomla-Website ein"
+INSTL_SITE_NAME_DESC_SHORT="Name der Website"
diff --git a/installation/language/de-LU/joomla.ini b/installation/language/de-LU/joomla.ini
index e6f49e085f5c9..c35c1fa54c629 100644
--- a/installation/language/de-LU/joomla.ini
+++ b/installation/language/de-LU/joomla.ini
@@ -91,6 +91,7 @@ INSTL_DATABASE_NAME_MSG_POSTGRES="Der Datenbankname ist ungültig. Der Datenbank
 INSTL_DATABASE_NO_SCHEMA="Für diesen Datenbanktyp existiert kein Datenbankschema."
 INSTL_DATABASE_PASSWORD_DESC="Datenbank Passwort"
 INSTL_DATABASE_PREFIX_DESC="Tabellenpräfix (wie generiert oder selbst vergeben)"
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Wenn in der Datenbank bereits Tabellen mit dem gleichen Präfix existieren, wird Joomla diese bestehenden Tabellen umbenennen, indem das Präfix 'bak_' vorrangestellt wird."
 INSTL_DATABASE_PREFIX_MSG="Der Tabellenpräfix muss mit einem Buchstaben beginnen. Danach können optional alphanumerische Zeichen folgen. Er muss mit einem Unterstrich enden."
 INSTL_DATABASE_RESPONSE_ERROR="Der Installationsvorgang ist fehlgeschlagen."
 INSTL_DATABASE_TYPE_DESC="Datenbanktyp auswählen"
diff --git a/installation/language/de-LU/langmetadata.xml b/installation/language/de-LU/langmetadata.xml
index fa63ebc7454c9..db0a5e53f0d3e 100644
--- a/installation/language/de-LU/langmetadata.xml
+++ b/installation/language/de-LU/langmetadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>German (Luxembourg)</name>
-	<version>4.2.8</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.3</version>
+	<creationDate>2023-07</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>
 	<files>
+		<filename>joomla.cli.ini</filename>
 		<filename>joomla.ini</filename>
 	</files>
 	<metadata>
diff --git a/installation/language/el-GR/joomla.ini b/installation/language/el-GR/joomla.ini
index 54e6fd805043c..fe889b1944ded 100644
--- a/installation/language/el-GR/joomla.ini
+++ b/installation/language/el-GR/joomla.ini
@@ -46,7 +46,7 @@ INSTL_PARSE_INI_FILE_AVAILABLE="Υποστήριξη INI Parser "
 INSTL_PRECHECK_ACTUAL="Πραγματικό"
 INSTL_PRECHECK_DESC="Εάν κάποιο από αυτά τα στοιχεία δεν υποστηρίζεται, παρακαλούμε προχωρήστε στις απαιτούμενες ενέργειες, για τη διόρθωσή τους.<br>Δεν μπορείτε να εγκαταστήσετε το Joomla μέχρι οι ρυθμίσεις σας ικανοποιούν αυτές τις απαιτήσεις."
 INSTL_PRECHECK_DIRECTIVE="Οδηγία"
-INSTL_PRECHECK_RECOMMENDED="Προτεινόμενο"
+INSTL_PRECHECK_RECOMMENDED="Προτείνεται"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Αυτές οι ρυθμίσεις συνιστώνται για την PHP ώστε να διασφαλιστεί η πλήρης συμβατότητα με το Joomla."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Προτεινόμενες ρυθμίσεις:"
 INSTL_PRECHECK_TITLE="Έλεγχος συμβατότητας πριν την εγκατάσταση"
@@ -81,6 +81,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_MSG="Το πρόθεμα του πίνακα πρέπει να ξεκινά με γράμμα, ακολουθούμενο προαιρετικά από αλφαριθμητικούς χαρακτήρες και κάτω παύλα"
 INSTL_DATABASE_RESPONSE_ERROR="Η διαδικασία της εγκατάστασης απέτυχε."
 INSTL_DATABASE_TYPE_DESC="Επιλέξτε τύπο βάσης δεδομένων."
@@ -201,7 +202,7 @@ 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_NO_RESULTS_MATCH="Δεν βρέθηκαν αποτελέσματα"
 JGLOBAL_SELECT_SOME_OPTIONS="Κάντε κάποιες επιλογές"
 JHIDEPASSWORD="Απόκρυψη κωδικού"
 JINVALID_TOKEN="Το πιο πρόσφατο αίτημα απορρίφθηκε επειδή περιείχε μη έγκυρο διακριτικό ασφαλείας. Ανανεώστε τη σελίδα και ξαναπροσπαθήστε."
@@ -275,7 +276,7 @@ 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/el-GR/langmetadata.xml b/installation/language/el-GR/langmetadata.xml
index c6103e5ae3190..a5179f10f1dc2 100644
--- a/installation/language/el-GR/langmetadata.xml
+++ b/installation/language/el-GR/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Greek (el-GR)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Ομάδα Μετάφρασης: joomla. gr</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/en-AU/joomla.ini b/installation/language/en-AU/joomla.ini
index 56137d7482474..00420b62447af 100644
--- a/installation/language/en-AU/joomla.ini
+++ b/installation/language/en-AU/joomla.ini
@@ -81,6 +81,7 @@ INSTL_DATABASE_NAME_MSG_POSTGRES="The database name is invalid. It must start wi
 INSTL_DATABASE_NO_SCHEMA="No database schema exists for this database type."
 INSTL_DATABASE_PASSWORD_DESC="Either a password you created or a password provided by your host."
 INSTL_DATABASE_PREFIX_DESC="Enter a table prefix or use the randomly generated one."
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="If you are using an existing database with tables with the same prefix, Joomla will rename those existing tables by adding the prefix \"bak_\"."
 INSTL_DATABASE_PREFIX_MSG="The table prefix must start with a letter, optionally be followed by alphanumeric characters and by an underscore"
 INSTL_DATABASE_RESPONSE_ERROR="The installation process failed."
 INSTL_DATABASE_TYPE_DESC="Select the database type."
diff --git a/installation/language/en-AU/langmetadata.xml b/installation/language/en-AU/langmetadata.xml
index ff6331860e402..bf2913d31ee84 100644
--- a/installation/language/en-AU/langmetadata.xml
+++ b/installation/language/en-AU/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>English (Australia)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Joomla! Project</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/en-CA/joomla.ini b/installation/language/en-CA/joomla.ini
index fe6df14c21133..a489e11ebd4ef 100644
--- a/installation/language/en-CA/joomla.ini
+++ b/installation/language/en-CA/joomla.ini
@@ -81,6 +81,7 @@ INSTL_DATABASE_NAME_MSG_POSTGRES="The database name is invalid. It must start wi
 INSTL_DATABASE_NO_SCHEMA="No database schema exists for this database type."
 INSTL_DATABASE_PASSWORD_DESC="Either a password you created or a password provided by your host."
 INSTL_DATABASE_PREFIX_DESC="Enter a table prefix or use the randomly generated one."
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="If you are using an existing database with tables with the same prefix, Joomla will rename those existing tables by adding the prefix \"bak_\"."
 INSTL_DATABASE_PREFIX_MSG="The table prefix must start with a letter, optionally be followed by alphanumeric characters and by an underscore"
 INSTL_DATABASE_RESPONSE_ERROR="The installation process failed."
 INSTL_DATABASE_TYPE_DESC="Select the database type."
diff --git a/installation/language/en-CA/langmetadata.xml b/installation/language/en-CA/langmetadata.xml
index 9d5d240b52b19..0b64d6e1d158b 100644
--- a/installation/language/en-CA/langmetadata.xml
+++ b/installation/language/en-CA/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>English (Canada)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Joomla! Project</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/en-GB/joomla.ini b/installation/language/en-GB/joomla.ini
index 4944288ea9002..07a4509346294 100644
--- a/installation/language/en-GB/joomla.ini
+++ b/installation/language/en-GB/joomla.ini
@@ -228,7 +228,7 @@ JGLOBAL_SELECT_NO_RESULTS_MATCH="No results match"
 JGLOBAL_SELECT_SOME_OPTIONS="Select some options"
 JHIDEPASSWORD="Hide Password"
 JINVALID_TOKEN="The most recent request was denied because it had an invalid security token. Please refresh the page and try again."
-JINVALID_TOKEN_NOTICE="The security token did not match. The request was aborted to prevent any security breach. Please try again."
+JINVALID_TOKEN_NOTICE="The security token did not match. The request was cancelled to prevent any security breach. Please try again."
 JNEXT="Next"
 JNO="No"
 JNOTICE="Notice"
@@ -251,7 +251,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="Aborting language installation: %s"
+JLIB_INSTALLER_ABORT="Stopping 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."
@@ -292,7 +292,7 @@ NOTICE="Notice"
 WARNING="Warning"
 
 ; Javascript ajax error messages
-JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="A connection abort has occurred while fetching the JSON data."
+JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="A connection error has occurred 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>"
@@ -310,3 +310,9 @@ JLIB_FORM_CONTAINS_INVALID_FIELDS="The form cannot be submitted as it's missing
 JLIB_FORM_FIELD_INVALID_VALUE="This value is not valid."
 JLIB_FORM_FIELD_REQUIRED_CHECK="One of the options must be selected."
 JLIB_FORM_FIELD_REQUIRED_VALUE="Please fill in this field."
+
+; Installation progress screen
+INSTL="Installation"
+INSTL_FINISHED="Installation finished"
+INSTL_IN_PROGRESS="Installation running"
+INSTL_PROGRESS="Installation Progress"
diff --git a/installation/language/en-GB/langmetadata.xml b/installation/language/en-GB/langmetadata.xml
index 2cae94f70591a..db834524c0020 100644
--- a/installation/language/en-GB/langmetadata.xml
+++ b/installation/language/en-GB/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="installation">
 	<name>English (United Kingdom)</name>
 	<version>5.0.0</version>
-	<creationDate>2022-08</creationDate>
+	<creationDate>2023-08</creationDate>
 	<author>Joomla! Project</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/en-NZ/joomla.ini b/installation/language/en-NZ/joomla.ini
index 5fc4a19b72c71..6b340c7e6e336 100644
--- a/installation/language/en-NZ/joomla.ini
+++ b/installation/language/en-NZ/joomla.ini
@@ -81,6 +81,7 @@ INSTL_DATABASE_NAME_MSG_POSTGRES="The database name is invalid. It must start wi
 INSTL_DATABASE_NO_SCHEMA="No database schema exists for this database type."
 INSTL_DATABASE_PASSWORD_DESC="Either a password you created or a password provided by your host."
 INSTL_DATABASE_PREFIX_DESC="Enter a table prefix or use the randomly generated one."
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="If you are using an existing database with tables with the same prefix, Joomla will rename those existing tables by adding the prefix \"bak_\"."
 INSTL_DATABASE_PREFIX_MSG="The table prefix must start with a letter, optionally be followed by alphanumeric characters and by an underscore"
 INSTL_DATABASE_RESPONSE_ERROR="The installation process failed."
 INSTL_DATABASE_TYPE_DESC="Select the database type."
diff --git a/installation/language/en-NZ/langmetadata.xml b/installation/language/en-NZ/langmetadata.xml
index 8488a53520fdc..6d0b799b1e1c5 100644
--- a/installation/language/en-NZ/langmetadata.xml
+++ b/installation/language/en-NZ/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>English (New Zealand)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Joomla! Project</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/en-US/joomla.ini b/installation/language/en-US/joomla.ini
index 2870e7690ab1a..743ca4ec8c7e5 100644
--- a/installation/language/en-US/joomla.ini
+++ b/installation/language/en-US/joomla.ini
@@ -81,6 +81,7 @@ INSTL_DATABASE_NAME_MSG_POSTGRES="The database name is invalid. It must start wi
 INSTL_DATABASE_NO_SCHEMA="No database schema exists for this database type."
 INSTL_DATABASE_PASSWORD_DESC="Either a password you created or a password provided by your host."
 INSTL_DATABASE_PREFIX_DESC="Enter a table prefix or use the randomly generated one."
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="If you are using an existing database with tables with the same prefix, Joomla will rename those existing tables by adding the prefix \"bak_\"."
 INSTL_DATABASE_PREFIX_MSG="The table prefix must start with a letter, optionally be followed by alphanumeric characters and by an underscore"
 INSTL_DATABASE_RESPONSE_ERROR="The installation process failed."
 INSTL_DATABASE_TYPE_DESC="Select the database type."
diff --git a/installation/language/en-US/langmetadata.xml b/installation/language/en-US/langmetadata.xml
index 36f41dce842d3..e42d8ebafe6b6 100644
--- a/installation/language/en-US/langmetadata.xml
+++ b/installation/language/en-US/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>English (United States)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Joomla! Project</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/es-ES/langmetadata.xml b/installation/language/es-ES/langmetadata.xml
index ea527a6c52358..ff489bdf3664a 100644
--- a/installation/language/es-ES/langmetadata.xml
+++ b/installation/language/es-ES/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Spanish (Spain)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Spanish [es-ES] Translation Team</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/et-EE/joomla.ini b/installation/language/et-EE/joomla.ini
index 24717f05c30c4..b6068bdf0a8a7 100644
--- a/installation/language/et-EE/joomla.ini
+++ b/installation/language/et-EE/joomla.ini
@@ -81,6 +81,7 @@ INSTL_DATABASE_NAME_MSG_POSTGRES="Andmebaasi nimi on vale. See peaks algama täh
 INSTL_DATABASE_NO_SCHEMA="Selle andmebaasi tüübi jaoks pole andmebaasi skeemi."
 INSTL_DATABASE_PASSWORD_DESC="Kas sinu poolt pandud parool või siis teenusepakkuja poolt antud parool."
 INSTL_DATABASE_PREFIX_DESC="Sisesta tabeli eesliide või genereeri see juhuslikest märkidest."
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Kui sa kasutad olemasolevat andmebaasi sama tabelite prefiksiga, siis Joomla nimetab need tabelid ümber lisades eesliite \"bak_\"."
 INSTL_DATABASE_PREFIX_MSG="Andmebaasi eesliide peab algama tähega ning selle järel tuleb valikuline täht või number ja allkriips"
 INSTL_DATABASE_RESPONSE_ERROR="Paigaldus ebaõnnestus."
 INSTL_DATABASE_TYPE_DESC="Vali andmebaasi liik."
diff --git a/installation/language/et-EE/langmetadata.xml b/installation/language/et-EE/langmetadata.xml
index 39ae6375d83b4..a578771d218c9 100644
--- a/installation/language/et-EE/langmetadata.xml
+++ b/installation/language/et-EE/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Estonian</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Joomla! Project</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/eu-ES/joomla.ini b/installation/language/eu-ES/joomla.ini
index da6ae9fd3f193..3aadd33ce33c9 100644
--- a/installation/language/eu-ES/joomla.ini
+++ b/installation/language/eu-ES/joomla.ini
@@ -81,7 +81,8 @@ INSTL_DATABASE_NAME_MSG_POSTGRES="Datu-basearen izena baliogabea da. Letra batek
 INSTL_DATABASE_NO_SCHEMA="Ez dago datu-base eskemarik datu-base mota honentzat."
 INSTL_DATABASE_PASSWORD_DESC="Sortu duzun pasahitza edo ostalariak emandako pasahitza. Erabiltzaile-izena eta pasahitza ez datoz bat edo oraindik ez duzu konturik."
 INSTL_DATABASE_PREFIX_DESC="Sartu taula aurrizki bat edo erabili ausaz sortutakoa."
-INSTL_DATABASE_PREFIX_MSG="Taularen aurrizkiak letra batekin hasi behar du, aukeran karaktere alfanumerikoak eta azpimarra batekin jarraitu behar da"
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Aurrizki bera duten taulak dituen datu-base bat erabiltzen ari bazara, Joomlak dauden taula horien izena aldatuko du \"bak_\" aurrizkia gehituz."
+INSTL_DATABASE_PREFIX_MSG="Taularen aurrizkiak letra batekin hasi behar du, aukeran karaktere alfanumerikoak eta azpimarra batekin jarraitu behar du"
 INSTL_DATABASE_RESPONSE_ERROR="Instalazio prozesuak huts egin du."
 INSTL_DATABASE_TYPE_DESC="Hautatu datu-base mota."
 INSTL_DATABASE_USER_DESC="Zeuk sortu duzun erabiltzaile izena edo zure ostalariak emandako izena."
@@ -105,6 +106,8 @@ INSTL_COMPLETE_ERROR_FOLDER_DELETE="Ezin da  \"%s\" karpeta ezabatu. Mesedez, ez
 INSTL_COMPLETE_REMOVE_FOLDER="Ezabatu \"%s\" karpeta"
 INSTL_COMPLETE_CONGRAT="Zorionak!"
 INSTL_COMPLETE_TITLE="Zorionak! Zure Joomla gunea prest dago."
+INSTL_COMPLETE_SITE_BTN="Gunea ireki"
+INSTL_COMPLETE_ADMIN_BTN="Administratzailea ireki"
 INSTL_COMPLETE_FINAL="Instalazioa Osatu da"
 INSTL_COMPLETE_FINAL_DESC="Zure Joomla instalazioa osatuta eta erabiltzeko prest dago."
 INSTL_COMPLETE_ADD_EXTRA_LANGUAGE="Instalatu Hizkuntza Gehigarriak"
@@ -115,7 +118,10 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Hizkuntza"
 INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_SELECT="Hautatu Hizkuntza"
 INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_TAG="Hizkuntza Etiketa"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Bertsioa"
+INSTL_LANGUAGES_DESC="Joomlaren interfazea hainbat hizkuntzatan erabilgarri dago. Aukeratu hobetsitako hizkuntzak kontrol-laukiak hautatuta eta instala itzazu \"Aukeratutako hizkuntzak instalatu\" botoia hautatuta. <br> Oharra: eragiketa honek 10 segundo inguru beharko ditu hizkuntza bakoitza deskargatu eta instalatzeko. Denbora-mugak ekiditeko, hauta itzazu 3 hizkuntza gehienez."
+INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Eragiketa honek 10 segundo inguru iraun ditzake hizkuntza bakoitzean.<br>Itxaron guk hizkuntzak deskargatu eta instalatu bitartean &hellip;"
 INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Ez da instalatzeko hizkuntzarik hautatu."
+INSTL_LANGUAGES_SELECTED="Aukeratutako hizkuntzak instalatu"
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! ezin izan da konektatu hizkuntzen zerbitzariarekin. Mesedez, utzi bertan behera instalazioa."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Oharra: Joomla administratzailea erabiliz, hizkuntzak instalatu ahal izango dituzu geroago."
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="Itzuli instalazioko azken urratsera."
@@ -166,9 +172,10 @@ INSTL_HEADER_ERROR="Errorea"
 ; Helpers
 INSTL_PAGE_TITLE="Joomla Instalatzailea"
 ; Configuration model
+INSTL_ERROR_CONNECT_DB="Ezin izan da datu-basearekin konektatu. Konektoreak zenbaki hau itzuli du: %d."
 INSTL_STD_OFFLINE_MSG="Gunea itxita dago mantentze-lanengatik.<br>Saia zaitez geroago."
 ; Languages model
-INSTL_ERROR_INVALID_URL="URL baliogabea"
+INSTL_ERROR_INVALID_URL="Baliogabedun URLa"
 ; Others
 INSTL_CONFPROBLEM="Zure konfigurazio-fitxategia edo karpeta ez da idazgarria edo arazoren bat gertatu da konfigurazio-fitxategia sortzean. Ondoko kodea eskuz kargatu beharko duzu: Egin klik testu-arean eduki osoa kopiatuz eta itsatsi gero testu-fitxategi berri batean. Gorde 'configuration.php' izenarekin, eta kargatu zure guneko erro karpetara."
 INSTL_DISPLAY_ERRORS="Bistaratu Erroreak"
@@ -183,6 +190,7 @@ INSTL_NOTICE_NEEDSTOBEWRITABLE="Instalazioarekin jarrai dezakezu baimenak konpon
 INSTL_OUTPUT_BUFFERING="Irteerako Bufferreratzea"
 INSTL_PHP_VERSION="PHP Bertsioa"
 INSTL_PHP_VERSION_NEWER="PHP Bertsioa >= %s"
+INSTL_PROCESS_BUSY="Prozesua martxan dago. Itxaron, mesedez &hellip;"
 INSTL_SESSION_AUTO_START="Saio Hasiera Automatikoa"
 INSTL_WRITABLE="Ez da aski baimen %s sortzeko."
 INSTL_ZIP_SUPPORT_AVAILABLE="ZIP natiboaren laguntza"
@@ -258,6 +266,7 @@ WARNING="Abisua"
 ; Javascript ajax error messages
 JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="Konexio etena gertatu da JSON datuak eskuratzean."
 JLIB_JS_AJAX_ERROR_NO_CONTENT="Ez da edukirik itzuli."
+JLIB_JS_AJAX_ERROR_OTHER="Errore bat gertatu da JSON datuak eskuratzerakoan: HTTP %d egoera-kodea."
 JLIB_JS_AJAX_ERROR_PARSE="Analisi errore bat gertatu da JSON datu hauek prozesatzean:<br><code style=\"color:inherit;white-space:pre-wrap;padding:0;margin:0;border:0;background:inherit;\">%s</code>"
 JLIB_JS_AJAX_ERROR_TIMEOUT="Denbora-muga gainditu da JSON datuak eskuratzean."
 ; Field password messages
@@ -265,6 +274,7 @@ JFIELD_PASSWORD_INDICATE_COMPLETE="Pasahitza onartu da"
 JFIELD_PASSWORD_INDICATE_INCOMPLETE="Pasahitzak ez ditu webgunearen eskakizunak betetzen."
 JFIELD_PASSWORD_SPACES_IN_PASSWORD="Pasahitzak ezin du zuriunerik eduki ez hasieran, ez amaieran."
 JFIELD_PASSWORD_TOO_LONG="Pasahitza luzeegia da. Pasahitzak 100 karaktere baino gutxiago izan behar ditu."
+JFIELD_PASSWORD_TOO_SHORT_N="Pasahitza laburregia da. Pasahitzak gutxienez %d karaktere izan behar ditu."
 ; Javascript Form Validation Messages
 JLIB_FORM_CONTAINS_INVALID_FIELDS="Inprimakia ezin da bidali, beharrezko datuak falta baitira. <br> Zuzendu markatutako eremuak eta saiatu berriro."
 JLIB_FORM_FIELD_INVALID_VALUE="Balio hau ez da balioduna."
diff --git a/installation/language/eu-ES/langmetadata.xml b/installation/language/eu-ES/langmetadata.xml
index e211b77615579..96c208c7e4ece 100644
--- a/installation/language/eu-ES/langmetadata.xml
+++ b/installation/language/eu-ES/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Basque</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Joomla! Basque Translation Team</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/fa-AF/langmetadata.xml b/installation/language/fa-AF/langmetadata.xml
index 5518b19a4b2f3..03a5659d16c0d 100644
--- a/installation/language/fa-AF/langmetadata.xml
+++ b/installation/language/fa-AF/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>فارسی (دری)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>JoomlaPersian Translation Team</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/fa-IR/langmetadata.xml b/installation/language/fa-IR/langmetadata.xml
index 8aeebb96b935f..b90c4ba1856e3 100644
--- a/installation/language/fa-IR/langmetadata.xml
+++ b/installation/language/fa-IR/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Persian (پارسی)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>JoomlaFarsi.Com Team</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/fi-FI/langmetadata.xml b/installation/language/fi-FI/langmetadata.xml
index a576b169837ee..41e139f968c56 100644
--- a/installation/language/fi-FI/langmetadata.xml
+++ b/installation/language/fi-FI/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Finnish (Suomi)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Finnish translation team: Joomla.fi</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/fr-FR/joomla.ini b/installation/language/fr-FR/joomla.ini
index 6c2cf9badad31..91a4192f34d87 100644
--- a/installation/language/fr-FR/joomla.ini
+++ b/installation/language/fr-FR/joomla.ini
@@ -78,9 +78,10 @@ INSTL_DATABASE_NAME_DESC="Saisissez le nom de la base de données"
 INSTL_DATABASE_NAME_LABEL="Nom de la base de données"
 INSTL_DATABASE_NAME_MSG_MYSQL="Le nom de la base de données n'est pas valide. Il ne doit pas contenir les caractères suivants : \ / "
 INSTL_DATABASE_NAME_MSG_POSTGRES="Le nom de la base de données n'est pas valide. Il doit commencer par une lettre, suivie de caractères alphanumériques."
-INSTL_DATABASE_NO_SCHEMA="Ce type de base de données ne contient pas de schéma de base de données."
+INSTL_DATABASE_NO_SCHEMA="Aucun schéma de base de données n'existe pour ce type de base de données."
 INSTL_DATABASE_PASSWORD_DESC="Saisissez le mot de passe d'accès à la base de données"
 INSTL_DATABASE_PREFIX_DESC="Saisissez un préfixe de table ou utilisez celui généré aléatoirement"
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Si vous utilisez une base de données existante avec des tables ayant le même préfixe, Joomla renommera les tables existantes en leur ajoutant le préfixe \"bak_\"."
 INSTL_DATABASE_PREFIX_MSG="Le préfixe de la table doit commencer par une lettre, éventuellement suivie de caractères alphanumériques et d'un trait de soulignement"
 INSTL_DATABASE_RESPONSE_ERROR="Le processus d'installation a échoué."
 INSTL_DATABASE_TYPE_DESC="Sélectionnez le type de base de données à utiliser"
@@ -179,7 +180,7 @@ INSTL_ERROR_INVALID_URL="URL non valide"
 INSTL_CONFPROBLEM="Votre fichier de configuration n'est pas modifiable ou il y a eu un problème durant sa création, par exemple le répertoire de Joomla n'est pas ouvert en écriture. Vous devez créer le fichier de configuration manuellement avec le contenu indiqué ci-dessous.<strong>Procédure</strong><br />Cliquez dans la zone de texte pour sélectionner et copier tout le code ;<br />Collez ce code dans un fichier créé au nom de 'configuration.php' ;<br />Transférez ce fichier à la racine du répertoire de Joomla."
 INSTL_DISPLAY_ERRORS="Afficher les erreurs"
 INSTL_ERROR="Erreur"
-INSTL_ERROR_DB="Des erreurs sont survenues lors du remplissage la base de données: %s"
+INSTL_ERROR_DB="Des erreurs sont survenues lors du remplissage de la base de données : %s."
 INSTL_ERROR_INITIALISE_SCHEMA="Impossible d'initialiser le schéma de la base de données."
 INSTL_EXTENSION_AVAILABLE="%s disponible"
 INSTL_FILE_UPLOADS="Transfert de fichiers"
diff --git a/installation/language/fr-FR/langmetadata.xml b/installation/language/fr-FR/langmetadata.xml
index 6f0c81f416798..8cc6dd2029643 100644
--- a/installation/language/fr-FR/langmetadata.xml
+++ b/installation/language/fr-FR/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>French (fr-FR)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Joomla! Project - French translation team</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/he-IL/langmetadata.xml b/installation/language/he-IL/langmetadata.xml
index e11ac54f963db..69b9c0790f00c 100644
--- a/installation/language/he-IL/langmetadata.xml
+++ b/installation/language/he-IL/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Hebrew (Israel)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Joomla! Project</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/hr-HR/joomla.ini b/installation/language/hr-HR/joomla.ini
new file mode 100644
index 0000000000000..8ae116ad230fa
--- /dev/null
+++ b/installation/language/hr-HR/joomla.ini
@@ -0,0 +1,283 @@
+; Joomla! Project
+; (C) 2005 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
+
+; Fatal error page
+; These will be processed by the JavaScript Build
+BUILD_FATAL_HEADER="Nažalost, došlo je do problema koji nismo u mogućnosti oporaviti."
+BUILD_FATAL_LANGUAGE="Hrvatski"
+BUILD_FATAL_TEXT="Server je vratio \"{{statusCode_statusText}}\""
+BUILD_FATAL_URL_TEXT="Pomozite mi riješiti ovo"
+; These will be processed by the JavaScript Build
+BUILD_INCOMPLETE_HEADER="Nepotpuna postavka okoline"
+BUILD_INCOMPLETE_LANGUAGE="Hrvatski"
+BUILD_INCOMPLETE_TEXT="Čini se da pokušavate pokrenuti Joomla! iz našeg git reprozitorija. Da biste to učinili, morate prvo dovršiti nekoliko dodatnih koraka."
+BUILD_INCOMPLETE_URL_TEXT="Više detalja"
+; These will be processed by the JavaScript Build
+BUILD_NOXML_HEADER="Vašem PHP-u nedostaje važna biblioteka"
+BUILD_NOXML_LANGUAGE="Hrvatski"
+BUILD_NOXML_TEXT="Za pokretanje ove Joomla! verzije, vaš host treba koristiti PHP s podrškom za XML biblioteku."
+BUILD_NOXML_URL_TEXT="Pomozite mi riješiti ovo"
+; These will be processed by the JavaScript Build
+BUILD_MIN_PHP_ERROR_HEADER="Nažalost, vaša PHP verzija nije podržana."
+BUILD_MIN_PHP_ERROR_LANGUAGE="Hrvatski"
+BUILD_MIN_PHP_ERROR_TEXT="Za pokretanje ove Joomla verzije, vaš host treba koristiti PHP verziju {{phpversion}} ili noviju."
+BUILD_MIN_PHP_ERROR_URL_TEXT="Pomozite mi riješiti ovo"
+; Main Config
+INSTL_SELECT_INSTALL_LANG="Odaberite jezik instalacije"
+INSTL_SELECT_LANGUAGE_TITLE="Odaberite jezik"
+INSTL_SETUP_LOGIN_DATA="Postavke podataka za pristup"
+INSTL_WARNJAVASCRIPT="Upozorenje! JavaScript mora biti omogućen za pravilnu Joomla instalaciju."
+INSTL_WARNJSON="Vaša PHP instalacija mora imati podršku za JSON da bi se Joomla! mogla instalirati!"
+; Precheck view
+INSTL_DATABASE_SUPPORT="Podrška baze podataka:"
+INSTL_JSON_SUPPORT_AVAILABLE="JSON podrška"
+INSTL_MB_LANGUAGE_IS_DEFAULT="MB jezik je osnovni"
+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>."
+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>."
+INSTL_PARSE_INI_FILE_AVAILABLE="INI Parser podrška"
+INSTL_PRECHECK_ACTUAL="Trenutno"
+INSTL_PRECHECK_DESC="Ako neka od ovih stavki nije podržana tada vas molimo da poduzmete potrebne radnje da ih ispravite.<br>Ne možete instalirati Joomlu tako dugo dok vaša instalacija ne zadovolji navedene zahtjeve."
+INSTL_PRECHECK_DIRECTIVE="Direktiva"
+INSTL_PRECHECK_RECOMMENDED="Preporuka"
+INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Ove postavke preporučuju se za PHP kako bi se osigurala potpuna Joomla kompatibilnost."
+INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Preporučene postavke:"
+INSTL_PRECHECK_TITLE="Provjera prije instalacije"
+INSTL_XML_SUPPORT="XML podrška"
+INSTL_ZLIB_COMPRESSION_SUPPORT="Podrška za Zlib kompresiju"
+; Database view
+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)"
+INSTL_DATABASE_ENCRYPTION_MODE_VALUE_ONE_WAY="Jednosmjera autentifikacija"
+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="Unijeli ste \"localhost\" kao naziv hosta. Povezivanje s bazom podataka pomoću šifrirane veze moglo bi biti neuspješno. 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."
+INSTL_DATABASE_HOST_DESC="Upišite ime hosta, najčešće je \"localhost\" ili ime koje ste dobili od svog hostera."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Nismo mogli kreirati datoteku. Molimo vas da ručno kreirate datoteku naziva \"%1$s\" i učitate je u \"%2$s\" direktorij vašeg Joomla sitea. Nakon toga odaberite \"%3$s\" za nastavak."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Kako bi potvrdili da ste vlasnik ovogh web sitea uklonite datoteku \"%1$s\" koja je kreirana u mapi \"%2$s\" vašeg Joomla sitea. Zatim odaberite \"%3$s\" za nastavak."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Pokušavate koristiti host baze podataka koji nije na vašem lokalnom poslužitelju. Iz sigurnosnih razloga morate potvrditi vlasništvo nad svojim web hosting računom. <a href=\"%s\" target=\"_blank\" rel=\"noopener noreferrer\">Pročitajte dokumentaciju</a> za više informacija."
+INSTL_DATABASE_HOST_LABEL="Ime servera"
+INSTL_DATABASE_NAME_DESC="Upišite ime baze podataka."
+INSTL_DATABASE_NAME_LABEL="Ime Baze podataka"
+INSTL_DATABASE_NAME_MSG_MYSQL="Naziv baze podataka nije važeći. Ne smije sadržavati sljedeće znakove: \ /"
+INSTL_DATABASE_NAME_MSG_POSTGRES="Ime baze podataka nije važeće. Mora počinjati slovom i nastaviti se alfanumeričkim znakovima."
+INSTL_DATABASE_NO_SCHEMA="Ne postoji shema baze podataka za ovaj tip baze podataka."
+INSTL_DATABASE_PASSWORD_DESC="Ili lozinka koju ste kreirali ili lozinka dobivena od hostera."
+INSTL_DATABASE_PREFIX_DESC="Upišite prefiks tablice ili koristite nasumično generirani."
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Ako koristite postojeću bazu podataka sa tablicama koje imaju iste prefikse, Joomla će preimenovati postojeće tablice dodajući prefix \"bak_\"."
+INSTL_DATABASE_PREFIX_MSG="Prefiks baze podataka mora započinjati sa slovom, kojeg sljede proizvoljni alfanumerički znakovi, a završavati donjom crtom"
+INSTL_DATABASE_RESPONSE_ERROR="Proces instalacije nije uspio."
+INSTL_DATABASE_TYPE_DESC="Odaberite tip baze podataka."
+INSTL_DATABASE_USER_DESC="Ili korisničko ime koje ste kreirali ili korisničko ime dobiveno od hostera."
+INSTL_DATABASE_VALIDATION_ERROR="Provjerite vjerodajnice za svoju bazu podataka, vrstu baze podataka, naziv baze podataka ili naziv hosta. Ako imate instaliran MySQL 8, onda pročitajte <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\">wiki</a> za više informacija."
+
+INSTL_CONNECT_DB="Postavke spajanje na bazu podataka"
+INSTL_INSTALL_JOOMLA="Instaliraj Joomla"
+; Site View
+INSTL_ADMIN_EMAIL_DESC="Upišite e-mail adresu Super Administrator korisnika."
+INSTL_ADMIN_PASSWORD_DESC="Postavite lozinku za vaš Super Administrator korisnički račun."
+INSTL_ADMIN_PASSWORD_LENGTH="Unesite najmanje 12 znakova."
+INSTL_ADMIN_USER_DESC="Upišite pravo ime Super korisnika."
+INSTL_ADMIN_USERNAME_DESC="Postavite korisničko ime za vaš Super Administrator korisnički račun."
+INSTL_LOGIN_DATA="Podaci za prijavu"
+INSTL_SETUP_SITE_NAME="Postavke imena sitea"
+INSTL_SITE="Glavna konfiguracija"
+INSTL_SITE_DEVMODE_LABEL="Detektiran je razvojni način rada"
+INSTL_SITE_NAME_DESC="Upišite ime vašeg Joomla sitea."
+; Complete view
+INSTL_COMPLETE_ERROR_FOLDER_DELETE="Mapa \"%s\" nije moguće izbrisati. Ručno izbrišite mapu."
+INSTL_COMPLETE_REMOVE_FOLDER="Uklonite mapu \"%s\""
+INSTL_COMPLETE_CONGRAT="Čestitamo!"
+INSTL_COMPLETE_TITLE="Čestitamo! Vaš Joomla site je spreman."
+INSTL_COMPLETE_SITE_BTN="Otvori site"
+INSTL_COMPLETE_ADMIN_BTN="Otvori administraciju"
+INSTL_COMPLETE_FINAL="Instalacija je dovršena"
+INSTL_COMPLETE_FINAL_DESC="Vaša Joomla instalacija je sada dovršena i spremna za upotrebu."
+INSTL_COMPLETE_ADD_EXTRA_LANGUAGE="Instalacija dodatnih jezika"
+INSTL_REMOVE_INST_FOLDER="Jeste li sigurni da želite izbrisati? Potvrdom ćete trajno izbrisati mapu \"%s\"."
+; Languages view
+INSTL_LANGUAGES="Instalacija dodatnih jezika"
+INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Jezik"
+INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_SELECT="Odaberite jezik"
+INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_TAG="Oznaka jezika"
+INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Verzija"
+INSTL_LANGUAGES_DESC="Joomla sučelje dostupno je na nekoliko jezika. Odaberite željene jezike odabirom okvira za potvrdu, a zatim ih preuzmite pritiskom na \"Instaliraj odabrane jezike\".<br>Napomena: Ova instalacija trajat če oko 10 sekundi za preuzimanje i instalaciju svakog jezika. Kako biste izbjegli vremenske pauze, odaberite najviše 3 jezika za instalaciju."
+INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Ova radnja trajati će do 10 sekundi po jeziku<br>Molimo pričekajte dok preuzmemo i instaliramo jezike &hellip;"
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Nije odabran niti jedan jezik za instalaciju."
+INSTL_LANGUAGES_SELECTED="Instaliraj odabrane jezike"
+INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! se nije mogla spojiti na server za jezike. Molimo završite proces instalacije."
+INSTL_LANGUAGES_WARNING_NO_INTERNET2="Napomena: Jezike možete kasnije instalirati pomoću Joomla administracije."
+INSTL_LANGUAGES_WARNING_BACK_BUTTON="Povratak na posljednji korak instalacije"
+; Default language view
+INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Osnovni jezik za Administratorsko sučelje"
+INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Joomla nije mogla postaviti jezik kao zadani. Engleski će se koristiti kao zadani jezik administratorskog sučelja."
+INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Joomla je postavila %s kao vaš osnovni jezik za ADMINISTRATORSKO sučelje."
+INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Odaberi"
+INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Jezik"
+INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="Oznaka"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_DOWNLOAD_PACKAGE="Joomla nije uspjela preuzeti ili raspakirati jezični paket sa: %s"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Joomla nije mogla instalirati %s jezik."
+INSTL_DEFAULTLANGUAGE_DESC="Joomla je instalirala sljedeće jezike. Molimo odaberite osnovni jezik za <strong>administratorsko sučelje.</strong>."
+INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla je instalirala sljedeće jezike. Molimo odaberite Vaš željeni zadani jezik za Joomla <strong>korisničko sučelje</strong>."
+INSTL_DEFAULTLANGUAGE_FRONTEND="Osnovni jezik sitea"
+INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla nije uspjela postaviti jezik kao zadani. Engleski će se koristiti kao osnovni jezik za web stranicu."
+INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Joomla je postavila %s kao osnovni jezik za SITE."
+INSTL_DEFAULTLANGUAGE_SET_DEFAULT_LANGUAGE="Postavite zadani jezik"
+INSTL_DEFAULTLANGUAGE_TRY_LATER="Moći ćete to instalirati kasnije koristeći Joomla administratorsko sučelje."
+
+INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Hrvatski (HR)" ; 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="Nije moguće povezati se na bazu. Povezivanje vraća poruku greške: %s"
+INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="Instalacija se nije mogla povezati na definiranu bazu podataka i nije mogla kreirati bazu. Potvrdite svoje postavke i ako je potrebno ručno kreirajte bazu podataka."
+INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Nije moguće osvježiti manifest cache za dodatak: %s"
+INSTL_DATABASE_ERROR_BACKINGUP="Pojavila se greška prilikom spremanja sigurnosne kopije baze."
+INSTL_DATABASE_ERROR_CREATE="Pojavila se greška prilikom izrade baze %s.<br> Korisnik možda nema dozvolu za kreiranje baze. Potrebna baza može biti izrađena odvojeno prije nego što nastavite sa Joomla instalacijom"
+INSTL_DATABASE_ERROR_DELETE="Pojavile su se greške prilikom brisanja baze."
+INSTL_DATABASE_ERROR_READING_SQL_FILE="Nije moguće učitati SQL datoteku."
+INSTL_DATABASE_FIELD_VALUE_BACKUP="Sigurnosna kopija"
+INSTL_DATABASE_FIELD_VALUE_REMOVE="Uklanjanje"
+INSTL_DATABASE_FILE_DOES_NOT_EXIST="Datoteka %s ne postoji."
+INSTL_DATABASE_FIX_LOWERCASE="Prefiks tablice mora biti malim slovima za PostgreSQL."
+INSTL_DATABASE_FIX_TOO_LONG="Prefiks MySQL tablice smije imati najviše 15 znaka"
+INSTL_DATABASE_INVALID_DB_DETAILS="Sadržaj baze je pogrešan i/ili prazan."
+INSTL_DATABASE_INVALID_MARIADB_VERSION="Potreban je MariaDB %1$s ili više za nastavak instalacije. Vaša verzija je: %2$s"
+INSTL_DATABASE_INVALID_MYSQL_VERSION="Potreban je MySQL %1$s ili više za nastavak instalacije. Vaša verzija je: %2$s"
+INSTL_DATABASE_INVALID_MYSQLI_VERSION="Potreban je MySQL %1$s ili više za nastavak instalacije. Vaša verzija je: %2$s"
+INSTL_DATABASE_INVALID_PGSQL_VERSION="Potreban je PostgreSQL %1$s ili više za nastavak instalacije. Vaša verzija je: %2$s"
+INSTL_DATABASE_INVALID_POSTGRESQL_VERSION="Potreban je PostgreSQL %1$s ili više za nastavak instalacije. Vaša verzija je: %2$s"
+INSTL_DATABASE_INVALID_TYPE="Odaberite tip baze podataka."
+INSTL_DATABASE_NAME_INVALID_CHAR="Niti jedan MySQL identifikator ne može sadržavati NULL ASCII(0x00)."
+INSTL_DATABASE_NAME_INVALID_SPACES="MySQL ime baze i tablice ne može početi ili završiti se praznim mjestom (razmaci)."
+INSTL_DATABASE_NAME_TOO_LONG="Ime MySQL baze podataka mora imati najviše 64 znaka"
+; Controllers
+INSTL_COOKIES_NOT_ENABLED="Izgleda da kolačići nisu dozvoljeni u vašem web pregledniku. Nećete moći instalirati aplikaciju ukoliko je ova opcija isključena. Također je moguće da je problem u postavkama <strong>session.save_path</strong> na serveru. Ako je ovo slučaj, kontaktirajte svog davatelja hosting usluge ako ne znate kako da to sami provjerite i ispravite."
+INSTL_HEADER_ERROR="Greška"
+; Helpers
+INSTL_PAGE_TITLE="Joomla Installer"
+; Configuration model
+INSTL_ERROR_CONNECT_DB="Nije moguće povezati se na bazu podataka. Povezivanje vraća grešku: %d."
+INSTL_STD_OFFLINE_MSG="Pauza zbog održavanja sustava.<br> Molimo, navratite kasnije."
+; Languages model
+INSTL_ERROR_INVALID_URL="Neispravan URL"
+; Others
+INSTL_CONFPROBLEM="Vaša konfiguracijska datoteka ili direktorij nemaju prava za zapisivanje ili je došlo do problema prilikom izrade konfiguracijske datoteke. Morati ćete ručno učitati sljedeći kod. Označite cijeli tekst kôda u prostoru za tekst, zatim ga kopirajte i dodajte u novu datoteku imena 'configuration.php', te datoteku prenesite u osnovni direktorij vaše stranice."
+INSTL_DISPLAY_ERRORS="Prikaz grešaka"
+INSTL_ERROR="Greška"
+INSTL_ERROR_DB="Došlo je do nekih pogrešaka prilikom popunjavanja baze podataka: %s."
+INSTL_ERROR_INITIALISE_SCHEMA="Nije moguće inicijalizirati shemu baze podataka."
+INSTL_EXTENSION_AVAILABLE="%s Dostupno"
+INSTL_FILE_UPLOADS="Upload datoteka"
+INSTL_GNU_GPL_LICENSE="GNU općom javnom licencom"
+INSTL_HELP_LINK="Pomoć instalacije Joomle"
+INSTL_NOTICE_NEEDSTOBEWRITABLE="Možete nastaviti instalaciju ako popravite dozvole."
+INSTL_OUTPUT_BUFFERING="Buffering izlaza"
+INSTL_PHP_VERSION="PHP verzija"
+INSTL_PHP_VERSION_NEWER="PHP verzija >= %s"
+INSTL_PROCESS_BUSY="Postupak je u tijeku. Molimo pričekajte &hellip;"
+INSTL_SESSION_AUTO_START="Auto Start sesije"
+INSTL_WRITABLE="Nedovoljna dozvola za kreiranje %s."
+INSTL_ZIP_SUPPORT_AVAILABLE="Nativna ZIP podrška"
+; Global strings
+JADMINISTRATOR="Administrator"
+JEMAIL="E-mail"
+JERROR="Greška"
+JERROR_LAYOUT_ERROR_HAS_OCCURRED_WHILE_PROCESSING_YOUR_REQUEST="Došlo je do greške prilikom procesiranja vašeg zahtjeva."
+JGLOBAL_ISFREESOFTWARE="%s je slobodan softver izdan pod %s."
+JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="Jezični paket ne odgovara ovoj Joomla verziji. Neki prijevodi bi mogli nedostajati i biti će prikazani na engleskom."
+JGLOBAL_SELECT_AN_OPTION="Odaberi opciju"
+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 token 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"
+JPREVIOUS="Prethodno"
+JSHOWPASSWORD="Prikaži lozinku"
+JSITE="Site"
+JSKIP="Preskoči"
+JUSERNAME="Korisničko ime"
+JYES="Da"
+; Framework strings necessary when no lang pack is available
+JLIB_DATABASE_ERROR_CONNECT_MYSQL="Nije moguće spajanje na MySQL."
+JLIB_DATABASE_ERROR_DATABASE="Došlo je do greške baze podataka."
+JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Nije moguće učitati upravljački program baze podataka: %s."
+JLIB_DATABASE_ERROR_VALID_MAIL="E-mail adresa koju ste unijeli nije ispravna. Molimo unesite drugu e-mail adresu."
+JLIB_ENVIRONMENT_SESSION_EXPIRED="Vaša sesija je istekla, molim ponovo učitajte stranu."
+JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER="%1$s: Putanja nije mapa. Putanja: %2$s"
+JLIB_FORM_FIELD_INVALID="Neispravno polje:&#160"
+JLIB_FORM_VALIDATE_FIELD_INVALID="Neispravno polje: %s"
+JLIB_FORM_VALIDATE_FIELD_REQUIRED="Potrebno polje: %s"
+JLIB_INSTALLER_ABORT="Odustajanje od instalacije jezika: %s"
+JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="Dodatak %1$s: Nije uspjelo kreiranje direktorija: %2$s"
+JLIB_INSTALLER_ABORT_NOINSTALLPATH="Instalacijska putanja ne postoji"
+JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="Paket %1$s: Došlo je do greške prilikom instalacije dodatka: %2$s."
+JLIB_INSTALLER_ABORT_PACK_INSTALL_NO_FILES="Paket %s: Nema datoteka za instalaciju!"
+JLIB_INSTALLER_ERROR_DOWNLOAD_SERVER_CONNECT="Greška pri spajanju na server: %s"
+JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Nije uspjelo kopiranje datoteke %1$s u %2$s."
+JLIB_INSTALLER_INSTALL="Instalacija"
+JLIB_INSTALLER_NOT_ERROR="Ako se pogreška odnosi na instalaciju TinyMCE jezičnih datoteka to nema nikakvog utjecaja na instalaciju jezika. Neki jezični paketi kreirani prije Joomla! 3.2.0 mogu pokušati instalirati zasebne TinyMCE jezične datoteke. Kako su isti sada uključeni u temeljnu instalaciju oni više ne moraju biti instalirani."
+JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Nije moguće kreirati jezik sadržaja za %s jezik: %s."
+JLIB_UPDATER_ERROR_COLLECTION_FOPEN="PHP postavka allow_url_fopen je onemogućena. Ova postavka mora biti omogućena da bi ažuriranje radilo."
+JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Ažuriranje: :Kolekcija: Nije moguće otvoriti %s"
+JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Ažuriranje: :Kolekcija: Nije moguće parsirati %s"
+JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Ažuriranja: Nije moguće otvoriti site za ažuriranje #%d \"%s\", URL: %s."
+JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Nije moguće spajanje na bazu podataka<br>joomla.library: %1$s - %2$s."
+; Strings for the language debugger
+JDEBUG_LANGUAGE_FILES_IN_ERROR="Analiza pogreški u jezičnim datotekama"
+JDEBUG_LANGUAGE_UNTRANSLATED_STRING="Neprevedeni nizovi"
+JNONE="Ništa"
+; Necessary for errors
+ADMIN_EMAIL="E-mail administratora"
+ADMIN_PASSWORD="Lozinka administratora"
+SITE_NAME="Ime Sitea"
+; Database types (allows for a more descriptive label than the internal name)
+MYSQL="MySQL (PDO)"
+MYSQLI="MySQLi"
+ORACLE="Oracle"
+PGSQL="PostgreSQL (PDO)"
+POSTGRESQL="PostgreSQL"
+SQLITE="SQLite"
+; Javascript message titles
+ERROR="Greška"
+MESSAGE="Poruka"
+NOTICE="Napomena"
+WARNING="Upozorenje"
+; Javascript ajax error messages
+JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="Došlo je do prekida veze prilikom dohvaćanja JSON podataka."
+JLIB_JS_AJAX_ERROR_NO_CONTENT="Nema vraćenog sadržaja."
+JLIB_JS_AJAX_ERROR_OTHER="Greška kod dohvaćanja JSON podataka: HTTP %d status kôd."
+JLIB_JS_AJAX_ERROR_PARSE="Greška prilikom procesiranja JSON podataka:<br><code style=\"color:inherit;white-space:pre-wrap;padding:0;margin:0;border:0;background:inherit;\">%s</code>"
+JLIB_JS_AJAX_ERROR_TIMEOUT="Isteklo je vrijeme za dohvaćanje JSON podataka."
+; Field password messages
+JFIELD_PASSWORD_INDICATE_COMPLETE="Lozinka prihvaćena"
+JFIELD_PASSWORD_INDICATE_INCOMPLETE="Lozinka ne zadovoljava zahtjevima sitea."
+JFIELD_PASSWORD_SPACES_IN_PASSWORD="Lozinka ne smije sadržavati razmake na početku ili na kraju."
+JFIELD_PASSWORD_TOO_LONG="Lozinka je predugačka. Lozinke moraju biti kraće od 100 znakova."
+JFIELD_PASSWORD_TOO_SHORT_N="Lozinka je prekratka. Lozinke moraju imati minimalno %d znakova."
+; Javascript Form Validation Messages
+JLIB_FORM_CONTAINS_INVALID_FIELDS="Obrazac nije moguće poslati jer nedostaju potrebni podaci. <br> Ispravite označena polja i pokušajte ponovo."
+JLIB_FORM_FIELD_INVALID_VALUE="Ova vrijednost nije valjana."
+JLIB_FORM_FIELD_REQUIRED_CHECK="Jedna opcija mora biti odabrana."
+JLIB_FORM_FIELD_REQUIRED_VALUE="Popunite ovo polje"
+
diff --git a/installation/language/hr-HR/langmetadata.xml b/installation/language/hr-HR/langmetadata.xml
new file mode 100644
index 0000000000000..eeaa6f3a43318
--- /dev/null
+++ b/installation/language/hr-HR/langmetadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metafile client="installation">
+	<name>Croatian (Croatia)</name>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
+	<author>Joomla! Hrvatska 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>Croatian (Croatia)</name>
+		<nativeName>Croatian (Croatia)</nativeName>
+		<tag>hr-HR</tag>
+		<rtl>0</rtl>
+	</metadata>
+	<params/>
+</metafile>
diff --git a/installation/language/hu-HU/joomla.ini b/installation/language/hu-HU/joomla.ini
index f23a43cbe7e39..4597f282878bf 100644
--- a/installation/language/hu-HU/joomla.ini
+++ b/installation/language/hu-HU/joomla.ini
@@ -81,6 +81,7 @@ INSTL_DATABASE_NAME_MSG_POSTGRES="Az adatbázis neve érvénytelen. Egy betűvel
 INSTL_DATABASE_NO_SCHEMA="Nem létezik adatbázisséma ehhez az adatbázistípushoz."
 INSTL_DATABASE_PASSWORD_DESC="Vagy az Ön által, vagy a szolgáltató által létrehozott jelszót."
 INSTL_DATABASE_PREFIX_DESC="Adja meg az adatbázis tábla előtagját, vagy használjon a véletlenszerűen előállított előtagot."
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Ha egy létező adatbázist használ azonos előtaggal rendelkező táblákkal, akkor a Joomla a már létező táblákat átnevezi \"bak_\" előtag hozzáadásával."
 INSTL_DATABASE_PREFIX_MSG="A tábla előtagjának betűvel kell kezdődnie, opcionálisan alfanumerikus karakterekkel és aláhúzással"
 INSTL_DATABASE_RESPONSE_ERROR="A telepítési folyamat sikertelen."
 INSTL_DATABASE_TYPE_DESC="Válassza ki az adatbázis típusát."
diff --git a/installation/language/hu-HU/langmetadata.xml b/installation/language/hu-HU/langmetadata.xml
index 6e228f9019620..37b3d31f19c43 100644
--- a/installation/language/hu-HU/langmetadata.xml
+++ b/installation/language/hu-HU/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Hungarian (Magyar)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Joomla! Magyarország</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/id-ID/joomla.ini b/installation/language/id-ID/joomla.ini
new file mode 100644
index 0000000000000..927390e9cefd0
--- /dev/null
+++ b/installation/language/id-ID/joomla.ini
@@ -0,0 +1,279 @@
+; Joomla! Project
+; (C) 2005 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
+
+; Fatal error page
+; These will be processed by the JavaScript Build
+BUILD_FATAL_HEADER="Maaf, ada masalah yang tidak dapat kami pulihkan."
+BUILD_FATAL_TEXT="Server merespon \"{{statusCode_statusText}}\""
+BUILD_FATAL_URL_TEXT="Bantu saya menyelesaikan masalah ini"
+; These will be processed by the JavaScript Build
+BUILD_INCOMPLETE_HEADER="Lingkup Setelan Tidak Lengkap"
+BUILD_INCOMPLETE_LANGUAGE="Bahasa Indonesia ID"
+BUILD_INCOMPLETE_TEXT="Sepertinya Anda mencoba menjalankan Joomla! dari repositori git kami. Untuk melakukannya, Anda harus menyelesaikan beberapa langkah tambahan terlebih dahulu."
+BUILD_INCOMPLETE_URL_TEXT="Lebih Detailnya"
+; These will be processed by the JavaScript Build
+BUILD_NOXML_HEADER="Maaf, PHP tidak memiliki library utama"
+BUILD_NOXML_TEXT="Host Anda perlu menggunakan PHP dengan dukungan library XML untuk menjalankan versi Joomla!"
+BUILD_NOXML_URL_TEXT="Bantu saya menyelesaikan masalah ini"
+; These will be processed by the JavaScript Build
+BUILD_MIN_PHP_ERROR_HEADER="Maaf, versi PHP anda tidak mendukung."
+BUILD_MIN_PHP_ERROR_TEXT="Host anda memerlukan PHP versi {{phpversion}} atau yang terbaru untuk menjalankan versi Joomla ini."
+BUILD_MIN_PHP_ERROR_URL_TEXT="Bantu saya menyelesaikan masalah ini"
+; Main Config
+INSTL_SELECT_INSTALL_LANG="Pilih Bahasa Instalasi"
+INSTL_SELECT_LANGUAGE_TITLE="Pilih Bahasa"
+INSTL_SETUP_LOGIN_DATA="Setelan Data Login"
+INSTL_WARNJAVASCRIPT="Perhatian! JavaScript harus diaktifkan untuk pemasangan Joomla yang benar."
+INSTL_WARNJSON="Konfigurasi JSON harus diaktifkan pada pemasangan PHP Anda untuk melanjutkan proses pemasangan Joomla!"
+; Precheck view
+INSTL_DATABASE_SUPPORT="Dukungan Database:"
+INSTL_JSON_SUPPORT_AVAILABLE="Dukungan JSON"
+INSTL_MB_LANGUAGE_IS_DEFAULT="Bahasa MB adalah Bawaan"
+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!"
+INSTL_NOTICE_MBLANG_NOTDEFAULT="Bahasa mbstring PHP tidak disetel ke netral. Ini dapat diatur secara lokal dengan memasukkan <strong>php_value mbstring.language neutral</strong> di file <code>.htaccess</code> Anda."
+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."
+INSTL_PARSE_INI_FILE_AVAILABLE="Dukungan INI Parser"
+INSTL_PRECHECK_ACTUAL="Aktual"
+INSTL_PRECHECK_DESC="Jika salah satu dari item ini tidak didukung, silakan ambil tindakan untuk memperbaikinya.<br>Anda tidak dapat menginstal Joomla sampai pengaturan Anda memenuhi persyaratan ini."
+INSTL_PRECHECK_DIRECTIVE="Direktif"
+INSTL_PRECHECK_RECOMMENDED="Disarankan"
+INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Pengaturan ini disarankan untuk PHP guna memastikan kompatibilitas penuh dengan Joomla."
+INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Konfigurasi yang disarankan:"
+INSTL_PRECHECK_TITLE="Pemeriksaan Pra-pemasangan"
+INSTL_XML_SUPPORT="Dukungan XML"
+INSTL_ZLIB_COMPRESSION_SUPPORT="Dukungan Kompresi Zlib"
+; Database view
+INSTL_DATABASE="Konfigurasi Database"
+INSTL_DATABASE_ENCRYPTION_CA_LABEL="Jalur ke File CA"
+INSTL_DATABASE_ENCRYPTION_CERT_LABEL="Jalur ke File Sertifikat"
+INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL="Cipher Suite yang Didukung (opsional)"
+INSTL_DATABASE_ENCRYPTION_KEY_LABEL="Jalur ke File Private Key"
+INSTL_DATABASE_ENCRYPTION_MODE_LABEL="Enkripsi Koneksi"
+INSTL_DATABASE_ENCRYPTION_MODE_VALUE_NONE="Default (dikontrol server)"
+INSTL_DATABASE_ENCRYPTION_MODE_VALUE_ONE_WAY="Otentikasi satu arah"
+INSTL_DATABASE_ENCRYPTION_MODE_VALUE_TWO_WAY="Otentikasi dua jalur"
+INSTL_DATABASE_ENCRYPTION_MSG_CONN_NOT_ENCRYPT="Anda telah memilih untuk menggunakan enkripsi koneksi database, dan koneksi dapat dibuat, tetapi tidak dienkripsi. Alasannya mungkin karena server database dikonfigurasi untuk kembali ke koneksi yang tidak terenkripsi jika terjadi parameter enkripsi yang buruk. Periksa dan perbaiki parameter enkripsi basis data, atau ubah bidang \"Enkripsi Sambungan\" kembali ke \"Default (dikontrol server)\"."
+INSTL_DATABASE_ENCRYPTION_MSG_FILE_FIELD_BAD="File yang dimasukkan di kolom \"%s\" tidak ada atau tidak dapat diakses."
+INSTL_DATABASE_ENCRYPTION_MSG_FILE_FIELD_EMPTY="Kolom \"%s\" kosong atau tidak berisi jalur yang valid."
+INSTL_DATABASE_ENCRYPTION_MSG_LOCALHOST="Anda telah memasukkan \"localhost\" sebagai nama host. Menghubungkan ke database dengan koneksi terenkripsi mungkin gagal dengan ini. Ubah \"localhost\" menjadi \"127.0.0.1\" atau \"::1\" atau nama host lain, atau ubah kolom \"Connection Encryption\" kembali ke \"Default (server dikendalikan)\"."
+INSTL_DATABASE_ENCRYPTION_MSG_SRV_NOT_SUPPORTS="Server database tidak mendukung koneksi terenkripsi. Aktifkan dukungan TLS (sering disebut SSL dalam dokumen) di server database Anda, atau ubah kolom \"Connection Encryption\" kembali ke \"Default (server dikendalikan)\"."
+INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="Verifikasi Sertifikat Server"
+INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="Query database PostgreSQL gagal."
+INSTL_DATABASE_HOST_DESC="Masukkan nama host, biasanya \"localhost\" atau nama yang diberikan oleh host Anda."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Kami tidak dapat membuat file. Harap buat file bernama \"%1$s\" secara manual dan unggah ke folder \"%2$s\" di situs Joomla Anda. Kemudian pilih \"%3$s\" untuk melanjutkan."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Untuk mengonfirmasi bahwa Anda adalah pemilik situs web ini, harap hapus file bernama \"%1$s\" yang telah dibuat di folder \"%2$s\" situs Joomla Anda. Kemudian pilih \"%3$s\" untuk melanjutkan."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Anda mencoba untuk menggunakan host database yang tidak ada di server lokal Anda. Untuk alasan keamanan, Anda perlu memverifikasi kepemilikan akun hosting web Anda. <a href=\"%s\" target=\"_blank\" rel=\"noopener noreferrer\">Silakan baca dokumentasi</a> untuk informasi lebih lanjut."
+INSTL_DATABASE_HOST_LABEL="Nama Host"
+INSTL_DATABASE_NAME_DESC="Masukkan nama database."
+INSTL_DATABASE_NAME_LABEL="Nama Database"
+INSTL_DATABASE_NAME_MSG_MYSQL="Nama Database tidak valid. Tidak boleh mengandung karakter berikut: \ /"
+INSTL_DATABASE_NAME_MSG_POSTGRES="Nama database tidak valid. Harus dimulai dengan huruf, diikuti dengan karakter alfanumerik."
+INSTL_DATABASE_NO_SCHEMA="Tidak ada skema database tersedia untuk tipe database ini."
+INSTL_DATABASE_PASSWORD_DESC="Kata sandi yang Anda buat atau kata sandi yang disediakan oleh host Anda."
+INSTL_DATABASE_PREFIX_DESC="Masukkan awalan tabel atau gunakan yang dibuat secara acak."
+INSTL_DATABASE_PREFIX_MSG="Awalan tabel harus dimulai dengan huruf, dapat diikuti oleh karakter alfanumerik dan garis bawah"
+INSTL_DATABASE_RESPONSE_ERROR="Proses instalasi gagal."
+INSTL_DATABASE_TYPE_DESC="Pilih tipe database."
+INSTL_DATABASE_USER_DESC="Nama pengguna yang Anda buat atau nama pengguna yang disediakan oleh host Anda."
+INSTL_DATABASE_VALIDATION_ERROR="Periksa kredensial database Anda, jenis database, nama database atau nama host. Jika Anda telah menginstal MySQL 8, silakan baca ini <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\">wiki</a> untuk informasi lebih lanjut."
+
+INSTL_CONNECT_DB="Konfigurasi Koneksi Database"
+INSTL_INSTALL_JOOMLA="Instal Joomla"
+; Site View
+INSTL_ADMIN_EMAIL_DESC="Masukkan alamat email dari Super User."
+INSTL_ADMIN_PASSWORD_DESC="Masukkan kata sandi untuk akun Super User."
+INSTL_ADMIN_PASSWORD_LENGTH="Masukkan setidaknya 12 karakter."
+INSTL_ADMIN_USER_DESC="Masukkan nama asli anda untuk Super User."
+INSTL_ADMIN_USERNAME_DESC="Atur nama pengguna untuk akun Super Administrator Anda."
+INSTL_LOGIN_DATA="Data Login"
+INSTL_SETUP_SITE_NAME="Pengaturan Nama Situs"
+INSTL_SITE="Konfigurasi Utama"
+INSTL_SITE_DEVMODE_LABEL="Kami mendeteksi mode pengembangan"
+INSTL_SITE_NAME_DESC="Masukkan nama situ Joomla anda."
+; Complete view
+INSTL_COMPLETE_ERROR_FOLDER_DELETE="Folder \"%s\" tidak dapat dihapus. Mohon hapus manual folder tersebut."
+INSTL_COMPLETE_REMOVE_FOLDER="Hapus folder \"%s\""
+INSTL_COMPLETE_CONGRAT="Selamat!"
+INSTL_COMPLETE_TITLE="Selamat! Situs Joomla anda telah siap."
+INSTL_COMPLETE_SITE_BTN="Selesai & Buka Situs"
+INSTL_COMPLETE_ADMIN_BTN="Selesai & Buka Admin"
+INSTL_COMPLETE_FINAL="Pemasangan Selesai"
+INSTL_COMPLETE_FINAL_DESC="Pemasangan Joomla anda telah selesai dan siap digunakan."
+INSTL_COMPLETE_ADD_EXTRA_LANGUAGE="Instal Bahasa Tambahan"
+INSTL_REMOVE_INST_FOLDER="Anda yakin ingin menghapus? Konfirmasi anda ini akan menghapus folder \"%s\" secara permanen."
+; Languages view
+INSTL_LANGUAGES="Instal Bahasa Tambahan"
+INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Bahasa"
+INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_SELECT="Pilih Bahasa"
+INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_TAG="Tagar Bahasa"
+INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Versi"
+INSTL_LANGUAGES_DESC="Tampilan Joomla tersedia dalam beberapa bahasa. Pilih bahasa pilihan Anda dengan memilih kotak centang lalu instal dengan memilih tombol Berikutnya \"Pasang Bahasa Terpilih\".<br>Catatan: Operasi ini akan memakan waktu sekitar 10 detik untuk mengunduh dan menginstal setiap bahasa. Untuk menghindari batas waktu, pilih tidak lebih dari 3 bahasa untuk dipasang."
+INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Operasi ini akan memakan waktu hingga 10 detik per bahasa untuk diselesaikan<br>Harap tunggu sementara kami mengunduh dan menginstal bahasa ..."
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Tidak ada bahasa yang dipilih untuk dipasang."
+INSTL_LANGUAGES_SELECTED="Pasang Bahasa yang Dipilih"
+INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla tidak dapat terhubung ke server bahasa. Silakan selesaikan proses instalasi."
+INSTL_LANGUAGES_WARNING_NO_INTERNET2="Catatan: Anda dapat menginstal bahasa nanti dengan menggunakan akun Administrator Joomla."
+INSTL_LANGUAGES_WARNING_BACK_BUTTON="Kembali ke langkah pemasangan terakhir"
+; Default language view
+INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Bahasa Administrasi Bawaan"
+INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Joomla tidak dapat mengatur bahasa sebagai default. Bahasa Inggris akan digunakan sebagai bahasa default untuk Administrator Backend."
+INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Joomla telah mengatur %s sebagai bahasa bawaan ADMINISTRATOR Anda."
+INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Pilih"
+INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Bahasa"
+INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="Tagar"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_DOWNLOAD_PACKAGE="Joomla gagal mengunduh atau membongkar paket bahasa dari: %s"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Joomla tidak dapat menginstal bahasa %s"
+INSTL_DEFAULTLANGUAGE_DESC="Joomla telah menginstal bahasa berikut. Harap pilih bahasa default yang Anda inginkan untuk <strong>Administrator Joomla</strong>."
+INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla telah menginstal bahasa berikut. Harap pilih bahasa default yang Anda inginkan untuk <strong>Joomla Frontend</strong>."
+INSTL_DEFAULTLANGUAGE_FRONTEND="Bahasa Bawaan Situs"
+INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla tidak dapat mengatur bahasa sebagai default. Bahasa Inggris akan digunakan sebagai bahasa default untuk Halaman Depan Website."
+INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Joomla telah mengatur %s sebagai bahasa bawaan SITUS Anda."
+INSTL_DEFAULTLANGUAGE_SET_DEFAULT_LANGUAGE="Setel bahasa default"
+INSTL_DEFAULTLANGUAGE_TRY_LATER="Catatan: Anda dapat menginstal bahasa nanti dengan menggunakan akun Administrator Joomla."
+
+INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Bahasa Indonesia" ; 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="Tidak dapat terhubung ke database. Respon pesan kesalahan Konektor: %s"
+INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="Pemasang tidak dapat terhubung ke database yang ditentukan dan tidak dapat membuat database. Verifikasikan pengaturan Anda dan jika perlu buat secara manual database Anda."
+INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Tidak dapat menyegarkan cache manifes untuk ekstensi: %s"
+INSTL_DATABASE_ERROR_BACKINGUP="Terjadi kesalahan (galat) pada saat membuat cadangan database."
+INSTL_DATABASE_ERROR_CREATE="Terjadi kesalahan saat mencoba membuat database %s.<br>Pengguna mungkin tidak memiliki cukup hak untuk membuat database. Database yang diperlukan mungkin perlu dibuat secara terpisah sebelum Anda dapat menginstal Joomla"
+INSTL_DATABASE_ERROR_DELETE="Beberapa kesalahan (galat) telah terjadi pada saat menghapus database."
+INSTL_DATABASE_ERROR_READING_SQL_FILE="Tidak bisa membaca file SQL."
+INSTL_DATABASE_FIELD_VALUE_BACKUP="Buat Cadangan"
+INSTL_DATABASE_FIELD_VALUE_REMOVE="Singkirkan"
+INSTL_DATABASE_FILE_DOES_NOT_EXIST="File %s tidak ada."
+INSTL_DATABASE_FIX_LOWERCASE="Awalan tabel harus huruf kecil untuk PostgreSQL."
+INSTL_DATABASE_FIX_TOO_LONG="Prefiks (awalan) untuk tabel database MySQL tidak boleh lebih dari 15 karakter"
+INSTL_DATABASE_INVALID_DB_DETAILS="Detail database yang diberikan salah dan/atau kosong."
+INSTL_DATABASE_INVALID_MARIADB_VERSION="Anda memerlukan MySQL %1$s atau lebih tinggi untuk melanjutkan pemasangan. Versi Anda adalah: %2$s"
+INSTL_DATABASE_INVALID_MYSQL_VERSION="Anda memerlukan MySQL %1$s atau lebih tinggi untuk melanjutkan pemasangan. Versi Anda adalah: %2$s"
+INSTL_DATABASE_INVALID_MYSQLI_VERSION="Anda memerlukan MySQL %1$s atau lebih tinggi untuk melanjutkan pemasangan. Versi Anda adalah: %2$s"
+INSTL_DATABASE_INVALID_PGSQL_VERSION="Anda memerlukan PostgreSQL %1$s atau lebih tinggi untuk melanjutkan penginstalan. Versi Anda adalah: %2$s"
+INSTL_DATABASE_INVALID_POSTGRESQL_VERSION="Anda memerlukan PostgreSQL %1$s atau lebih tinggi untuk melanjutkan penginstalan. Versi Anda adalah: %2$s"
+INSTL_DATABASE_INVALID_TYPE="Silahkan pilih tipe database."
+INSTL_DATABASE_NAME_INVALID_CHAR="No MySQL dapat memiliki NULL ASCII (0x00)."
+INSTL_DATABASE_NAME_INVALID_SPACES="Nama database MySQL dan nama tabel tidak boleh dimulai atau diakhiri dengan spasi."
+INSTL_DATABASE_NAME_TOO_LONG="Panjang nama Database MySQL maksimal 64 karakter."
+; Controllers
+INSTL_COOKIES_NOT_ENABLED="Cookie tampaknya tidak diaktifkan pada klien browser Anda. Anda tidak akan dapat menginstal aplikasi dengan fitur ini dinonaktifkan. Atau, mungkin juga ada masalah dengan <strong>session.save_path</strong> server. Jika demikian, silakan berkonsultasi dengan penyedia hosting Anda jika Anda tidak tahu cara memeriksa atau memperbaikinya sendiri."
+INSTL_HEADER_ERROR="Galat"
+; Helpers
+INSTL_PAGE_TITLE="Pemasang Joomla"
+; Configuration model
+INSTL_ERROR_CONNECT_DB="Tidak dapat terhubung ke database. Respon pesan kesalahan Konektor: %d."
+INSTL_STD_OFFLINE_MSG="Situs ini sedang dalam perbaikan.<br>Silakan periksa kembali nanti."
+; Languages model
+INSTL_ERROR_INVALID_URL="URL Salah"
+; Others
+INSTL_CONFPROBLEM="Berkas konfigurasi anda atau folder tidak bisa ditulisi atau terjadi masalah pada pembuatan berkas konfigurasi. Anda harus mengunggah kode berikut secara manual. Klik pada area teks untuk menyorot semua kode dan kemudian salin dan tempel kedalam sebuah berkas teks baru. Berinama berkas ini dengan 'configuration.php' dan unggah berkas tersebut ke folder pangkal situs anda."
+INSTL_DISPLAY_ERRORS="Tampilkan Kesalahan"
+INSTL_ERROR="Galat"
+INSTL_ERROR_DB="Beberapa kesalahan terjadi saat mengisi database: %s."
+INSTL_ERROR_INITIALISE_SCHEMA="Tidak dapat menginisialisasi skema database."
+INSTL_EXTENSION_AVAILABLE="%s Tersedia"
+INSTL_FILE_UPLOADS="Unggah Berkas"
+INSTL_GNU_GPL_LICENSE="Lisensi GNU General Public"
+INSTL_HELP_LINK="Bantuan instalasi Joomla"
+INSTL_NOTICE_NEEDSTOBEWRITABLE="Anda masih dapat melanjutkan instalasi jika Anda memperbaiki izin."
+INSTL_OUTPUT_BUFFERING="Penyangga Keluar"
+INSTL_PHP_VERSION="Versi PHP"
+INSTL_PHP_VERSION_NEWER="Versi PHP >= %s"
+INSTL_PROCESS_BUSY="Proses sedang berlangsung. Harap tunggu..."
+INSTL_SESSION_AUTO_START="Sesi Mulai Otomatis"
+INSTL_WRITABLE="Izin untuk membuat %s tidak memadai."
+INSTL_ZIP_SUPPORT_AVAILABLE="Dukungan Native ZIP"
+; Global strings
+JADMINISTRATOR="Administrator"
+JEMAIL="E-mail"
+JERROR="Galat"
+JERROR_LAYOUT_ERROR_HAS_OCCURRED_WHILE_PROCESSING_YOUR_REQUEST="Sebuah kesalahan telah terjadi saat memproses permintaan Anda."
+JGLOBAL_ISFREESOFTWARE="%s adalah perangkat lunak bebas yang dirilis dibawah %s"
+JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="Paket bahasa tidak cocok dengan versi Joomla ini. Beberapa string mungkin hilang dan akan ditampilkan dalam bahasa Inggris."
+JGLOBAL_SELECT_AN_OPTION="Pilih sebuah opsi"
+JGLOBAL_SELECT_NO_RESULTS_MATCH="Tidak ada hasil yang sesuai"
+JGLOBAL_SELECT_SOME_OPTIONS="Pilih beberapa opsi"
+JHIDEPASSWORD="Sembunyikan Kata sandi"
+JINVALID_TOKEN="Permintaan terakhir ditolak karena mengandung token keamanan yang tidak benar. Silakan segarkan halaman dan coba lagi."
+JINVALID_TOKEN_NOTICE="Token keamanan tidak cocok. Permintaan dibatalkan untuk mencegah pelanggaran keamanan. Silakan coba lagi."
+JNEXT="Berikut"
+JNO="Tidak"
+JNOTICE="Pemberitahuan"
+JOFF="Padam"
+JON="Nyala"
+JPREVIOUS="Sebelum"
+JSHOWPASSWORD="Tampilkan Kata sandi"
+JSITE="Situs"
+JSKIP="Lewati"
+JUSERNAME="Nama Pengguna"
+JYES="Ya"
+; Framework strings necessary when no lang pack is available
+JLIB_DATABASE_ERROR_CONNECT_MYSQL="Tidak bisa terhubung dengan MySQL."
+JLIB_DATABASE_ERROR_DATABASE="Telah terjadi Galat Database."
+JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Tidak dapat memuat Driver Database: %s."
+JLIB_DATABASE_ERROR_VALID_MAIL="Alamat email yang Anda masukkan tidak valid. Masukkan alamat email lain."
+JLIB_ENVIRONMENT_SESSION_EXPIRED="Sesi Anda telah berakhir, silakan muat kembali halaman ini."
+JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER="%1$s: Jalur bukan folder. Jalur: %2$s"
+JLIB_FORM_FIELD_INVALID="Isian tidak benar:&#160"
+JLIB_FORM_VALIDATE_FIELD_INVALID="Kolom tidak valid: %s"
+JLIB_FORM_VALIDATE_FIELD_REQUIRED="Kolom diperlukan: %s"
+JLIB_INSTALLER_ABORT="Membatalkan pemasangan bahasa: %s"
+JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="Ekstensi %1$s: Gagal membuat folder: %2$s"
+JLIB_INSTALLER_ABORT_NOINSTALLPATH="Jalur pemasangan tidak ada"
+JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="Paket %1$s: Ada kesalahan saat memasang ekstensi: %2$s."
+JLIB_INSTALLER_ABORT_PACK_INSTALL_NO_FILES="Paket %s: Tidak ada berkas untuk dipasang!"
+JLIB_INSTALLER_ERROR_DOWNLOAD_SERVER_CONNECT="Galat menghubungi server: %s"
+JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Gagal menyalin berkas %1$s ke %2$s."
+JLIB_INSTALLER_INSTALL="Pasang"
+JLIB_INSTALLER_NOT_ERROR="Jika kesalahan terkait dengan penginstalan file bahasa TinyMCE, itu tidak berpengaruh pada penginstalan bahasa. Beberapa paket bahasa yang dibuat sebelum Joomla 3.2.0 mungkin mencoba menginstal file bahasa TinyMCE yang terpisah. Karena ini sekarang termasuk dalam inti, mereka tidak perlu lagi diinstal."
+JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Tidak dapat membuat konten bahasa untuk %s bahasa: %s."
+JLIB_UPDATER_ERROR_COLLECTION_FOPEN="Pengaturan PHP allow_url_fopen dinonaktifkan. Pengaturan ini harus diaktifkan agar mesin pembaruan bisa bekerja."
+JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Pembaruan: :Collection: Tidak dapat membuka %s"
+JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Pembaruan: :Collection: Tidak dapat parsing %s"
+JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Pembaruan: Tidak dapat membuka situs pembaruan #%d \"%s\", URL: %s."
+JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Tidak dapat dikoneksikan ke database <br>joomla.library: %1$s - %2$s."
+; Strings for the language debugger
+JDEBUG_LANGUAGE_FILES_IN_ERROR="Galat penguraian pada berkas bahasa"
+JDEBUG_LANGUAGE_UNTRANSLATED_STRING="String belum diterjemahkan"
+JNONE="Tidak ada"
+; Necessary for errors
+ADMIN_EMAIL="Email Admin"
+ADMIN_PASSWORD="Sandi Admin"
+SITE_NAME="Nama Situs"
+; Database types (allows for a more descriptive label than the internal name)
+MYSQL="MySQL (PDO)"
+MYSQLI="MySQLi"
+ORACLE="Oracle"
+PGSQL="PostgreSQL (PDO)"
+POSTGRESQL="PostgreSQL"
+SQLITE="SQLite"
+; Javascript message titles
+ERROR="Galat"
+MESSAGE="Pesan"
+NOTICE="Pemberitahuan"
+WARNING="Peringatan"
+; Javascript ajax error messages
+JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="Koneksi diputuskan saat mengambil data JSON."
+JLIB_JS_AJAX_ERROR_NO_CONTENT="Tidak ada konten yang ditampilkan."
+JLIB_JS_AJAX_ERROR_OTHER="Terjadi kesalahan saat mengambil data JSON: Kode status HTTP %d."
+JLIB_JS_AJAX_ERROR_PARSE="Terjadi kesalahan penguraian saat memproses data JSON berikut:<br><code style=\"color:inherit;white-space:pre-wrap;padding:0;margin:0;border:0;background:inherit;\">%s</code>"
+JLIB_JS_AJAX_ERROR_TIMEOUT="Waktu habis saat mengambil data JSON."
+; Field password messages
+JFIELD_PASSWORD_INDICATE_COMPLETE="Kata Sandi diterima"
+JFIELD_PASSWORD_INDICATE_INCOMPLETE="Kata sandi tidak memenuhi persyaratan situs."
+JFIELD_PASSWORD_SPACES_IN_PASSWORD="Sandi tidak boleh mengandung spasi di awal atau di akhir."
+JFIELD_PASSWORD_TOO_LONG="Sandi terlalu panjang. Sandi harus kurang dari 100 karakter."
+JFIELD_PASSWORD_TOO_SHORT_N="Sandi terlalu pendek. Sandi harus harus mengandung setidaknya %s karakter."
+; Javascript Form Validation Messages
+JLIB_FORM_CONTAINS_INVALID_FIELDS="Formulir tidak dapat dikirimkan karena tidak ada data yang diperlukan. <br> Harap perbaiki kolom yang ditandai dan coba lagi."
+JLIB_FORM_FIELD_INVALID_VALUE="Nilai ini tidak valid."
+JLIB_FORM_FIELD_REQUIRED_CHECK="Harus memilih salah satu opsi."
+JLIB_FORM_FIELD_REQUIRED_VALUE="Silahkan isi kolom ini."
+
diff --git a/installation/language/id-ID/langmetadata.xml b/installation/language/id-ID/langmetadata.xml
new file mode 100644
index 0000000000000..c700bb08fae65
--- /dev/null
+++ b/installation/language/id-ID/langmetadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metafile client="installation">
+	<name>Bahasa Indonesia (id)</name>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
+	<author>Joomla! Indonesia</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>Bahasa Indonesia (id)</name>
+		<nativeName>Bahasa Indonesia (id)</nativeName>
+		<tag>id</tag>
+		<rtl>0</rtl>
+	</metadata>
+	<params/>
+</metafile>
diff --git a/installation/language/it-IT/joomla.ini b/installation/language/it-IT/joomla.ini
index 483ba4360d65d..24c6d56950a8f 100644
--- a/installation/language/it-IT/joomla.ini
+++ b/installation/language/it-IT/joomla.ini
@@ -5,17 +5,17 @@
 
 ; Fatal error page
 ; These will be processed by the JavaScript Build
-BUILD_FATAL_HEADER="Siamo spiacenti, c'è stato un problema da che non siamo riusciti a risolvere."
+BUILD_FATAL_HEADER="Siamo spiacenti, c'è stato un problema che non abbiamo potuto risolvere."
 BUILD_FATAL_LANGUAGE="Italiano IT"
 BUILD_FATAL_TEXT="Il server ha restituito un \"{{statusCode_statusText}}\""
 BUILD_FATAL_URL_TEXT="Aiutami a risolvere questo"
 ; These will be processed by the JavaScript Build
-BUILD_INCOMPLETE_HEADER="Configurazione Ambientale Incompleta"
+BUILD_INCOMPLETE_HEADER="Impostazione ambiente incompleta"
 BUILD_INCOMPLETE_LANGUAGE="Italiano IT"
 BUILD_INCOMPLETE_TEXT="Sembra che si stia tentando di avviare Joomla! dal nostro archivio git. Per riuscirci è necessario completare anzitutto un paio di altri passaggi."
 BUILD_INCOMPLETE_URL_TEXT="Ulteriori Dettagli"
 ; These will be processed by the JavaScript Build
-BUILD_NOXML_HEADER="Siamo spiacenti, al tuo PHP manca di una libreria essenziale"
+BUILD_NOXML_HEADER="Siamo spiacenti, al tuo PHP manca una libreria essenziale"
 BUILD_NOXML_LANGUAGE="Italiano IT"
 BUILD_NOXML_TEXT="Il tuo host deve usare PHP con il supporto per la libreria XML per eseguire questa versione di Joomla!"
 BUILD_NOXML_URL_TEXT="Aiutami a risolvere questo"
@@ -27,7 +27,7 @@ BUILD_MIN_PHP_ERROR_URL_TEXT="Aiutami a risolvere questo"
 ; Main Config
 INSTL_SELECT_INSTALL_LANG="Seleziona la Lingua di Installazione"
 INSTL_SELECT_LANGUAGE_TITLE="Seleziona la lingua"
-INSTL_SETUP_LOGIN_DATA="Configura i Dati del Login"
+INSTL_SETUP_LOGIN_DATA="Configura dati di accesso"
 INSTL_WARNJAVASCRIPT="Attenzione! È necessario abilitare JavaScript per una corretta installazione di Joomla"
 INSTL_WARNJSON="La tua installazione di PHP deve avere JSON abilitato perchè Joomla!® venga installato!"
 ; Precheck view
@@ -81,6 +81,7 @@ INSTL_DATABASE_NAME_MSG_POSTGRES="Il nome del database non è valido. Deve inizi
 INSTL_DATABASE_NO_SCHEMA="Non esiste nessun schema di database per questo tipo di database."
 INSTL_DATABASE_PASSWORD_DESC="La password del database creata da te o fornita dal tuo gestore di hosting."
 INSTL_DATABASE_PREFIX_DESC="Immetti un prefisso delle tabelle o utilizza quello generato casualmente."
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Se stai utilizzando un database esistente con tabelle con lo stesso prefisso, Joomla rinominerà quelle tabelle esistenti aggiungendo il prefisso \"bak_\"."
 INSTL_DATABASE_PREFIX_MSG="Il prefisso delle tabelle deve iniziare con una lettera, seguita facoltativamente da caratteri alfanumerici e da un underscore"
 INSTL_DATABASE_RESPONSE_ERROR="Il processo di installazione è fallito."
 INSTL_DATABASE_TYPE_DESC="Seleziona il tipo di database."
@@ -95,7 +96,7 @@ INSTL_ADMIN_PASSWORD_DESC="Imposta la password del tuo account Super User."
 INSTL_ADMIN_PASSWORD_LENGTH="Inserisci almeno 12 caratteri."
 INSTL_ADMIN_USER_DESC="Inserisci il vero nome del tuo Super User."
 INSTL_ADMIN_USERNAME_DESC="Imposta il nome utente per il tuo account Super Amministratore."
-INSTL_LOGIN_DATA="Dati di login"
+INSTL_LOGIN_DATA="Dati di accesso"
 INSTL_SETUP_SITE_NAME="Imposta il Nome del Sito"
 INSTL_SITE="Configurazione principale"
 INSTL_SITE_DEVMODE_LABEL="Modalità di sviluppo rilevata"
@@ -126,7 +127,7 @@ INSTL_LANGUAGES_WARNING_NO_INTERNET2="Nota: Potrai installare le lingue successi
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="Torna all'ultima fase dell'installazione"
 ; Default language view
 INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Lingua predefinita lato amministrativo"
-INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Joomla! non ha potuto impostare la lingua come predefinita. Come lingua predefinita lato AMMINISTRATIVO verrà impostato l'Inglese."
+INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Joomla! non ha potuto impostare la lingua come predefinita. Come lingua predefinita lato amministrativo verrà impostato l'Inglese."
 INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Joomla ha impostato %s come lingua predefinita AMMINISTRATOR."
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Seleziona"
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Lingua"
@@ -194,7 +195,7 @@ INSTL_SESSION_AUTO_START="Auto start sessione"
 INSTL_WRITABLE="Permessi non sufficienti per creare %s"
 INSTL_ZIP_SUPPORT_AVAILABLE="Supporto nativo per ZIP"
 ; Global strings
-JADMINISTRATOR="Pannello amministrativo"
+JADMINISTRATOR="Amministrazione"
 JEMAIL="Indirizzo e-mail"
 JERROR="Errore"
 JERROR_LAYOUT_ERROR_HAS_OCCURRED_WHILE_PROCESSING_YOUR_REQUEST="si è verificato un errore durante l'esecuzione della richiesta."
diff --git a/installation/language/it-IT/langmetadata.xml b/installation/language/it-IT/langmetadata.xml
index 1037b64750daf..ff8837b11c696 100644
--- a/installation/language/it-IT/langmetadata.xml
+++ b/installation/language/it-IT/langmetadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Italiano (it-IT)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
-	<author>Progetto Joomla!</author>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
+	<author>Joomla! Project (Italian 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/ja-JP/langmetadata.xml b/installation/language/ja-JP/langmetadata.xml
index bb0f030ff1250..e4b25f7a3232e 100644
--- a/installation/language/ja-JP/langmetadata.xml
+++ b/installation/language/ja-JP/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Japanese (ja-JP)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Joomla!じゃぱん</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/ka-GE/joomla.ini b/installation/language/ka-GE/joomla.ini
index 2678a98b7942d..5d2e35d2b012c 100644
--- a/installation/language/ka-GE/joomla.ini
+++ b/installation/language/ka-GE/joomla.ini
@@ -60,8 +60,8 @@ 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_ONE_WAY="ერთმხრივი აუტენთიფიკაცია"
-INSTL_DATABASE_ENCRYPTION_MODE_VALUE_TWO_WAY="ორმხრივი აუტენთიფიკაცია"
+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\" არ არის შევსებული ან არ შეიცავს სწორ გზას."
@@ -81,6 +81,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_MSG="მონაცემთა ბაზის ცხრილის პრეფიქსი უნდა იწყებოდეს ასოთი, რომელსაც შეიძლება მოჰყვეს ასო-ციფრული სიმბოლოები და ქვედა ტირე"
 INSTL_DATABASE_RESPONSE_ERROR="ინსტალაციის პროცესის დასრულება ვერ მოხერხდა."
 INSTL_DATABASE_TYPE_DESC="აირჩიეთ მონაცემთა ბაზის ტიპი."
diff --git a/installation/language/ka-GE/langmetadata.xml b/installation/language/ka-GE/langmetadata.xml
index 5e7953738827d..281d9890a9bc3 100644
--- a/installation/language/ka-GE/langmetadata.xml
+++ b/installation/language/ka-GE/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Georgian (Georgia)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Georgian Translation Team</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/kk-KZ/langmetadata.xml b/installation/language/kk-KZ/langmetadata.xml
index 9259350df4e7e..7d3817fcb5524 100644
--- a/installation/language/kk-KZ/langmetadata.xml
+++ b/installation/language/kk-KZ/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Kazakh (Kazakhstan)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Sarvarov Akylkerey</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/lt-LT/joomla.ini b/installation/language/lt-LT/joomla.ini
index 83a1c3c900545..40af2c202d9e6 100644
--- a/installation/language/lt-LT/joomla.ini
+++ b/installation/language/lt-LT/joomla.ini
@@ -81,6 +81,7 @@ INSTL_DATABASE_NAME_MSG_POSTGRES="Duomenų bazės pavadinimas neteisingas. Jis t
 INSTL_DATABASE_NO_SCHEMA="Šiam duomenų bazės tipui neegzistuoja duomenų bazės schema."
 INSTL_DATABASE_PASSWORD_DESC="Arba jūsų sukurtas slaptažodis, arba slaptažodis, kurį pateikė jūsų priegloba."
 INSTL_DATABASE_PREFIX_DESC="Įveskite lentelės priešdėlį arba naudokite atsitiktinai sugeneruotą."
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Jei naudojate esamą duomenų bazę su lentelėmis su tuo pačiu priešdėliu, Joomla pervadins esamas lenteles pridėdama priešdėlį \"bak_\"."
 INSTL_DATABASE_PREFIX_MSG="Lentelės priešdėlis turi prasidėti raide, po kurios gali būti raidiniai ir skaitiniai simboliai ir apatinis brūkšnys"
 INSTL_DATABASE_RESPONSE_ERROR="Diegimo procesas nepavyko."
 INSTL_DATABASE_TYPE_DESC="Pasirinkite duomenų bazės tipą."
diff --git a/installation/language/lt-LT/langmetadata.xml b/installation/language/lt-LT/langmetadata.xml
index 9ebca0f17c10d..000741fee64d1 100644
--- a/installation/language/lt-LT/langmetadata.xml
+++ b/installation/language/lt-LT/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Lithuanian (Lithuania)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Oskaras Jankauskas</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/lv-LV/joomla.ini b/installation/language/lv-LV/joomla.ini
index 2d5c8dc176d5a..7ffe4f101c11a 100644
--- a/installation/language/lv-LV/joomla.ini
+++ b/installation/language/lv-LV/joomla.ini
@@ -81,6 +81,7 @@ INSTL_DATABASE_NAME_MSG_POSTGRES="Nepareizs datu bāzes nosaukums. Tam jāsākas
 INSTL_DATABASE_NO_SCHEMA="Šim datu bāzes tipam nav atrodama shēma."
 INSTL_DATABASE_PASSWORD_DESC="Jūsu izveidots vai provaidera piešķirts lietotājvārds."
 INSTL_DATABASE_PREFIX_DESC="Ievadiet tabulas prefiksu vai lietojiet automātiski ģenerētu."
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Ja lietojat eksistējošu datu bāzi ar tabulām kurām ir tāds pats prefikss, Joomla pārsauks šīs tabulas pievienojot prefiksu \"bak_\"."
 INSTL_DATABASE_PREFIX_MSG="Datu bāzes prefiksam ir jāsākas ar burtu, pēc tā var būt cipari, burti vai zemsvītra"
 INSTL_DATABASE_RESPONSE_ERROR="Instalēšanas process neizdevās."
 INSTL_DATABASE_TYPE_DESC="Izvēlieties datu bāzes tipu."
diff --git a/installation/language/lv-LV/langmetadata.xml b/installation/language/lv-LV/langmetadata.xml
index 94e76f78507d7..4bd1498ee4c70 100644
--- a/installation/language/lv-LV/langmetadata.xml
+++ b/installation/language/lv-LV/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Latvian (Latvia)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Joomla! Projekts</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/mk-MK/langmetadata.xml b/installation/language/mk-MK/langmetadata.xml
index e821df651114d..0c7f4c9da6aab 100644
--- a/installation/language/mk-MK/langmetadata.xml
+++ b/installation/language/mk-MK/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Macedonian (Macedonia)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Joomla! Project</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/nl-BE/joomla.ini b/installation/language/nl-BE/joomla.ini
index b9e669bc7ef85..d8c80d86530f2 100644
--- a/installation/language/nl-BE/joomla.ini
+++ b/installation/language/nl-BE/joomla.ini
@@ -81,6 +81,7 @@ INSTL_DATABASE_NAME_MSG_POSTGRES="De naam van de database is ongeldig. Deze moet
 INSTL_DATABASE_NO_SCHEMA="Er bestaat geen database schema voor dit database type."
 INSTL_DATABASE_PASSWORD_DESC="Een wachtwoord dat door uzelf is aangemaakt, of een wachtwoord dat door de webhost is verstrekt."
 INSTL_DATABASE_PREFIX_DESC="Een tabel voorvoegsel invoeren of de willekeurig gegenereerde gebruiken."
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Als een bestaande database gebruikt wordt met tabellen met dezelfde voorvoegsel, zal Joomla deze bestaande tabellen hernoemen door het voorvoegsel \"bak_\" toe te voegen."
 INSTL_DATABASE_PREFIX_MSG="Het voorvoegsel van de tabel moet beginnen met een letter, eventueel gevolgd door alfanumerieke tekens en een onderstrepingsteken"
 INSTL_DATABASE_RESPONSE_ERROR="Het installatieproces is mislukt."
 INSTL_DATABASE_TYPE_DESC="Selecteer het databasetype."
diff --git a/installation/language/nl-BE/langmetadata.xml b/installation/language/nl-BE/langmetadata.xml
index 284dd82d651b0..4f48299968f3d 100644
--- a/installation/language/nl-BE/langmetadata.xml
+++ b/installation/language/nl-BE/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Dutch (Belgium)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<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>
diff --git a/installation/language/nl-NL/joomla.ini b/installation/language/nl-NL/joomla.ini
index f602ced927834..c37d37ce0f0cb 100644
--- a/installation/language/nl-NL/joomla.ini
+++ b/installation/language/nl-NL/joomla.ini
@@ -81,6 +81,7 @@ INSTL_DATABASE_NAME_MSG_POSTGRES="De naam van de database is ongeldig. Deze moet
 INSTL_DATABASE_NO_SCHEMA="Er bestaat geen databaseschema voor dit type database."
 INSTL_DATABASE_PASSWORD_DESC="Een wachtwoord dat door uzelf is aangemaakt, of een wachtwoord dat door de webhost is verstrekt."
 INSTL_DATABASE_PREFIX_DESC="Een tabel voorvoegsel invoeren of de willekeurig gegenereerde gebruiken."
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Als een bestaande database gebruikt wordt met tabellen met dezelfde voorvoegsel, zal Joomla deze bestaande tabellen hernoemen door het voorvoegsel \"bak_\" toe te voegen."
 INSTL_DATABASE_PREFIX_MSG="Het voorvoegsel van de tabel moet beginnen met een letter, eventueel gevolgd door alfanumerieke tekens en een onderstrepingsteken"
 INSTL_DATABASE_RESPONSE_ERROR="Het installatieproces is mislukt."
 INSTL_DATABASE_TYPE_DESC="Selecteer het databasetype."
diff --git a/installation/language/nl-NL/langmetadata.xml b/installation/language/nl-NL/langmetadata.xml
index 7ed535aefe932..7706d62062492 100644
--- a/installation/language/nl-NL/langmetadata.xml
+++ b/installation/language/nl-NL/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Dutch (nl-NL)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Dutch Translation Team</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/pl-PL/langmetadata.xml b/installation/language/pl-PL/langmetadata.xml
index a4568ca257642..15f1f0661c213 100644
--- a/installation/language/pl-PL/langmetadata.xml
+++ b/installation/language/pl-PL/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Polish (Poland)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Projekt Joomla!</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/pt-BR/langmetadata.xml b/installation/language/pt-BR/langmetadata.xml
index 3b10d0ec54bc2..a709150683c13 100644
--- a/installation/language/pt-BR/langmetadata.xml
+++ b/installation/language/pt-BR/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Português Brasil (pt-BR)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Projeto Joomla!</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/pt-PT/joomla.ini b/installation/language/pt-PT/joomla.ini
index a2294e0eb46d2..388965d8f5c58 100644
--- a/installation/language/pt-PT/joomla.ini
+++ b/installation/language/pt-PT/joomla.ini
@@ -12,7 +12,7 @@ BUILD_FATAL_URL_TEXT="Ajude-me a resolver isto"
 ; These will be processed by the JavaScript Build
 BUILD_INCOMPLETE_HEADER="Configuração do ambiente incompleta"
 BUILD_INCOMPLETE_LANGUAGE="Portuguese (pt-PT)"
-BUILD_INCOMPLETE_TEXT="Parece que está a tentar executar o Joomla a partir do nosso repositório Git. Se pretende fazer isso, primeiro terá de efetuar algumas etapas adicionais."
+BUILD_INCOMPLETE_TEXT="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."
 BUILD_INCOMPLETE_URL_TEXT="Mais detalhes"
 ; These will be processed by the JavaScript Build
 BUILD_NOXML_HEADER="Desculpe, o seu PHP não possui uma biblioteca vital"
@@ -20,27 +20,27 @@ BUILD_NOXML_LANGUAGE="Portuguese (pt-PT)"
 BUILD_NOXML_TEXT="O seu alojamento terá de ter suporte para a biblioteca XML no PHP para poder utilizar esta versão do Joomla!"
 BUILD_NOXML_URL_TEXT="Ajude-me a resolver isto"
 ; These will be processed by the JavaScript Build
-BUILD_MIN_PHP_ERROR_HEADER="Lamentamos mas a sua versão de PHP não é suportada."
+BUILD_MIN_PHP_ERROR_HEADER="Lamentamos, mas a sua versão de PHP não é suportada."
 BUILD_MIN_PHP_ERROR_LANGUAGE="Portuguese (pt-PT)"
 BUILD_MIN_PHP_ERROR_TEXT="O seu alojamento terá de usar PHP na versão {{phpversion}}, ou mais recente, para poder utilizar esta versão do Joomla."
 BUILD_MIN_PHP_ERROR_URL_TEXT="Ajude-me a resolver isto"
 ; Main Config
 INSTL_SELECT_INSTALL_LANG="Selecionar idioma de instalação"
-INSTL_SELECT_LANGUAGE_TITLE="Escolher idioma"
+INSTL_SELECT_LANGUAGE_TITLE="Selecionar idioma"
 INSTL_SETUP_LOGIN_DATA="Configuração de dados de autenticação"
 INSTL_WARNJAVASCRIPT="Alerta! É necessário ativar o JavaScript para a correta instalação do Joomla."
 INSTL_WARNJSON="É necessário ter o JSON ativado na sua instalação PHP de forma a poder instalar o Joomla. Contacte o gestor do seu alojamento!"
 ; Precheck view
 INSTL_DATABASE_SUPPORT="Suporte a bases de dados:"
 INSTL_JSON_SUPPORT_AVAILABLE="Suporte a JSON"
-INSTL_MB_LANGUAGE_IS_DEFAULT="Idioma padrão de MB"
+INSTL_MB_LANGUAGE_IS_DEFAULT="Idioma predefinido de MB"
 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 ativado 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>."
 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 ativado, por padrã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_XML_SUPPORT="O suporte a XML não está disponível. Isto deve estar ativado, 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>."
 INSTL_PARSE_INI_FILE_AVAILABLE="Suporte a compilador de INI"
 INSTL_PRECHECK_ACTUAL="ATUAL"
@@ -59,14 +59,14 @@ INSTL_DATABASE_ENCRYPTION_CERT_LABEL="Caminho para o ficheiro do certificado"
 INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL="Suite de criptografia suportada (opcional)"
 INSTL_DATABASE_ENCRYPTION_KEY_LABEL="Caminho para o ficheiro da chave privada"
 INSTL_DATABASE_ENCRYPTION_MODE_LABEL="Encriptação de ligação"
-INSTL_DATABASE_ENCRYPTION_MODE_VALUE_NONE="Padrão (controlado pelo servidor)"
+INSTL_DATABASE_ENCRYPTION_MODE_VALUE_NONE="Predefinido (controlado pelo servidor)"
 INSTL_DATABASE_ENCRYPTION_MODE_VALUE_ONE_WAY="Autenticação de sentido único"
 INSTL_DATABASE_ENCRYPTION_MODE_VALUE_TWO_WAY="Autenticação em dois sentidos"
-INSTL_DATABASE_ENCRYPTION_MSG_CONN_NOT_ENCRYPT="Selecionou para utilização o modo de encriptação de ligação à base de dados. Apesar de ser possível estabelecer uma conexão não pode ser encriptada. O motivo pode residir no facto de o servidor da base de dados estar configurado para regredir para uma ligação não encriptada caso os parâmetros de encriptação sejam inválidos. Verifique e corrija os parâmetros de encriptação da base de dados ou altere o campo \"Encriptação de ligação\" de volta para \"Padrão (controlado pelo servidor)\"."
+INSTL_DATABASE_ENCRYPTION_MSG_CONN_NOT_ENCRYPT="Selecionou para utilização o modo de encriptação de ligação à base de dados. Apesar de ser possível estabelecer uma conexão não pode ser encriptada. O motivo pode residir no facto de o servidor da base de dados estar configurado para regredir para uma ligação não encriptada caso os parâmetros de encriptação sejam inválidos. Verifique e corrija os parâmetros de encriptação da base de dados ou altere o campo \"Encriptação de ligação\" de volta para \"Predefinição (controlado pelo servidor)\"."
 INSTL_DATABASE_ENCRYPTION_MSG_FILE_FIELD_BAD="O ficheiro inserido no campo \"%s\" não existe ou não está acessível."
 INSTL_DATABASE_ENCRYPTION_MSG_FILE_FIELD_EMPTY="O campo \"%s\" está vazio ou não contém um caminho válido."
-INSTL_DATABASE_ENCRYPTION_MSG_LOCALHOST="Você digitou \"localhost\" como nome de anfitrião. Ligar à base de dados com encriptação de ligação pode falhar dessa forma. Altere \"localhost\" para \"127.0.0.1\" ou \"::1\" ou um nome de anfitrião diferente, ou altere o campo \"Encriptação de ligação\" de volta para \"Padrão (controlado pelo servidor)\"."
-INSTL_DATABASE_ENCRYPTION_MSG_SRV_NOT_SUPPORTS="O servidor da base de dados não suporta encriptação de ligações. Ative o suporte TLS (frequentemente chamado SSL nos documentos) no seu servidor de base de dados ou altere o campo \"Encriptação de ligação\" de volta para \"Padrão (controlado pelo servidor)\"."
+INSTL_DATABASE_ENCRYPTION_MSG_LOCALHOST="Você digitou \"localhost\" como nome de servidor. Ligar à base de dados com encriptação de ligação pode falhar dessa forma. Altere \"localhost\" para \"127.0.0.1\" ou \"::1\" ou um nome de servidor diferente, ou altere o campo \"Encriptação de ligação\" de volta para \"Predefinição (controlado pelo servidor)\"."
+INSTL_DATABASE_ENCRYPTION_MSG_SRV_NOT_SUPPORTS="O servidor da base de dados não suporta encriptação de ligações. Ative o suporte TLS (frequentemente chamado SSL) no seu servidor de base de dados ou altere o campo \"Encriptação de ligação\" de volta para \"Predefinição (controlado pelo servidor)\"."
 INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="Verificar certificado do servidor"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="Falha na consulta à base de dados PostgreSQL."
 INSTL_DATABASE_HOST_DESC="Introduza o nome de alojamento. Normalmente é \"localhost\" ou um nome fornecido pelo seu alojamento."
@@ -81,17 +81,18 @@ INSTL_DATABASE_NAME_MSG_POSTGRES="O nome da base de dados é inválido. Deve com
 INSTL_DATABASE_NO_SCHEMA="Não existe um esquema de base de dados para este tipo de base."
 INSTL_DATABASE_PASSWORD_DESC="A senha que criou ou a atribuída pelo seu alojamento Web."
 INSTL_DATABASE_PREFIX_DESC="Introduza um prefixo para a tabela ou use um gerado aleatoriamente."
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Se estiver a usar uma base de dados contendo tabelas com o mesmo prefixo, o Joomla renomeará as tabelas existentes adicionando o prefixo \"bak_\"."
 INSTL_DATABASE_PREFIX_MSG="O prefixo de tabela deve começar por uma letra, e seguido, opcionalmente, de caracteres do tipo alfanumérico. Terá de ser terminado por um sobtraço"
 INSTL_DATABASE_RESPONSE_ERROR="Falha no processo de instalação."
 INSTL_DATABASE_TYPE_DESC="Escolha o tipo de base de dados."
 INSTL_DATABASE_USER_DESC="O nome de utilizador para acesso à base de dados ou um nome de utilizador atribuído pelo seu alojamento web. Nota: em alguns servidores locais será: root"
-INSTL_DATABASE_VALIDATION_ERROR="Verifique as suas credenciais da base de dados, tipo de base de dados, nome da base de dados ou nome do servidor. Se tem o MySQL 8 instalado, por favor leia este <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\">Wiki</a> para obter mais informações."
+INSTL_DATABASE_VALIDATION_ERROR="Verifique as suas credenciais da base de dados, tipo de base de dados, nome da base de dados ou nome do servidor. Se tem o MySQL 8 instalado, por favor, leia isto <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\">Wiki</a> para obter mais informações."
 
 INSTL_CONNECT_DB="Ligação à base de dados"
 INSTL_INSTALL_JOOMLA="Instalar o Joomla"
 ; Site View
 INSTL_ADMIN_EMAIL_DESC="Digite o endereço de email do superutilizador do sítio."
-INSTL_ADMIN_PASSWORD_DESC="Defina a senha da sua conta de supe utilizador."
+INSTL_ADMIN_PASSWORD_DESC="Defina a senha para a sua conta de superutilizador."
 INSTL_ADMIN_PASSWORD_LENGTH="Introduza pelo menos 12 caracteres."
 INSTL_ADMIN_USER_DESC="Digite o nome real para o seu superutilizador."
 INSTL_ADMIN_USERNAME_DESC="Defina o nome de utilizador para a sua conta de superutilizador."
@@ -114,7 +115,7 @@ INSTL_REMOVE_INST_FOLDER="Pretende mesmo eliminar? Ao confirmar irá apagar perm
 ; Languages view
 INSTL_LANGUAGES="Instalar idiomas adicionais"
 INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Idioma"
-INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_SELECT="Escolher idioma"
+INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_SELECT="Selecionar idioma"
 INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_TAG="Código de idioma"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Versão"
 INSTL_LANGUAGES_DESC="A interface do Joomla está disponível em vários idiomas. Escolha os seus idiomas preferidos assinalando as caixas de verificação. Instale os idiomas carregando no botão \"Instalar idiomas selecionados\".<br>Nota: esta operação pode levar cerca de 10 segundos para descarregar e instalar cada um dos idiomas. Não escolha mais que 3 idiomas, de cada vez, de modo a evitar ligações esgotadas no servidor."
@@ -125,20 +126,20 @@ INSTL_LANGUAGES_WARNING_NO_INTERNET="Não foi possível ligar ao servidor de idi
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Nota: posteriormente poderá instalar idiomas no painel de administração do Joomla!"
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="Voltar ao último passo da instalação"
 ; Default language view
-INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Idioma padrão da administração"
-INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Não foi possível definir este idioma como padrão. Será utilizado o inglês como idioma padrão da interface da área de visitantes do sítio."
-INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="O idioma %s foi definido como padrão para a administração."
+INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Idioma predefinido da administração"
+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 de visitantes do sítio."
+INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="O idioma %s foi definido como predefinido para a administração."
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Escolher"
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Idioma"
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="Código"
 INSTL_DEFAULTLANGUAGE_COULD_NOT_DOWNLOAD_PACKAGE="O Joomla não conseguiu descarregar ou descomprimir o seguinte pacote de idioma: %s"
 INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Não foi possível ao Joomla instalar o idioma %s."
-INSTL_DEFAULTLANGUAGE_DESC="Foram instalados os idiomas listados. Por favor, escolha o idioma padrão para o <strong>painel de administração do sítio</strong>."
-INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Foram instalados os idiomas listados. Por favor, escolha o idioma padrão para a <strong>área de visitantes</strong>."
-INSTL_DEFAULTLANGUAGE_FRONTEND="Idioma padrão da área de visitantes"
-INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Não foi possível definir este idioma como padrão. Será utilizado o inglês como idioma padrão da interface da área de visitantes do sítio."
-INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="O idioma %s foi definido como padrão para a área de visitantes do sítio."
-INSTL_DEFAULTLANGUAGE_SET_DEFAULT_LANGUAGE="Definir idioma padrão"
+INSTL_DEFAULTLANGUAGE_DESC="Foram instalados os idiomas listados. Por favor, escolha o idioma predefinido para o <strong>painel de administração do sítio</strong>."
+INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Foram instalados os idiomas listados. Por favor, escolha o idioma predefinido para a <strong>área de visitantes</strong>."
+INSTL_DEFAULTLANGUAGE_FRONTEND="Idioma predefinido da área de visitantes"
+INSTL_DEFAULTLANGUAGE_FRONTEND_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 de visitantes do sítio."
+INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="O idioma %s foi definido como predefinido para a área de visitantes do sítio."
+INSTL_DEFAULTLANGUAGE_SET_DEFAULT_LANGUAGE="Definir idioma predefinido"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="Posteriormente poderá fazer a instalação no painel de administração do Joomla!"
 
 INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Português (pt-PT)" ; 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
@@ -199,7 +200,7 @@ JEMAIL="Email"
 JERROR="Erro"
 JERROR_LAYOUT_ERROR_HAS_OCCURRED_WHILE_PROCESSING_YOUR_REQUEST="Ocorreu um erro ao processar o seu pedido."
 JGLOBAL_ISFREESOFTWARE="%s é um software aberto disponibilizado sob a %s."
-JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="O pacote de idioma não corresponde a esta versão Joomla! Algumas entradas podem estar em falta e serão exibidas em Inglês."
+JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="O pacote de idioma não corresponde a esta versão Joomla! Algumas entradas podem estar em falta e serão exibidas em inglês."
 JGLOBAL_SELECT_AN_OPTION="Escolha uma opção"
 JGLOBAL_SELECT_NO_RESULTS_MATCH="Nenhum resultado obtido"
 JGLOBAL_SELECT_SOME_OPTIONS="Selecione algumas opções"
@@ -240,8 +241,8 @@ JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Não foi possível cr
 JLIB_UPDATER_ERROR_COLLECTION_FOPEN="A definição PHP allow_url_fopen está desativada. Essa definição deve ser ativada para o atualizador poder funcionar."
 JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Atualização: :Collection: Não foi possível abrir %s"
 JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Atualização: :Collection: Não foi possível compilar %s"
-JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Atualização - Não foi possível abrir o sítio de atualização #%d \"%s\", URL: %s."
-JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: não foi possível ligar à base de dados <br> joomla.library: %1$s - %2$s."
+JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Atualização — Não foi possível abrir o sítio de atualização #%d \"%s\", URL: %s."
+JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: não foi possível ligar à base de dados <br>joomla.library: %1$s — %2$s."
 ; Strings for the language debugger
 JDEBUG_LANGUAGE_FILES_IN_ERROR="Erros de compilação em ficheiros de idioma"
 JDEBUG_LANGUAGE_UNTRANSLATED_STRING="Frases por traduzir"
diff --git a/installation/language/pt-PT/langmetadata.xml b/installation/language/pt-PT/langmetadata.xml
index 751d769bc27c1..2360a6bab8de6 100644
--- a/installation/language/pt-PT/langmetadata.xml
+++ b/installation/language/pt-PT/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Português (Portugal)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Comunidade JoomlaPortugal</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/ro-RO/joomla.ini b/installation/language/ro-RO/joomla.ini
index 89d9952105d25..4818ab8453bf7 100644
--- a/installation/language/ro-RO/joomla.ini
+++ b/installation/language/ro-RO/joomla.ini
@@ -81,6 +81,7 @@ INSTL_DATABASE_NAME_MSG_POSTGRES="Numele bazei de date nu este valid. Trebuie s
 INSTL_DATABASE_NO_SCHEMA="Nu există o schemă pentru acest tip de bază de date."
 INSTL_DATABASE_PASSWORD_DESC="Fie o parolă pe care ați creat-o fie o parolă furnizată de gazda dvs."
 INSTL_DATABASE_PREFIX_DESC="Introduceți un prefix de tabel sau folosiți unul generat aleatoriu."
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Dacă utilizați o bază de date existentă cu tabele cu același prefix, Joomla va redenumi tabelele existente prin adăugarea prefixului \"bak_\"."
 INSTL_DATABASE_PREFIX_MSG="Prefixul tabelului trebuie să înceapă cu o literă, opțional urmată de caractere alfanumerice și de o linie de subliniere"
 INSTL_DATABASE_RESPONSE_ERROR="Procesul de instalare a eșuat."
 INSTL_DATABASE_TYPE_DESC="Selectaţi tipul bazei de date."
diff --git a/installation/language/ro-RO/langmetadata.xml b/installation/language/ro-RO/langmetadata.xml
index 10565079fea40..13692a0477f30 100644
--- a/installation/language/ro-RO/langmetadata.xml
+++ b/installation/language/ro-RO/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Română (România)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Horia Negura - Quanta</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/ru-RU/langmetadata.xml b/installation/language/ru-RU/langmetadata.xml
index 82a1d169fc02f..956842c378d17 100644
--- a/installation/language/ru-RU/langmetadata.xml
+++ b/installation/language/ru-RU/langmetadata.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <metafile client="installation">
 	<name>Russian (Russia)</name>
-	<version>4.2.2</version>
+	<version>4.2.2</version>
 	<creationDate>2022-09</creationDate>
 	<author>Russian Translation Team</author>
-	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
+	<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>
diff --git a/installation/language/sk-SK/joomla.ini b/installation/language/sk-SK/joomla.ini
index e007427cf505c..e67628d3a5731 100644
--- a/installation/language/sk-SK/joomla.ini
+++ b/installation/language/sk-SK/joomla.ini
@@ -81,6 +81,7 @@ INSTL_DATABASE_NAME_MSG_POSTGRES="Názov databázy je neplatný. Musí začína
 INSTL_DATABASE_NO_SCHEMA="Pre tento typ databázy neexistuje schéma databázy."
 INSTL_DATABASE_PASSWORD_DESC="Buď vami zadané heslo alebo heslo poskytnuté hostingom."
 INSTL_DATABASE_PREFIX_DESC="Zadajte predponu tabuľky alebo použite náhodne generovanú."
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Ak používate existujúcu databázu s tabuľkami s rovnakým prefixom, Joomla tieto existujúce tabuľky premenuje pridaním prefixu \"bak_\"."
 INSTL_DATABASE_PREFIX_MSG="Predpona názvu tabuľky musí začínať písmenom, voliteľne potom môžu nasledovať alfanumerické znaky a podčiarkovník"
 INSTL_DATABASE_RESPONSE_ERROR="Proces inštalácie zlyhal."
 INSTL_DATABASE_TYPE_DESC="Vyberte typ databázy."
diff --git a/installation/language/sk-SK/langmetadata.xml b/installation/language/sk-SK/langmetadata.xml
index c7dcc886fb987..5585e6c7b2ab0 100644
--- a/installation/language/sk-SK/langmetadata.xml
+++ b/installation/language/sk-SK/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Slovak (Slovakia)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Slovak translation team : Peter Michnica</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/sl-SI/joomla.ini b/installation/language/sl-SI/joomla.ini
index f04f955a6b432..720b895703a7a 100644
--- a/installation/language/sl-SI/joomla.ini
+++ b/installation/language/sl-SI/joomla.ini
@@ -81,6 +81,7 @@ INSTL_DATABASE_NAME_MSG_POSTGRES="Ime zbirke podatkov, ni veljaven. Začeti se m
 INSTL_DATABASE_NO_SCHEMA="Za to vrsto baze podatkov ne obstaja nobena shema baz podatkov."
 INSTL_DATABASE_PASSWORD_DESC="Bodisi geslo, ki ste ga ustvarili, ali geslo, ki ga zagotovi vaš gostitelj."
 INSTL_DATABASE_PREFIX_DESC="Vnesite predpone tabele ali uporabite naključno ustvarjeno."
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Če uporabljate obstoječo zbirko podatkov s tabelami z isto predpono, bo Joomla preimenovala te obstoječe tabele z dodajanjem predpone \"bak_\"."
 INSTL_DATABASE_PREFIX_MSG="Tabela predpon se mora začeti s črko, po izbiri sledijo alfanumerični znaki in podčrtaj"
 INSTL_DATABASE_RESPONSE_ERROR="Postopek namestitve ni uspel."
 INSTL_DATABASE_TYPE_DESC="Izberite vrsto zbirke podatkov."
diff --git a/installation/language/sl-SI/langmetadata.xml b/installation/language/sl-SI/langmetadata.xml
index 1eb69f009d480..29233948cea44 100644
--- a/installation/language/sl-SI/langmetadata.xml
+++ b/installation/language/sl-SI/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Slovenščina (Slovenija)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Slovenska prevajalska ekipa</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/sr-YU/joomla.ini b/installation/language/sr-YU/joomla.ini
index 388731c24c70e..704306ab94824 100644
--- a/installation/language/sr-YU/joomla.ini
+++ b/installation/language/sr-YU/joomla.ini
@@ -17,7 +17,7 @@ BUILD_INCOMPLETE_URL_TEXT="Više detalja"
 ; These will be processed by the JavaScript Build
 BUILD_NOXML_HEADER="Žao nam je, PHP-u nedostaje vitalna biblioteka"
 BUILD_NOXML_LANGUAGE="Srpski Latinica SRB"
-BUILD_NOXML_TEXT="Vaš host mora da koristi PHP sa podrškom za XML biblioteke da bi pokrenuo ovu verziju Joomla!"
+BUILD_NOXML_TEXT="Vaš hosting provajder mora da koristi PHP sa podrškom za XML biblioteke da bi pokrenuo ovu verziju Joomla!"
 BUILD_NOXML_URL_TEXT="Kako da rešim ovo"
 ; These will be processed by the JavaScript Build
 BUILD_MIN_PHP_ERROR_HEADER="Žao nam je vaša PHP verzija nije podržana."
@@ -81,6 +81,7 @@ INSTL_DATABASE_NAME_MSG_POSTGRES="Neispravno ime baze Ime mora započeti sa slov
 INSTL_DATABASE_NO_SCHEMA="Ne postoji šema baze za ovaj tip baze."
 INSTL_DATABASE_PASSWORD_DESC="Lozinka koju ste kreirali ili koju vam je dostavio vaš hosting."
 INSTL_DATABASE_PREFIX_DESC="Unesite prefix tabela baze ili izaberite neki nasumičan."
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Ako koristite postojeću bazu sa tabelama koje imaju isti prefiks Joomla će preimenovati te tabele sa prefiksom \"bak_\"."
 INSTL_DATABASE_PREFIX_MSG="Prefiks tabela baze mora započeti slovom i nastaviti sa slovima i brojevima, a mora se završiti donjom crtom"
 INSTL_DATABASE_RESPONSE_ERROR="Instalacija nije uspela."
 INSTL_DATABASE_TYPE_DESC="Izaberi tip baze."
diff --git a/installation/language/sr-YU/langmetadata.xml b/installation/language/sr-YU/langmetadata.xml
index b7cd24d836ec2..64b8e5da88e9d 100644
--- a/installation/language/sr-YU/langmetadata.xml
+++ b/installation/language/sr-YU/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Srpski Latinica (Republika Srbija)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Goran Nešić - UIX Web Design &amp;  Saša Matić Bardak.RS</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/sv-SE/joomla.ini b/installation/language/sv-SE/joomla.ini
index de59843388226..b833ef5f57640 100644
--- a/installation/language/sv-SE/joomla.ini
+++ b/installation/language/sv-SE/joomla.ini
@@ -81,6 +81,7 @@ INSTL_DATABASE_NAME_MSG_POSTGRES="Databasnamnet är ogiltigt. Det måste börja
 INSTL_DATABASE_NO_SCHEMA="Det finns inget databasschema för den här databastypen."
 INSTL_DATABASE_PASSWORD_DESC="Antingen ett lösenord som du skapat eller ett lösenord som tillhandahållits av ditt webbhotell."
 INSTL_DATABASE_PREFIX_DESC="Ange ett eget tabellprefix eller använd det slumpmässigt genererade."
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Om du använder en befintlig databas med tabeller med samma prefix, kommer Joomla att döpa om de befintliga tabellerna genom att lägga till prefixet \"bak_\"."
 INSTL_DATABASE_PREFIX_MSG="Tabell prefixet måste börja med en bokstav följt av alfanumeriska tecken och understreck"
 INSTL_DATABASE_RESPONSE_ERROR="Installationen misslyckades."
 INSTL_DATABASE_TYPE_DESC="Välj databastyp."
diff --git a/installation/language/sv-SE/langmetadata.xml b/installation/language/sv-SE/langmetadata.xml
index 355dca6070031..a63cda1a04ef6 100644
--- a/installation/language/sv-SE/langmetadata.xml
+++ b/installation/language/sv-SE/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Swedish (Sweden)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Swedish Translation Team - SvenskJoomla</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/ta-IN/joomla.ini b/installation/language/ta-IN/joomla.ini
index e991a75b9262b..d3204141bc7a4 100644
--- a/installation/language/ta-IN/joomla.ini
+++ b/installation/language/ta-IN/joomla.ini
@@ -12,7 +12,7 @@ BUILD_FATAL_URL_TEXT="இதனைத் தீர்க்க எனக்க
 ; These will be processed by the JavaScript Build
 BUILD_INCOMPLETE_HEADER="சூழல் அமைப்பு முடிவுபெறவில்லை"
 BUILD_INCOMPLETE_LANGUAGE="தமிழ் இந்தியா"
-BUILD_INCOMPLETE_TEXT="தாங்கள் Joomla-வை எங்கள் git களஞ்சியத்திலிருந்து இயக்க முயற்சிக்கிறீர்கள் என்று தெரிகிறது. அவ்வாறு செய்வதற்கு தாங்கள் முதலில் இரண்டு கூடுதல் கட்டங்களை முடிக்க வேண்டும்."
+BUILD_INCOMPLETE_TEXT="தாங்கள் Joomla!-வை எங்கள் git களஞ்சியத்திலிருந்து இயக்க முயற்சிக்கிறீர்கள் என்று தெரிகிறது. அவ்வாறு செய்வதற்கு தாங்கள் முதலில் இரண்டு கூடுதல் கட்டங்களை முடிக்க வேண்டும்."
 BUILD_INCOMPLETE_URL_TEXT="மேலும் விவரங்கள்"
 ; These will be processed by the JavaScript Build
 BUILD_NOXML_HEADER="மன்னிக்கவும், தங்கள் PHP-இல் ஒரு முக்கியமான மென்பொருளகம் இல்லை"
@@ -28,7 +28,7 @@ BUILD_MIN_PHP_ERROR_URL_TEXT="இதனைத் தீர்க்க எனக
 INSTL_SELECT_INSTALL_LANG="நிறுவல் மொழித் தேர்வு"
 INSTL_SELECT_LANGUAGE_TITLE="மொழியைத் தேர்வுசெய்யவும்"
 INSTL_SETUP_LOGIN_DATA="உள்நுழைவு தரவு அமைத்தல்"
-INSTL_WARNJAVASCRIPT="எச்சரிக்கை! Joomla-வை சரியாக நிறுவுவதற்கு JavaScript கட்டாயம் இயலுமைப்படுத்தப்பட வேண்டும்."
+INSTL_WARNJAVASCRIPT="எச்சரிக்கை! Joomla-வை சரியாக நிறுவுவதற்கு JavaScript இயலுமைப்படுத்தப்பட வேண்டும்."
 INSTL_WARNJSON="Joomla-வை நிறுவுவதற்கு, தங்கள் PHP நிறுவலில் JSON ஆனது இயலுமைப்படுத்தப்பட்டிருக்க வேண்டும்!"
 ; Precheck view
 INSTL_DATABASE_SUPPORT="தரவுத்தள ஆதரவு:"
@@ -76,12 +76,13 @@ INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="தாங்கள் உ
 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_MYSQL="தரவுத்தளப் பெயர் செல்லுபடியாகாதது. இது, பின்வரும் உருக்களைக் கொண்டிருத்தல் கூடாது: \ /"
+INSTL_DATABASE_NAME_MSG_POSTGRES="தரவுத்தளப் பெயர் செல்லுபடியாகாதது. இது, ஒரு எழுத்தில் ஆரம்பித்து, எண்ணெழுத்து உருக்களால் பின்பற்றப்பட வேண்டும்."
 INSTL_DATABASE_NO_SCHEMA="இந்தத் தரவுத்தள வகைக்கு, அமைப்புமுறைகள் (schema) இல்லை."
 INSTL_DATABASE_PASSWORD_DESC="தாங்கள் உருவாக்கிய கடவுச்சொல்லை அல்லது தங்கள் சேவை வழங்குநரால் கொடுக்கப்பட்ட கடவுச்சொல்லை நிரப்பவும்."
 INSTL_DATABASE_PREFIX_DESC="அட்டவணை முன்-ஒட்டு ஒன்றை நிரப்பவும் அல்லது குறிப்பிலா வகையில் உருவாக்கப்பட்டதைப் பயன்படுத்தவும்."
-INSTL_DATABASE_PREFIX_MSG="அட்டவணை முன்-ஒட்டு ஆனது கட்டாயம் ஒரு எழுத்தில் ஆரம்பித்து, விருப்பமானால் எண்ணெழுத்து உருக்களால் பின்பற்றப்பட்டு, கட்டாயம் அடிக்கோடுடன் முடிவதாகவும் இருத்தல் வேண்டும்"
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="இதே முன்-ஒட்டு உடன் கூடிய அட்டவணைகள் கொண்ட ஏற்கனவே உள்ள தரவுத்தளத்தைத் தாங்கள் பயன்படுத்தினால், \"bak_\" முன்-ஒட்டு-வை சேர்ப்பதன் மூலம் Joomla ஏற்கனவே இருக்கும் அட்டவணைகளை மறுபெயரிடும்."
+INSTL_DATABASE_PREFIX_MSG="அட்டவணை முன்-ஒட்டு ஆனது ஒரு எழுத்தில் ஆரம்பித்து, விருப்பமானால் எண்ணெழுத்து உருக்களால் பின்பற்றப்பட்டு, கட்டாயம் அடிக்கோடுடன் முடிவதாகவும் இருத்தல் வேண்டும்"
 INSTL_DATABASE_RESPONSE_ERROR="நிறுவல் தோல்வியுற்றது."
 INSTL_DATABASE_TYPE_DESC="தரவுத்தள வகையைத் தேர்வுசெய்யவும்."
 INSTL_DATABASE_USER_DESC="தாங்கள் உருவாக்கிய பயனாளர்பெயரை அல்லது தங்கள் சேவை வழங்குநரால் (Host) கொடுக்கப்பட்ட பயனாளர்பெயரை நிரப்பவும்."
@@ -154,7 +155,7 @@ INSTL_DATABASE_FIELD_VALUE_BACKUP="காப்பு நகலெடுக்
 INSTL_DATABASE_FIELD_VALUE_REMOVE="நீக்குக"
 INSTL_DATABASE_FILE_DOES_NOT_EXIST="கோப்பு \"%s\" இல்லை."
 INSTL_DATABASE_FIX_LOWERCASE="PostgreSQL-க்கு அட்டவணை முன்-ஒட்டு (Table Prefix) ஆனது சிற்றெழுத்துக்களில் (Lowercase) இருத்தல் வேண்டும்."
-INSTL_DATABASE_FIX_TOO_LONG="MySQL அட்டவணையின் முன்-ஒட்டு கட்டாயம் 15 உருக்களுக்கு மிகாமல் இருத்தல் வேண்டும்."
+INSTL_DATABASE_FIX_TOO_LONG="MySQL அட்டவணையின் முன்-ஒட்டு ஆனது 15 உருக்களுக்கு மிகாமல் இருத்தல் வேண்டும்."
 INSTL_DATABASE_INVALID_DB_DETAILS="கொடுக்கப்பட்ட தரவுத்தள (Database) விவரங்கள் (details) தவறானவை மற்றும்/அல்லது வெறுமையானவை."
 INSTL_DATABASE_INVALID_MARIADB_VERSION="நிறுவலைத் தொடர, தங்களுக்கு MariaDB %1$s அல்லது அதற்கும் மேலானது தேவை. தங்கள் பதிப்பு ஆனது: %2$s"
 INSTL_DATABASE_INVALID_MYSQL_VERSION="நிறுவலைத் தொடர, தங்களுக்கு MySQL %1$s அல்லது அதற்கும் மேலானது தேவை. தங்கள் பதிப்பு ஆனது: %2$s"
@@ -164,7 +165,7 @@ INSTL_DATABASE_INVALID_POSTGRESQL_VERSION="நிறுவலைத் தொட
 INSTL_DATABASE_INVALID_TYPE="தரவுத்தள வகையைத் தேர்வுசெய்யவும்."
 INSTL_DATABASE_NAME_INVALID_CHAR="எந்த ஒரு MySQL குறிப்பானும் (identifier) NULL ASCII(0x00) கொண்டிருத்தல் கூடாது."
 INSTL_DATABASE_NAME_INVALID_SPACES="MySQL தரவுத்தளப் பெயர்கள் மற்றும் அட்டவணைப் பெயர்கள் ஆகியவை இடைவெளிகளைக் கொண்டு ஆரம்பிக்கவோ அல்லது முடிக்கவோ கூடாது."
-INSTL_DATABASE_NAME_TOO_LONG="MySQL தரவுத்தளப் பெயர் கட்டாயம் 64 உருக்களுக்கு மிகாமல் இருத்தல் வேண்டும்."
+INSTL_DATABASE_NAME_TOO_LONG="MySQL தரவுத்தளப் பெயர் ஆனது 64 உருக்களுக்கு மிகாமல் இருத்தல் வேண்டும்."
 ; Controllers
 INSTL_COOKIES_NOT_ENABLED="தங்கள் உலாவியில் (browser) நினைவிகள் (cookies) இயலுமைப்படுத்தியிருப்பதாகத் தெரியவில்லை. இந்த அம்சம் (feature) முடக்கப்பட்டிருந்தால் தாங்கள் செயலியை (application) நிறுவ முடியாது. மாறாக, சேவையகத்தின் <strong>session.save_path</strong>-இல் பிரச்சினை இருக்கலாம். இவ்வாறு இருந்து, தங்களுக்கு சரி பார்க்க மற்றும் பழுது நீக்கத் தெரியாவிட்டால், தாங்கள் புரவலர் சேவை வழங்குநரிடம் (hosting provider) ஆலோசிக்கவும்."
 INSTL_HEADER_ERROR="பிழை"
@@ -227,7 +228,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"
@@ -237,7 +238,7 @@ JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: கோப்பு \"
 JLIB_INSTALLER_INSTALL="நிறுவுக"
 JLIB_INSTALLER_NOT_ERROR="பிழையானது TinyMCE மொழிக் கோப்புகள் நிறுவல் தொடர்பானது என்றால் இப்பிழை Joomla! மொழி(கள்) நிறுவலுக்கு எந்த விளைவையும் ஏற்படுத்தாது. Joomla 3.2.0-க்கு முன் உருவாக்கப்பட்ட சில மொழித் தொகுப்புகள் TinyMCE மொழிக் கோப்புகளைத் தனியாக நிறுவ முயற்சிக்கலாம். இந்த TinyMCE மொழிக் கோப்புகள் தற்சமயம் Joomla-வில் சேர்க்கப்பட்டிருப்பதால் இவற்றைத் தனியாக நிறுவ வேண்டாம்."
 JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="%s மொழிக்கு உள்ளடக்க மொழியை (content language) உருவாக்க முடியவில்லை: %s."
-JLIB_UPDATER_ERROR_COLLECTION_FOPEN="PHP-இன் allow_url_fopen அமைப்பு முடக்கப்பட்டுள்ளது. புதுப்பி (updater) வேலை செய்வதற்கு இந்த அமைப்பானது கட்டாயம் இயலுமைப்படுத்தியிருக்க வேண்டும்."
+JLIB_UPDATER_ERROR_COLLECTION_FOPEN="PHP-இன் allow_url_fopen அமைப்பு முடக்கப்பட்டுள்ளது. புதுப்பி (updater) வேலை செய்வதற்கு இந்த அமைப்பானது கட்டாயம் இயலுமைப்படுத்தப்பட வேண்டும்."
 JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="புதுப்பித்தல்: :Collection: %s-ஐத் திறக்க முடியவில்லை."
 JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="புதுப்பித்தல்: :Collection: %s-ஐ அலகிட (parse) முடியவில்லை."
 JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="புதுப்பித்தல்: புதுப்பித்தல் தளத்தைத் திறக்க முடியவில்லை #%d \"%s\", இணையமுகவரி: %s"
@@ -263,7 +264,7 @@ MESSAGE="செய்தி"
 NOTICE="அறிவிப்பு"
 WARNING="எச்சரிக்கை"
 ; Javascript ajax error messages
-JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="JSON தரவு பெறும்போது (fetching) இணைப்பு ரத்து செய்தல் (connection abort) ஏற்பட்டுள்ளது."
+JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="JSON தரவு பெறும்போது (fetching) இணைப்பு கைவிடப்படல் (connection abort) ஏற்பட்டுள்ளது."
 JLIB_JS_AJAX_ERROR_NO_CONTENT="உள்ளடக்கம் எதுவும் திரும்பப்பெறப்படவில்லை."
 JLIB_JS_AJAX_ERROR_OTHER="JSON தரவு பெறும்போது (fetching) பிழை ஏற்பட்டுள்ளது: HTTP %d நிலை குறியீடு (Status Code)."
 JLIB_JS_AJAX_ERROR_PARSE="கீழ்க்கண்ட JSON தரவு செயலாக்கத்தின்போது (processing) அலகிடல் (parse) பிழை ஏற்பட்டுள்ளது:<br><code style=\"color:inherit;white-space:pre-wrap;padding:0;margin:0;border:0;background:inherit;\">%s</code>"
diff --git a/installation/language/ta-IN/langmetadata.xml b/installation/language/ta-IN/langmetadata.xml
index 48dce13ed54a5..e2b6922483c37 100644
--- a/installation/language/ta-IN/langmetadata.xml
+++ b/installation/language/ta-IN/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Tamil (India)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Ilagnayeru 'MIG' Manickam, Elango Samy Manim</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/th-TH/joomla.ini b/installation/language/th-TH/joomla.ini
index 5c093758cf918..cf6c0db0f2e80 100644
--- a/installation/language/th-TH/joomla.ini
+++ b/installation/language/th-TH/joomla.ini
@@ -81,6 +81,7 @@ INSTL_DATABASE_NAME_MSG_POSTGRES="ชื่อฐานข้อมูลไม
 INSTL_DATABASE_NO_SCHEMA="ไม่มีโครงร่างที่ได้จากการออกแบบฐานข้อมูล (Database Schema) ในฐานข้อมูลชนิดนี้"
 INSTL_DATABASE_PASSWORD_DESC="ป้อนรหัสผ่านที่คุณสร้าง หรือรหัสผ่านที่โฮสต์ของคุณให้มา"
 INSTL_DATABASE_PREFIX_DESC="ป้อนคำนำหน้าตารางหรือใช้คำที่สร้างแบบสุ่ม"
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="หากคุณใช้ฐานข้อมูลที่มีอยู่แล้วกับตารางที่มีคำนำหน้าเหมือนกัน Joomla จะเปลี่ยนชื่อตารางที่มีอยู่โดยเพิ่มคำนำหน้าเป็น \"bak_\""
 INSTL_DATABASE_PREFIX_MSG="คำนำหน้าตารางต้องขึ้นต้นด้วยตัวอักษร, แล้วตามด้วยตัวอักษรและตัวเลข และขีดล่าง"
 INSTL_DATABASE_RESPONSE_ERROR="กระบวนการติดตั้งล้มเหลว"
 INSTL_DATABASE_TYPE_DESC="เลือกประเภทฐานข้อมูล"
diff --git a/installation/language/th-TH/langmetadata.xml b/installation/language/th-TH/langmetadata.xml
index f4ae7e582a2ae..77240511f6739 100644
--- a/installation/language/th-TH/langmetadata.xml
+++ b/installation/language/th-TH/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Thai (ภาษาไทย)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Thai Translation Team</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/tr-TR/joomla.ini b/installation/language/tr-TR/joomla.ini
index 9b7bf645f37bf..7300620a92ffa 100644
--- a/installation/language/tr-TR/joomla.ini
+++ b/installation/language/tr-TR/joomla.ini
@@ -81,6 +81,7 @@ INSTL_DATABASE_NAME_MSG_POSTGRES="Veritabanı adı geçersiz. Bir harfle başlam
 INSTL_DATABASE_NO_SCHEMA="Bu veritabanı türü için veritabanı şeması yok."
 INSTL_DATABASE_PASSWORD_DESC="Sizin oluşturduğunuz bir şifre ya da sunucunuz tarafından sağlanan bir şifre."
 INSTL_DATABASE_PREFIX_DESC="Bir tablo öneki girin veya rastgele oluşturulmuş olanı kullanın."
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Aynı öneke sahip tablolara sahip mevcut bir veritabanı kullanıyorsanız, Joomla bu mevcut tabloları \"bak_\" önekini ekleyerek yeniden adlandıracaktır."
 INSTL_DATABASE_PREFIX_MSG="Tablo öneki bir harfle başlamalı, isteğe bağlı olarak alfa sayısal karakterler ve alt çizgi ile devam etmelidir"
 INSTL_DATABASE_RESPONSE_ERROR="Yükleme işlemi başarısız oldu."
 INSTL_DATABASE_TYPE_DESC="Veritabanı türünü seçin."
diff --git a/installation/language/tr-TR/langmetadata.xml b/installation/language/tr-TR/langmetadata.xml
index 648bb7059eaf6..e9fc4dea5d9d0 100644
--- a/installation/language/tr-TR/langmetadata.xml
+++ b/installation/language/tr-TR/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Turkish (Türkiye)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Joomla! Türkiye</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/uk-UA/langmetadata.xml b/installation/language/uk-UA/langmetadata.xml
index 02383306f8fee..995a6745c2083 100644
--- a/installation/language/uk-UA/langmetadata.xml
+++ b/installation/language/uk-UA/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Ukrainian (uk-UA)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Joomla! Project - Ukrainian translation team</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/ur-PK/joomla.ini b/installation/language/ur-PK/joomla.ini
new file mode 100644
index 0000000000000..b0c5a84e5b3e4
--- /dev/null
+++ b/installation/language/ur-PK/joomla.ini
@@ -0,0 +1,53 @@
+; Joomla! Project
+; (C) 2005 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
+
+; Fatal error page
+; These will be processed by the JavaScript Build
+
+; Build incomplete error page
+; These will be processed by the JavaScript Build
+
+; No XML PHP error page
+; These will be processed by the JavaScript Build
+
+; Minimum PHP error page
+; These will be processed by the JavaScript Build
+
+; Main Config
+
+; Precheck view
+
+; Database view
+INSTL_DATABASE_NAME_LABEL="ڈیٹابیس کا نام"
+INSTL_DATABASE_NO_SCHEMA="ڈیٹابیس کا نام"
+; Languages view
+INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_TAG="زبان کا نشان"
+INSTL_LANGUAGES_COLUMN_HEADER_VERSION="ورژن"
+; Default language view
+INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Select"
+INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Select"
+; Languages model
+INSTL_ERROR_INVALID_URL="ناجائز یو آر ایل"
+; Others
+INSTL_DISPLAY_ERRORS="خرابیاں دکھانا"
+INSTL_FILE_UPLOADS="فائل اپ لوڈ"
+INSTL_OUTPUT_BUFFERING="آؤٹ پٹ بفرنگ"
+INSTL_PHP_VERSION="PHP شمارہ"
+INSTL_SESSION_AUTO_START="نشست خود شروع ہو"
+; Global strings
+JADMINISTRATOR="منتظم"
+JOFF="Off"
+JON="On"
+JSITE="سائٹ"
+; Framework strings necessary when no lang pack is available
+JLIB_INSTALLER_ABORT="Aborting language installation: %s"
+JLIB_INSTALLER_ERROR_DOWNLOAD_SERVER_CONNECT="Error connecting to the server: %s"
+JLIB_UPDATER_ERROR_COLLECTION_FOPEN="The PHP allow_url_fopen setting is disabled. This setting must be enabled for the updater to work."
+; Necessary for errors
+SITE_NAME="سائٹ کا نام"
+; Field password messages
+JFIELD_PASSWORD_SPACES_IN_PASSWORD="پاس ورڈ کے شروع یا آخر میں لازماً خالی جگہ نہیں ہونی چاہیے."
+JFIELD_PASSWORD_TOO_LONG="پاس ورڈ زیادہ لمبا ہے ۔ پاس ورڈ لازماً 100 سے کم حروف میں ہونا چاہیے ۔."
+
diff --git a/installation/language/ur-PK/langmetadata.xml b/installation/language/ur-PK/langmetadata.xml
new file mode 100644
index 0000000000000..3bd41850a3952
--- /dev/null
+++ b/installation/language/ur-PK/langmetadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metafile client="installation">
+	<name/>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
+	<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/>
+		<nativeName/>
+		<tag/>
+		<rtl/>
+	</metadata>
+	<params/>
+</metafile>
diff --git a/installation/language/vi-VN/langmetadata.xml b/installation/language/vi-VN/langmetadata.xml
index 3cde589af654f..6b53107528d55 100644
--- a/installation/language/vi-VN/langmetadata.xml
+++ b/installation/language/vi-VN/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Tiếng Việt (Việt Nam)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Joomla! Project</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/zh-CN/joomla.ini b/installation/language/zh-CN/joomla.ini
index 82bd86e1eabe6..1bc157c330f44 100644
--- a/installation/language/zh-CN/joomla.ini
+++ b/installation/language/zh-CN/joomla.ini
@@ -118,6 +118,7 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_SELECT="选择语言"
 INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_TAG="语言标签"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="版本"
 INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="没有选择要安装的语言。"
+INSTL_LANGUAGES_SELECTED="安装选择的语言"
 INSTL_LANGUAGES_WARNING_NO_INTERNET="无法连接到语言服务器。请完成安装过程。"
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="注意：以后可以使用管理员账号安装语言。"
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="返回到最后一个安装步骤"
diff --git a/installation/language/zh-CN/langmetadata.xml b/installation/language/zh-CN/langmetadata.xml
index ebc22b72fe1f6..45f393de14b75 100644
--- a/installation/language/zh-CN/langmetadata.xml
+++ b/installation/language/zh-CN/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>简体中文(中国)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>逐浪中文网 joomlachina.org.cn 周永建</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/zh-TW/langmetadata.xml b/installation/language/zh-TW/langmetadata.xml
index 999e96d7bf010..53011f61b113e 100644
--- a/installation/language/zh-TW/langmetadata.xml
+++ b/installation/language/zh-TW/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>正體中文 (臺灣)</name>
-	<version>4.2.9</version>
-	<creationDate>2023-02</creationDate>
+	<version>4.3.4</version>
+	<creationDate>2023-08</creationDate>
 	<author>Joomla! 專案</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/sql/mysql/base.sql b/installation/sql/mysql/base.sql
index 6cbe27732c7ca..b978a5c41fc33 100644
--- a/installation/sql/mysql/base.sql
+++ b/installation/sql/mysql/base.sql
@@ -25,7 +25,7 @@ CREATE TABLE IF NOT EXISTS `#__assets` (
 --
 
 INSERT INTO `#__assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name`, `title`, `rules`) VALUES
-(1, 0, 0, 177, 0, 'root.1', 'Root Asset', '{"core.login.site":{"6":1,"2":1},"core.login.admin":{"6":1},"core.login.api":{"8":1},"core.login.offline":{"6":1},"core.admin":{"8":1},"core.manage":{"7":1},"core.create":{"6":1,"3":1},"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1},"core.edit.own":{"6":1,"3":1}}'),
+(1, 0, 0, 181, 0, 'root.1', 'Root Asset', '{"core.login.site":{"6":1,"2":1},"core.login.admin":{"6":1},"core.login.api":{"8":1},"core.login.offline":{"6":1},"core.admin":{"8":1},"core.manage":{"7":1},"core.create":{"6":1,"3":1},"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1},"core.edit.own":{"6":1,"3":1}}'),
 (2, 1, 1, 2, 1, 'com_admin', 'com_admin', '{}'),
 (3, 1, 3, 6, 1, 'com_banners', 'com_banners', '{"core.admin":{"7":1},"core.manage":{"6":1}}'),
 (4, 1, 7, 8, 1, 'com_cache', 'com_cache', '{"core.admin":{"7":1},"core.manage":{"7":1}}'),
@@ -113,7 +113,9 @@ INSERT INTO `#__assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name`, `titl
 (93, 1, 171, 172, 1, 'com_fields', 'com_fields', '{}'),
 (94, 1, 173, 174, 1, 'com_workflow', 'com_workflow', '{}'),
 (95, 1, 175, 176, 1, 'com_guidedtours', 'com_guidedtours', '{}'),
-(96, 18, 130, 131, 2, 'com_modules.module.109', 'Guided Tours', '{}');
+(96, 18, 130, 131, 2, 'com_modules.module.109', 'Guided Tours', '{}'),
+(97, 1, 177, 178, 1, 'com_scheduler.task.1', 'com_scheduler.task.1', '{}'),
+(98, 1, 179, 180, 1, 'com_scheduler.task.2', 'com_scheduler.task.2', '{}');
 
 -- --------------------------------------------------------
 
@@ -165,7 +167,7 @@ INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`,
 (0, 'com_installer', 'component', 'com_installer', '', 1, 1, 1, 1, 1, '', '{"cachetimeout":"6","minimum_stability":"4"}', ''),
 (0, 'com_languages', 'component', 'com_languages', '', 1, 1, 1, 1, 1, '', '{"administrator":"en-GB","site":"en-GB"}', ''),
 (0, 'com_login', 'component', 'com_login', '', 1, 1, 1, 1, 1, '', '', ''),
-(0, 'com_media', 'component', 'com_media', '', 1, 1, 0, 1, 1, '', '{"upload_maxsize":"10","file_path":"images","image_path":"images","restrict_uploads":"1","allowed_media_usergroup":"3","restrict_uploads_extensions":"bmp,gif,jpg,jpeg,png,webp,ico,mp3,m4a,mp4a,ogg,mp4,mp4v,mpeg,mov,odg,odp,ods,odt,pdf,png,ppt,txt,xcf,xls,csv","check_mime":"1","image_extensions":"bmp,gif,jpg,png,jpeg,webp","audio_extensions":"mp3,m4a,mp4a,ogg","video_extensions":"mp4,mp4v,mpeg,mov,webm","doc_extensions":"odg,odp,ods,odt,pdf,ppt,txt,xcf,xls,csv","ignore_extensions":"","upload_mime":"image\\/jpeg,image\\/gif,image\\/png,image\\/bmp,image\\/webp,audio\\/ogg,audio\\/mpeg,audio\\/mp4,video\\/mp4,video\\/webm,video\\/mpeg,video\\/quicktime,application\\/msword,application\\/excel,application\\/pdf,application\\/powerpoint,text\\/plain,application\\/x-zip"}', ''),
+(0, 'com_media', 'component', 'com_media', '', 1, 1, 0, 1, 1, '', '{"upload_maxsize":"10","file_path":"images","image_path":"images","restrict_uploads":"1","allowed_media_usergroup":"3","restrict_uploads_extensions":"bmp,gif,jpg,jpeg,png,webp,avif,ico,mp3,m4a,mp4a,ogg,mp4,mp4v,mpeg,mov,odg,odp,ods,odt,pdf,png,ppt,txt,xcf,xls,csv","check_mime":"1","image_extensions":"bmp,gif,jpg,png,jpeg,webp,avif","audio_extensions":"mp3,m4a,mp4a,ogg","video_extensions":"mp4,mp4v,mpeg,mov,webm","doc_extensions":"odg,odp,ods,odt,pdf,ppt,txt,xcf,xls,csv","ignore_extensions":"","upload_mime":"image\\/jpeg,image\\/gif,image\\/png,image\\/bmp,image\\/webp,image\\/avif,audio\\/ogg,audio\\/mpeg,audio\\/mp4,video\\/mp4,video\\/webm,video\\/mpeg,video\\/quicktime,application\\/msword,application\\/excel,application\\/pdf,application\\/powerpoint,text\\/plain,application\\/x-zip"}', ''),
 (0, 'com_menus', 'component', 'com_menus', '', 1, 1, 1, 1, 1, '', '{"page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":""}', ''),
 (0, 'com_messages', 'component', 'com_messages', '', 1, 1, 1, 1, 1, '', '', ''),
 (0, 'com_modules', 'component', 'com_modules', '', 1, 1, 1, 1, 1, '', '', ''),
@@ -258,10 +260,9 @@ 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_taggable', 'plugin', 'taggable', 'behaviour', 0, 1, 1, 0, 1, '', '{}', '', 1, 0),
-(0, 'plg_behaviour_versionable', 'plugin', 'versionable', 'behaviour', 0, 1, 1, 0, 1, '', '{}', '', 2, 0),
-(0, 'plg_captcha_recaptcha', 'plugin', 'recaptcha', 'captcha', 0, 0, 1, 0, 1, '', '{"public_key":"","private_key":"","theme":"clean"}', '', 1, 0),
-(0, 'plg_captcha_recaptcha_invisible', 'plugin', 'recaptcha_invisible', 'captcha', 0, 0, 1, 0, 1, '', '{"public_key":"","private_key":"","theme":"clean"}', '', 2, 0),
+(0, 'plg_behaviour_compat', 'plugin', 'compat', 'behaviour', 0, 0, 1, 0, 1, '', '{"classes_aliases":"1","es5_assets":"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_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),
@@ -282,14 +283,14 @@ 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","|","formatselect","|","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","|","styleselect","|","formatselect","fontselect","fontsizeselect","|","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","template","|","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","|","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_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_namespacemap', 'plugin', 'namespacemap', 'extension', 0, 1, 1, 1, 1, '', '{}', '', 3, 0),
 (0, 'plg_fields_calendar', 'plugin', 'calendar', 'fields', 0, 1, 1, 0, 1, '', '', '', 1, 0),
 (0, 'plg_fields_checkboxes', 'plugin', 'checkboxes', 'fields', 0, 1, 1, 0, 1, '', '', '', 2, 0),
 (0, 'plg_fields_color', 'plugin', 'color', 'fields', 0, 1, 1, 0, 1, '', '', '', 3, 0),
-(0, 'plg_fields_editor', 'plugin', 'editor', 'fields', 0, 1, 1, 0, 1, '', '{"buttons":0,"width":"100%","height":"250px","filter":"JComponentHelper::filterText"}', '', 4, 0),
+(0, 'plg_fields_editor', 'plugin', 'editor', 'fields', 0, 1, 1, 0, 1, '', '{"buttons":0,"width":"100%","height":"250px","filter":"\\\\Joomla\\\\CMS\\\\Component\\\\ComponentHelper::filterText"}', '', 4, 0),
 (0, 'plg_fields_imagelist', 'plugin', 'imagelist', 'fields', 0, 1, 1, 0, 1, '', '', '', 5, 0),
 (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),
@@ -298,7 +299,7 @@ INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`,
 (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":"JComponentHelper::filterText"}', '', 13, 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),
@@ -328,8 +329,16 @@ INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`,
 (0, 'plg_quickicon_downloadkey', 'plugin', 'downloadkey', 'quickicon', 0, 1, 1, 0, 1, '', '', '', 4, 0),
 (0, 'plg_quickicon_privacycheck', 'plugin', 'privacycheck', 'quickicon', 0, 1, 1, 0, 1, '', '{}', '', 5, 0),
 (0, 'plg_quickicon_phpversioncheck', 'plugin', 'phpversioncheck', 'quickicon', 0, 1, 1, 0, 1, '', '', '', 6, 0),
+(0, 'plg_quickicon_eos', 'plugin', 'eos', 'quickicon', 0, 1, 1, 0, 1, '', '', '', 7, 0),
 (0, 'plg_sampledata_blog', 'plugin', 'blog', 'sampledata', 0, 1, 1, 0, 1, '', '', '', 1, 0),
 (0, 'plg_sampledata_multilang', 'plugin', 'multilang', 'sampledata', 0, 1, 1, 0, 1, '', '', '', 2, 0),
+(0, 'plg_schemaorg_blogposting', 'plugin', 'blogposting', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 1, 0),
+(0, 'plg_schemaorg_book', 'plugin', 'book', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 2, 0),
+(0, 'plg_schemaorg_event', 'plugin', 'event', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 3, 0),
+(0, 'plg_schemaorg_organization', 'plugin', 'organization', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 4, 0),
+(0, 'plg_schemaorg_person', 'plugin', 'person', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 5, 0),
+(0, 'plg_schemaorg_recipe', 'plugin', 'recipe', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 6, 0),
+(0, 'plg_schemaorg_jobposting', 'plugin', 'jobposting', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 7, 0),
 (0, 'plg_system_accessibility', 'plugin', 'accessibility', 'system', 0, 0, 1, 0, 1, '', '{}', '', 1, 0),
 (0, 'plg_system_actionlogs', 'plugin', 'actionlogs', 'system', 0, 1, 1, 0, 1, '', '{}', '', 2, 0),
 (0, 'plg_system_cache', 'plugin', 'cache', 'system', 0, 0, 1, 0, 1, '', '{"browsercache":"0","cachetime":"15"}', '', 3, 0),
@@ -342,23 +351,26 @@ INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`,
 (0, 'plg_system_languagefilter', 'plugin', 'languagefilter', 'system', 0, 0, 1, 0, 1, '', '', '', 10, 0),
 (0, 'plg_system_log', 'plugin', 'log', 'system', 0, 1, 1, 0, 1, '', '', '', 11, 0),
 (0, 'plg_system_logout', 'plugin', 'logout', 'system', 0, 1, 1, 0, 1, '', '', '', 12, 0),
-(0, 'plg_system_logrotation', 'plugin', 'logrotation', 'system', 0, 1, 1, 0, 1, '', '{}', '', 13, 0),
 (0, 'plg_system_privacyconsent', 'plugin', 'privacyconsent', 'system', 0, 0, 1, 0, 1, '', '{}', '', 14, 0),
 (0, 'plg_system_redirect', 'plugin', 'redirect', 'system', 0, 0, 1, 0, 1, '', '', '', 15, 0),
 (0, 'plg_system_remember', 'plugin', 'remember', 'system', 0, 1, 1, 0, 1, '', '', '', 16, 0),
 (0, 'plg_system_schedulerunner', 'plugin', 'schedulerunner', 'system', 0, 1, 1, 0, 1, '', '{}', '', 17, 0),
-(0, 'plg_system_sef', 'plugin', 'sef', 'system', 0, 1, 1, 0, 1, '', '', '', 18, 0),
-(0, 'plg_system_sessiongc', 'plugin', 'sessiongc', 'system', 0, 1, 1, 0, 1, '', '', '', 19, 0),
-(0, 'plg_system_shortcut', 'plugin', 'shortcut', 'system', 0, 1, 1, 0, 1, '', '{}', '', 0, 0),
-(0, 'plg_system_skipto', 'plugin', 'skipto', 'system', 0, 1, 1, 0, 1, '', '{}', '', 20, 0),
-(0, 'plg_system_stats', 'plugin', 'stats', 'system', 0, 1, 1, 0, 1, '', '', '', 21, 0),
-(0, 'plg_system_tasknotification', 'plugin', 'tasknotification', 'system', 0, 1, 1, 0, 1, '', '', '', 22, 0),
-(0, 'plg_system_updatenotification', 'plugin', 'updatenotification', 'system', 0, 1, 1, 0, 1, '', '', '', 23, 0),
-(0, 'plg_system_webauthn', 'plugin', 'webauthn', 'system', 0, 1, 1, 0, 1, '', '{}', '', 24, 0),
+(0, 'plg_system_schemaorg', 'plugin', 'schemaorg', 'system', 0, 1, 1, 0, 0, '', '{}', '', 18, 0),
+(0, 'plg_system_sef', 'plugin', 'sef', 'system', 0, 1, 1, 0, 1, '', '', '', 19, 0),
+(0, 'plg_system_sessiongc', 'plugin', 'sessiongc', 'system', 0, 1, 1, 0, 1, '', '', '', 20, 0),
+(0, 'plg_system_shortcut', 'plugin', 'shortcut', 'system', 0, 1, 1, 0, 1, '', '{}', '', 21, 0),
+(0, 'plg_system_skipto', 'plugin', 'skipto', 'system', 0, 1, 1, 0, 1, '', '{}', '', 22, 0),
+(0, 'plg_system_stats', 'plugin', 'stats', 'system', 0, 1, 1, 0, 1, '', '', '', 23, 0),
+(0, 'plg_system_tasknotification', 'plugin', 'tasknotification', 'system', 0, 1, 1, 0, 1, '', '', '', 24, 0),
+(0, 'plg_system_webauthn', 'plugin', 'webauthn', 'system', 0, 1, 1, 0, 1, '', '{}', '', 26, 0),
 (0, 'plg_task_checkfiles', 'plugin', 'checkfiles', 'task', 0, 1, 1, 0, 1, '', '{}', '', 1, 0),
-(0, 'plg_task_demotasks', 'plugin', 'demotasks', 'task', 0, 1, 1, 0, 1, '', '{}', '', 2, 0),
-(0, 'plg_task_requests', 'plugin', 'requests', 'task', 0, 1, 1, 0, 1, '', '{}', '', 3, 0),
-(0, 'plg_task_sitestatus', 'plugin', 'sitestatus', 'task', 0, 1, 1, 0, 1, '', '{}', '', 4, 0),
+(0, 'plg_task_deleteactionlogs', 'plugin', 'deleteactionlogs', 'task', 0, 1, 1, 0, 1, '', '{}', '', 2, 0),
+(0, 'plg_task_globalcheckin', 'plugin', 'globalcheckin', 'task', 0, 1, 1, 0, 0, '', '{}', '', 3, 0),
+(0, 'plg_task_requests', 'plugin', 'requests', 'task', 0, 1, 1, 0, 1, '', '{}', '', 4, 0),
+(0, 'plg_task_privacyconsent', 'plugin', 'privacyconsent', 'task', 0, 1, 1, 0, 1, '', '{}', '', 5, 0),
+(0, 'plg_task_rotatelogs', 'plugin', 'rotatelogs', 'task', 0, 1, 1, 0, 1, '', '{}', '', 6, 0),
+(0, 'plg_task_sitestatus', 'plugin', 'sitestatus', 'task', 0, 1, 1, 0, 1, '', '{}', '', 7, 0),
+(0, 'plg_task_updatenotification', 'plugin', 'updatenotification', 'task', 0, 1, 1, 0, 1, '', '{}', '', 8, 0),
 (0, 'plg_multifactorauth_totp', 'plugin', 'totp', 'multifactorauth', 0, 1, 1, 0, 1, '', '', '', 1, 0),
 (0, 'plg_multifactorauth_yubikey', 'plugin', 'yubikey', 'multifactorauth', 0, 1, 1, 0, 1, '', '', '', 2, 0),
 (0, 'plg_multifactorauth_webauthn', 'plugin', 'webauthn', 'multifactorauth', 0, 1, 1, 0, 1, '', '', '', 3, 0),
@@ -551,6 +563,7 @@ CREATE TABLE IF NOT EXISTS `#__menu_types` (
   `title` varchar(48) NOT NULL,
   `description` varchar(255) NOT NULL DEFAULT '',
   `client_id` int NOT NULL DEFAULT 0,
+  `ordering` int NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   UNIQUE KEY `idx_menutype` (`menutype`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
@@ -559,8 +572,8 @@ CREATE TABLE IF NOT EXISTS `#__menu_types` (
 -- Dumping data for table `#__menu_types`
 --
 
-INSERT IGNORE INTO `#__menu_types` (`id`, `asset_id`, `menutype`, `title`, `description`, `client_id`) VALUES
-(1, 0, 'mainmenu', 'Main Menu', 'The main menu for the site', 0);
+INSERT IGNORE INTO `#__menu_types` (`id`, `asset_id`, `menutype`, `title`, `description`, `client_id`, `ordering`) VALUES
+(1, 0, 'mainmenu', 'Main Menu', 'The main menu for the site', 0, 1);
 
 -- --------------------------------------------------------
 
@@ -878,7 +891,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', 'collection', 'https://update.joomla.org/core/list.xml', 1, 0),
-(2, 'Accredited Joomla! Translations', 'collection', 'https://update.joomla.org/language/translationlist_4.xml', 1, 0),
+(2, 'Accredited Joomla! Translations', 'collection', 'https://update.joomla.org/language/translationlist_5.xml', 1, 0),
 (3, 'Joomla! Update Component', 'extension', 'https://update.joomla.org/core/extensions/com_joomlaupdate.xml', 1, 0);
 
 -- --------------------------------------------------------
@@ -1043,6 +1056,8 @@ CREATE TABLE IF NOT EXISTS `#__user_mfa` (
   `options` mediumtext NOT NULL,
   `created_on` datetime NOT NULL,
   `last_used` datetime,
+  `tries` int NOT NULL DEFAULT 0,
+  `last_try` datetime,
   PRIMARY KEY (`id`),
   KEY `idx_user_id` (`user_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci COMMENT='Multi-factor Authentication settings';
diff --git a/installation/sql/mysql/extensions.sql b/installation/sql/mysql/extensions.sql
index 69f4c05716efa..6e7d4734cdfe2 100644
--- a/installation/sql/mysql/extensions.sql
+++ b/installation/sql/mysql/extensions.sql
@@ -925,6 +925,25 @@ CREATE TABLE IF NOT EXISTS `#__scheduler_tasks` (
   KEY `idx_checked_out` (`checked_out`)
 ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci;
 
+INSERT INTO `#__scheduler_tasks` (`id`, `asset_id`, `title`, `type`, `execution_rules`, `cron_rules`, `state`, `last_execution`, `next_execution`, `locked`, `params`, `created`) VALUES
+(1, 97, 'RotateLogs', 'rotation.logs', CONCAT('{"rule-type":"interval-days","interval-days":"30","exec-day":"', DATE_FORMAT(NOW(), '%e'), '","exec-time":"', TIME_FORMAT(NOW(), '%H:00'), '"}'), '{"type":"interval","exp":"P30D"}', 1, NULL, DATE_FORMAT(NOW() + INTERVAL 30 DAY, '%Y-%m-%d %H:00:00'), NULL, '{"individual_log":false,"log_file":"","notifications":{"success_mail":"0","failure_mail":"1","fatal_failure_mail":"1","orphan_mail":"1"},"logstokeep":1}', NOW()),
+(2, 98, 'UpdateNotification', 'update.notification', CONCAT('{"rule-type":"interval-hours","interval-hours":"24","exec-day":"01","exec-time":"', TIME_FORMAT(NOW(), '%H:00'), '"}'), '{"type":"interval","exp":"PT24H"}', 1, NULL, DATE_FORMAT(NOW() + INTERVAL 24 HOUR, '%Y-%m-%d %H:00:00'), NULL, '{"individual_log":false,"log_file":"","notifications":{"success_mail":"0","failure_mail":"1","fatal_failure_mail":"1","orphan_mail":"1"},"email":"","language_override":""}', NOW());
+
+-- --------------------------------------------------------
+
+--
+-- 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;
+
 -- --------------------------------------------------------
 
 --
@@ -934,6 +953,7 @@ CREATE TABLE IF NOT EXISTS `#__scheduler_tasks` (
 CREATE TABLE IF NOT EXISTS `#__guidedtours` (
   `id` int NOT NULL AUTO_INCREMENT,
   `title` varchar(255) DEFAULT '' NOT NULL,
+  `uid` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
   `description` text NOT NULL,
   `ordering` int NOT NULL DEFAULT 0,
   `extensions` text NOT NULL,
@@ -951,25 +971,26 @@ CREATE TABLE IF NOT EXISTS `#__guidedtours` (
   PRIMARY KEY (`id`),
   KEY `idx_access` (`access`),
   KEY `idx_state` (`published`),
-  KEY `idx_language` (`language`)
+  KEY `idx_language` (`language`),
+  KEY `idx_uid` (`uid`(191))
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
 
 --
 -- Dumping data for table `#__guidedtours`
 --
 
-INSERT INTO `#__guidedtours` (`id`, `title`, `description`, `ordering`, `extensions`, `url`, `created`, `created_by`, `modified`, `modified_by`, `checked_out_time`, `checked_out`, `published`, `language`, `access`) VALUES
-(1, 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_TITLE', 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_DESCRIPTION', 1, '[\"com_guidedtours\"]', 'administrator/index.php?option=com_guidedtours&view=tours', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, NULL, NULL, 1, '*', 1),
-(2, 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_TITLE', 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_DESCRIPTION', 2, '[\"com_guidedtours\"]', 'administrator/index.php?option=com_guidedtours&view=tours', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, NULL, NULL, 1, '*', 1),
-(3, 'COM_GUIDEDTOURS_TOUR_ARTICLES_TITLE', 'COM_GUIDEDTOURS_TOUR_ARTICLES_DESCRIPTION', 3, '[\"*\"]', 'administrator/index.php?option=com_content&view=articles', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, NULL, NULL, 1, '*', 1),
-(4, 'COM_GUIDEDTOURS_TOUR_CATEGORIES_TITLE', 'COM_GUIDEDTOURS_TOUR_CATEGORIES_DESCRIPTION', 4, '[\"*\"]', 'administrator/index.php?option=com_categories&view=categories&extension=com_content', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, NULL, NULL, 1, '*', 1),
-(5, 'COM_GUIDEDTOURS_TOUR_MENUS_TITLE', 'COM_GUIDEDTOURS_TOUR_MENUS_DESCRIPTION', 5, '[\"*\"]', 'administrator/index.php?option=com_menus&view=menus', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, NULL, NULL, 1, '*', 1),
-(6, 'COM_GUIDEDTOURS_TOUR_TAGS_TITLE', 'COM_GUIDEDTOURS_TOUR_TAGS_DESCRIPTION', 6, '[\"*\"]', 'administrator/index.php?option=com_tags&view=tags', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, NULL, NULL, 1, '*', 1),
-(7, 'COM_GUIDEDTOURS_TOUR_BANNERS_TITLE', 'COM_GUIDEDTOURS_TOUR_BANNERS_DESCRIPTION', 7, '[\"*\"]', 'administrator/index.php?option=com_banners&view=banners', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, NULL, NULL, 1, '*', 1),
-(8, 'COM_GUIDEDTOURS_TOUR_CONTACTS_TITLE', 'COM_GUIDEDTOURS_TOUR_CONTACTS_DESCRIPTION', 8, '[\"*\"]', 'administrator/index.php?option=com_contact&view=contacts', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, NULL, NULL, 1, '*', 1),
-(9, 'COM_GUIDEDTOURS_TOUR_NEWSFEEDS_TITLE', 'COM_GUIDEDTOURS_TOUR_NEWSFEEDS_DESCRIPTION', 9, '[\"*\"]', 'administrator/index.php?option=com_newsfeeds&view=newsfeeds', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, NULL, NULL, 1, '*', 1),
-(10, 'COM_GUIDEDTOURS_TOUR_SMARTSEARCH_TITLE', 'COM_GUIDEDTOURS_TOUR_SMARTSEARCH_DESCRIPTION', 10, '[\"*\"]', 'administrator/index.php?option=com_finder&view=filters', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, NULL, NULL, 1, '*', 1),
-(11, 'COM_GUIDEDTOURS_TOUR_USERS_TITLE', 'COM_GUIDEDTOURS_TOUR_USERS_DESCRIPTION', 11, '[\"*\"]', 'administrator/index.php?option=com_users&view=users', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, NULL, NULL, 1, '*', 1);
+INSERT INTO `#__guidedtours` (`id`, `title`, `uid`, `description`, `ordering`, `extensions`, `url`, `created`, `created_by`, `modified`, `modified_by`, `checked_out_time`, `checked_out`, `published`, `language`, `access`) VALUES
+(1, 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_TITLE', 'joomla-guidedtours', 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_DESCRIPTION', 1, '["com_guidedtours"]', 'administrator/index.php?option=com_guidedtours&view=tours', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, NULL, NULL, 1, '*', 1),
+(2, 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_TITLE', 'joomla-guidedtoursteps', 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_DESCRIPTION', 2, '["com_guidedtours"]', 'administrator/index.php?option=com_guidedtours&view=tours', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, NULL, NULL, 1, '*', 1),
+(3, 'COM_GUIDEDTOURS_TOUR_ARTICLES_TITLE', 'joomla-articles', 'COM_GUIDEDTOURS_TOUR_ARTICLES_DESCRIPTION', 3, '["com_content","com_categories"]', 'administrator/index.php?option=com_content&view=articles', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, NULL, NULL, 1, '*', 1),
+(4, 'COM_GUIDEDTOURS_TOUR_CATEGORIES_TITLE', 'joomla-categories', 'COM_GUIDEDTOURS_TOUR_CATEGORIES_DESCRIPTION', 4, '["com_content","com_categories"]', 'administrator/index.php?option=com_categories&view=categories&extension=com_content', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, NULL, NULL, 1, '*', 1),
+(5, 'COM_GUIDEDTOURS_TOUR_MENUS_TITLE', 'joomla-menus', 'COM_GUIDEDTOURS_TOUR_MENUS_DESCRIPTION', 5, '["com_menus"]', 'administrator/index.php?option=com_menus&view=menus', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, NULL, NULL, 1, '*', 1),
+(6, 'COM_GUIDEDTOURS_TOUR_TAGS_TITLE', 'joomla-tags', 'COM_GUIDEDTOURS_TOUR_TAGS_DESCRIPTION', 6, '["com_tags"]', 'administrator/index.php?option=com_tags&view=tags', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, NULL, NULL, 1, '*', 1),
+(7, 'COM_GUIDEDTOURS_TOUR_BANNERS_TITLE', 'joomla-banners', 'COM_GUIDEDTOURS_TOUR_BANNERS_DESCRIPTION', 7, '["com_banners"]', 'administrator/index.php?option=com_banners&view=banners', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, NULL, NULL, 1, '*', 1),
+(8, 'COM_GUIDEDTOURS_TOUR_CONTACTS_TITLE', 'joomla-contacts', 'COM_GUIDEDTOURS_TOUR_CONTACTS_DESCRIPTION', 8, '["com_contact"]', 'administrator/index.php?option=com_contact&view=contacts', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, NULL, NULL, 1, '*', 1),
+(9, 'COM_GUIDEDTOURS_TOUR_NEWSFEEDS_TITLE', 'joomla-newsfeeds', 'COM_GUIDEDTOURS_TOUR_NEWSFEEDS_DESCRIPTION', 9, '["com_newsfeeds"]', 'administrator/index.php?option=com_newsfeeds&view=newsfeeds', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, NULL, NULL, 1, '*', 1),
+(10, 'COM_GUIDEDTOURS_TOUR_SMARTSEARCH_TITLE', 'joomla-smartsearch', 'COM_GUIDEDTOURS_TOUR_SMARTSEARCH_DESCRIPTION', 10, '["com_finder"]', 'administrator/index.php?option=com_finder&view=filters', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, NULL, NULL, 1, '*', 1),
+(11, 'COM_GUIDEDTOURS_TOUR_USERS_TITLE', 'joomla-users', 'COM_GUIDEDTOURS_TOUR_USERS_DESCRIPTION', 11, '["com_users"]', 'administrator/index.php?option=com_users&view=users', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, NULL, NULL, 1, '*', 1);
 
 -- --------------------------------------------------------
 
@@ -1076,7 +1097,7 @@ INSERT INTO `#__guidedtour_steps` (`id`, `tour_id`, `title`, `published`, `descr
 (60, 7, 'COM_GUIDEDTOURS_TOUR_BANNERS_STEP_NEW_TITLE', 1, 'COM_GUIDEDTOURS_TOUR_BANNERS_STEP_NEW_DESCRIPTION', 60, 'bottom', '.button-new', 2, 1, 'administrator/index.php?option=com_banners&view=banners', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, '*'),
 (61, 7, 'COM_GUIDEDTOURS_TOUR_BANNERS_STEP_TITLE_TITLE', 1, 'COM_GUIDEDTOURS_TOUR_BANNERS_STEP_TITLE_DESCRIPTION', 61, 'bottom', '#jform_name', 2, 2, 'administrator/index.php?option=com_banners&view=banner&layout=edit', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, '*'),
 (62, 7, 'COM_GUIDEDTOURS_TOUR_BANNERS_STEP_ALIAS_TITLE', 1, 'COM_GUIDEDTOURS_TOUR_BANNERS_STEP_ALIAS_DESCRIPTION', 62, 'bottom', '#jform_alias', 2, 2, 'administrator/index.php?option=com_banners&view=banner&layout=edit', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, '*'),
-(63, 7, 'COM_GUIDEDTOURS_TOUR_BANNERS_STEP_DESCRIPTION_TITLE', 1, 'COM_GUIDEDTOURS_TOUR_BANNERS_STEP_DESCRIPTION_DESCRIPTION', 63, 'bottom', '#jform_description,#jform_description_ifr', 2, 3, 'administrator/index.php?option=com_banners&view=banner&layout=edit', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, '*'),
+(63, 7, 'COM_GUIDEDTOURS_TOUR_BANNERS_STEP_DETAILS_TITLE', 1, 'COM_GUIDEDTOURS_TOUR_BANNERS_STEP_DETAILS_DESCRIPTION', 63, 'bottom', '.col-lg-9', 2, 3, 'administrator/index.php?option=com_banners&view=banner&layout=edit', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, '*'),
 (64, 7, 'COM_GUIDEDTOURS_TOUR_BANNERS_STEP_STATUS_TITLE', 1, 'COM_GUIDEDTOURS_TOUR_BANNERS_STEP_STATUS_DESCRIPTION', 64, 'bottom', '#jform_state', 2, 3, 'administrator/index.php?option=com_banners&view=banner&layout=edit', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, '*'),
 (65, 7, 'COM_GUIDEDTOURS_TOUR_BANNERS_STEP_CATEGORY_TITLE', 1, 'COM_GUIDEDTOURS_TOUR_BANNERS_STEP_CATEGORY_DESCRIPTION', 65, 'top', 'joomla-field-fancy-select .choices[data-type=select-one]', 2, 3, 'administrator/index.php?option=com_banners&view=banner&layout=edit', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, '*'),
 (66, 7, 'COM_GUIDEDTOURS_TOUR_BANNERS_STEP_PINNED_TITLE', 1, 'COM_GUIDEDTOURS_TOUR_BANNERS_STEP_PINNED_DESCRIPTION', 66, 'bottom', '#jform_sticky1', 2, 3, 'administrator/index.php?option=com_banners&view=banner&layout=edit', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, '*'),
diff --git a/installation/sql/mysql/supports.sql b/installation/sql/mysql/supports.sql
index 034682c5a2bfc..2829bad359b0c 100644
--- a/installation/sql/mysql/supports.sql
+++ b/installation/sql/mysql/supports.sql
@@ -275,8 +275,6 @@ SELECT `extension_id`, 'COM_CPANEL_WELCOME_BEGINNERS_TITLE', 'COM_CPANEL_WELCOME
 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_CPANEL_MSG_STATS_COLLECTION_TITLE', 'COM_CPANEL_MSG_STATS_COLLECTION_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/statscollection.php', 'admin_postinstall_statscollection_condition', '3.5.0', 1 FROM `#__extensions` WHERE `name` = 'files_joomla';
 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`, 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME', 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_BODY', 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_ACTION', 'plg_system_updatenotification', 1, 'action', 'site://plugins/system/updatenotification/postinstall/updatecachetime.php', 'updatecachetime_postinstall_action', 'site://plugins/system/updatenotification/postinstall/updatecachetime.php', 'updatecachetime_postinstall_condition', '3.6.3', 1 FROM `#__extensions` WHERE `name` = 'files_joomla';
-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`, 'PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_TITLE', 'PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_BODY', 'PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_ACTION', 'plg_system_httpheaders', 1, 'action', 'site://plugins/system/httpheaders/postinstall/introduction.php', 'httpheaders_postinstall_action', 'site://plugins/system/httpheaders/postinstall/introduction.php', 'httpheaders_postinstall_condition', '4.0.0', 1 FROM `#__extensions` WHERE `name` = 'files_joomla';
 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_USERS_POSTINSTALL_MULTIFACTORAUTH_TITLE', 'COM_USERS_POSTINSTALL_MULTIFACTORAUTH_BODY', 'COM_USERS_POSTINSTALL_MULTIFACTORAUTH_ACTION', 'com_users', 1, 'action', 'admin://components/com_users/postinstall/multifactorauth.php', 'com_users_postinstall_mfa_action', 'admin://components/com_users/postinstall/multifactorauth.php', 'com_users_postinstall_mfa_condition', '4.2.0', 1 FROM `#__extensions` WHERE `name` = 'files_joomla';
@@ -416,7 +414,7 @@ INSERT INTO `#__mail_templates` (`template_id`, `extension`, `language`, `subjec
 ('com_users.massmail.mail', 'com_users', '', 'COM_USERS_MASSMAIL_MAIL_SUBJECT', 'COM_USERS_MASSMAIL_MAIL_BODY', '', '', '{"tags":["subject","body","subjectprefix","bodysuffix"]}'),
 ('com_users.password_reset', 'com_users', '', 'COM_USERS_EMAIL_PASSWORD_RESET_SUBJECT', 'COM_USERS_EMAIL_PASSWORD_RESET_BODY', '', '', '{"tags":["name","email","sitename","link_text","link_html","token"]}'),
 ('com_users.reminder', 'com_users','', 'COM_USERS_EMAIL_USERNAME_REMINDER_SUBJECT', 'COM_USERS_EMAIL_USERNAME_REMINDER_BODY', '', '', '{"tags":["name","username","sitename","email","link_text","link_html"]}'),
-('plg_system_updatenotification.mail', 'plg_system_updatenotification', '', 'PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_SUBJECT', 'PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_BODY', '', '', '{"tags":["newversion","curversion","sitename","url","link","releasenews"]}'),
+('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":["message","date","extension","username"]}'),
 ('com_privacy.userdataexport', 'com_privacy', '', 'COM_PRIVACY_EMAIL_DATA_EXPORT_COMPLETED_SUBJECT', 'COM_PRIVACY_EMAIL_DATA_EXPORT_COMPLETED_BODY', '', '', '{"tags":["sitename","url"]}'),
@@ -433,7 +431,7 @@ INSERT INTO `#__mail_templates` (`template_id`, `extension`, `language`, `subjec
 ('com_users.registration.admin.new_notification', 'com_users', '', 'COM_USERS_EMAIL_ACCOUNT_DETAILS', 'COM_USERS_EMAIL_REGISTERED_NOTIFICATION_TO_ADMIN_BODY', '', '', '{"tags":["name","sitename","siteurl","username"]}'),
 ('com_users.registration.user.admin_activated', 'com_users', '', 'COM_USERS_EMAIL_ACTIVATED_BY_ADMIN_ACTIVATION_SUBJECT', 'COM_USERS_EMAIL_ACTIVATED_BY_ADMIN_ACTIVATION_BODY', '', '', '{"tags":["name","sitename","siteurl","username"]}'),
 ('com_users.registration.admin.verification_request', 'com_users', '', 'COM_USERS_EMAIL_ACTIVATE_WITH_ADMIN_ACTIVATION_SUBJECT', 'COM_USERS_EMAIL_ACTIVATE_WITH_ADMIN_ACTIVATION_BODY', '', '', '{"tags":["name","sitename","email","username","activate"]}'),
-('plg_system_privacyconsent.request.reminder', 'plg_system_privacyconsent', '', 'PLG_SYSTEM_PRIVACYCONSENT_EMAIL_REMIND_SUBJECT', 'PLG_SYSTEM_PRIVACYCONSENT_EMAIL_REMIND_BODY', '', '', '{"tags":["sitename","url","tokenurl","formurl","token"]}'),
+('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"]}'),
 ('com_messages.new_message', 'com_messages', '', 'COM_MESSAGES_NEW_MESSAGE', 'COM_MESSAGES_NEW_MESSAGE_BODY', '', '', '{"tags":["subject","message","fromname","sitename","siteurl","fromemail","toname","toemail"]}'),
 ('plg_system_tasknotification.failure_mail', 'plg_system_tasknotification', '', 'PLG_SYSTEM_TASK_NOTIFICATION_FAILURE_MAIL_SUBJECT', 'PLG_SYSTEM_TASK_NOTIFICATION_FAILURE_MAIL_BODY', '', '', '{"tags": ["task_id", "task_title", "exit_code", "exec_data_time", "task_output"]}'),
 ('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"]}'),
diff --git a/installation/sql/postgresql/base.sql b/installation/sql/postgresql/base.sql
index eaf4db92ad35f..d4f3a214375fc 100644
--- a/installation/sql/postgresql/base.sql
+++ b/installation/sql/postgresql/base.sql
@@ -31,7 +31,7 @@ COMMENT ON COLUMN "#__assets"."rules" IS 'JSON encoded access control.';
 --
 
 INSERT INTO "#__assets" ("id", "parent_id", "lft", "rgt", "level", "name", "title", "rules") VALUES
-(1, 0, 0, 177, 0, 'root.1', 'Root Asset', '{"core.login.site":{"6":1,"2":1},"core.login.admin":{"6":1},"core.login.api":{"8":1},"core.login.offline":{"6":1},"core.admin":{"8":1},"core.manage":{"7":1},"core.create":{"6":1,"3":1},"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1},"core.edit.own":{"6":1,"3":1}}'),
+(1, 0, 0, 181, 0, 'root.1', 'Root Asset', '{"core.login.site":{"6":1,"2":1},"core.login.admin":{"6":1},"core.login.api":{"8":1},"core.login.offline":{"6":1},"core.admin":{"8":1},"core.manage":{"7":1},"core.create":{"6":1,"3":1},"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1},"core.edit.own":{"6":1,"3":1}}'),
 (2, 1, 1, 2, 1, 'com_admin', 'com_admin', '{}'),
 (3, 1, 3, 6, 1, 'com_banners', 'com_banners', '{"core.admin":{"7":1},"core.manage":{"6":1}}'),
 (4, 1, 7, 8, 1, 'com_cache', 'com_cache', '{"core.admin":{"7":1},"core.manage":{"7":1}}'),
@@ -119,9 +119,11 @@ INSERT INTO "#__assets" ("id", "parent_id", "lft", "rgt", "level", "name", "titl
 (93, 1, 171, 172, 1, 'com_fields', 'com_fields', '{}'),
 (94, 1, 173, 174, 1, 'com_workflow', 'com_workflow', '{}'),
 (95, 1, 175, 176, 1, 'com_guidedtours', 'com_guidedtours', '{}'),
-(96, 18, 130, 131, 2, 'com_modules.module.109', 'Guided Tours', '{}');
+(96, 18, 130, 131, 2, 'com_modules.module.109', 'Guided Tours', '{}'),
+(97, 1, 177, 178, 1, 'com_scheduler.task.1', 'com_scheduler.task.1', '{}'),
+(98, 1, 179, 180, 1, 'com_scheduler.task.2', 'com_scheduler.task.2', '{}');
 
-SELECT setval('#__assets_id_seq', 97, false);
+SELECT setval('#__assets_id_seq', 99, false);
 
 --
 -- Table structure for table `#__extensions`
@@ -171,7 +173,7 @@ INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder",
 (0, 'com_installer', 'component', 'com_installer', '', 1, 1, 1, 1, 1, '', '{"cachetimeout":"6","minimum_stability":"4"}', '', 0, 0),
 (0, 'com_languages', 'component', 'com_languages', '', 1, 1, 1, 1, 1, '', '{"administrator":"en-GB","site":"en-GB"}', '', 0, 0),
 (0, 'com_login', 'component', 'com_login', '', 1, 1, 1, 1, 1, '', '', '', 0, 0),
-(0, 'com_media', 'component', 'com_media', '', 1, 1, 0, 1, 1, '', '{"upload_maxsize":"10","file_path":"images","image_path":"images","restrict_uploads":"1","allowed_media_usergroup":"3","restrict_uploads_extensions":"bmp,gif,jpg,jpeg,png,ico,webp,mp3,m4a,mp4a,ogg,mp4,mp4v,mpeg,mov,odg,odp,ods,odt,pdf,png,ppt,txt,xcf,xls,csv","check_mime":"1","image_extensions":"bmp,gif,jpg,png,jpeg,webp","audio_extensions":"mp3,m4a,mp4a,ogg","video_extensions":"mp4,mp4v,mpeg,mov,webm","doc_extensions":"odg,odp,ods,odt,pdf,ppt,txt,xcf,xls,csv","ignore_extensions":"","upload_mime":"image\\/jpeg,image\\/gif,image\\/png,image\\/bmp,image\\/webp,audio\\/ogg,audio\\/mpeg,audio\\/mp4,video\\/mp4,video\\/webm,video\\/mpeg,video\\/quicktime,application\\/msword,application\\/excel,application\\/pdf,application\\/powerpoint,text\\/plain,application\\/x-zip"}', '', 0, 0),
+(0, 'com_media', 'component', 'com_media', '', 1, 1, 0, 1, 1, '', '{"upload_maxsize":"10","file_path":"images","image_path":"images","restrict_uploads":"1","allowed_media_usergroup":"3","restrict_uploads_extensions":"bmp,gif,jpg,jpeg,png,ico,webp,avif,mp3,m4a,mp4a,ogg,mp4,mp4v,mpeg,mov,odg,odp,ods,odt,pdf,png,ppt,txt,xcf,xls,csv","check_mime":"1","image_extensions":"bmp,gif,jpg,png,jpeg,webp,avif","audio_extensions":"mp3,m4a,mp4a,ogg","video_extensions":"mp4,mp4v,mpeg,mov,webm","doc_extensions":"odg,odp,ods,odt,pdf,ppt,txt,xcf,xls,csv","ignore_extensions":"","upload_mime":"image\\/jpeg,image\\/gif,image\\/png,image\\/bmp,image\\/webp,image\\/avif,audio\\/ogg,audio\\/mpeg,audio\\/mp4,video\\/mp4,video\\/webm,video\\/mpeg,video\\/quicktime,application\\/msword,application\\/excel,application\\/pdf,application\\/powerpoint,text\\/plain,application\\/x-zip"}', '', 0, 0),
 (0, 'com_menus', 'component', 'com_menus', '', 1, 1, 1, 1, 1, '', '{"page_title":"","show_page_heading":0,"page_heading":"","pageclass_sfx":""}', '', 0, 0),
 (0, 'com_messages', 'component', 'com_messages', '', 1, 1, 1, 1, 1, '', '', '', 0, 0),
 (0, 'com_modules', 'component', 'com_modules', '', 1, 1, 1, 1, 1, '', '', '', 0, 0),
@@ -264,10 +266,9 @@ 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_taggable', 'plugin', 'taggable', 'behaviour', 0, 1, 1, 0, 1, '', '{}', '', 1, 0),
-(0, 'plg_behaviour_versionable', 'plugin', 'versionable', 'behaviour', 0, 1, 1, 0, 1, '', '{}', '', 2, 0),
-(0, 'plg_captcha_recaptcha', 'plugin', 'recaptcha', 'captcha', 0, 0, 1, 0, 1, '', '{"public_key":"","private_key":"","theme":"clean"}', '', 1, 0),
-(0, 'plg_captcha_recaptcha_invisible', 'plugin', 'recaptcha_invisible', 'captcha', 0, 0, 1, 0, 1, '', '{"public_key":"","private_key":"","theme":"clean"}', '', 2, 0),
+(0, 'plg_behaviour_compat', 'plugin', 'compat', 'behaviour', 0, 0, 1, 0, 1, '', '{"classes_aliases":"1","es5_assets":"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_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),
@@ -288,14 +289,14 @@ 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","|","formatselect","|","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","|","styleselect","|","formatselect","fontselect","fontsizeselect","|","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","template","|","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","|","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_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_namespacemap', 'plugin', 'namespacemap', 'extension', 0, 1, 1, 1, 1, '', '{}', '', 3, 0),
 (0, 'plg_fields_calendar', 'plugin', 'calendar', 'fields', 0, 1, 1, 0, 1, '', '', '', 1, 0),
 (0, 'plg_fields_checkboxes', 'plugin', 'checkboxes', 'fields', 0, 1, 1, 0, 1, '', '', '', 2, 0),
 (0, 'plg_fields_color', 'plugin', 'color', 'fields', 0, 1, 1, 0, 1, '', '', '', 3, 0),
-(0, 'plg_fields_editor', 'plugin', 'editor', 'fields', 0, 1, 1, 0, 1, '', '{"buttons":0,"width":"100%","height":"250px","filter":"JComponentHelper::filterText"}', '', 4, 0),
+(0, 'plg_fields_editor', 'plugin', 'editor', 'fields', 0, 1, 1, 0, 1, '', '{"buttons":0,"width":"100%","height":"250px","filter":"\\\\Joomla\\\\CMS\\\\Component\\\\ComponentHelper::filterText"}', '', 4, 0),
 (0, 'plg_fields_imagelist', 'plugin', 'imagelist', 'fields', 0, 1, 1, 0, 1, '', '', '', 5, 0),
 (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),
@@ -304,7 +305,7 @@ INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder",
 (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":"JComponentHelper::filterText"}', '', 13, 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),
@@ -334,8 +335,16 @@ INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder",
 (0, 'plg_quickicon_downloadkey', 'plugin', 'downloadkey', 'quickicon', 0, 1, 1, 0, 1, '', '', '', 4, 0),
 (0, 'plg_quickicon_privacycheck', 'plugin', 'privacycheck', 'quickicon', 0, 1, 1, 0, 1, '', '{}', '', 5, 0),
 (0, 'plg_quickicon_phpversioncheck', 'plugin', 'phpversioncheck', 'quickicon', 0, 1, 1, 0, 1, '', '', '', 6, 0),
+(0, 'plg_quickicon_eos', 'plugin', 'eos', 'quickicon', 0, 1, 1, 0, 1, '', '', '', 7, 0),
 (0, 'plg_sampledata_blog', 'plugin', 'blog', 'sampledata', 0, 1, 1, 0, 1, '', '', '', 1, 0),
 (0, 'plg_sampledata_multilang', 'plugin', 'multilang', 'sampledata', 0, 1, 1, 0, 1, '', '', '', 2, 0),
+(0, 'plg_schemaorg_blogposting', 'plugin', 'blogposting', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 1, 0),
+(0, 'plg_schemaorg_book', 'plugin', 'book', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 2, 0),
+(0, 'plg_schemaorg_event', 'plugin', 'event', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 3, 0),
+(0, 'plg_schemaorg_organization', 'plugin', 'organization', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 4, 0),
+(0, 'plg_schemaorg_person', 'plugin', 'person', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 5, 0),
+(0, 'plg_schemaorg_recipe', 'plugin', 'recipe', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 6, 0),
+(0, 'plg_schemaorg_jobposting', 'plugin', 'jobposting', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 7, 0),
 (0, 'plg_system_accessibility', 'plugin', 'accessibility', 'system', 0, 0, 1, 0, 1, '', '{}', '', 1, 0),
 (0, 'plg_system_actionlogs', 'plugin', 'actionlogs', 'system', 0, 1, 1, 0, 1, '', '{}', '', 2, 0),
 (0, 'plg_system_cache', 'plugin', 'cache', 'system', 0, 0, 1, 0, 1, '', '{"browsercache":"0","cachetime":"15"}', '', 3, 0),
@@ -348,23 +357,26 @@ INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder",
 (0, 'plg_system_languagefilter', 'plugin', 'languagefilter', 'system', 0, 0, 1, 0, 1, '', '', '', 10, 0),
 (0, 'plg_system_log', 'plugin', 'log', 'system', 0, 1, 1, 0, 1, '', '', '', 11, 0),
 (0, 'plg_system_logout', 'plugin', 'logout', 'system', 0, 1, 1, 0, 1, '', '', '', 12, 0),
-(0, 'plg_system_logrotation', 'plugin', 'logrotation', 'system', 0, 1, 1, 0, 1, '', '{}', '', 13, 0),
 (0, 'plg_system_privacyconsent', 'plugin', 'privacyconsent', 'system', 0, 0, 1, 0, 1, '', '{}', '', 14, 0),
 (0, 'plg_system_redirect', 'plugin', 'redirect', 'system', 0, 0, 1, 0, 1, '', '', '', 15, 0),
 (0, 'plg_system_remember', 'plugin', 'remember', 'system', 0, 1, 1, 0, 1, '', '', '', 16, 0),
 (0, 'plg_system_schedulerunner', 'plugin', 'schedulerunner', 'system', 0, 1, 1, 0, 1, '', '{}', '', 17, 0),
-(0, 'plg_system_sef', 'plugin', 'sef', 'system', 0, 1, 1, 0, 1, '', '', '', 18, 0),
-(0, 'plg_system_sessiongc', 'plugin', 'sessiongc', 'system', 0, 1, 1, 0, 1, '', '', '', 19, 0),
-(0, 'plg_system_shortcut', 'plugin', 'shortcut', 'system', 0, 1, 1, 0, 1, '', '{}', '', 0, 0),
-(0, 'plg_system_skipto', 'plugin', 'skipto', 'system', 0, 1, 1, 0, 1, '', '{}', '', 20, 0),
-(0, 'plg_system_stats', 'plugin', 'stats', 'system', 0, 1, 1, 0, 1, '', '', '', 21, 0),
-(0, 'plg_system_tasknotification', 'plugin', 'tasknotification', 'system', 0, 1, 1, 0, 1, '', '', '', 22, 0),
-(0, 'plg_system_updatenotification', 'plugin', 'updatenotification', 'system', 0, 1, 1, 0, 1, '', '', '', 23, 0),
-(0, 'plg_system_webauthn', 'plugin', 'webauthn', 'system', 0, 1, 1, 0, 1, '', '{}', '', 24, 0),
+(0, 'plg_system_schemaorg', 'plugin', 'schemaorg', 'system', 0, 1, 1, 0, 0, '', '{}', '', 18, 0),
+(0, 'plg_system_sef', 'plugin', 'sef', 'system', 0, 1, 1, 0, 1, '', '', '', 19, 0),
+(0, 'plg_system_sessiongc', 'plugin', 'sessiongc', 'system', 0, 1, 1, 0, 1, '', '', '', 20, 0),
+(0, 'plg_system_shortcut', 'plugin', 'shortcut', 'system', 0, 1, 1, 0, 1, '', '{}', '', 21, 0),
+(0, 'plg_system_skipto', 'plugin', 'skipto', 'system', 0, 1, 1, 0, 1, '', '{}', '', 22, 0),
+(0, 'plg_system_stats', 'plugin', 'stats', 'system', 0, 1, 1, 0, 1, '', '', '', 23, 0),
+(0, 'plg_system_tasknotification', 'plugin', 'tasknotification', 'system', 0, 1, 1, 0, 1, '', '', '', 24, 0),
+(0, 'plg_system_webauthn', 'plugin', 'webauthn', 'system', 0, 1, 1, 0, 1, '', '{}', '', 26, 0),
 (0, 'plg_task_checkfiles', 'plugin', 'checkfiles', 'task', 0, 1, 1, 0, 1, '', '{}', '', 1, 0),
-(0, 'plg_task_demotasks', 'plugin', 'demotasks', 'task', 0, 1, 1, 0, 1, '', '{}', '', 2, 0),
-(0, 'plg_task_requests', 'plugin', 'requests', 'task', 0, 1, 1, 0, 1, '', '{}', '', 3, 0),
-(0, 'plg_task_sitestatus', 'plugin', 'sitestatus', 'task', 0, 1, 1, 0, 1, '', '{}', '', 4, 0),
+(0, 'plg_task_deleteactionlogs', 'plugin', 'deleteactionlogs', 'task', 0, 1, 1, 0, 1, '', '{}', '', 2, 0),
+(0, 'plg_task_globalcheckin', 'plugin', 'globalcheckin', 'task', 0, 1, 1, 0, 0, '', '{}', '', 3, 0),
+(0, 'plg_task_requests', 'plugin', 'requests', 'task', 0, 1, 1, 0, 1, '', '{}', '', 4, 0),
+(0, 'plg_task_privacyconsent', 'plugin', 'privacyconsent', 'task', 0, 1, 1, 0, 1, '', '{}', '', 5, 0),
+(0, 'plg_task_rotatelogs', 'plugin', 'rotatelogs', 'task', 0, 1, 1, 0, 1, '', '{}', '', 6, 0),
+(0, 'plg_task_sitestatus', 'plugin', 'sitestatus', 'task', 0, 1, 1, 0, 1, '', '{}', '', 7, 0),
+(0, 'plg_task_updatenotification', 'plugin', 'updatenotification', 'task', 0, 1, 1, 0, 1, '', '{}', '', 8, 0),
 (0, 'plg_multifactorauth_totp', 'plugin', 'totp', 'multifactorauth', 0, 1, 1, 0, 1, '', '', '', 1, 0),
 (0, 'plg_multifactorauth_yubikey', 'plugin', 'yubikey', 'multifactorauth', 0, 1, 1, 0, 1, '', '', '', 2, 0),
 (0, 'plg_multifactorauth_webauthn', 'plugin', 'webauthn', 'multifactorauth', 0, 1, 1, 0, 1, '', '', '', 3, 0),
@@ -575,6 +587,7 @@ CREATE TABLE IF NOT EXISTS "#__menu_types" (
   "title" varchar(48) NOT NULL,
   "description" varchar(255) DEFAULT '' NOT NULL,
   "client_id" int DEFAULT 0 NOT NULL,
+  "ordering" int NOT NULL DEFAULT 0,
   PRIMARY KEY ("id"),
   CONSTRAINT "#__menu_types_idx_menutype" UNIQUE ("menutype")
 );
@@ -583,8 +596,8 @@ CREATE TABLE IF NOT EXISTS "#__menu_types" (
 -- Dumping data for table `#__menu_types`
 --
 
-INSERT INTO "#__menu_types" ("id", "asset_id", "menutype", "title", "description", "client_id") VALUES
-(1, 0, 'mainmenu', 'Main Menu', 'The main menu for the site', 0);
+INSERT INTO "#__menu_types" ("id", "asset_id", "menutype", "title", "description", "client_id", "ordering") VALUES
+(1, 0, 'mainmenu', 'Main Menu', 'The main menu for the site', 0, 1);
 
 SELECT setval('#__menu_types_id_seq', 2, false);
 
@@ -895,7 +908,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', 'collection', 'https://update.joomla.org/core/list.xml', 1, 0),
-(2, 'Accredited Joomla! Translations', 'collection', 'https://update.joomla.org/language/translationlist_4.xml', 1, 0),
+(2, 'Accredited Joomla! Translations', 'collection', 'https://update.joomla.org/language/translationlist_5.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);
@@ -1064,6 +1077,8 @@ CREATE TABLE IF NOT EXISTS "#__user_mfa" (
   "options" text NOT NULL,
   "created_on" timestamp without time zone NOT NULL,
   "last_used" timestamp without time zone,
+  "tries" bigint DEFAULT 0 NOT NULL,
+  "last_try" timestamp without time zone,
   PRIMARY KEY ("id")
 );
 
diff --git a/installation/sql/postgresql/extensions.sql b/installation/sql/postgresql/extensions.sql
index b0365982b6df8..abd3cfa743d1c 100644
--- a/installation/sql/postgresql/extensions.sql
+++ b/installation/sql/postgresql/extensions.sql
@@ -889,6 +889,27 @@ CREATE INDEX "#__scheduler_tasks_idx_priority" ON "#__scheduler_tasks" ("priorit
 CREATE INDEX "#__scheduler_tasks_idx_cli_exclusive" ON "#__scheduler_tasks" ("cli_exclusive");
 CREATE INDEX "#__scheduler_tasks_idx_checked_out" ON "#__scheduler_tasks" ("checked_out");
 
+INSERT INTO "#__scheduler_tasks" ("id", "asset_id", "title", "type", "execution_rules", "cron_rules", "state", "last_execution", "next_execution", "locked", "params", "created") VALUES
+(1, 97, 'RotateLogs', 'rotation.logs', CONCAT('{"rule-type":"interval-days","interval-days":"30","exec-day":"', TO_CHAR(CURRENT_TIMESTAMP AT TIME ZONE 'UTC', 'FMDD'), '","exec-time":"', TO_CHAR(CURRENT_TIMESTAMP AT TIME ZONE 'UTC', 'HH24:00'), '"}'), '{"type":"interval","exp":"P30D"}', 1, NULL, TO_TIMESTAMP(TO_CHAR(CURRENT_TIMESTAMP AT TIME ZONE 'UTC' + INTERVAL '30 days', 'YYYY-MM-DD HH24:00:00'), 'YYYY-MM-DD HH24:MI:SS'), NULL, '{"individual_log":false,"log_file":"","notifications":{"success_mail":"0","failure_mail":"1","fatal_failure_mail":"1","orphan_mail":"1"},"logstokeep":1}', CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
+(2, 98, 'UpdateNotification', 'update.notification', CONCAT('{"rule-type":"interval-hours","interval-hours":"24","exec-day":"01","exec-time":"', TO_CHAR(CURRENT_TIMESTAMP AT TIME ZONE 'UTC', 'HH24:00'), '"}'), '{"type":"interval","exp":"PT24H"}', 1, NULL, TO_TIMESTAMP(TO_CHAR(CURRENT_TIMESTAMP AT TIME ZONE 'UTC' + INTERVAL '24 hours', 'YYYY-MM-DD HH24:00:00'), 'YYYY-MM-DD HH24:MI:SS'), NULL, '{"individual_log":false,"log_file":"","notifications":{"success_mail":"0","failure_mail":"1","fatal_failure_mail":"1","orphan_mail":"1"},"email":"","language_override":""}', CURRENT_TIMESTAMP AT TIME ZONE 'UTC');
+
+SELECT setval('#__scheduler_tasks_id_seq', 3, false);
+
+-- --------------------------------------------------------
+
+--
+-- 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")
+);
+
 -- --------------------------------------------------------
 
 --
@@ -898,6 +919,7 @@ CREATE INDEX "#__scheduler_tasks_idx_checked_out" ON "#__scheduler_tasks" ("chec
 CREATE TABLE IF NOT EXISTS "#__guidedtours" (
   "id" serial NOT NULL,
   "title" varchar(255) DEFAULT '' NOT NULL,
+  "uid" varchar(255) DEFAULT '' NOT NULL,
   "description" text NOT NULL,
   "ordering" bigint DEFAULT 0 NOT NULL,
   "extensions" text NOT NULL,
@@ -918,23 +940,23 @@ CREATE TABLE IF NOT EXISTS "#__guidedtours" (
 CREATE INDEX "#__guidedtours_idx_access" ON "#__guidedtours" ("access");
 CREATE INDEX "#__guidedtours_idx_state" ON "#__guidedtours" ("published");
 CREATE INDEX "#__guidedtours_idx_language" ON "#__guidedtours" ("language");
-
+CREATE INDEX "#__guidedtours_idx_uid" ON "#__guidedtours" ("uid");
 --
 -- Dumping data for table `#__guidedtours`
 --
 
-INSERT INTO "#__guidedtours" ("id", "title", "description", "ordering", "extensions", "url", "created", "created_by", "modified", "modified_by", "checked_out_time", "checked_out", "published", "language", "access") VALUES
-(1, 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_TITLE', 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_DESCRIPTION', 1, '[\"com_guidedtours\"]', 'administrator/index.php?option=com_guidedtours&view=tours', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, NULL, NULL, 1, '*', 1),
-(2, 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_TITLE', 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_DESCRIPTION', 2, '[\"com_guidedtours\"]', 'administrator/index.php?option=com_guidedtours&view=tours', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, NULL, NULL, 1, '*', 1),
-(3, 'COM_GUIDEDTOURS_TOUR_ARTICLES_TITLE', 'COM_GUIDEDTOURS_TOUR_ARTICLES_DESCRIPTION', 3, '[\"*\"]', 'administrator/index.php?option=com_content&view=articles', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, NULL, NULL, 1, '*', 1),
-(4, 'COM_GUIDEDTOURS_TOUR_CATEGORIES_TITLE', 'COM_GUIDEDTOURS_TOUR_CATEGORIES_DESCRIPTION', 4, '[\"*\"]', 'administrator/index.php?option=com_categories&view=categories&extension=com_content', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, NULL, NULL, 1, '*', 1),
-(5, 'COM_GUIDEDTOURS_TOUR_MENUS_TITLE', 'COM_GUIDEDTOURS_TOUR_MENUS_DESCRIPTION', 5, '[\"*\"]', 'administrator/index.php?option=com_menus&view=menus', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, NULL, NULL, 1, '*', 1),
-(6, 'COM_GUIDEDTOURS_TOUR_TAGS_TITLE', 'COM_GUIDEDTOURS_TOUR_TAGS_DESCRIPTION', 6, '[\"*\"]', 'administrator/index.php?option=com_tags&view=tags', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, NULL, NULL, 1, '*', 1),
-(7, 'COM_GUIDEDTOURS_TOUR_BANNERS_TITLE', 'COM_GUIDEDTOURS_TOUR_BANNERS_DESCRIPTION', 7, '[\"*\"]', 'administrator/index.php?option=com_banners&view=banners', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, NULL, NULL, 1, '*', 1),
-(8, 'COM_GUIDEDTOURS_TOUR_CONTACTS_TITLE', 'COM_GUIDEDTOURS_TOUR_CONTACTS_DESCRIPTION', 8, '[\"*\"]', 'administrator/index.php?option=com_contact&view=contacts', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, NULL, NULL, 1, '*', 1),
-(9, 'COM_GUIDEDTOURS_TOUR_NEWSFEEDS_TITLE', 'COM_GUIDEDTOURS_TOUR_NEWSFEEDS_DESCRIPTION', 9, '[\"*\"]', 'administrator/index.php?option=com_newsfeeds&view=newsfeeds', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, NULL, NULL, 1, '*', 1),
-(10, 'COM_GUIDEDTOURS_TOUR_SMARTSEARCH_TITLE', 'COM_GUIDEDTOURS_TOUR_SMARTSEARCH_DESCRIPTION', 10, '[\"*\"]', 'administrator/index.php?option=com_finder&view=filters', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, NULL, NULL, 1, '*', 1),
-(11, 'COM_GUIDEDTOURS_TOUR_USERS_TITLE', 'COM_GUIDEDTOURS_TOUR_USERS_DESCRIPTION', 11, '[\"*\"]', 'administrator/index.php?option=com_users&view=users', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, NULL, NULL, 1, '*', 1);
+INSERT INTO "#__guidedtours" ("id", "title", "uid", "description", "ordering", "extensions", "url", "created", "created_by", "modified", "modified_by", "checked_out_time", "checked_out", "published", "language", "access") VALUES
+(1, 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_TITLE', 'joomla-guidedtours', 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_DESCRIPTION', 1, '["com_guidedtours"]', 'administrator/index.php?option=com_guidedtours&view=tours', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, NULL, NULL, 1, '*', 1),
+(2, 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_TITLE', 'joomla-guidedtoursteps', 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_DESCRIPTION', 2, '["com_guidedtours"]', 'administrator/index.php?option=com_guidedtours&view=tours', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, NULL, NULL, 1, '*', 1),
+(3, 'COM_GUIDEDTOURS_TOUR_ARTICLES_TITLE', 'joomla-articles', 'COM_GUIDEDTOURS_TOUR_ARTICLES_DESCRIPTION', 3, '["com_content","com_categories"]', 'administrator/index.php?option=com_content&view=articles', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, NULL, NULL, 1, '*', 1),
+(4, 'COM_GUIDEDTOURS_TOUR_CATEGORIES_TITLE', 'joomla-categories', 'COM_GUIDEDTOURS_TOUR_CATEGORIES_DESCRIPTION', 4, '["com_content","com_categories"]', 'administrator/index.php?option=com_categories&view=categories&extension=com_content', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, NULL, NULL, 1, '*', 1),
+(5, 'COM_GUIDEDTOURS_TOUR_MENUS_TITLE', 'joomla-menus', 'COM_GUIDEDTOURS_TOUR_MENUS_DESCRIPTION', 5, '["com_menus"]', 'administrator/index.php?option=com_menus&view=menus', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, NULL, NULL, 1, '*', 1),
+(6, 'COM_GUIDEDTOURS_TOUR_TAGS_TITLE', 'joomla-tags', 'COM_GUIDEDTOURS_TOUR_TAGS_DESCRIPTION', 6, '["com_tags"]', 'administrator/index.php?option=com_tags&view=tags', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, NULL, NULL, 1, '*', 1),
+(7, 'COM_GUIDEDTOURS_TOUR_BANNERS_TITLE', 'joomla-banners', 'COM_GUIDEDTOURS_TOUR_BANNERS_DESCRIPTION', 7, '["com_banners"]', 'administrator/index.php?option=com_banners&view=banners', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, NULL, NULL, 1, '*', 1),
+(8, 'COM_GUIDEDTOURS_TOUR_CONTACTS_TITLE', 'joomla-contacts', 'COM_GUIDEDTOURS_TOUR_CONTACTS_DESCRIPTION', 8, '["com_contact"]', 'administrator/index.php?option=com_contact&view=contacts', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, NULL, NULL, 1, '*', 1),
+(9, 'COM_GUIDEDTOURS_TOUR_NEWSFEEDS_TITLE', 'joomla-newsfeeds', 'COM_GUIDEDTOURS_TOUR_NEWSFEEDS_DESCRIPTION', 9, '["com_newsfeeds"]', 'administrator/index.php?option=com_newsfeeds&view=newsfeeds', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, NULL, NULL, 1, '*', 1),
+(10, 'COM_GUIDEDTOURS_TOUR_SMARTSEARCH_TITLE', 'joomla-smartsearch', 'COM_GUIDEDTOURS_TOUR_SMARTSEARCH_DESCRIPTION', 10, '["com_finder"]', 'administrator/index.php?option=com_finder&view=filters', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, NULL, NULL, 1, '*', 1),
+(11, 'COM_GUIDEDTOURS_TOUR_USERS_TITLE', 'joomla-users', 'COM_GUIDEDTOURS_TOUR_USERS_DESCRIPTION', 11, '["com_users"]', 'administrator/index.php?option=com_users&view=users', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, NULL, NULL, 1, '*', 1);
 
 SELECT setval('#__guidedtours_id_seq', 12, false);
 
@@ -1044,7 +1066,7 @@ INSERT INTO "#__guidedtour_steps" ("id", "tour_id", "title", "published", "descr
 (60, 7, 'COM_GUIDEDTOURS_TOUR_BANNERS_STEP_NEW_TITLE', 1, 'COM_GUIDEDTOURS_TOUR_BANNERS_STEP_NEW_DESCRIPTION', 60, 'bottom', '.button-new', 2, 1, 'administrator/index.php?option=com_banners&view=banners', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, '*'),
 (61, 7, 'COM_GUIDEDTOURS_TOUR_BANNERS_STEP_TITLE_TITLE', 1, 'COM_GUIDEDTOURS_TOUR_BANNERS_STEP_TITLE_DESCRIPTION', 61, 'bottom', '#jform_name', 2, 2, 'administrator/index.php?option=com_banners&view=banner&layout=edit', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, '*'),
 (62, 7, 'COM_GUIDEDTOURS_TOUR_BANNERS_STEP_ALIAS_TITLE', 1, 'COM_GUIDEDTOURS_TOUR_BANNERS_STEP_ALIAS_DESCRIPTION', 62, 'bottom', '#jform_alias', 2, 2, 'administrator/index.php?option=com_banners&view=banner&layout=edit', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, '*'),
-(63, 7, 'COM_GUIDEDTOURS_TOUR_BANNERS_STEP_DESCRIPTION_TITLE', 1, 'COM_GUIDEDTOURS_TOUR_BANNERS_STEP_DESCRIPTION_DESCRIPTION', 63, 'bottom', '#jform_description,#jform_description_ifr', 2, 3, 'administrator/index.php?option=com_banners&view=banner&layout=edit', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, '*'),
+(63, 7, 'COM_GUIDEDTOURS_TOUR_BANNERS_STEP_DETAILS_TITLE', 1, 'COM_GUIDEDTOURS_TOUR_BANNERS_STEP_DETAILS_DESCRIPTION', 63, 'bottom', '.col-lg-9', 2, 3, 'administrator/index.php?option=com_banners&view=banner&layout=edit', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, '*'),
 (64, 7, 'COM_GUIDEDTOURS_TOUR_BANNERS_STEP_STATUS_TITLE', 1, 'COM_GUIDEDTOURS_TOUR_BANNERS_STEP_STATUS_DESCRIPTION', 64, 'bottom', '#jform_state', 2, 3, 'administrator/index.php?option=com_banners&view=banner&layout=edit', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, '*'),
 (65, 7, 'COM_GUIDEDTOURS_TOUR_BANNERS_STEP_CATEGORY_TITLE', 1, 'COM_GUIDEDTOURS_TOUR_BANNERS_STEP_CATEGORY_DESCRIPTION', 65, 'top', 'joomla-field-fancy-select .choices[data-type=select-one]', 2, 3, 'administrator/index.php?option=com_banners&view=banner&layout=edit', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, '*'),
 (66, 7, 'COM_GUIDEDTOURS_TOUR_BANNERS_STEP_PINNED_TITLE', 1, 'COM_GUIDEDTOURS_TOUR_BANNERS_STEP_PINNED_DESCRIPTION', 66, 'bottom', '#jform_sticky1', 2, 3, 'administrator/index.php?option=com_banners&view=banner&layout=edit', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, '*'),
diff --git a/installation/sql/postgresql/supports.sql b/installation/sql/postgresql/supports.sql
index 8a00c79fff6c7..fb6571f6f951b 100644
--- a/installation/sql/postgresql/supports.sql
+++ b/installation/sql/postgresql/supports.sql
@@ -286,8 +286,6 @@ SELECT "extension_id", 'COM_CPANEL_WELCOME_BEGINNERS_TITLE', 'COM_CPANEL_WELCOME
 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_CPANEL_MSG_STATS_COLLECTION_TITLE', 'COM_CPANEL_MSG_STATS_COLLECTION_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/statscollection.php', 'admin_postinstall_statscollection_condition', '3.5.0', 1 FROM "#__extensions" WHERE "name" = 'files_joomla';
 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", 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME', 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_BODY', 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_ACTION', 'plg_system_updatenotification', 1, 'action', 'site://plugins/system/updatenotification/postinstall/updatecachetime.php', 'updatecachetime_postinstall_action', 'site://plugins/system/updatenotification/postinstall/updatecachetime.php', 'updatecachetime_postinstall_condition', '3.6.3', 1 FROM "#__extensions" WHERE "name" = 'files_joomla';
-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", 'PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_TITLE', 'PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_BODY', 'PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_ACTION', 'plg_system_httpheaders', 1, 'action', 'site://plugins/system/httpheaders/postinstall/introduction.php', 'httpheaders_postinstall_action', 'site://plugins/system/httpheaders/postinstall/introduction.php', 'httpheaders_postinstall_condition', '4.0.0', 1 FROM "#__extensions" WHERE "name" = 'files_joomla';
 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_USERS_POSTINSTALL_MULTIFACTORAUTH_TITLE', 'COM_USERS_POSTINSTALL_MULTIFACTORAUTH_BODY', 'COM_USERS_POSTINSTALL_MULTIFACTORAUTH_ACTION', 'com_users', 1, 'action', 'admin://components/com_users/postinstall/multifactorauth.php', 'com_users_postinstall_mfa_action', 'admin://components/com_users/postinstall/multifactorauth.php', 'com_users_postinstall_mfa_condition', '4.2.0', 1 FROM "#__extensions" WHERE "name" = 'files_joomla';
@@ -427,7 +425,7 @@ INSERT INTO "#__mail_templates" ("template_id", "extension", "language", "subjec
 ('com_users.massmail.mail', 'com_users', '', 'COM_USERS_MASSMAIL_MAIL_SUBJECT', 'COM_USERS_MASSMAIL_MAIL_BODY', '', '', '{"tags":["subject","body","subjectprefix","bodysuffix"]}'),
 ('com_users.password_reset', 'com_users', '', 'COM_USERS_EMAIL_PASSWORD_RESET_SUBJECT', 'COM_USERS_EMAIL_PASSWORD_RESET_BODY', '', '', '{"tags":["name","email","sitename","link_text","link_html","token"]}'),
 ('com_users.reminder', 'com_users', '', 'COM_USERS_EMAIL_USERNAME_REMINDER_SUBJECT', 'COM_USERS_EMAIL_USERNAME_REMINDER_BODY', '', '', '{"tags":["name","username","sitename","email","link_text","link_html"]}'),
-('plg_system_updatenotification.mail', 'plg_system_updatenotification', '', 'PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_SUBJECT', 'PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_BODY', '', '', '{"tags":["newversion","curversion","sitename","url","link","releasenews"]}'),
+('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":["message","date","extension","username"]}'),
 ('com_privacy.userdataexport', 'com_privacy', '', 'COM_PRIVACY_EMAIL_DATA_EXPORT_COMPLETED_SUBJECT', 'COM_PRIVACY_EMAIL_DATA_EXPORT_COMPLETED_BODY', '', '', '{"tags":["sitename","url"]}'),
@@ -444,7 +442,7 @@ INSERT INTO "#__mail_templates" ("template_id", "extension", "language", "subjec
 ('com_users.registration.admin.new_notification', 'com_users', '', 'COM_USERS_EMAIL_ACCOUNT_DETAILS', 'COM_USERS_EMAIL_REGISTERED_NOTIFICATION_TO_ADMIN_BODY', '', '', '{"tags":["name","sitename","siteurl","username"]}'),
 ('com_users.registration.user.admin_activated', 'com_users', '', 'COM_USERS_EMAIL_ACTIVATED_BY_ADMIN_ACTIVATION_SUBJECT', 'COM_USERS_EMAIL_ACTIVATED_BY_ADMIN_ACTIVATION_BODY', '', '', '{"tags":["name","sitename","siteurl","username"]}'),
 ('com_users.registration.admin.verification_request', 'com_users', '', 'COM_USERS_EMAIL_ACTIVATE_WITH_ADMIN_ACTIVATION_SUBJECT', 'COM_USERS_EMAIL_ACTIVATE_WITH_ADMIN_ACTIVATION_BODY', '', '', '{"tags":["name","sitename","email","username","activate"]}'),
-('plg_system_privacyconsent.request.reminder', 'plg_system_privacyconsent', '', 'PLG_SYSTEM_PRIVACYCONSENT_EMAIL_REMIND_SUBJECT', 'PLG_SYSTEM_PRIVACYCONSENT_EMAIL_REMIND_BODY', '', '', '{"tags":["sitename","url","tokenurl","formurl","token"]}'),
+('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"]}'),
 ('com_messages.new_message', 'com_messages', '', 'COM_MESSAGES_NEW_MESSAGE', 'COM_MESSAGES_NEW_MESSAGE_BODY', '', '', '{"tags":["subject","message","fromname","sitename","siteurl","fromemail","toname","toemail"]}'),
 ('plg_system_tasknotification.failure_mail', 'plg_system_tasknotification', '', 'PLG_SYSTEM_TASK_NOTIFICATION_FAILURE_MAIL_SUBJECT', 'PLG_SYSTEM_TASK_NOTIFICATION_FAILURE_MAIL_BODY', '', '', '{"tags": ["task_id", "task_title", "exit_code", "exec_data_time", "task_output"]}'),
 ('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"]}'),
diff --git a/installation/src/Application/CliInstallationApplication.php b/installation/src/Application/CliInstallationApplication.php
index d9dcc5762149d..77ccaace502ee 100644
--- a/installation/src/Application/CliInstallationApplication.php
+++ b/installation/src/Application/CliInstallationApplication.php
@@ -217,7 +217,7 @@ public function getLocaliseAdmin(DatabaseInterface $db = null)
 
         // If db connection, fetch them from the database.
         if ($db) {
-            foreach (LanguageHelper::getInstalledLanguages() as $clientId => $language) {
+            foreach (LanguageHelper::getInstalledLanguages(null, null, null, null, null, null, $db) as $clientId => $language) {
                 $clientName = $clientId === 0 ? 'site' : 'admin';
 
                 foreach ($language as $languageCode => $lang) {
diff --git a/installation/src/Application/InstallationApplication.php b/installation/src/Application/InstallationApplication.php
index 44f54b55f40e8..dc64e11ea83d5 100644
--- a/installation/src/Application/InstallationApplication.php
+++ b/installation/src/Application/InstallationApplication.php
@@ -20,6 +20,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filesystem\Folder;
 use Joomla\CMS\Input\Input;
+use Joomla\CMS\Language\LanguageFactoryInterface;
 use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Factory\MVCFactory;
@@ -296,7 +297,7 @@ private function executeController()
             list($controllerName, $task) = explode('.', $task, 2);
         }
 
-        $factory = new MVCFactory('Joomla\\CMS');
+        $factory = new MVCFactory('Joomla\\CMS', $this->getLogger());
         $factory->setDatabase($this->getContainer()->get(DatabaseInterface::class));
 
         // Create the instance
@@ -351,7 +352,7 @@ public function getLocaliseAdmin(DatabaseInterface $db = null)
 
         // If db connection, fetch them from the database.
         if ($db) {
-            foreach (LanguageHelper::getInstalledLanguages() as $clientId => $language) {
+            foreach (LanguageHelper::getInstalledLanguages(null, null, null, null, null, null, $db) as $clientId => $language) {
                 $clientName = $clientId === 0 ? 'site' : 'admin';
 
                 foreach ($language as $languageCode => $lang) {
@@ -452,6 +453,15 @@ protected function initialiseApp($options = [])
         $this->config->set('debug_lang', $forced['debug']);
         $this->config->set('sampledata', $forced['sampledata']);
         $this->config->set('helpurl', $options['helpurl']);
+
+        // Build our language object
+        $lang = $this->getContainer()->get(LanguageFactoryInterface::class)->createLanguage($options['language'], $forced['debug']);
+
+        // Load the language to the API
+        $this->loadLanguage($lang);
+
+        // Register the language object with Factory
+        Factory::$language = $this->getLanguage();
     }
 
     /**
@@ -470,7 +480,7 @@ protected function initialiseApp($options = [])
     public function loadDocument(Document $document = null)
     {
         if ($document === null) {
-            $lang = Factory::getLanguage();
+            $lang = $this->getLanguage();
             $type = $this->input->get('format', 'html', 'word');
             $date = new Date('now');
 
diff --git a/installation/src/Console/InstallCommand.php b/installation/src/Console/InstallCommand.php
index 7f5d3553e9eb6..4833037c4c10e 100644
--- a/installation/src/Console/InstallCommand.php
+++ b/installation/src/Console/InstallCommand.php
@@ -112,8 +112,7 @@ protected function doExecute(InputInterface $input, OutputInterface $output): in
         $this->ioStyle->write('Validating DB connection...');
 
         try {
-            $setupModel->storeOptions($cfg);
-            $setupModel->validateDbConnection();
+            $setupModel->validateDbConnection($cfg);
         } catch (\Exception $e) {
             $this->ioStyle->error($e->getMessage());
 
@@ -126,8 +125,8 @@ protected function doExecute(InputInterface $input, OutputInterface $output): in
 
         // Create and populate database
         $this->ioStyle->write('Creating and populating the database...');
-        $databaseModel->createDatabase();
-        $db = $databaseModel->initialise();
+        $databaseModel->createDatabase($cfg);
+        $db = $databaseModel->initialise($cfg);
 
         // Set the character set to UTF-8 for pre-existing databases.
         try {
@@ -156,7 +155,7 @@ protected function doExecute(InputInterface $input, OutputInterface $output): in
                 continue;
             }
 
-            $databaseModel->createTables($schema);
+            $databaseModel->createTables($schema, $cfg);
         }
 
         $this->ioStyle->writeln('OK');
@@ -359,7 +358,7 @@ protected function getStringFromOption($option, $question, FormField $field): st
                 throw new \Exception('Value for ' . $option . ' is wrong: ' . $valid->getMessage());
             }
 
-            return (string) $answer;
+            return $answer;
         }
 
         // We don't have a CLI option and now interactively get that from the user.
diff --git a/installation/src/Controller/DisplayController.php b/installation/src/Controller/DisplayController.php
index fb3d790c8a031..65c8b5c99244e 100644
--- a/installation/src/Controller/DisplayController.php
+++ b/installation/src/Controller/DisplayController.php
@@ -28,7 +28,8 @@ class DisplayController extends BaseController
      * Method to display a view.
      *
      * @param   boolean  $cachable   If true, the view output will be cached.
-     * @param   boolean  $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+     * @param   boolean  $urlparams  An array of safe URL parameters and their variable types.
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  \Joomla\CMS\MVC\Controller\BaseController  This object to support chaining.
      *
diff --git a/installation/src/Controller/InstallationController.php b/installation/src/Controller/InstallationController.php
index 260dcb29853bd..8cb068739b1db 100644
--- a/installation/src/Controller/InstallationController.php
+++ b/installation/src/Controller/InstallationController.php
@@ -11,7 +11,6 @@
 namespace Joomla\CMS\Installation\Controller;
 
 use Joomla\CMS\Application\CMSApplication;
-use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\Session\Session;
@@ -64,11 +63,11 @@ public function dbcheck()
         $r       = new \stdClass();
         $r->view = 'setup';
 
-        // Check the form
         /** @var \Joomla\CMS\Installation\Model\SetupModel $model */
         $model = $this->getModel('Setup');
+        $data  = $this->app->getInput()->post->get('jform', [], 'array');
 
-        if ($model->checkForm('setup') === false) {
+        if ($model->validate($data, 'setup') === false) {
             $this->app->enqueueMessage(Text::_('INSTL_DATABASE_VALIDATION_ERROR'), 'error');
             $r->validated = false;
             $this->sendJsonResponse($r);
@@ -76,7 +75,27 @@ public function dbcheck()
             return;
         }
 
-        $r->validated = $model->validateDbConnection();
+        $form = $model->getForm();
+        $data = $form->filter($data);
+
+        // Check for validation errors.
+        if ($data === false) {
+            $this->app->enqueueMessage(Text::_('INSTL_DATABASE_VALIDATION_ERROR'), 'error');
+            $r->validated = false;
+            $r->error     = true;
+            $this->sendJsonResponse($r);
+
+            return;
+        }
+
+        $data = $model->storeOptions($data);
+
+        if (!$model->validateDbConnection($data)) {
+            $r->validated = false;
+            $r->error     = true;
+        } else {
+            $r->validated = true;
+        }
 
         $this->sendJsonResponse($r);
     }
@@ -96,10 +115,11 @@ public function create()
 
         /** @var \Joomla\CMS\Installation\Model\DatabaseModel $databaseModel */
         $databaseModel = $this->getModel('Database');
+        $options       = $databaseModel->getOptions();
 
         // Create Db
         try {
-            $dbCreated = $databaseModel->createDatabase();
+            $dbCreated = $databaseModel->createDatabase($options);
         } catch (\RuntimeException $e) {
             $this->app->enqueueMessage($e->getMessage(), 'error');
 
@@ -107,10 +127,12 @@ public function create()
         }
 
         if (!$dbCreated) {
-            $r->view = 'setup';
+            $r->view  = 'setup';
+            $r->error = true;
         } else {
-            if (!$databaseModel->handleOldDatabase()) {
-                $r->view = 'setup';
+            if (!$databaseModel->handleOldDatabase($options)) {
+                $r->view  = 'setup';
+                $r->error = true;
             }
         }
 
@@ -131,9 +153,10 @@ public function populate()
         /** @var \Joomla\CMS\Installation\Model\DatabaseModel $model */
         $model = $this->getModel('Database');
 
-        $r     = new \stdClass();
-        $db    = $model->initialise();
-        $files = [
+        $r       = new \stdClass();
+        $options = $model->getOptions();
+        $db      = $model->initialise($options);
+        $files   = [
             'populate1' => 'base',
             'populate2' => 'supports',
             'populate3' => 'extensions',
@@ -152,13 +175,15 @@ public function populate()
 
         if (!isset($files[$step])) {
             $r->view = 'setup';
-            Factory::getApplication()->enqueueMessage(Text::_('INSTL_SAMPLE_DATA_NOT_FOUND'), 'error');
+            $this->app->enqueueMessage(Text::_('INSTL_SAMPLE_DATA_NOT_FOUND'), 'error');
+            $r->error = true;
             $this->sendJsonResponse($r);
         }
 
         // Attempt to populate the database with the given file.
-        if (!$model->createTables($schema)) {
-            $r->view = 'setup';
+        if (!$model->createTables($schema, $options)) {
+            $r->view  = 'setup';
+            $r->error = true;
         }
 
         $this->sendJsonResponse($r);
@@ -189,7 +214,8 @@ public function config()
 
         // Attempt to setup the configuration.
         if (!$configurationModel->setup($options)) {
-            $r->view = 'setup';
+            $r->view  = 'setup';
+            $r->error = true;
         }
 
         $this->sendJsonResponse($r);
diff --git a/installation/src/Helper/DatabaseHelper.php b/installation/src/Helper/DatabaseHelper.php
index efbd94c52341e..d7511c376695f 100644
--- a/installation/src/Helper/DatabaseHelper.php
+++ b/installation/src/Helper/DatabaseHelper.php
@@ -10,12 +10,12 @@
 namespace Joomla\CMS\Installation\Helper;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\User\UserHelper;
 use Joomla\Database\DatabaseDriver;
 use Joomla\Database\DatabaseInterface;
 use Joomla\Filesystem\File;
+use Joomla\Filesystem\Path;
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -36,7 +36,7 @@ abstract class DatabaseHelper
      * @var    string
      * @since  4.0.0
      */
-    protected static $dbMinimumMariaDb = '10.1';
+    protected static $dbMinimumMariaDb = '10.4';
 
     /**
      * The minimum database server version for MySQL databases as required by the CMS.
@@ -45,7 +45,7 @@ abstract class DatabaseHelper
      * @var    string
      * @since  4.0.0
      */
-    protected static $dbMinimumMySql = '5.6';
+    protected static $dbMinimumMySql = '8.0.13';
 
     /**
      * The minimum database server version for PostgreSQL databases as required by the CMS.
@@ -54,7 +54,7 @@ abstract class DatabaseHelper
      * @var    string
      * @since  4.0.0
      */
-    protected static $dbMinimumPostgreSql = '11.0';
+    protected static $dbMinimumPostgreSql = '12.0';
 
     /**
      * Method to get a database driver.
@@ -365,9 +365,10 @@ public static function checkRemoteDbHost($options)
 
                     // Get the path
                     $remoteDbPath = JPATH_INSTALLATION . '/' . $remoteDbFile;
+                    $emptyString  = '';
 
                     // When the path is not writable the user needs to create the file manually
-                    if (!File::write($remoteDbPath, '')) {
+                    if (!File::write($remoteDbPath, $emptyString)) {
                         // Request to create the file manually
                         Factory::getApplication()->enqueueMessage(
                             Text::sprintf(
diff --git a/installation/src/Model/ConfigurationModel.php b/installation/src/Model/ConfigurationModel.php
index 5925ec090abb7..257eab32816ee 100644
--- a/installation/src/Model/ConfigurationModel.php
+++ b/installation/src/Model/ConfigurationModel.php
@@ -141,8 +141,10 @@ public function setup($options)
         }
 
         // This is needed because the installer loads the extension table in constructor, needs to be refactored in 5.0
-        Factory::$database = $db;
-        $installer         = Installer::getInstance();
+        // It doesn't honor the DatabaseAware interface
+        Factory::getContainer()->set('\Joomla\CMS\Table\Extension', new \Joomla\CMS\Table\Extension($db));
+
+        $installer = Installer::getInstance();
 
         foreach ($extensions as $extension) {
             if (!$installer->refreshManifestCache($extension->extension_id)) {
@@ -275,9 +277,10 @@ protected function updateUserIds($db)
 
         // Update all core tables created_by fields of the tables with the random user id.
         $updatesArray = [
-            '#__categories' => ['created_user_id', 'modified_user_id'],
-            '#__tags'       => ['created_user_id', 'modified_user_id'],
-            '#__workflows'  => ['created_by', 'modified_by'],
+            '#__categories'      => ['created_user_id', 'modified_user_id'],
+            '#__scheduler_tasks' => ['created_by'],
+            '#__tags'            => ['created_user_id', 'modified_user_id'],
+            '#__workflows'       => ['created_by', 'modified_by'],
         ];
 
         foreach ($updatesArray as $table => $fields) {
diff --git a/installation/src/Model/DatabaseModel.php b/installation/src/Model/DatabaseModel.php
index 75f8cca655661..fda7d4076fe5e 100644
--- a/installation/src/Model/DatabaseModel.php
+++ b/installation/src/Model/DatabaseModel.php
@@ -14,7 +14,6 @@
 use Joomla\CMS\Installation\Helper\DatabaseHelper;
 use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\Database\DatabaseDriver;
 use Joomla\Database\DatabaseInterface;
 use Joomla\Utilities\ArrayHelper;
@@ -45,16 +44,15 @@ public function getOptions()
     /**
      * Method to initialise the database.
      *
-     * @param   boolean  $select  Select the database when creating the connections.
+     * @param   array    $options  Array with db connection credentials
+     * @param   boolean  $select   Select the database when creating the connections.
      *
      * @return  DatabaseInterface|boolean  Database object on success, boolean false on failure
      *
      * @since   3.1
      */
-    public function initialise($select = true)
+    public function initialise(array $options, bool $select = true)
     {
-        $options = $this->getOptions();
-
         // Get the options as an object for easier handling.
         $options = ArrayHelper::toObject($options);
 
@@ -107,22 +105,25 @@ public function initialise($select = true)
     /**
      * Method to create a new database.
      *
+     * @param   array  $options  Array of database credentials
+     *
      * @return  boolean
      *
      * @since   3.1
      * @throws  \RuntimeException
      */
-    public function createDatabase()
+    public function createDatabase(array $options)
     {
-        $options = (object) $this->getOptions();
-
-        $db = $this->initialise(false);
+        $db = $this->initialise($options, false);
 
         if ($db === false) {
             // Error messages are enqueued by the initialise function, we just need to tell the controller how to redirect
             return false;
         }
 
+        // Get the options as an object for easier handling.
+        $options = ArrayHelper::toObject($options);
+
         // Check database version.
         $type = $options->db_type;
 
@@ -262,34 +263,31 @@ public function createDatabase()
     /**
      * Method to process the old database.
      *
+     * @param   array  $options  Array with database credentials
+     *
      * @return  boolean  True on success.
      *
      * @since   3.1
      */
-    public function handleOldDatabase()
+    public function handleOldDatabase(array $options)
     {
-        $options = $this->getOptions();
-
         if (!isset($options['db_created']) || !$options['db_created']) {
             return $this->createDatabase($options);
         }
 
-        // Get the options as an object for easier handling.
-        $options = ArrayHelper::toObject($options);
-
-        if (!$db = $this->initialise()) {
+        if (!$db = $this->initialise($options)) {
             return false;
         }
 
         // Set the character set to UTF-8 for pre-existing databases.
         try {
-            $db->alterDbCharacterSet($options->db_name);
+            $db->alterDbCharacterSet($options['db_name']);
         } catch (\RuntimeException $e) {
             // Continue Anyhow
         }
 
         // Backup any old database.
-        if (!$this->backupDatabase($db, $options->db_prefix)) {
+        if (!$this->backupDatabase($db, $options['db_prefix'])) {
             return false;
         }
 
@@ -299,15 +297,16 @@ public function handleOldDatabase()
     /**
      * Method to create the database tables.
      *
-     * @param   string  $schema  The SQL schema file to apply.
+     * @param   string  $schema   The SQL schema file to apply.
+     * @param   array   $options  Array with database credentials
      *
      * @return  boolean  True on success.
      *
      * @since   3.1
      */
-    public function createTables($schema)
+    public function createTables(string $schema, array $options)
     {
-        if (!$db = $this->initialise()) {
+        if (!$db = $this->initialise($options)) {
             return false;
         }
 
@@ -334,7 +333,7 @@ public function createTables($schema)
     /**
      * Method to backup all tables in a database with a given prefix.
      *
-     * @param   DatabaseDriver  $db      JDatabaseDriver object.
+     * @param   DatabaseDriver  $db      DatabaseDriver object.
      * @param   string          $prefix  Database table prefix.
      *
      * @return  boolean  True on success.
@@ -383,10 +382,10 @@ public function backupDatabase($db, $prefix)
     /**
      * Method to create a new database.
      *
-     * @param   DatabaseDriver  $db       Database object.
-     * @param   CMSObject       $options  CMSObject coming from "initialise" function to pass user
-     *                                    and database name to database driver.
-     * @param   boolean         $utf      True if the database supports the UTF-8 character set.
+     * @param   DatabaseInterface  $db       Database object.
+     * @param   object             $options  Object with database credentials to pass user
+     *                                       and database name to database driver.
+     * @param   boolean            $utf      True if the database supports the UTF-8 character set.
      *
      * @return  boolean  True on success.
      *
@@ -409,8 +408,8 @@ public function createDb($db, $options, $utf)
     /**
      * Method to import a database schema from a file.
      *
-     * @param   \Joomla\Database\DatabaseInterface  $db      JDatabase object.
-     * @param   string                              $schema  Path to the schema file.
+     * @param   DatabaseInterface  $db      Database object.
+     * @param   string             $schema  Path to the schema file.
      *
      * @return  boolean  True on success.
      *
diff --git a/installation/src/Model/SetupModel.php b/installation/src/Model/SetupModel.php
index e46e658545244..e9c4ea9a11e6e 100644
--- a/installation/src/Model/SetupModel.php
+++ b/installation/src/Model/SetupModel.php
@@ -120,36 +120,6 @@ public function getForm($view = null)
         return $form;
     }
 
-    /**
-     * Method to check the form data.
-     *
-     * @param   string  $page  The view being checked.
-     *
-     * @return  array|boolean  Array with the validated form data or boolean false on a validation failure.
-     *
-     * @since   3.1
-     */
-    public function checkForm($page = 'setup')
-    {
-        // Get the posted values from the request and validate them.
-        $data   = Factory::getApplication()->getInput()->post->get('jform', [], 'array');
-        $return = $this->validate($data, $page);
-
-        // Attempt to save the data before validation.
-        $form = $this->getForm();
-        $data = $form->filter($data);
-
-        $this->storeOptions($data);
-
-        // Check for validation errors.
-        if ($return === false) {
-            return false;
-        }
-
-        // Store the options in the session.
-        return $this->storeOptions($return);
-    }
-
     /**
      * Generate a panel of language choices for the user to select their language.
      *
@@ -236,15 +206,15 @@ public function validate($data, $view = null)
     /**
      * Method to validate the db connection properties.
      *
+     * @param   array  $options  Array with database credentials
+     *
      * @return  boolean
      *
      * @since   4.0.0
      * @throws  \Exception
      */
-    public function validateDbConnection()
+    public function validateDbConnection(array $options)
     {
-        $options = $this->getOptions();
-
         // Get the options as an object for easier handling.
         $options = ArrayHelper::toObject($options);
 
diff --git a/installation/src/Response/JsonResponse.php b/installation/src/Response/JsonResponse.php
index 89c0b93db3a07..17bac112db31b 100644
--- a/installation/src/Response/JsonResponse.php
+++ b/installation/src/Response/JsonResponse.php
@@ -122,6 +122,11 @@ public function __construct($data)
         } else {
             // Prepare the response data.
             $this->error = false;
+
+            if (isset($data->error) && $data->error) {
+                $this->error = true;
+            }
+
             $this->data  = $data;
         }
     }
diff --git a/installation/src/Service/Provider/Application.php b/installation/src/Service/Provider/Application.php
index 512adf757be47..b8da47fb3b480 100644
--- a/installation/src/Service/Provider/Application.php
+++ b/installation/src/Service/Provider/Application.php
@@ -11,17 +11,19 @@
 namespace Joomla\CMS\Installation\Service\Provider;
 
 use Joomla\CMS\Error\Renderer\JsonRenderer;
-use Joomla\CMS\Factory;
+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\Session\SessionEvents;
 use Joomla\Session\SessionInterface;
 use Psr\Log\LoggerInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -45,16 +47,13 @@ public function register(Container $container)
         $container->share(
             InstallationApplication::class,
             function (Container $container) {
-                $app = new InstallationApplication(null, $container->get('config'), null, $container);
-
-                // The session service provider needs Factory::$application, set it if still null
-                if (Factory::$application === null) {
-                    Factory::$application = $app;
-                }
-
+                $app = new InstallationApplication($container->get(CMSInput::class), $container->get('config'), null, $container);
                 $app->setDispatcher($container->get('Joomla\Event\DispatcherInterface'));
                 $app->setLogger($container->get(LoggerInterface::class));
-                $app->setSession($container->get('Joomla\Session\SessionInterface'));
+                $app->setSession($container->get(SessionInterface::class));
+
+                // Ensure that session purging is configured now we have a dispatcher
+                $app->getDispatcher()->addListener(SessionEvents::START, [$app, 'afterSessionStart'], Priority::HIGH);
 
                 return $app;
             },
@@ -68,11 +67,6 @@ function (Container $container) {
 
                 $app = new CliInstallationApplication(null, null, $container->get('config'), $lang);
 
-                // The session service provider needs Factory::$application, set it if still null
-                if (Factory::$application === null) {
-                    Factory::$application = $app;
-                }
-
                 $app->setDispatcher($container->get('Joomla\Event\DispatcherInterface'));
                 $app->setLogger($container->get(LoggerInterface::class));
                 $app->setSession($container->get(SessionInterface::class));
diff --git a/installation/template/index.php b/installation/template/index.php
index ff6e477798b33..7ac31f5e4b876 100644
--- a/installation/template/index.php
+++ b/installation/template/index.php
@@ -32,7 +32,7 @@
 		--template-bg-light: #f0f4fb;
 		--template-text-dark: #495057;
 		--template-text-light: #ffffff;
-		--template-link-color: #2a69b8;
+		--link-color: #2a69b8;
 		--template-special-color: #001b4c;
 	}');
 
@@ -53,6 +53,11 @@
 Text::script('JLIB_JS_AJAX_ERROR_TIMEOUT');
 Text::script('INSTL_DATABASE_RESPONSE_ERROR');
 
+// Add strings for installation progress
+Text::script('INSTL');
+Text::script('INSTL_FINISHED');
+Text::script('INSTL_IN_PROGRESS');
+
 // Load the JavaScript translated messages
 Text::script('INSTL_PROCESS_BUSY');
 
diff --git a/installation/template/js/setup.js b/installation/template/js/setup.js
index 9df8d99a143a0..e52141385bdd4 100644
--- a/installation/template/js/setup.js
+++ b/installation/template/js/setup.js
@@ -58,24 +58,37 @@ Joomla.checkInputs = function() {
   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');
 
-
   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'])) {
     Joomla.checkDbCredentials();
   }
 };
 
-
 Joomla.checkDbCredentials = function() {
-  document.body.appendChild(document.createElement('joomla-core-loader'));
+  const progress = document.getElementById('progressbar');
+  const progress_text = document.getElementById('progress-text');
   var form = document.getElementById('adminForm'),
     data = Joomla.serialiseForm(form);
 
+  // Remove potential messages
+  Joomla.removeMessages();
+
+  // Hide form and show progress bar
+  document.getElementById('installStep1').classList.remove('active');
+  document.getElementById('installStep2').classList.remove('active');
+  document.getElementById('installStep3').classList.remove('active');
+  document.getElementById('installStep4').classList.add('active');
+  progress_text.innerText = Joomla.Text._('INSTL_IN_PROGRESS');
+
   Joomla.request({
     method: "POST",
     url : Joomla.installationBaseUrl + '?task=installation.dbcheck&format=json',
@@ -83,11 +96,12 @@ Joomla.checkDbCredentials = function() {
     perform: true,
     headers: {'Content-Type': 'application/x-www-form-urlencoded'},
     onSuccess: function(response, xhr){
-      var loaderElement = document.querySelector('joomla-core-loader');
       try {
         response = JSON.parse(response);
       } catch (e) {
-        loaderElement.parentNode.removeChild(loaderElement);
+        progress_text.setAttribute('role', 'alert');
+        progress_text.classList.add('error');
+        progress_text.innerText = response;
         console.error('Error in DB Check Endpoint');
         console.error(response);
         Joomla.renderMessages({'error': [Joomla.Text._('INSTL_DATABASE_RESPONSE_ERROR')]});
@@ -100,21 +114,27 @@ Joomla.checkDbCredentials = function() {
       }
 
       Joomla.replaceTokens(response.token);
-      loaderElement.parentNode.removeChild(loaderElement);
 
       if (response.error) {
-        Joomla.renderMessages({'error': [response.message]});
+        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');
       } else if (response.data && response.data.validated === true) {
         // Run the installer - we let this handle the redirect for now
         // @todo: Convert to promises
+        progress.setAttribute('value', parseInt(progress.getAttribute('value')) + 1);
+        progress_text.innerText = Joomla.Text._('INSTL_IN_PROGRESS');
         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');
-      var loaderElement = document.querySelector('joomla-core-loader');
-      loaderElement.parentNode.removeChild(loaderElement);
 
       try {
         var r = JSON.parse(xhr.responseText);
@@ -199,5 +219,4 @@ Joomla.checkDbCredentials = function() {
       Joomla.checkInputs();
     })
   }
-
 })();
diff --git a/installation/template/js/template.js b/installation/template/js/template.js
index 963c8b8c36f44..b78b5aaaaed2f 100644
--- a/installation/template/js/template.js
+++ b/installation/template/js/template.js
@@ -154,17 +154,21 @@
    * @param tasks       An array of install tasks to execute
    */
   Joomla.install = function(tasks, form) {
+    const progress = document.getElementById('progressbar');
+    const progress_text = document.getElementById('progress-text');
     if (!form) {
       throw new Error('No form provided')
     }
     if (!tasks.length) {
-      Joomla.goToPage('remove');
+      if (progress_text) {
+        progress_text.innerText = Joomla.Text._('INSTL_FINISHED');
+      }
+      setTimeout(Joomla.goToPage, 2000, 'remove');
       return;
     }
 
     var task = tasks.shift();
     var data = Joomla.serialiseForm(form);
-    document.body.appendChild(document.createElement('joomla-core-loader'));
 
     Joomla.request({
       method: "POST",
@@ -172,12 +176,14 @@
       data: data,
       perform: true,
       onSuccess: function(response, xhr){
-        var spinnerElement = document.querySelector('joomla-core-loader');
-
         try {
           response = JSON.parse(response);
         } catch (e) {
-          spinnerElement.parentNode.removeChild(spinnerElement);
+          if (progress_text) {
+            progress_text.setAttribute('role', 'alert');
+            progress_text.classList.add('error');
+            progress_text.innerText = response;
+          }
           console.error('Error in ' + task + ' Endpoint');
           console.error(response);
           Joomla.renderMessages({'error': [Joomla.Text._('INSTL_DATABASE_RESPONSE_ERROR')]});
@@ -189,21 +195,30 @@
 
         if (response.error === true)
         {
-          spinnerElement.parentNode.removeChild(spinnerElement);
+          progress_text.setAttribute('role', 'alert');
+          progress_text.classList.add('error');
+          progress_text.innerText = response.message;
           Joomla.renderMessages({"error": [response.message]});
           return false;
         }
 
         if (response.messages) {
-          spinnerElement.parentNode.removeChild(spinnerElement);
           Joomla.renderMessages(response.messages);
           return false;
         }
 
-        spinnerElement.parentNode.removeChild(spinnerElement);
+        if (progress) {
+          progress.setAttribute('value', parseInt(progress.getAttribute('value')) + 1);
+          progress_text.innerText = Joomla.Text._('INSTL_IN_PROGRESS');
+        }
         Joomla.install(tasks, form);
       },
       onError: function(xhr){
+        if (progress_text) {
+          progress_text.setAttribute('role', 'alert');
+          progress_text.classList.add('error');
+          progress_text.innerText = xhr.responseText;
+        }
         Joomla.renderMessages([['', Joomla.Text._('JLIB_DATABASE_ERROR_DATABASE_CONNECT', 'A Database error occurred.')]]);
         Joomla.goToPage('remove');
 
diff --git a/installation/template/scss/template.scss b/installation/template/scss/template.scss
index c82fbf2d12298..a0b7c3cebb4ce 100644
--- a/installation/template/scss/template.scss
+++ b/installation/template/scss/template.scss
@@ -1,6 +1,3 @@
-// Remove prefix added in BS5 for compat with Joomla beta's shipped with Betas
-$prefix: "";
-
 $jicon-css-prefix: icon;
 $fa-css-prefix: fa;
 $fa-font-path: "../../../media/vendor/fontawesome-free/webfonts";
@@ -8,12 +5,15 @@ $fa-font-path: "../../../media/vendor/fontawesome-free/webfonts";
 // Font Awesome
 @import "../../../media/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome";
 
-// "Font Awesome 5 Free"
+// "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.
 
+// B/C with Font Awesome 5
+@import "../../../media/vendor/fontawesome-free/scss/shims";
+
 // B/C for Icomoon
 @import "../../../build/media_source/system/scss/icomoon";
 
@@ -23,7 +23,10 @@ $fa-font-path: "../../../media/vendor/fontawesome-free/webfonts";
 // Variables from the Atum template
 @import "../../../build/media_source/templates/administrator/atum/scss/variables";
 
+$body-bg: $template-background-light;
+
 @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";
@@ -172,14 +175,6 @@ $fa-font-path: "../../../media/vendor/fontawesome-free/webfonts";
   background-color: var(--body-bg) !important;
 }
 
-body {
-  background: var(--template-bg-light);
-}
-
-.form-select {
-  @extend .form-select;
-}
-
 *,
 *::after,
 *::before {
@@ -205,7 +200,7 @@ body {
     color: $white;
 
     &:hover {
-      color: var(--template-link-color);
+      color: var(--#{$prefix}link-color);
     }
   }
 }
@@ -253,6 +248,21 @@ body {
   }
 }
 
+@if $enable-dark-mode {
+  @include color-mode(dark) {
+    .j-install-step {
+      background-color: var(--secondary-bg);
+    }
+
+    // For now in dark mode we swap the color and the background around. But this probably is too much
+    // emphasis than we require for the header
+    .j-install-step-header {
+      color: #fff;
+      background-color: $dark-blue;
+    }
+  }
+}
+
 .j-install-step-form {
   padding: .65rem 1.2rem;
 
@@ -298,14 +308,20 @@ body {
 // Form
 
 .form-control {
-  background-color: var(--white-offset);
-
   &.input-full {
     max-width: 100%;
   }
+}
 
+@if $enable-dark-mode {
+  @include color-mode(light) {
+    .form-control {
+      background-color: var(--white-offset);
+    }
+  }
 }
 
+
 label {
   margin-bottom: .5rem;
 }
@@ -389,6 +405,27 @@ caption {
   box-shadow: 0 0 1px 1px rgba(0, 0, 0, .25);
 }
 
+@if $enable-dark-mode {
+  @include color-mode(dark) {
+    .footer {
+      background-color: var(--secondary-bg);
+    }
+  }
+}
+
 .table > :not(:last-child) > :last-child > * {
   border-bottom-color: $table-border-color;
 }
+
+// Installation progress
+.progresslabel {width: 100%;}
+
+progress {
+  display: block;
+  width: 100%;
+  height: 25px;
+  margin: 1rem auto;
+  background: linear-gradient(#ccc 0%, #eee 50%, #eee 50%, #ccc 100%);
+  border: 0 none;
+  border-radius: 4px;
+}
diff --git a/installation/tmpl/setup/default.php b/installation/tmpl/setup/default.php
index 39737eeffb78c..9b6978d193017 100644
--- a/installation/tmpl/setup/default.php
+++ b/installation/tmpl/setup/default.php
@@ -120,7 +120,17 @@
                 </div>
             </div>
         </fieldset>
-
+        <fieldset id="installStep4" class="j-install-step" >
+            <legend class="j-install-step-header">
+                <span class="icon-cogs" aria-hidden="true"></span> <?php echo Text::_('INSTL_PROGRESS'); ?>
+            </legend>
+            <div class="j-install-step-form" aria-live="polite" >
+                <label class="progresslabel text-center">
+                    <progress class="progressbar" id="progressbar" value="0" max="8"></progress>
+                    <span id="progress-text" role="status"><?php echo Text::_('INSTL'); ?></span>
+                </label>
+            </div>
+        </fieldset>
         <input type="hidden" name="admin_password2" id="jform_admin_password2">
         <?php echo HTMLHelper::_('form.token'); ?>
     </form>
diff --git a/language/en-GB/com_content.ini b/language/en-GB/com_content.ini
index a8a07ffaa97ae..ccbb51901c62b 100644
--- a/language/en-GB/com_content.ini
+++ b/language/en-GB/com_content.ini
@@ -25,7 +25,7 @@ COM_CONTENT_EDIT_UNPUBLISHED_ARTICLE="Unpublished Article"
 COM_CONTENT_ERROR_ARTICLE_NOT_FOUND="Article not found"
 COM_CONTENT_ERROR_LOGIN_TO_VIEW_ARTICLE="Please login to view the article"
 COM_CONTENT_ERROR_PARENT_CATEGORY_NOT_FOUND="Parent category not found"
-COM_CONTENT_ERROR_PRINT_POPUP="Sorry, Joomla 4 no longer supports print_popup"
+COM_CONTENT_ERROR_PRINT_POPUP="Sorry, Joomla no longer supports print_popup"
 COM_CONTENT_ERROR_UNIQUE_ALIAS="Another Article in this category has the same alias."
 COM_CONTENT_ERROR_UNIQUE_ALIAS_TRASHED="A trashed Article in this category has the same alias."
 COM_CONTENT_FEED_READMORE="Read More &hellip;"
diff --git a/language/en-GB/com_finder.ini b/language/en-GB/com_finder.ini
index 3853dae9e0bf0..dd727eff73845 100644
--- a/language/en-GB/com_finder.ini
+++ b/language/en-GB/com_finder.ini
@@ -15,8 +15,10 @@ COM_FINDER_DEFAULT_PAGE_TITLE="Search Results"
 COM_FINDER_FILTER_BRANCH_LABEL="Search by %s"
 COM_FINDER_FILTER_DATE1="Start Date"
 COM_FINDER_FILTER_DATE1_DESC="Enter a date in YYYY-MM-DD format."
+COM_FINDER_FILTER_DATE1_OPERATOR="Start Date Operator"
 COM_FINDER_FILTER_DATE2="End Date"
 COM_FINDER_FILTER_DATE2_DESC="Enter a date in YYYY-MM-DD format."
+COM_FINDER_FILTER_DATE2_OPERATOR="End Date Operator"
 COM_FINDER_FILTER_DATE_AFTER="After"
 COM_FINDER_FILTER_DATE_BEFORE="Before"
 COM_FINDER_FILTER_DATE_EXACTLY="Exactly"
diff --git a/language/en-GB/com_users.ini b/language/en-GB/com_users.ini
index 2ba1cb2db2157..fb506aeb48408 100644
--- a/language/en-GB/com_users.ini
+++ b/language/en-GB/com_users.ini
@@ -30,7 +30,6 @@ COM_USERS_FIELD_RESET_CONFIRM_USERNAME_LABEL="Username"
 COM_USERS_FIELD_RESET_PASSWORD1_LABEL="Password"
 COM_USERS_FIELD_RESET_PASSWORD1_MESSAGE="The passwords you entered do not match. Please enter your desired password in the password field and confirm your entry by entering it in the confirm password field."
 COM_USERS_FIELD_RESET_PASSWORD2_LABEL="Confirm Password"
-COM_USERS_FRONTEND_LOGIN_SUCCESS="You have been logged in."
 COM_USERS_FRONTEND_LOGOUT_SUCCESS="You have been logged out."
 COM_USERS_INVALID_EMAIL="Invalid email address"
 COM_USERS_LBL_SELECT_INSTRUCTIONS="Please select how you would like to verify your login to this site."
@@ -78,6 +77,7 @@ COM_USERS_MFA_MANDATORY_NOTICE_BODY="Please enable a Multi-factor Authentication
 COM_USERS_MFA_MANDATORY_NOTICE_HEAD="Multi-factor Authentication is mandatory for your user account"
 COM_USERS_MFA_SELECT_PAGE_HEAD="Select a Multi-factor Authentication method"
 COM_USERS_MFA_USE_DIFFERENT_METHOD="Select a different method"
+COM_USERS_MFA_TRY_LIMIT_REACHED="You have reached the try limit for the currently selected Authentication method. Please choose a different method or wait."
 COM_USERS_MFA_VALIDATE="Validate"
 COM_USERS_OR="or"
 COM_USERS_PROFILE="User Profile"
@@ -162,3 +162,6 @@ COM_USERS_PROFILE_OTEPS_WAIT_DESC="There are no emergency one time passwords gen
 COM_USERS_PROFILE_TWOFACTOR_DESC="Select the two factor authentication method you want to use."
 COM_USERS_PROFILE_TWOFACTOR_LABEL="Authentication Method"
 COM_USERS_PROFILE_TWO_FACTOR_AUTH="Two Factor Authentication"
+
+; Obsolete language strings since 4.3.0 -- Remove them in Joomla 5.0
+COM_USERS_FRONTEND_LOGIN_SUCCESS="You have been logged in."
diff --git a/language/en-GB/files_joomla.sys.ini b/language/en-GB/files_joomla.sys.ini
index ed17d91d71843..f575132b76be8 100644
--- a/language/en-GB/files_joomla.sys.ini
+++ b/language/en-GB/files_joomla.sys.ini
@@ -6,4 +6,4 @@
 FILES_JOOMLA="Joomla CMS"
 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! 4 Content Management System."
+FILES_JOOMLA_XML_DESCRIPTION="Joomla! 5 Content Management System."
diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml
index 086107fdeabf0..47bb7ccb1c583 100644
--- a/language/en-GB/install.xml
+++ b/language/en-GB/install.xml
@@ -3,7 +3,7 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>5.0.0</version>
-	<creationDate>2022-08</creationDate>
+	<creationDate>2023-08</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/language/en-GB/joomla.ini b/language/en-GB/joomla.ini
index 42be541f93db5..9394e9487f576 100644
--- a/language/en-GB/joomla.ini
+++ b/language/en-GB/joomla.ini
@@ -84,7 +84,7 @@ JINLINEHELP="Toggle Inline Help"
 JHIDE="Hide"
 JHIDEPASSWORD="Hide Password"
 JINVALID_TOKEN="The most recent request was denied because it had an invalid security token. Please refresh the page and try again."
-JINVALID_TOKEN_NOTICE="The security token did not match. The request was aborted to prevent any security breach. Please try again."
+JINVALID_TOKEN_NOTICE="The security token did not match. The request was cancelled to prevent any security breach. Please try again."
 JLOGIN="Log in"
 JLOGOUT="Log out"
 JMONTH="Month"
diff --git a/language/en-GB/langmetadata.xml b/language/en-GB/langmetadata.xml
index 9f860f5e05af8..4aa813295affe 100644
--- a/language/en-GB/langmetadata.xml
+++ b/language/en-GB/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="site">
 	<name>English (en-GB)</name>
 	<version>5.0.0</version>
-	<creationDate>2022-08</creationDate>
+	<creationDate>2023-08</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/language/en-GB/lib_joomla.ini b/language/en-GB/lib_joomla.ini
index f26ca5605820f..95c3f717e70dc 100644
--- a/language/en-GB/lib_joomla.ini
+++ b/language/en-GB/lib_joomla.ini
@@ -467,7 +467,7 @@ JLIB_HTML_UNPUBLISH_ITEM="Unpublish Item"
 JLIB_HTML_UNSETDEFAULT_ITEM="Unset default"
 JLIB_HTML_VIEW_ALL="View All"
 
-JLIB_INSTALLER_ABORT="Aborting language installation: %s"
+JLIB_INSTALLER_ABORT="Stopping language installation: %s"
 JLIB_INSTALLER_ABORT_ALREADY_EXISTS="Extension %1$s: Extension %2$s already exists."
 JLIB_INSTALLER_ABORT_ALREADYINSTALLED="Extension is already installed."
 JLIB_INSTALLER_ABORT_COMP_BUILDADMINMENUS_FAILED="Error building Administrator Menus."
@@ -496,7 +496,7 @@ JLIB_INSTALLER_ABORT_FILE_INSTALL_ROLLBACK="Files Install: %s"
 JLIB_INSTALLER_ABORT_FILE_INSTALL_SQL_ERROR="Files %1$s: SQL error file %2$s"
 JLIB_INSTALLER_ABORT_FILE_ROLLBACK="Files Install: %s"
 JLIB_INSTALLER_ABORT_FILE_UPDATE_SQL_ERROR="Files Update: SQL error file %s"
-JLIB_INSTALLER_ABORT_INSTALL_ABORTED="Extension installation aborted."
+JLIB_INSTALLER_ABORT_INSTALL_ABORTED="Extension installation stopped."
 JLIB_INSTALLER_ABORT_INSTALL_CUSTOM_INSTALL_FAILURE="Extension %s: Custom install routine failure."
 JLIB_INSTALLER_ABORT_LIB_COPY_FILES="Library %s: Could not copy files from the source."
 JLIB_INSTALLER_ABORT_LIB_INSTALL_ALREADY_INSTALLED="Library Install: Library already installed."
@@ -659,7 +659,7 @@ JLIB_INSTALLER_UPDATE="Update"
 JLIB_INSTALLER_UPDATE_LOG_QUERY="Ran query from file %1$s. Query text: %2$s."
 JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Unable to create a content language for %s language: %s"
 
-JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="A connection abort has occurred while fetching the JSON data."
+JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="A connection error has occurred 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 %s 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/language/en-GB/tpl_cassiopeia.ini b/language/en-GB/tpl_cassiopeia.ini
index 1e41d15aa1c99..767466ee41822 100644
--- a/language/en-GB/tpl_cassiopeia.ini
+++ b/language/en-GB/tpl_cassiopeia.ini
@@ -15,11 +15,29 @@ TPL_CASSIOPEIA_FLUID_LABEL="Layout"
 TPL_CASSIOPEIA_FONT_GROUP_LOCAL="Fonts from Folder"
 TPL_CASSIOPEIA_FONT_GROUP_WEB="Fonts from Web"
 TPL_CASSIOPEIA_FONT_LABEL="Fonts Scheme"
-TPL_CASSIOPEIA_FONT_NOTE_TEXT="Loading fonts from external sources might be against privacy regulations in some countries.<br>Loading fonts from a local folder might have a performance impact on your site."
+TPL_CASSIOPEIA_FONT_NOTE_TEXT="System fonts are the most performant although there may be small differences between operating systems.<br>Loading fonts from external sources might be against privacy regulations in some countries.<br>Loading fonts from a local folder might have a performance impact on your site."
+TPL_CASSIOPEIA_FONT_SYSTEM="System Fonts"
+TPL_CASSIOPEIA_FONT_SYSTEM_BODY="Body Font Stack"
+TPL_CASSIOPEIA_FONT_SYSTEM_HEADING="Heading Font Stack"
+TPL_CASSIOPEIA_FONT_SYSTEM_SELECT="Select System Fonts"
+TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_ANTIQUE="Antique"
+TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_CLASSICAL="Classical Humanist"
+TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_CODE="Monospace Code"
+TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_DIDONE="Didone"
+TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_GEOMETRIC="Geometric Humanist"
+TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_GROTESQUE="Neo-Grotesque"
+TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_HANDWRITTEN="Handwritten"
+TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_HUMANIST="Humanist"
+TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_INDUSTRIAL="Industrial"
+TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_MONOSPACE="Monospace Slab Serif"
+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_LOGO_LABEL="Logo"
 TPL_CASSIOPEIA_STATIC="Static"
 TPL_CASSIOPEIA_STICKY_LABEL="Sticky Header"
-TPL_CASSIOPEIA_TAGLINE_LABEL="Tagline"
 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 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 f2b0f2a651100..be02e4c25a6f8 100644
--- a/language/en-GB/tpl_cassiopeia.sys.ini
+++ b/language/en-GB/tpl_cassiopeia.sys.ini
@@ -12,6 +12,8 @@ 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"
diff --git a/layouts/joomla/content/blog_style_default_item_title.php b/layouts/joomla/content/blog_style_default_item_title.php
index 7a3128e50f058..1d12d5fc81bd8 100644
--- a/layouts/joomla/content/blog_style_default_item_title.php
+++ b/layouts/joomla/content/blog_style_default_item_title.php
@@ -25,9 +25,9 @@
 <?php if ($displayData->state == 0 || $params->get('show_title') || ($params->get('show_author') && !empty($displayData->author))) : ?>
     <div class="page-header">
         <?php if ($params->get('show_title')) : ?>
-            <h2 itemprop="name">
+            <h2>
                 <?php if ($params->get('link_titles') && ($params->get('access-view') || $params->get('show_noauth', '0') == '1')) : ?>
-                    <a href="<?php echo Route::_($link); ?>" itemprop="url">
+                    <a href="<?php echo Route::_($link); ?>">
                         <?php echo $this->escape($displayData->title); ?>
                     </a>
                 <?php else : ?>
diff --git a/layouts/joomla/content/full_image.php b/layouts/joomla/content/full_image.php
index 83fcc57b4489e..94e4ffd94e41f 100644
--- a/layouts/joomla/content/full_image.php
+++ b/layouts/joomla/content/full_image.php
@@ -22,7 +22,6 @@
 $imgclass   = empty($images->float_fulltext) ? $params->get('float_fulltext') : $images->float_fulltext;
 $layoutAttr = [
     'src'      => $images->image_fulltext,
-    'itemprop' => 'image',
     'alt'      => empty($images->image_fulltext_alt) && empty($images->image_fulltext_alt_empty) ? false : $images->image_fulltext_alt,
 ];
 ?>
diff --git a/layouts/joomla/content/info_block/author.php b/layouts/joomla/content/info_block/author.php
index 02c4ee32247fb..53b8af327c041 100644
--- a/layouts/joomla/content/info_block/author.php
+++ b/layouts/joomla/content/info_block/author.php
@@ -14,12 +14,12 @@
 use Joomla\CMS\Language\Text;
 
 ?>
-<dd class="createdby" itemprop="author" itemscope itemtype="https://schema.org/Person">
+<dd class="createdby">
     <span class="icon-user icon-fw" aria-hidden="true"></span>
     <?php $author = ($displayData['item']->created_by_alias ?: $displayData['item']->author); ?>
-    <?php $author = '<span itemprop="name">' . $author . '</span>'; ?>
+    <?php $author = '<span>' . $author . '</span>'; ?>
     <?php if (!empty($displayData['item']->contact_link) && $displayData['params']->get('link_author') == true) : ?>
-        <?php echo Text::sprintf('COM_CONTENT_WRITTEN_BY', HTMLHelper::_('link', $displayData['item']->contact_link, $author, ['itemprop' => 'url'])); ?>
+        <?php echo Text::sprintf('COM_CONTENT_WRITTEN_BY', HTMLHelper::_('link', $displayData['item']->contact_link, $author)); ?>
     <?php else : ?>
         <?php echo Text::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
     <?php endif; ?>
diff --git a/layouts/joomla/content/info_block/category.php b/layouts/joomla/content/info_block/category.php
index 4006b0f345fc1..8a40824833ce9 100644
--- a/layouts/joomla/content/info_block/category.php
+++ b/layouts/joomla/content/info_block/category.php
@@ -23,9 +23,9 @@
         <?php $url = '<a href="' . Route::_(
             RouteHelper::getCategoryRoute($displayData['item']->catid, $displayData['item']->category_language)
         )
-            . '" itemprop="genre">' . $title . '</a>'; ?>
+            . '">' . $title . '</a>'; ?>
         <?php echo Text::sprintf('COM_CONTENT_CATEGORY', $url); ?>
     <?php else : ?>
-        <?php echo Text::sprintf('COM_CONTENT_CATEGORY', '<span itemprop="genre">' . $title . '</span>'); ?>
+        <?php echo Text::sprintf('COM_CONTENT_CATEGORY', '<span>' . $title . '</span>'); ?>
     <?php endif; ?>
 </dd>
diff --git a/layouts/joomla/content/info_block/create_date.php b/layouts/joomla/content/info_block/create_date.php
index 0fed237346ebc..538721ccfe60f 100644
--- a/layouts/joomla/content/info_block/create_date.php
+++ b/layouts/joomla/content/info_block/create_date.php
@@ -16,7 +16,7 @@
 ?>
 <dd class="create">
     <span class="icon-calendar icon-fw" aria-hidden="true"></span>
-    <time datetime="<?php echo HTMLHelper::_('date', $displayData['item']->created, 'c'); ?>" itemprop="dateCreated">
+    <time datetime="<?php echo HTMLHelper::_('date', $displayData['item']->created, 'c'); ?>">
         <?php echo Text::sprintf('COM_CONTENT_CREATED_DATE_ON', HTMLHelper::_('date', $displayData['item']->created, Text::_('DATE_FORMAT_LC3'))); ?>
     </time>
 </dd>
diff --git a/layouts/joomla/content/info_block/hits.php b/layouts/joomla/content/info_block/hits.php
index 1ff76321b969b..91f7d8484e41f 100644
--- a/layouts/joomla/content/info_block/hits.php
+++ b/layouts/joomla/content/info_block/hits.php
@@ -15,6 +15,6 @@
 ?>
 <dd class="hits">
     <span class="icon-eye icon-fw" aria-hidden="true"></span>
-    <meta itemprop="interactionCount" content="UserPageVisits:<?php echo $displayData['item']->hits; ?>">
+    <meta content="UserPageVisits:<?php echo $displayData['item']->hits; ?>">
     <?php echo Text::sprintf('COM_CONTENT_ARTICLE_HITS', $displayData['item']->hits); ?>
 </dd>
diff --git a/layouts/joomla/content/info_block/modify_date.php b/layouts/joomla/content/info_block/modify_date.php
index 5c2aaf90ea1fc..15209a5e6ca5d 100644
--- a/layouts/joomla/content/info_block/modify_date.php
+++ b/layouts/joomla/content/info_block/modify_date.php
@@ -16,7 +16,7 @@
 ?>
 <dd class="modified">
     <span class="icon-calendar icon-fw" aria-hidden="true"></span>
-    <time datetime="<?php echo HTMLHelper::_('date', $displayData['item']->modified, 'c'); ?>" itemprop="dateModified">
+    <time datetime="<?php echo HTMLHelper::_('date', $displayData['item']->modified, 'c'); ?>">
         <?php echo Text::sprintf('COM_CONTENT_LAST_UPDATED', HTMLHelper::_('date', $displayData['item']->modified, Text::_('DATE_FORMAT_LC3'))); ?>
     </time>
 </dd>
diff --git a/layouts/joomla/content/info_block/parent_category.php b/layouts/joomla/content/info_block/parent_category.php
index 39a3110625ce8..6a080a933b572 100644
--- a/layouts/joomla/content/info_block/parent_category.php
+++ b/layouts/joomla/content/info_block/parent_category.php
@@ -23,9 +23,9 @@
         <?php $url = '<a href="' . Route::_(
             RouteHelper::getCategoryRoute($displayData['item']->parent_id, $displayData['item']->parent_language)
         )
-            . '" itemprop="genre">' . $title . '</a>'; ?>
+            . '">' . $title . '</a>'; ?>
         <?php echo Text::sprintf('COM_CONTENT_PARENT', $url); ?>
     <?php else : ?>
-        <?php echo Text::sprintf('COM_CONTENT_PARENT', '<span itemprop="genre">' . $title . '</span>'); ?>
+        <?php echo Text::sprintf('COM_CONTENT_PARENT', '<span>' . $title . '</span>'); ?>
     <?php endif; ?>
 </dd>
diff --git a/layouts/joomla/content/info_block/publish_date.php b/layouts/joomla/content/info_block/publish_date.php
index 04fbb4492a13c..12106a56c664f 100644
--- a/layouts/joomla/content/info_block/publish_date.php
+++ b/layouts/joomla/content/info_block/publish_date.php
@@ -16,7 +16,7 @@
 ?>
 <dd class="published">
     <span class="icon-calendar icon-fw" aria-hidden="true"></span>
-    <time datetime="<?php echo HTMLHelper::_('date', $displayData['item']->publish_up, 'c'); ?>" itemprop="datePublished">
+    <time datetime="<?php echo HTMLHelper::_('date', $displayData['item']->publish_up, 'c'); ?>">
         <?php echo Text::sprintf('COM_CONTENT_PUBLISHED_DATE_ON', HTMLHelper::_('date', $displayData['item']->publish_up, Text::_('DATE_FORMAT_LC3'))); ?>
     </time>
 </dd>
diff --git a/layouts/joomla/content/intro_image.php b/layouts/joomla/content/intro_image.php
index f7db3b42a9474..8bd618bbc0e9d 100644
--- a/layouts/joomla/content/intro_image.php
+++ b/layouts/joomla/content/intro_image.php
@@ -29,11 +29,11 @@
 ?>
 <figure class="<?php echo $this->escape($imgclass); ?> item-image">
     <?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)); ?>" itemprop="url" title="<?php echo $this->escape($displayData->title); ?>">
-            <?php echo LayoutHelper::render('joomla.html.image', array_merge($layoutAttr, ['itemprop' => 'thumbnailUrl'])); ?>
+        <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); ?>
         </a>
     <?php else : ?>
-        <?php echo LayoutHelper::render('joomla.html.image', array_merge($layoutAttr, ['itemprop' => 'thumbnail'])); ?>
+        <?php echo LayoutHelper::render('joomla.html.image', $layoutAttr); ?>
     <?php endif; ?>
     <?php if (isset($images->image_intro_caption) && $images->image_intro_caption !== '') : ?>
         <figcaption class="caption"><?php echo $this->escape($images->image_intro_caption); ?></figcaption>
diff --git a/layouts/joomla/content/tags.php b/layouts/joomla/content/tags.php
index 1bef066ea1a85..0a3260959b38a 100644
--- a/layouts/joomla/content/tags.php
+++ b/layouts/joomla/content/tags.php
@@ -24,7 +24,7 @@
             <?php if (in_array($tag->access, $authorised)) : ?>
                 <?php $tagParams = new Registry($tag->params); ?>
                 <?php $link_class = $tagParams->get('tag_link_class', 'btn-info'); ?>
-                <li class="list-inline-item tag-<?php echo $tag->tag_id; ?> tag-list<?php echo $i; ?>" itemprop="keywords">
+                <li class="list-inline-item tag-<?php echo $tag->tag_id; ?> tag-list<?php echo $i; ?>">
                     <a href="<?php echo Route::_(RouteHelper::getComponentTagRoute($tag->tag_id . ':' . $tag->alias, $tag->language)); ?>" class="btn btn-sm <?php echo $link_class; ?>">
                         <?php echo $this->escape($tag->title); ?>
                     </a>
diff --git a/layouts/joomla/editors/buttons.php b/layouts/joomla/editors/buttons.php
index 3176e1dc44db2..7698f7af700f1 100644
--- a/layouts/joomla/editors/buttons.php
+++ b/layouts/joomla/editors/buttons.php
@@ -17,9 +17,12 @@
 ?>
 <div class="editor-xtd-buttons" role="toolbar" aria-label="<?php echo Text::_('JTOOLBAR'); ?>">
     <?php if ($buttons) : ?>
-        <?php foreach ($buttons as $button) : ?>
+        <?php foreach ($buttons as $button) :
+            $options     = (array) $button->get('options');
+            $legacyModal = $button->get('modal') && !empty($options['confirmCallback']);
+            ?>
             <?php echo $this->sublayout('button', $button); ?>
-            <?php echo $this->sublayout('modal', $button); ?>
+            <?php echo $legacyModal ? $this->sublayout('modal', $button) : ''; ?>
         <?php endforeach; ?>
     <?php endif; ?>
 </div>
diff --git a/layouts/joomla/editors/buttons/button.php b/layouts/joomla/editors/buttons/button.php
index 32a31ab3af0f5..6463d8c89c4c1 100644
--- a/layouts/joomla/editors/buttons/button.php
+++ b/layouts/joomla/editors/buttons/button.php
@@ -10,22 +10,76 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Factory;
 use Joomla\CMS\Uri\Uri;
 
+/** @var \Joomla\CMS\Editor\Button\Button $button */
 $button = $displayData;
 
-if ($button->get('name')) :
-    $class   = 'btn btn-secondary';
-    $class  .= ($button->get('class')) ? ' ' . $button->get('class') : null;
-    $class  .= ($button->get('modal')) ? ' modal-button' : null;
-    $href    = '#' . $button->get('editor') . '_' . strtolower($button->get('name')) . '_modal';
-    $link    = ($button->get('link')) ? Uri::base() . $button->get('link') : null;
-    $onclick = ($button->get('onclick')) ? ' onclick="' . $button->get('onclick') . '"' : '';
-    $title   = ($button->get('title')) ? $button->get('title') : $button->get('text');
-    $icon    = ($button->get('icon')) ? $button->get('icon') : $button->get('name');
-    ?>
-<button type="button" data-bs-target="<?php echo $href; ?>" class="xtd-button btn btn-secondary <?php echo $class; ?>" <?php echo $button->get('modal') ? 'data-bs-toggle="modal"' : '' ?> title="<?php echo $title; ?>" <?php echo $onclick; ?>>
-    <span class="icon-<?php echo $icon; ?>" aria-hidden="true"></span>
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa       = Factory::getApplication()->getDocument()->getWebAssetManager();
+$btnAsset = 'editor-button.' . $button->getButtonName();
+
+// Enable the button assets if any
+if ($wa->assetExists('style', $btnAsset)) {
+    $wa->useStyle($btnAsset);
+}
+if ($wa->assetExists('script', $btnAsset)) {
+    $wa->useScript($btnAsset);
+}
+
+$class   = 'btn btn-secondary';
+$class  .= $button->get('class') ? ' ' . $button->get('class') : null;
+$class  .= $button->get('modal') ? ' modal-button' : null;
+$href    = '#' . $button->get('editor') . '_' . strtolower($button->get('name', '')) . '_modal';
+$link    = $button->get('link');
+$onclick = $button->get('onclick') ? ' onclick="' . $button->get('onclick') . '"' : '';
+$title   = $button->get('title') ? $button->get('title') : $button->get('text', '');
+$icon    = $button->get('icon');
+$action  = $button->get('action', '');
+$options = (array) $button->get('options');
+
+// Correct the link, check for legacy with &amp; in it, and prepend a base Uri
+if ($link && $link[0] !== '#') {
+    $link           = str_contains($link, '&amp;') ? htmlspecialchars_decode($link) : $link;
+    $link           = Uri::base(true) . '/' . $link;
+    $options['src'] = $options['src'] ?? $link;
+}
+
+// Detect a legacy BS modal, and set action to "modal" for legacy buttons, when possible
+$legacyModal = $button->get('modal') && !empty($options['confirmCallback']);
+
+if (!$action && $button->get('modal') && !$legacyModal) {
+    $action = 'modal';
+
+    // Backward compatibility check, for older options
+    if (!empty($options['modalWidth'])) {
+        $options['width'] = $options['modalWidth'] . 'vw';
+    }
+    if (!empty($options['bodyHeight'])) {
+        $options['height'] = $options['bodyHeight'] . 'vh';
+    }
+}
+
+// Prepare default values for modal
+if ($action === 'modal') {
+    $wa->useScript('joomla.dialog');
+
+    $options['popupType']  = $options['popupType'] ?? 'iframe';
+    $options['textHeader'] = $options['textHeader'] ?? $title;
+    $options['iconHeader'] = $options['iconHeader'] ?? 'icon-' . $icon;
+}
+
+$optStr = $options && $action ? json_encode($options, JSON_UNESCAPED_SLASHES) : '';
+
+?>
+
+<button type="button" data-joomla-editor-button-action="<?php echo $this->escape($action); ?>" data-joomla-editor-button-options="<?php echo $this->escape($optStr); ?>"
+        class="xtd-button btn btn-secondary <?php echo $class; ?>" title="<?php echo $this->escape($title); ?>" <?php echo $onclick; ?>
+    <?php echo $legacyModal ? 'data-bs-toggle="modal" data-bs-target="' . $href . '"' : '' ?>>
+    <?php if ($icon) : ?>
+        <span class="icon-<?php echo $icon; ?>" aria-hidden="true"></span>
+    <?php endif; ?>
     <?php echo $button->get('text'); ?>
 </button>
-<?php endif; ?>
+
diff --git a/layouts/joomla/editors/buttons/modal.php b/layouts/joomla/editors/buttons/modal.php
index 18f51bc0c7ea7..36e1e0e0c1ba4 100644
--- a/layouts/joomla/editors/buttons/modal.php
+++ b/layouts/joomla/editors/buttons/modal.php
@@ -14,6 +14,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Uri\Uri;
 
+/** @var \Joomla\CMS\Editor\Button\Button $button */
 $button = $displayData;
 
 if (!$button->get('modal')) {
@@ -26,7 +27,7 @@
 $link     = ($button->get('link')) ? Uri::base() . $button->get('link') : null;
 $onclick  = ($button->get('onclick')) ? ' onclick="' . $button->get('onclick') . '"' : '';
 $title    = ($button->get('title')) ? $button->get('title') : $button->get('text');
-$options  = is_array($button->get('options')) ? $button->get('options') : [];
+$options  = $button->getOptions();
 
 $confirm = '';
 
diff --git a/layouts/joomla/form/field/color/advanced.php b/layouts/joomla/form/field/color/advanced.php
index 24a27ec303b34..f26ce92d89831 100644
--- a/layouts/joomla/form/field/color/advanced.php
+++ b/layouts/joomla/form/field/color/advanced.php
@@ -43,8 +43,8 @@
  * @var   boolean  $hasValue        Has this field a value assigned?
  * @var   array    $options         Options available for this field.
  * @var   array    $checked         Is this field checked?
- * @var   array    $position        Is this field checked?
- * @var   array    $control         Is this field checked?
+ * @var   array    $position        Position of input.
+ * @var   array    $control         The forms control.
  * @var   string   $dataAttribute   Miscellaneous data attributes preprocessed for HTML output
  * @var   array    $dataAttributes  Miscellaneous data attributes for eg, data-*.
  */
@@ -66,6 +66,7 @@
 $disabled     = $disabled ? ' disabled' : '';
 $readonly     = $readonly ? ' readonly' : '';
 $hint         = strlen($hint) ? ' placeholder="' . $this->escape($hint) . '"' : ' placeholder="' . $placeholder . '"';
+$onchange     = $onchange ? ' onchange="' . $onchange . '"' : '';
 $required     = $required ? ' required' : '';
 $autocomplete = !empty($autocomplete) ? ' autocomplete="' . $autocomplete . '"' : '';
 
diff --git a/layouts/joomla/form/field/color/simple.php b/layouts/joomla/form/field/color/simple.php
index cfa1923581fde..2ed3e632ead10 100644
--- a/layouts/joomla/form/field/color/simple.php
+++ b/layouts/joomla/form/field/color/simple.php
@@ -45,8 +45,8 @@
  * @var   boolean  $hasValue        Has this field a value assigned?
  * @var   array    $options         Options available for this field.
  * @var   array    $checked         Is this field checked?
- * @var   array    $position        Is this field checked?
- * @var   array    $control         Is this field checked?
+ * @var   array    $position        Position of input.
+ * @var   array    $control         The forms control.
  * @var   array    $colors          The specified colors
  * @var   string   $dataAttribute   Miscellaneous data attributes preprocessed for HTML output
  * @var   array    $dataAttributes  Miscellaneous data attribute for eg, data-*.
diff --git a/layouts/joomla/form/field/modal-select.php b/layouts/joomla/form/field/modal-select.php
new file mode 100644
index 0000000000000..b0f1737943c54
--- /dev/null
+++ b/layouts/joomla/form/field/modal-select.php
@@ -0,0 +1,76 @@
+<?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;
+
+extract($displayData);
+
+/**
+ * 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  $repeat          Allows extensions to duplicate elements.
+ * @var   boolean  $required        Is this field required?
+ * @var   integer  $size            Size attribute of the input.
+ * @var   boolean  $spellcheck      Spellcheck state for the form field.
+ * @var   string   $validate        Validation rules to apply.
+ * @var   string   $value           Value attribute of the field.
+ * @var   string   $dataAttribute   Miscellaneous data attributes preprocessed for HTML output
+ * @var   array    $dataAttributes  Miscellaneous data attribute for eg, data-*
+ * @var   string   $valueTitle
+ * @var   array    $canDo
+ * @var   string[] $urls
+ * @var   string[] $modalTitles
+ */
+
+// Add the field script
+if (!$readonly && !$disabled) {
+    /** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
+    $wa = Factory::getApplication()->getDocument()->getWebAssetManager();
+    $wa->useScript('modal-content-select-field');
+}
+
+$fieldClass = $required ? 'required modal-value' : '';
+?>
+
+<div class="js-modal-content-select-field <?php echo $class; ?>" <?php echo $dataAttribute; ?>>
+    <div class="input-group">
+        <input class="form-control js-input-title" type="text" value="<?php echo $this->escape($valueTitle ?? $value); ?>" readonly
+               id="<?php echo $id; ?>" name="<?php echo $name; ?>"
+               placeholder="<?php echo $this->escape($hint); ?>"/>
+
+        <?php if (!$readonly && !$disabled) :
+            echo $this->sublayout('buttons', $displayData);
+            // The "extra-buttons" layout allows to add extra control buttons to the field, example "propagate association" by com_content
+            echo $this->sublayout('extra-buttons', $displayData);
+        endif; ?>
+    </div>
+
+    <input type="hidden" id="<?php echo $id; ?>_id" class="<?php echo $fieldClass; ?> js-input-value" data-required="<?php echo (int) $required; ?>"
+           name="<?php echo $name; ?>" value="<?php echo $this->escape($value); ?>">
+</div>
diff --git a/layouts/joomla/form/field/modal-select/buttons.php b/layouts/joomla/form/field/modal-select/buttons.php
new file mode 100644
index 0000000000000..464aa7c117b10
--- /dev/null
+++ b/layouts/joomla/form/field/modal-select/buttons.php
@@ -0,0 +1,99 @@
+<?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\Language\Text;
+
+extract($displayData);
+
+/**
+ * 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  $repeat          Allows extensions to duplicate elements.
+ * @var   boolean  $required        Is this field required?
+ * @var   integer  $size            Size attribute of the input.
+ * @var   boolean  $spellcheck      Spellcheck state for the form field.
+ * @var   string   $validate        Validation rules to apply.
+ * @var   string   $value           Value attribute of the field.
+ * @var   string   $dataAttribute   Miscellaneous data attributes preprocessed for HTML output
+ * @var   array    $dataAttributes  Miscellaneous data attribute for eg, data-*
+ * @var   string   $valueTitle
+ * @var   array    $canDo
+ * @var   string[] $urls
+ * @var   string[] $modalTitles
+ */
+
+// Prepare options for each Modal
+$modalSelect = [
+    'popupType'  => 'iframe',
+    'src'        => $urls['select'] ?? '',
+    'textHeader' => $modalTitles['select'] ?? Text::_('JSELECT'),
+];
+$modalNew = [
+    'popupType'  => 'iframe',
+    'src'        => $urls['new'] ?? '',
+    'textHeader' => $modalTitles['new'] ?? Text::_('JACTION_CREATE'),
+];
+$modalEdit = [
+    'popupType'  => 'iframe',
+    'src'        => $urls['edit'] ?? '',
+    'textHeader' => $modalTitles['edit'] ?? Text::_('JACTION_EDIT'),
+];
+
+?>
+<?php if ($modalSelect['src'] && $canDo['select'] ?? true) : ?>
+<button type="button" class="btn btn-primary" <?php echo $value ? 'hidden' : ''; ?>
+        data-button-action="select" data-show-when-value=""
+        data-modal-config="<?php echo $this->escape(json_encode($modalSelect)); ?>">
+    <span class="icon-file" aria-hidden="true"></span> <?php echo Text::_('JSELECT'); ?>
+</button>
+<?php endif; ?>
+
+<?php if ($modalNew['src'] && $canDo['new'] ?? false) : ?>
+<button type="button" class="btn btn-secondary" <?php echo $value ? 'hidden' : ''; ?>
+        data-button-action="create" data-show-when-value=""
+        data-modal-config="<?php echo $this->escape(json_encode($modalNew)); ?>">
+    <span class="icon-plus" aria-hidden="true"></span> <?php echo Text::_('JACTION_CREATE'); ?>
+</button>
+<?php endif; ?>
+
+<?php if ($modalEdit['src'] && $canDo['edit'] ?? false) : ?>
+<button type="button" class="btn btn-primary" <?php echo $value ? '' : 'hidden'; ?>
+        data-button-action="edit" data-show-when-value="1"
+        data-modal-config="<?php echo $this->escape(json_encode($modalEdit)); ?>"
+        data-checkin-url="<?php echo $this->escape($urls['checkin'] ?? ''); ?>">
+    <span class="icon-pen-square" aria-hidden="true"></span> <?php echo Text::_('JACTION_EDIT'); ?>
+</button>
+<?php endif; ?>
+
+<?php if ($canDo['clear'] ?? true) : ?>
+<button type="button" class="btn btn-secondary" <?php echo $value ? '' : 'hidden'; ?>
+        data-button-action="clear" data-show-when-value="1">
+    <span class="icon-times" aria-hidden="true"></span> <?php echo Text::_('JCLEAR'); ?>
+</button>
+<?php endif; ?>
diff --git a/layouts/joomla/form/field/modal-select/extra-buttons.php b/layouts/joomla/form/field/modal-select/extra-buttons.php
new file mode 100644
index 0000000000000..93cbc4859b781
--- /dev/null
+++ b/layouts/joomla/form/field/modal-select/extra-buttons.php
@@ -0,0 +1,47 @@
+<?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;
+
+/**
+ * The layout allows to add extra control buttons to the field, example "propagate association" by com_content.
+ *
+ * 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  $repeat          Allows extensions to duplicate elements.
+ * @var   boolean  $required        Is this field required?
+ * @var   integer  $size            Size attribute of the input.
+ * @var   boolean  $spellcheck      Spellcheck state for the form field.
+ * @var   string   $validate        Validation rules to apply.
+ * @var   string   $value           Value attribute of the field.
+ * @var   string   $dataAttribute   Miscellaneous data attributes preprocessed for HTML output
+ * @var   array    $dataAttributes  Miscellaneous data attribute for eg, data-*
+ * @var   string   $valueTitle
+ * @var   array    $canDo
+ * @var   string[] $urls
+ * @var   string[] $modalTitles
+ */
diff --git a/layouts/joomla/links/groupopen.php b/layouts/joomla/links/groupopen.php
index 1058791ba4fc3..1cfc5815f6b14 100644
--- a/layouts/joomla/links/groupopen.php
+++ b/layouts/joomla/links/groupopen.php
@@ -10,8 +10,8 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Filter\OutputFilter;
 use Joomla\CMS\Language\Text;
+use Joomla\Filter\OutputFilter;
 
 ?>
 <h2 class="nav-header"><?php echo OutputFilter::ampReplace(Text::_($displayData)); ?></h2>
diff --git a/layouts/joomla/links/link.php b/layouts/joomla/links/link.php
index 8c0c909a41fb8..46aff9043afef 100644
--- a/layouts/joomla/links/link.php
+++ b/layouts/joomla/links/link.php
@@ -10,7 +10,7 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Filter\OutputFilter;
+use Joomla\Filter\OutputFilter;
 
 $id      = empty($displayData['id']) ? '' : (' id="' . $displayData['id'] . '"');
 $target  = empty($displayData['target']) ? '' : (' target="' . $displayData['target'] . '"');
diff --git a/layouts/joomla/tinymce/textarea.php b/layouts/joomla/tinymce/textarea.php
index ac59f711d145d..859782f89117e 100644
--- a/layouts/joomla/tinymce/textarea.php
+++ b/layouts/joomla/tinymce/textarea.php
@@ -20,7 +20,7 @@
 }
 
 if (!$wa->assetExists('script', 'plg_editors_tinymce')) {
-    $wa->registerScript('plg_editors_tinymce', 'plg_editors_tinymce/tinymce.min.js', [], ['defer' => true], ['core', 'tinymce']);
+    $wa->registerScript('plg_editors_tinymce', 'plg_editors_tinymce/tinymce.min.js', [], ['type' => 'module'], ['core', 'editors', 'tinymce']);
 }
 
 $wa->useScript('tinymce')->useScript('plg_editors_tinymce');
diff --git a/layouts/libraries/html/bootstrap/modal/main.php b/layouts/libraries/html/bootstrap/modal/main.php
index 0e357e8997ca3..6ce9aece875fc 100644
--- a/layouts/libraries/html/bootstrap/modal/main.php
+++ b/layouts/libraries/html/bootstrap/modal/main.php
@@ -32,6 +32,7 @@
  *                             - bodyHeight   int      Optional height of the modal body in viewport units (vh)
  *                             - modalWidth   int      Optional width of the modal in viewport units (vh)
  *                             - footer       string   Optional markup for the modal footer
+ *                             - modalCss     string   Optional CSS classes of the modal
  * @var   string  $body      Markup for the modal body. Appended after the <iframe> if the URL option is set
  */
 
@@ -42,10 +43,14 @@
 }
 
 $modalWidth       = isset($params['modalWidth']) ? round((int) $params['modalWidth'], -1) : '';
-$modalDialogClass = '';
+$modalDialogClass = 'modal-lg';
 
 if ($modalWidth && $modalWidth > 0 && $modalWidth <= 100) {
-    $modalDialogClass = ' jviewport-width' . $modalWidth;
+    $modalDialogClass .= ' jviewport-width' . $modalWidth;
+}
+
+if (!empty($params['modalCss'])) {
+    $modalDialogClass = $params['modalCss'];
 }
 
 $modalAttributes = [
@@ -67,7 +72,7 @@
 }
 ?>
 <div id="<?php echo $selector; ?>" role="dialog" <?php echo ArrayHelper::toString($modalAttributes); ?> <?php echo $url ?? ''; ?> <?php echo isset($url) ? 'data-iframe="' . trim($iframeHtml) . '"' : ''; ?>>
-    <div class="modal-dialog modal-lg<?php echo $modalDialogClass; ?>">
+    <div class="modal-dialog <?php echo $modalDialogClass; ?>">
         <div class="modal-content">
             <?php
                 // Header
diff --git a/layouts/plugins/editors/tinymce/field/tinymcebuilder.php b/layouts/plugins/editors/tinymce/field/tinymcebuilder.php
index d5b354367ac51..f08af22c03ab0 100644
--- a/layouts/plugins/editors/tinymce/field/tinymcebuilder.php
+++ b/layouts/plugins/editors/tinymce/field/tinymcebuilder.php
@@ -13,6 +13,7 @@
 use Joomla\CMS\Document\HtmlDocument;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
+use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\FileLayout;
 
@@ -78,10 +79,13 @@
 $doc->addScriptOptions(
     'plg_editors_tinymce_builder',
     [
-        'menus'         => $menus,
-        'buttons'       => $buttons,
-        'toolbarPreset' => $toolbarPreset,
-        'formControl'   => $name . '[toolbars]',
+        'menus'            => $menus,
+        'buttons'          => $buttons,
+        'toolbarPreset'    => $toolbarPreset,
+        'formControl'      => $name . '[toolbars]',
+        'external_plugins' => [
+            'jtemplate' => HTMLHelper::_('script', 'plg_editors_tinymce/plugins/jtemplate/plugin.min.js', ['relative' => true, 'version' => 'auto', 'pathOnly' => true])
+        ]
     ]
 );
 
diff --git a/libraries/bootstrap.php b/libraries/bootstrap.php
index 6f9f749178f01..190240a730ee6 100644
--- a/libraries/bootstrap.php
+++ b/libraries/bootstrap.php
@@ -5,12 +5,17 @@
  * Including this file into your application will make Joomla libraries available for use.
  *
  * @copyright  (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @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.
+/**
+ * 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__);
 
 // Detect the native operating system type.
@@ -21,7 +26,7 @@
 
 // Import the library loader if necessary.
 if (!class_exists('JLoader')) {
-    require_once JPATH_PLATFORM . '/loader.php';
+    require_once JPATH_LIBRARIES . '/loader.php';
 
     // If JLoader still does not exist panic.
     if (!class_exists('JLoader')) {
@@ -44,9 +49,6 @@ class_exists('\\Joomla\\CMS\\Autoload\\ClassLoader');
 // Decorate Composer autoloader
 spl_autoload_register([new \Joomla\CMS\Autoload\ClassLoader($loader), 'loadClass'], true, true);
 
-// Register the class aliases for Framework classes that have replaced their Platform equivalents
-require_once JPATH_LIBRARIES . '/classmap.php';
-
 /**
  * Register the global exception handler. And set error level to server default error level.
  * The error level may be changed later in boot up process, after application config will be loaded.
@@ -80,7 +82,7 @@ class_exists('\\Joomla\\CMS\\Autoload\\ClassLoader');
 }
 
 // Register the Crypto lib
-JLoader::register('Crypto', JPATH_PLATFORM . '/php-encryption/Crypto.php');
+JLoader::register('Crypto', JPATH_LIBRARIES . '/php-encryption/Crypto.php');
 
 // Register the PasswordHash library.
-JLoader::register('PasswordHash', JPATH_PLATFORM . '/phpass/PasswordHash.php');
+JLoader::register('PasswordHash', JPATH_LIBRARIES . '/phpass/PasswordHash.php');
diff --git a/libraries/cms.php b/libraries/cms.php
index d881827a526b1..03f8203174b7b 100644
--- a/libraries/cms.php
+++ b/libraries/cms.php
@@ -18,14 +18,19 @@
     E_USER_DEPRECATED
 );
 
-// Set the platform root path as a constant if necessary
+/**
+ * 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_PLATFORM . '/loader.php';
+    require_once JPATH_LIBRARIES . '/loader.php';
 }
 
 // Make sure that the Joomla Platform has been successfully loaded
@@ -44,9 +49,6 @@ class_exists('\\Joomla\\CMS\\Autoload\\ClassLoader');
 // Decorate Composer autoloader
 spl_autoload_register([new \Joomla\CMS\Autoload\ClassLoader($loader), 'loadClass'], true, true);
 
-// Register the class aliases for Framework classes that have replaced their Platform equivalents
-require_once JPATH_LIBRARIES . '/classmap.php';
-
 // Suppress phar stream wrapper for non .phar files
 $behavior = new \TYPO3\PharStreamWrapper\Behavior();
 \TYPO3\PharStreamWrapper\Manager::initialize(
@@ -72,4 +74,4 @@ class_exists('\\Joomla\\CMS\\Autoload\\ClassLoader');
 }
 
 // Register the Crypto lib
-JLoader::register('Crypto', JPATH_PLATFORM . '/php-encryption/Crypto.php');
+JLoader::register('Crypto', JPATH_LIBRARIES . '/php-encryption/Crypto.php');
diff --git a/libraries/import.legacy.php b/libraries/import.legacy.php
index 99943e3efe534..60ea147aaa017 100644
--- a/libraries/import.legacy.php
+++ b/libraries/import.legacy.php
@@ -17,7 +17,12 @@
     E_USER_DEPRECATED
 );
 
-// Set the platform root path as a constant if necessary.
+/**
+ * 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__);
 }
@@ -35,7 +40,7 @@
 
 // Import the library loader if necessary.
 if (!class_exists('JLoader')) {
-    require_once JPATH_PLATFORM . '/loader.php';
+    require_once JPATH_LIBRARIES . '/loader.php';
 }
 
 // Make sure that the Joomla Loader has been successfully loaded.
@@ -47,4 +52,4 @@
 JLoader::setup();
 
 // Register the PasswordHash lib
-JLoader::register('PasswordHash', JPATH_PLATFORM . '/phpass/PasswordHash.php');
+JLoader::register('PasswordHash', JPATH_LIBRARIES . '/phpass/PasswordHash.php');
diff --git a/libraries/import.php b/libraries/import.php
index a313bcbbe10ea..cc87ee797a32f 100644
--- a/libraries/import.php
+++ b/libraries/import.php
@@ -17,7 +17,12 @@
     E_USER_DEPRECATED
 );
 
-// Set the platform root path as a constant if necessary.
+/**
+ * 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__);
 }
@@ -35,7 +40,7 @@
 
 // Import the library loader if necessary.
 if (!class_exists('JLoader')) {
-    require_once JPATH_PLATFORM . '/loader.php';
+    require_once JPATH_LIBRARIES . '/loader.php';
 }
 
 // Make sure that the Joomla Platform has been successfully loaded.
@@ -47,4 +52,4 @@
 JLoader::setup();
 
 // Register the PasswordHash lib
-JLoader::register('PasswordHash', JPATH_PLATFORM . '/phpass/PasswordHash.php');
+JLoader::register('PasswordHash', JPATH_LIBRARIES . '/phpass/PasswordHash.php');
diff --git a/libraries/loader.php b/libraries/loader.php
index d8688858bd9c8..2e5c98bc38fb7 100644
--- a/libraries/loader.php
+++ b/libraries/loader.php
@@ -9,7 +9,7 @@
  * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
-defined('JPATH_PLATFORM') or die;
+defined('_JEXEC') or die;
 
 /**
  * Static class to handle loading of libraries.
diff --git a/libraries/src/Access/Access.php b/libraries/src/Access/Access.php
index 8e323ef7ee526..21245a45a5d25 100644
--- a/libraries/src/Access/Access.php
+++ b/libraries/src/Access/Access.php
@@ -20,7 +20,7 @@
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Access/Exception/AuthenticationFailed.php b/libraries/src/Access/Exception/AuthenticationFailed.php
index 568e731142852..70de55a7d6536 100644
--- a/libraries/src/Access/Exception/AuthenticationFailed.php
+++ b/libraries/src/Access/Exception/AuthenticationFailed.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Access\Exception;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Access/Exception/NotAllowed.php b/libraries/src/Access/Exception/NotAllowed.php
index 02e244c03a9c4..f3c7f593d61d2 100644
--- a/libraries/src/Access/Exception/NotAllowed.php
+++ b/libraries/src/Access/Exception/NotAllowed.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Access\Exception;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Access/Rule.php b/libraries/src/Access/Rule.php
index 3824b63dcf1c2..62f8d93b2b6c4 100644
--- a/libraries/src/Access/Rule.php
+++ b/libraries/src/Access/Rule.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Access;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Access/Rules.php b/libraries/src/Access/Rules.php
index 1feafd280daf9..7d492c3ad52dc 100644
--- a/libraries/src/Access/Rules.php
+++ b/libraries/src/Access/Rules.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Object\CMSObject;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Adapter/Adapter.php b/libraries/src/Adapter/Adapter.php
index ffea81b8ff06f..e82cd3eee74b9 100644
--- a/libraries/src/Adapter/Adapter.php
+++ b/libraries/src/Adapter/Adapter.php
@@ -10,11 +10,12 @@
 namespace Joomla\CMS\Adapter;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Object\CMSObject;
+use Joomla\CMS\Object\LegacyErrorHandlingTrait;
+use Joomla\CMS\Object\LegacyPropertyManagementTrait;
 use Joomla\Database\DatabaseAwareInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -26,8 +27,11 @@
  * @deprecated  4.3 will be removed in 6.0
  *              Will be removed without replacement
  */
-class Adapter extends CMSObject
+class Adapter
 {
+    use LegacyErrorHandlingTrait;
+    use LegacyPropertyManagementTrait;
+
     /**
      * Associative array of adapters
      *
diff --git a/libraries/src/Adapter/AdapterInstance.php b/libraries/src/Adapter/AdapterInstance.php
index 831f6b818156d..49023952b8ed0 100644
--- a/libraries/src/Adapter/AdapterInstance.php
+++ b/libraries/src/Adapter/AdapterInstance.php
@@ -10,11 +10,12 @@
 namespace Joomla\CMS\Adapter;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Object\CMSObject;
+use Joomla\CMS\Object\LegacyErrorHandlingTrait;
+use Joomla\CMS\Object\LegacyPropertyManagementTrait;
 use Joomla\Database\DatabaseDriver;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -24,8 +25,11 @@
  * @deprecated  4.3 will be removed in 6.0
  *              Will be removed without replacement
  */
-class AdapterInstance extends CMSObject
+class AdapterInstance
 {
+    use LegacyErrorHandlingTrait;
+    use LegacyPropertyManagementTrait;
+
     /**
      * Parent
      *
diff --git a/libraries/src/Application/AdministratorApplication.php b/libraries/src/Application/AdministratorApplication.php
index a785b8183b67d..a40fc7fc35955 100644
--- a/libraries/src/Application/AdministratorApplication.php
+++ b/libraries/src/Application/AdministratorApplication.php
@@ -11,6 +11,9 @@
 
 use Joomla\Application\Web\WebClient;
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Event\Application\AfterDispatchEvent;
+use Joomla\CMS\Event\Application\AfterInitialiseDocumentEvent;
+use Joomla\CMS\Event\Application\AfterRouteEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filter\InputFilter;
 use Joomla\CMS\Input\Input;
@@ -24,7 +27,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -55,16 +58,16 @@ 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
-     *                                 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
-     *                                 application's config object, otherwise a default config object is created.
-     * @param   WebClient  $client     An optional argument to provide dependency injection for the application's
-     *                                 client object.  If the argument is a WebClient object that object will become the
-     *                                 application's client object, otherwise a default client object is created.
-     * @param   Container  $container  Dependency injection container.
+     * @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
+     *                                  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
+     *                                  application's config object, otherwise a default config object is created.
+     * @param   ?WebClient  $client     An optional argument to provide dependency injection for the application's
+     *                                  client object.  If the argument is a WebClient object that object will become the
+     *                                  application's client object, otherwise a default client object is created.
+     * @param   ?Container  $container  Dependency injection container.
      *
      * @since   3.2
      */
@@ -104,9 +107,6 @@ public function dispatch($component = null)
         // Set up the params
         $document = Factory::getDocument();
 
-        // Register the document object with Factory
-        Factory::$document = $document;
-
         switch ($document->getType()) {
             case 'html':
                 // Get the template
@@ -140,12 +140,21 @@ public function dispatch($component = null)
         $document->setDescription($this->get('MetaDesc'));
         $document->setGenerator('Joomla! - Open Source Content Management');
 
+        // Trigger the onAfterInitialiseDocument event.
+        PluginHelper::importPlugin('system', null, true, $this->getDispatcher());
+        $this->dispatchEvent(
+            'onAfterInitialiseDocument',
+            new AfterInitialiseDocumentEvent('onAfterInitialiseDocument', ['subject' => $this, 'document' => $document])
+        );
+
         $contents = ComponentHelper::renderComponent($component);
-        $document->setBuffer($contents, 'component');
+        $document->setBuffer($contents, ['type' => 'component']);
 
         // Trigger the onAfterDispatch event.
-        PluginHelper::importPlugin('system');
-        $this->triggerEvent('onAfterDispatch');
+        $this->dispatchEvent(
+            'onAfterDispatch',
+            new AfterDispatchEvent('onAfterDispatch', ['subject' => $this])
+        );
     }
 
     /**
@@ -450,8 +459,11 @@ protected function route()
         $this->isHandlingMultiFactorAuthentication();
 
         // Trigger the onAfterRoute event.
-        PluginHelper::importPlugin('system');
-        $this->triggerEvent('onAfterRoute');
+        PluginHelper::importPlugin('system', null, true, $this->getDispatcher());
+        $this->dispatchEvent(
+            'onAfterRoute',
+            new AfterRouteEvent('onAfterRoute', ['subject' => $this])
+        );
     }
 
     /**
diff --git a/libraries/src/Application/ApiApplication.php b/libraries/src/Application/ApiApplication.php
index 3641cc288fc78..18061a720f118 100644
--- a/libraries/src/Application/ApiApplication.php
+++ b/libraries/src/Application/ApiApplication.php
@@ -4,7 +4,7 @@
  * 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
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Application;
@@ -12,6 +12,10 @@
 use Joomla\Application\Web\WebClient;
 use Joomla\CMS\Access\Exception\AuthenticationFailed;
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Event\Application\AfterApiRouteEvent;
+use Joomla\CMS\Event\Application\AfterDispatchEvent;
+use Joomla\CMS\Event\Application\AfterInitialiseDocumentEvent;
+use Joomla\CMS\Event\Application\BeforeApiRouteEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Router\ApiRouter;
@@ -25,7 +29,7 @@
 use Negotiation\Negotiator;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -54,16 +58,16 @@ final class ApiApplication extends CMSApplication
     /**
      * Class constructor.
      *
-     * @param   JInputJson  $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
-     *                                  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
-     *                                  application's config object, otherwise a default config object is created.
-     * @param   WebClient   $client     An optional argument to provide dependency injection for the application's client
-     *                                  object.  If the argument is a WebClient object that object will become the
-     *                                  application's client object, otherwise a default client object is created.
-     * @param   Container   $container  Dependency injection container.
+     * @param   ?JInputJson  $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
+     *                                   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
+     *                                   application's config object, otherwise a default config object is created.
+     * @param   ?WebClient   $client     An optional argument to provide dependency injection for the application's client
+     *                                   object.  If the argument is a WebClient object that object will become the
+     *                                   application's client object, otherwise a default client object is created.
+     * @param   ?Container   $container  Dependency injection container.
      *
      * @since   4.0.0
      */
@@ -227,8 +231,12 @@ protected function route()
         $router = $this->getContainer()->get(ApiRouter::class);
 
         // Trigger the onBeforeApiRoute event.
-        PluginHelper::importPlugin('webservices');
-        $this->triggerEvent('onBeforeApiRoute', [&$router, $this]);
+        PluginHelper::importPlugin('webservices', null, true, $this->getDispatcher());
+        $this->dispatchEvent(
+            'onBeforeApiRoute',
+            new BeforeApiRouteEvent('onBeforeApiRoute', ['router' => $router, 'subject' => $this])
+        );
+
         $caught404 = false;
         $method    = $this->input->getMethod();
 
@@ -263,7 +271,7 @@ protected function route()
             throw new Exception\NotAcceptable('Could not match accept header', 406);
         }
 
-        /** @var $mediaType Accept */
+        /** @var Accept $mediaType */
         $format = $mediaType->getValue();
 
         if (\array_key_exists($mediaType->getValue(), $this->formatMapper)) {
@@ -299,7 +307,10 @@ protected function route()
             }
         }
 
-        $this->triggerEvent('onAfterApiRoute', [$this]);
+        $this->dispatchEvent(
+            'onAfterApiRoute',
+            new AfterApiRouteEvent('onAfterApiRoute', ['subject' => $this])
+        );
 
         if (!isset($route['vars']['public']) || $route['vars']['public'] === false) {
             if (!$this->login(['username' => ''], ['silent' => true, 'action' => 'core.login.api'])) {
@@ -412,14 +423,20 @@ public function dispatch($component = null)
         // Set up the params
         $document = Factory::getDocument();
 
-        // Register the document object with Factory
-        Factory::$document = $document;
+        // Trigger the onAfterInitialiseDocument event.
+        PluginHelper::importPlugin('system', null, true, $this->getDispatcher());
+        $this->dispatchEvent(
+            'onAfterInitialiseDocument',
+            new AfterInitialiseDocumentEvent('onAfterInitialiseDocument', ['subject' => $this, 'document' => $document])
+        );
 
         $contents = ComponentHelper::renderComponent($component);
-        $document->setBuffer($contents, 'component');
+        $document->setBuffer($contents, ['type' => 'component']);
 
         // Trigger the onAfterDispatch event.
-        PluginHelper::importPlugin('system');
-        $this->triggerEvent('onAfterDispatch');
+        $this->dispatchEvent(
+            'onAfterDispatch',
+            new AfterDispatchEvent('onAfterDispatch', ['subject' => $this])
+        );
     }
 }
diff --git a/libraries/src/Application/ApplicationHelper.php b/libraries/src/Application/ApplicationHelper.php
index f81052d404652..aa6b64d774c72 100644
--- a/libraries/src/Application/ApplicationHelper.php
+++ b/libraries/src/Application/ApplicationHelper.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Filter\OutputFilter;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Application/BaseApplication.php b/libraries/src/Application/BaseApplication.php
index 11080c64d0bdf..365bf91eb7662 100644
--- a/libraries/src/Application/BaseApplication.php
+++ b/libraries/src/Application/BaseApplication.php
@@ -16,7 +16,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -39,12 +39,12 @@ abstract class BaseApplication extends AbstractApplication implements Dispatcher
     /**
      * 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 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 application's config object, otherwise a default config object is created.
+     * @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 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 application's config object, otherwise a default config object is created.
      *
      * @since   3.0.0
      */
diff --git a/libraries/src/Application/CLI/CliInput.php b/libraries/src/Application/CLI/CliInput.php
index 792a556fa39f3..c704982ae3b8d 100644
--- a/libraries/src/Application/CLI/CliInput.php
+++ b/libraries/src/Application/CLI/CliInput.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Application\CLI;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Application/CLI/CliOutput.php b/libraries/src/Application/CLI/CliOutput.php
index de7aaa5c34254..a81b2732249f7 100644
--- a/libraries/src/Application/CLI/CliOutput.php
+++ b/libraries/src/Application/CLI/CliOutput.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Application\CLI\Output\Processor\ProcessorInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -36,7 +36,7 @@ abstract class CliOutput
     /**
      * Constructor
      *
-     * @param   ProcessorInterface  $processor  The output processor.
+     * @param   ?ProcessorInterface  $processor  The output processor.
      *
      * @since   4.0.0
      */
diff --git a/libraries/src/Application/CLI/ColorStyle.php b/libraries/src/Application/CLI/ColorStyle.php
index 109ca724675c8..3017f61b75ca6 100644
--- a/libraries/src/Application/CLI/ColorStyle.php
+++ b/libraries/src/Application/CLI/ColorStyle.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Application\CLI;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Application/CLI/Output/Processor/ColorProcessor.php b/libraries/src/Application/CLI/Output/Processor/ColorProcessor.php
index ae9265b233e8e..559038925af4b 100644
--- a/libraries/src/Application/CLI/Output/Processor/ColorProcessor.php
+++ b/libraries/src/Application/CLI/Output/Processor/ColorProcessor.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Application\CLI\ColorStyle;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Application/CLI/Output/Processor/ProcessorInterface.php b/libraries/src/Application/CLI/Output/Processor/ProcessorInterface.php
index 8b075651129d9..2c7e0bdbcd47a 100644
--- a/libraries/src/Application/CLI/Output/Processor/ProcessorInterface.php
+++ b/libraries/src/Application/CLI/Output/Processor/ProcessorInterface.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Application\CLI\Output\Processor;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Application/CLI/Output/Stdout.php b/libraries/src/Application/CLI/Output/Stdout.php
index 6865007c448d7..ccae44b56ffa9 100644
--- a/libraries/src/Application/CLI/Output/Stdout.php
+++ b/libraries/src/Application/CLI/Output/Stdout.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Application\CLI\CliOutput;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Application/CLI/Output/Xml.php b/libraries/src/Application/CLI/Output/Xml.php
index 4dbf69a01839d..36ab151db6441 100644
--- a/libraries/src/Application/CLI/Output/Xml.php
+++ b/libraries/src/Application/CLI/Output/Xml.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Application\CLI\CliOutput;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Application/CMSApplication.php b/libraries/src/Application/CMSApplication.php
index f049e8d7d0561..49b30637ff78e 100644
--- a/libraries/src/Application/CMSApplication.php
+++ b/libraries/src/Application/CMSApplication.php
@@ -12,14 +12,27 @@
 use Joomla\Application\SessionAwareWebApplicationTrait;
 use Joomla\Application\Web\WebClient;
 use Joomla\CMS\Authentication\Authentication;
-use Joomla\CMS\Event\AbstractEvent;
+use Joomla\CMS\Event\Application\AfterCompressEvent;
+use Joomla\CMS\Event\Application\AfterInitialiseEvent;
+use Joomla\CMS\Event\Application\AfterRenderEvent;
+use Joomla\CMS\Event\Application\AfterRespondEvent;
+use Joomla\CMS\Event\Application\AfterRouteEvent;
+use Joomla\CMS\Event\Application\BeforeRenderEvent;
+use Joomla\CMS\Event\Application\BeforeRespondEvent;
 use Joomla\CMS\Event\ErrorEvent;
+use Joomla\CMS\Event\User\AfterLoginEvent;
+use Joomla\CMS\Event\User\AfterLogoutEvent;
+use Joomla\CMS\Event\User\AuthorisationFailureEvent;
+use Joomla\CMS\Event\User\LoginEvent;
+use Joomla\CMS\Event\User\LoginFailureEvent;
+use Joomla\CMS\Event\User\LogoutEvent;
+use Joomla\CMS\Event\User\LogoutFailureEvent;
 use Joomla\CMS\Exception\ExceptionHandler;
 use Joomla\CMS\Extension\ExtensionManagerTrait;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filter\InputFilter;
 use Joomla\CMS\Input\Input;
-use Joomla\CMS\Language\Language;
+use Joomla\CMS\Language\LanguageFactoryInterface;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Menu\AbstractMenu;
@@ -39,7 +52,7 @@
 use Joomla\String\StringHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -154,16 +167,16 @@ 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
-     *                                 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
-     *                                 application's config object, otherwise a default config object is created.
-     * @param   WebClient  $client     An optional argument to provide dependency injection for the application's client
-     *                                 object.  If the argument is a WebClient object that object will become the
-     *                                 application's client object, otherwise a default client object is created.
-     * @param   Container  $container  Dependency injection container.
+     * @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
+     *                                  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
+     *                                  application's config object, otherwise a default config object is created.
+     * @param   ?WebClient  $client     An optional argument to provide dependency injection for the application's client
+     *                                  object.  If the argument is a WebClient object that object will become the
+     *                                  application's client object, otherwise a default client object is created.
+     * @param   ?Container  $container  Dependency injection container.
      *
      * @since   3.2
      */
@@ -269,7 +282,7 @@ function ($systemVariable) use ($input) {
             $input->set($systemVariable, null);
         }
 
-        // Abort when there are invalid variables
+        // Stop when there are invalid variables
         if ($invalidInputVariables) {
             throw new \RuntimeException('Invalid input, aborting application.');
         }
@@ -303,33 +316,40 @@ public function execute()
                 $this->compress();
 
                 // Trigger the onAfterCompress event.
-                $this->triggerEvent('onAfterCompress');
+                $this->dispatchEvent(
+                    'onAfterCompress',
+                    new AfterCompressEvent('onAfterCompress', ['subject' => $this])
+                );
             }
         } catch (\Throwable $throwable) {
-            /** @var ErrorEvent $event */
-            $event = AbstractEvent::create(
+            $event = new ErrorEvent(
                 'onError',
                 [
                     'subject'     => $throwable,
-                    'eventClass'  => ErrorEvent::class,
                     'application' => $this,
                 ]
             );
 
             // Trigger the onError event.
-            $this->triggerEvent('onError', $event);
+            $this->dispatchEvent('onError', $event);
 
             ExceptionHandler::handleException($event->getError());
         }
 
         // Trigger the onBeforeRespond event.
-        $this->getDispatcher()->dispatch('onBeforeRespond');
+        $this->dispatchEvent(
+            'onBeforeRespond',
+            new BeforeRespondEvent('onBeforeRespond', ['subject' => $this])
+        );
 
         // Send the application response.
         $this->respond();
 
         // Trigger the onAfterRespond event.
-        $this->getDispatcher()->dispatch('onAfterRespond');
+        $this->dispatchEvent(
+            'onAfterRespond',
+            new AfterRespondEvent('onAfterRespond', ['subject' => $this])
+        );
     }
 
     /**
@@ -417,7 +437,7 @@ protected function checkUserRequireReset($option, $view, $layout, $tasks)
      *
      * @since   3.2
      *
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  3.2 will be removed in 6.0
      *              Use get() instead
      *              Example: Factory::getApplication()->get($varname, $default);
      */
@@ -425,7 +445,7 @@ public function getCfg($varname, $default = null)
     {
         try {
             Log::add(
-                sprintf('%s() is deprecated and will be removed in 5.0. Use JFactory->getApplication()->get() instead.', __METHOD__),
+                sprintf('%s() is deprecated and will be removed in 6.0. Use Factory->getApplication()->get() instead.', __METHOD__),
                 Log::WARNING,
                 'deprecated'
             );
@@ -453,9 +473,9 @@ public function getClientId()
      *
      * This method must be invoked as: $web = CmsApplication::getInstance();
      *
-     * @param   string     $name       The name (optional) of the CmsApplication class to instantiate.
-     * @param   string     $prefix     The class name prefix of the object.
-     * @param   Container  $container  An optional dependency injection container to inject into the application.
+     * @param   string      $name       The name (optional) of the CmsApplication class to instantiate.
+     * @param   string      $prefix     The class name prefix of the object.
+     * @param   ?Container  $container  An optional dependency injection container to inject into the application.
      *
      * @return  CmsApplication
      *
@@ -674,7 +694,8 @@ public function getUserState($key, $default = null)
      * @param   string  $key      The key of the user state variable.
      * @param   string  $request  The name of the variable passed in a request.
      * @param   string  $default  The default value for the variable if not found. Optional.
-     * @param   string  $type     Filter for the variable, for valid values see {@link InputFilter::clean()}. Optional.
+     * @param   string  $type     Filter for the variable. Optional.
+     *                  @see      \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  mixed  The request user state.
      *
@@ -712,7 +733,7 @@ protected function initialiseApp($options = [])
         }
 
         // Build our language object
-        $lang = Language::getInstance($this->get('language'), $this->get('debug_lang'));
+        $lang = $this->getContainer()->get(LanguageFactoryInterface::class)->createLanguage($this->get('language'), $this->get('debug_lang'));
 
         // Load the language to the API
         $this->loadLanguage($lang);
@@ -738,11 +759,14 @@ protected function initialiseApp($options = [])
         $this->set('editor', $editor);
 
         // Load the behaviour plugins
-        PluginHelper::importPlugin('behaviour');
+        PluginHelper::importPlugin('behaviour', null, true, $this->getDispatcher());
 
         // Trigger the onAfterInitialise event.
-        PluginHelper::importPlugin('system');
-        $this->triggerEvent('onAfterInitialise');
+        PluginHelper::importPlugin('system', null, true, $this->getDispatcher());
+        $this->dispatchEvent(
+            'onAfterInitialise',
+            new AfterInitialiseEvent('onAfterInitialise', ['subject' => $this])
+        );
     }
 
     /**
@@ -820,9 +844,10 @@ public function login($credentials, $options = [])
         // Get the global Authentication object.
         $authenticate = Authentication::getInstance($this->authenticationPluginType);
         $response     = $authenticate->authenticate($credentials, $options);
+        $dispatcher   = $this->getDispatcher();
 
         // Import the user plugin group.
-        PluginHelper::importPlugin('user');
+        PluginHelper::importPlugin('user', null, true, $dispatcher);
 
         if ($response->status === Authentication::STATUS_SUCCESS) {
             /*
@@ -835,7 +860,10 @@ public function login($credentials, $options = [])
             foreach ($authorisations as $authorisation) {
                 if ((int) $authorisation->status & $denied_states) {
                     // Trigger onUserAuthorisationFailure Event.
-                    $this->triggerEvent('onUserAuthorisationFailure', [(array) $authorisation]);
+                    $dispatcher->dispatch('onUserAuthorisationFailure', new AuthorisationFailureEvent('onUserAuthorisationFailure', [
+                        'subject' => (array) $authorisation,
+                        'options' => $options,
+                    ]));
 
                     // If silent is set, just return false.
                     if (isset($options['silent']) && $options['silent']) {
@@ -845,17 +873,17 @@ public function login($credentials, $options = [])
                     // Return the error.
                     switch ($authorisation->status) {
                         case Authentication::STATUS_EXPIRED:
-                            Factory::getApplication()->enqueueMessage(Text::_('JLIB_LOGIN_EXPIRED'), 'error');
+                            $this->enqueueMessage(Text::_('JLIB_LOGIN_EXPIRED'), 'error');
 
                             return false;
 
                         case Authentication::STATUS_DENIED:
-                            Factory::getApplication()->enqueueMessage(Text::_('JLIB_LOGIN_DENIED'), 'error');
+                            $this->enqueueMessage(Text::_('JLIB_LOGIN_DENIED'), 'error');
 
                             return false;
 
                         default:
-                            Factory::getApplication()->enqueueMessage(Text::_('JLIB_LOGIN_AUTHORISATION'), 'error');
+                            $this->enqueueMessage(Text::_('JLIB_LOGIN_AUTHORISATION'), 'error');
 
                             return false;
                     }
@@ -863,7 +891,9 @@ public function login($credentials, $options = [])
             }
 
             // OK, the credentials are authenticated and user is authorised.  Let's fire the onLogin event.
-            $results = $this->triggerEvent('onUserLogin', [(array) $response, $options]);
+            $loginEvent = new LoginEvent('onUserLogin', ['subject' => (array) $response, 'options' => $options]);
+            $dispatcher->dispatch('onUserLogin', $loginEvent);
+            $results = $loginEvent['result'] ?? [];
 
             /*
              * If any of the user plugins did not successfully complete the login routine
@@ -883,14 +913,20 @@ public function login($credentials, $options = [])
                 $options['responseType'] = $response->type;
 
                 // The user is successfully logged in. Run the after login events
-                $this->triggerEvent('onUserAfterLogin', [$options]);
+                $dispatcher->dispatch('onUserAfterLogin', new AfterLoginEvent('onUserAfterLogin', [
+                    'options' => $options,
+                    'subject' => (array) $response,
+                ]));
 
                 return true;
             }
         }
 
         // Trigger onUserLoginFailure Event.
-        $this->triggerEvent('onUserLoginFailure', [(array) $response]);
+        $dispatcher->dispatch('onUserLoginFailure', new LoginFailureEvent('onUserLoginFailure', [
+            'subject' => (array) $response,
+            'options' => $options,
+        ]));
 
         // If silent is set, just return false.
         if (isset($options['silent']) && $options['silent']) {
@@ -925,7 +961,8 @@ public function login($credentials, $options = [])
     public function logout($userid = null, $options = [])
     {
         // Get a user object from the Application.
-        $user = Factory::getUser($userid);
+        $user       = Factory::getUser($userid);
+        $dispatcher = $this->getDispatcher();
 
         // Build the credentials array.
         $parameters = [
@@ -939,21 +976,29 @@ public function logout($userid = null, $options = [])
         }
 
         // Import the user plugin group.
-        PluginHelper::importPlugin('user');
+        PluginHelper::importPlugin('user', null, true, $dispatcher);
 
         // OK, the credentials are built. Lets fire the onLogout event.
-        $results = $this->triggerEvent('onUserLogout', [$parameters, $options]);
+        $logoutEvent = new LogoutEvent('onUserLogout', ['subject' => $parameters, 'options' => $options]);
+        $dispatcher->dispatch('onUserLogout', $logoutEvent);
+        $results = $logoutEvent['result'] ?? [];
 
         // Check if any of the plugins failed. If none did, success.
         if (!\in_array(false, $results, true)) {
             $options['username'] = $user->get('username');
-            $this->triggerEvent('onUserAfterLogout', [$options]);
+            $dispatcher->dispatch('onUserAfterLogout', new AfterLogoutEvent('onUserAfterLogout', [
+                'options' => $options,
+                'subject' => $parameters,
+            ]));
 
             return true;
         }
 
         // Trigger onUserLogoutFailure Event.
-        $this->triggerEvent('onUserLogoutFailure', [$parameters]);
+        $dispatcher->dispatch('onUserLogoutFailure', new LogoutFailureEvent('onUserLogoutFailure', [
+            'subject' => $parameters,
+            'options' => $options,
+        ]));
 
         return false;
     }
@@ -1012,8 +1057,11 @@ protected function render()
         $this->document->parse($this->docOptions);
 
         // Trigger the onBeforeRender event.
-        PluginHelper::importPlugin('system');
-        $this->triggerEvent('onBeforeRender');
+        PluginHelper::importPlugin('system', null, true, $this->getDispatcher());
+        $this->dispatchEvent(
+            'onBeforeRender',
+            new BeforeRenderEvent('onBeforeRender', ['subject' => $this])
+        );
 
         $caching = false;
 
@@ -1028,7 +1076,10 @@ protected function render()
         $this->setBody($data);
 
         // Trigger the onAfterRender event.
-        $this->triggerEvent('onAfterRender');
+        $this->dispatchEvent(
+            'onAfterRender',
+            new AfterRenderEvent('onAfterRender', ['subject' => $this])
+        );
 
         // Mark afterRender in the profiler.
         JDEBUG ? $this->profiler->mark('afterRender') : null;
@@ -1098,8 +1149,11 @@ protected function route()
         }
 
         // Trigger the onAfterRoute event.
-        PluginHelper::importPlugin('system');
-        $this->triggerEvent('onAfterRoute');
+        PluginHelper::importPlugin('system', null, true, $this->getDispatcher());
+        $this->dispatchEvent(
+            'onAfterRoute',
+            new AfterRouteEvent('onAfterRoute', ['subject' => $this])
+        );
     }
 
     /**
diff --git a/libraries/src/Application/CMSApplicationInterface.php b/libraries/src/Application/CMSApplicationInterface.php
index ed0325de36d02..52bb7c30f85d5 100644
--- a/libraries/src/Application/CMSApplicationInterface.php
+++ b/libraries/src/Application/CMSApplicationInterface.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2017 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Application;
@@ -177,7 +177,7 @@ public function getName();
     /**
      * Allows the application to load a custom or default identity.
      *
-     * @param   User  $identity  An optional identity object. If omitted, the factory user is created.
+     * @param   ?User  $identity  An optional identity object. If omitted, the factory user is created.
      *
      * @return  $this
      *
diff --git a/libraries/src/Application/CMSWebApplicationInterface.php b/libraries/src/Application/CMSWebApplicationInterface.php
index 73e11d03812dd..73a728fdb3312 100644
--- a/libraries/src/Application/CMSWebApplicationInterface.php
+++ b/libraries/src/Application/CMSWebApplicationInterface.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Application;
@@ -15,7 +15,7 @@
 use Joomla\CMS\Router\Router;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -80,7 +80,8 @@ public function getUserState($key, $default = null);
      * @param   string  $key      The key of the user state variable.
      * @param   string  $request  The name of the variable passed in a request.
      * @param   string  $default  The default value for the variable if not found. Optional.
-     * @param   string  $type     Filter for the variable, for valid values see {@link InputFilter::clean()}. Optional.
+     * @param   string  $type     Filter for the variable. Optional.
+     *                  @see      \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  mixed  The request user state.
      *
diff --git a/libraries/src/Application/CliApplication.php b/libraries/src/Application/CliApplication.php
index 6dda7a98c4e34..dfe6d2512b561 100644
--- a/libraries/src/Application/CliApplication.php
+++ b/libraries/src/Application/CliApplication.php
@@ -13,6 +13,8 @@
 use Joomla\CMS\Application\CLI\CliInput;
 use Joomla\CMS\Application\CLI\CliOutput;
 use Joomla\CMS\Application\CLI\Output\Stdout;
+use Joomla\CMS\Event\Application\AfterExecuteEvent;
+use Joomla\CMS\Event\Application\BeforeExecuteEvent;
 use Joomla\CMS\Extension\ExtensionManagerTrait;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Language;
@@ -26,7 +28,7 @@
 use Joomla\Session\SessionInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -97,19 +99,19 @@ abstract class CliApplication extends AbstractApplication implements DispatcherA
     /**
      * Class constructor.
      *
-     * @param   Input                $input       An optional argument to provide dependency injection for the application's
-     *                                            input object.  If the argument is a JInputCli 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 application's config object, otherwise a default config object is created.
-     * @param   CliOutput            $output      The output handler.
-     * @param   CliInput             $cliInput    The CLI input handler.
-     * @param   DispatcherInterface  $dispatcher  An optional argument to provide dependency injection for the application's
-     *                                            event dispatcher.  If the argument is a DispatcherInterface object that object will become
-     *                                            the application's event dispatcher, if it is null then the default event dispatcher
-     *                                            will be created based on the application's loadDispatcher() method.
-     * @param   Container            $container   Dependency injection container.
+     * @param   ?Input                $input       An optional argument to provide dependency injection for the application's
+     *                                             input object.  If the argument is a JInputCli 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 application's config object, otherwise a default config object is created.
+     * @param   ?CliOutput            $output      The output handler.
+     * @param   ?CliInput             $cliInput    The CLI input handler.
+     * @param   ?DispatcherInterface  $dispatcher  An optional argument to provide dependency injection for the application's
+     *                                             event dispatcher.  If the argument is a DispatcherInterface object that object will become
+     *                                             the application's event dispatcher, if it is null then the default event dispatcher
+     *                                             will be created based on the application's loadDispatcher() method.
+     * @param   ?Container            $container   Dependency injection container.
      *
      * @since   1.7.0
      */
@@ -257,13 +259,19 @@ public function execute()
         $this->createExtensionNamespaceMap();
 
         // Trigger the onBeforeExecute event
-        $this->triggerEvent('onBeforeExecute');
+        $this->dispatchEvent(
+            'onBeforeExecute',
+            new BeforeExecuteEvent('onBeforeExecute', ['subject' => $this, 'container' => $this->getContainer()])
+        );
 
         // Perform application routines.
         $this->doExecute();
 
         // Trigger the onAfterExecute event.
-        $this->triggerEvent('onAfterExecute');
+        $this->dispatchEvent(
+            'onAfterExecute',
+            new AfterExecuteEvent('onAfterExecute', ['subject' => $this])
+        );
     }
 
     /**
diff --git a/libraries/src/Application/ConsoleApplication.php b/libraries/src/Application/ConsoleApplication.php
index 5d8be7624e194..6f836a04b0ba9 100644
--- a/libraries/src/Application/ConsoleApplication.php
+++ b/libraries/src/Application/ConsoleApplication.php
@@ -9,7 +9,6 @@
 
 namespace Joomla\CMS\Application;
 
-use InvalidArgumentException;
 use Joomla\CMS\Console;
 use Joomla\CMS\Extension\ExtensionManagerTrait;
 use Joomla\CMS\Factory;
@@ -36,7 +35,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -253,8 +252,8 @@ public function execute()
         $this->populateHttpHost();
 
         // Import CMS plugin groups to be able to subscribe to events
-        PluginHelper::importPlugin('system');
-        PluginHelper::importPlugin('console');
+        PluginHelper::importPlugin('system', null, true, $this->getDispatcher());
+        PluginHelper::importPlugin('console', null, true, $this->getDispatcher());
 
         parent::execute();
     }
@@ -483,7 +482,7 @@ public function setName(string $name): void
     public static function getRouter($name = null, array $options = [])
     {
         if (empty($name)) {
-            throw new InvalidArgumentException('A router name must be set in console application.');
+            throw new \InvalidArgumentException('A router name must be set in console application.');
         }
 
         $options['mode'] = Factory::getApplication()->get('sef');
@@ -506,7 +505,7 @@ public static function getRouter($name = null, array $options = [])
      *
      * @return  void
      * @since   4.2.1
-     * @see     https://github.com/joomla/joomla-cms/issues/38518
+     * @link    https://github.com/joomla/joomla-cms/issues/38518
      */
     protected function populateHttpHost()
     {
diff --git a/libraries/src/Application/DaemonApplication.php b/libraries/src/Application/DaemonApplication.php
index abdedf1484ca7..a9b06fcc403e0 100644
--- a/libraries/src/Application/DaemonApplication.php
+++ b/libraries/src/Application/DaemonApplication.php
@@ -9,6 +9,10 @@
 
 namespace Joomla\CMS\Application;
 
+use Joomla\CMS\Event\Application\AfterExecuteEvent;
+use Joomla\CMS\Event\Application\BeforeExecuteEvent;
+use Joomla\CMS\Event\Application\DaemonForkEvent;
+use Joomla\CMS\Event\Application\DaemonReceiveSignalEvent;
 use Joomla\CMS\Filesystem\Folder;
 use Joomla\CMS\Input\Cli;
 use Joomla\CMS\Log\Log;
@@ -16,7 +20,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -99,16 +103,16 @@ abstract class DaemonApplication extends CliApplication
     /**
      * Class constructor.
      *
-     * @param   Cli                  $input       An optional argument to provide dependency injection for the application's
-     *                                            input object.  If the argument is a JInputCli 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 application's config object, otherwise a default config object is created.
-     * @param   DispatcherInterface  $dispatcher  An optional argument to provide dependency injection for the application's
-     *                                            event dispatcher.  If the argument is a DispatcherInterface object that object will become
-     *                                            the application's event dispatcher, if it is null then the default event dispatcher
-     *                                            will be created based on the application's loadDispatcher() method.
+     * @param   ?Cli                  $input       An optional argument to provide dependency injection for the application's
+     *                                             input object.  If the argument is a JInputCli 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 application's config object, otherwise a default config object is created.
+     * @param   ?DispatcherInterface  $dispatcher  An optional argument to provide dependency injection for the application's
+     *                                             event dispatcher.  If the argument is a DispatcherInterface object that object will become
+     *                                             the application's event dispatcher, if it is null then the default event dispatcher
+     *                                             will be created based on the application's loadDispatcher() method.
      *
      * @since   1.7.0
      */
@@ -163,7 +167,13 @@ public static function signal($signal)
         }
 
         // Fire the onReceiveSignal event.
-        static::$instance->triggerEvent('onReceiveSignal', [$signal]);
+        static::$instance->getDispatcher()->dispatch(
+            'onReceiveSignal',
+            new DaemonReceiveSignalEvent('onReceiveSignal', [
+                'signal'  => $signal,
+                'subject' => static::$instance,
+            ])
+        );
 
         switch ($signal) {
             case SIGINT:
@@ -345,7 +355,10 @@ public function loadConfiguration($data)
     public function execute()
     {
         // Trigger the onBeforeExecute event
-        $this->triggerEvent('onBeforeExecute');
+        $this->dispatchEvent(
+            'onBeforeExecute',
+            new BeforeExecuteEvent('onBeforeExecute', ['subject' => $this, 'container' => $this->getContainer()])
+        );
 
         // Enable basic garbage collection.
         gc_enable();
@@ -375,7 +388,10 @@ public function execute()
         }
 
         // Trigger the onAfterExecute event.
-        $this->triggerEvent('onAfterExecute');
+        $this->dispatchEvent(
+            'onAfterExecute',
+            new AfterExecuteEvent('onAfterExecute', ['subject' => $this])
+        );
     }
 
     /**
@@ -768,7 +784,10 @@ protected function writeProcessIdFile()
     protected function postFork()
     {
         // Trigger the onFork event.
-        $this->triggerEvent('onFork');
+        $this->dispatchEvent(
+            'onFork',
+            new DaemonForkEvent('onFork', ['subject' => $this])
+        );
     }
 
     /**
diff --git a/libraries/src/Application/EventAware.php b/libraries/src/Application/EventAware.php
index d90bcd4ddf343..f8a3d75cfa9e7 100644
--- a/libraries/src/Application/EventAware.php
+++ b/libraries/src/Application/EventAware.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Application;
@@ -15,7 +15,7 @@
 use Psr\Log\LoggerInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Application/EventAwareInterface.php b/libraries/src/Application/EventAwareInterface.php
index 262a838a6fc55..c77d9d8a90395 100644
--- a/libraries/src/Application/EventAwareInterface.php
+++ b/libraries/src/Application/EventAwareInterface.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Application;
@@ -23,7 +23,7 @@
  * @since       4.0.0
  * @deprecated  4.3 will be removed in 6.0
  *              This interface will be removed without replacement as the Joomla 3.x compatibility layer will be removed
- * @todo        Move to combat plugin
+ * @todo        Move to compat plugin
  */
 interface EventAwareInterface extends DispatcherAwareInterface
 {
diff --git a/libraries/src/Application/Exception/NotAcceptable.php b/libraries/src/Application/Exception/NotAcceptable.php
index 9613816c68f22..738810110f30e 100644
--- a/libraries/src/Application/Exception/NotAcceptable.php
+++ b/libraries/src/Application/Exception/NotAcceptable.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Application\Exception;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Application/ExtensionNamespaceMapper.php b/libraries/src/Application/ExtensionNamespaceMapper.php
index 4a8071de7c548..c70a672b03a77 100644
--- a/libraries/src/Application/ExtensionNamespaceMapper.php
+++ b/libraries/src/Application/ExtensionNamespaceMapper.php
@@ -4,15 +4,13 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2017 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Application;
 
-use JLoader;
-
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -31,7 +29,7 @@ trait ExtensionNamespaceMapper
      */
     public function createExtensionNamespaceMap()
     {
-        JLoader::register('JNamespacePsr4Map', JPATH_LIBRARIES . '/namespacemap.php');
+        \JLoader::register('JNamespacePsr4Map', JPATH_LIBRARIES . '/namespacemap.php');
         $extensionPsr4Loader = new \JNamespacePsr4Map();
         $extensionPsr4Loader->load();
     }
diff --git a/libraries/src/Application/IdentityAware.php b/libraries/src/Application/IdentityAware.php
index 9e4135c0fc190..08c3d829eb7f9 100644
--- a/libraries/src/Application/IdentityAware.php
+++ b/libraries/src/Application/IdentityAware.php
@@ -4,16 +4,16 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Application;
 
 use Joomla\CMS\User\User;
-use Joomla\CMS\User\UserFactoryInterface;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -23,6 +23,8 @@
  */
 trait IdentityAware
 {
+    use UserFactoryAwareTrait;
+
     /**
      * The application identity object.
      *
@@ -31,14 +33,6 @@ trait IdentityAware
      */
     protected $identity;
 
-    /**
-     * UserFactoryInterface
-     *
-     * @var    UserFactoryInterface
-     * @since  4.0.0
-     */
-    private $userFactory;
-
     /**
      * Get the application identity.
      *
@@ -62,22 +56,8 @@ public function getIdentity()
      */
     public function loadIdentity(User $identity = null)
     {
-        $this->identity = $identity ?: $this->userFactory->loadUserById(0);
+        $this->identity = $identity ?: $this->getUserFactory()->loadUserById(0);
 
         return $this;
     }
-
-    /**
-     * Set the user factory to use.
-     *
-     * @param   UserFactoryInterface  $userFactory  The user factory to use
-     *
-     * @return  void
-     *
-     * @since   4.0.0
-     */
-    public function setUserFactory(UserFactoryInterface $userFactory)
-    {
-        $this->userFactory = $userFactory;
-    }
 }
diff --git a/libraries/src/Application/MultiFactorAuthenticationHandler.php b/libraries/src/Application/MultiFactorAuthenticationHandler.php
index 42fa8b9c3df7e..057dce8a28c6e 100644
--- a/libraries/src/Application/MultiFactorAuthenticationHandler.php
+++ b/libraries/src/Application/MultiFactorAuthenticationHandler.php
@@ -9,7 +9,6 @@
 
 namespace Joomla\CMS\Application;
 
-use Exception;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Date\Date;
 use Joomla\CMS\Encrypt\Aes;
@@ -21,9 +20,8 @@
 use Joomla\CMS\User\User;
 use Joomla\Component\Users\Administrator\Helper\Mfa as MfaHelper;
 use Joomla\Component\Users\Administrator\Table\MfaTable;
-use Joomla\Database\DatabaseDriver;
+use Joomla\Database\DatabaseInterface;
 use Joomla\Database\ParameterType;
-use RuntimeException;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -54,7 +52,7 @@ trait MultiFactorAuthenticationHandler
      * Handle the redirection to the Multi-factor Authentication captive login or setup page.
      *
      * @return  boolean  True if we are currently handling a Multi-factor Authentication captive page.
-     * @throws  Exception
+     * @throws  \Exception
      * @since   4.2.0
      */
     protected function isHandlingMultiFactorAuthentication(): bool
@@ -62,7 +60,7 @@ protected function isHandlingMultiFactorAuthentication(): bool
         // Multi-factor Authentication checks take place only for logged in users.
         try {
             $user = $this->getIdentity() ?? null;
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             return false;
         }
 
@@ -121,7 +119,7 @@ protected function isHandlingMultiFactorAuthentication(): bool
 
         // Prevent non-interactive (non-HTML) content from being loaded until MFA is validated.
         if ($isMFAPending && $isNonHtml) {
-            throw new RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
+            throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
         }
 
         if ($isMFAPending && !$isMFADisallowed) {
@@ -184,7 +182,7 @@ protected function isHandlingMultiFactorAuthentication(): bool
      * Does the current user need to complete MFA authentication before being allowed to access the site?
      *
      * @return  boolean
-     * @throws  Exception
+     * @throws  \Exception
      * @since   4.2.0
      */
     private function isMultiFactorAuthenticationPending(): bool
@@ -258,7 +256,7 @@ private function needsMultiFactorAuthenticationRedirection(): bool
         // Make sure we are logged in
         try {
             $user = $this->getIdentity();
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             // This would happen if we are in CLI or under an old Joomla! version. Either case is not supported.
             return false;
         }
@@ -347,8 +345,8 @@ private function hasRejectedMultiFactorAuthenticationSetup(): bool
     {
         $user       = $this->getIdentity();
         $profileKey = 'mfa.dontshow';
-        /** @var DatabaseDriver $db */
-        $db         = Factory::getContainer()->get('DatabaseDriver');
+        /** @var DatabaseInterface $db */
+        $db         = Factory::getContainer()->get(DatabaseInterface::class);
         $query      = $db->getQuery(true)
             ->select($db->quoteName('profile_value'))
             ->from($db->quoteName('#__user_profiles'))
@@ -359,7 +357,7 @@ private function hasRejectedMultiFactorAuthenticationSetup(): bool
 
         try {
             $result = $db->setQuery($query)->loadResult();
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $result = 1;
         }
 
@@ -380,8 +378,8 @@ private function migrateFromLegacyMFA(): void
             return;
         }
 
-        /** @var DatabaseDriver $db */
-        $db         = Factory::getContainer()->get('DatabaseDriver');
+        /** @var DatabaseInterface $db */
+        $db         = Factory::getContainer()->get(DatabaseInterface::class);
 
         $userTable = new UserTable($db);
 
@@ -409,6 +407,8 @@ private function migrateFromLegacyMFA(): void
                             'default'    => 0,
                             'created_on' => Date::getInstance()->toSql(),
                             'last_used'  => null,
+                            'tries'      => 0,
+                            'try_count'  => null,
                             'options'    => ['key' => $config['code']],
                         ]
                     );
@@ -425,6 +425,8 @@ private function migrateFromLegacyMFA(): void
                             'default'    => 0,
                             'created_on' => Date::getInstance()->toSql(),
                             'last_used'  => null,
+                            'tries'      => 0,
+                            'try_count'  => null,
                             'options'    => ['id' => $config['yubikey']],
                         ]
                     );
@@ -458,6 +460,8 @@ private function migrateFromLegacyMFA(): void
                     'default'    => 0,
                     'created_on' => Date::getInstance()->toSql(),
                     'last_used'  => null,
+                    'tries'      => 0,
+                    'try_count'  => null,
                     'options'    => @json_decode($otep, true),
                 ]
             );
@@ -480,7 +484,7 @@ private function migrateFromLegacyMFA(): void
      *
      * @return  string  Decrypted, but JSON-encoded, information
      *
-     * @see     https://github.com/joomla/joomla-cms/pull/12497
+     * @link    https://github.com/joomla/joomla-cms/pull/12497
      * @since   4.2.0
      */
     private function decryptLegacyTFAString(string $secret, string $stringToDecrypt): string
@@ -488,7 +492,7 @@ private function decryptLegacyTFAString(string $secret, string $stringToDecrypt)
         // Is this already decrypted?
         try {
             $decrypted = @json_decode($stringToDecrypt, true);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $decrypted = null;
         }
 
diff --git a/libraries/src/Application/SiteApplication.php b/libraries/src/Application/SiteApplication.php
index 5506fe9043c50..03d95d8e81cf9 100644
--- a/libraries/src/Application/SiteApplication.php
+++ b/libraries/src/Application/SiteApplication.php
@@ -13,6 +13,9 @@
 use Joomla\CMS\Cache\CacheControllerFactoryAwareTrait;
 use Joomla\CMS\Cache\Controller\OutputController;
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Event\Application\AfterDispatchEvent;
+use Joomla\CMS\Event\Application\AfterInitialiseDocumentEvent;
+use Joomla\CMS\Event\Application\AfterRouteEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filter\InputFilter;
 use Joomla\CMS\Input\Input;
@@ -28,7 +31,7 @@
 use Joomla\String\StringHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -68,16 +71,16 @@ 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
-     *                                 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
-     *                                 application's config object, otherwise a default config object is created.
-     * @param   WebClient  $client     An optional argument to provide dependency injection for the application's client
-     *                                 object.  If the argument is a WebClient object that object will become the
-     *                                 application's client object, otherwise a default client object is created.
-     * @param   Container  $container  Dependency injection container.
+     * @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
+     *                                  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
+     *                                  application's config object, otherwise a default config object is created.
+     * @param   ?WebClient  $client     An optional argument to provide dependency injection for the application's client
+     *                                  object.  If the argument is a WebClient object that object will become the
+     *                                  application's client object, otherwise a default client object is created.
+     * @param   ?Container  $container  Dependency injection container.
      *
      * @since   3.2
      */
@@ -205,12 +208,21 @@ public function dispatch($component = null)
             $document->setGenerator('Joomla! - Open Source Content Management');
         }
 
+        // Trigger the onAfterInitialiseDocument event.
+        PluginHelper::importPlugin('system', null, true, $this->getDispatcher());
+        $this->dispatchEvent(
+            'onAfterInitialiseDocument',
+            new AfterInitialiseDocumentEvent('onAfterInitialiseDocument', ['subject' => $this, 'document' => $document])
+        );
+
         $contents = ComponentHelper::renderComponent($component);
-        $document->setBuffer($contents, 'component');
+        $document->setBuffer($contents, ['type' => 'component']);
 
         // Trigger the onAfterDispatch event.
-        PluginHelper::importPlugin('system');
-        $this->triggerEvent('onAfterDispatch');
+        $this->dispatchEvent(
+            'onAfterDispatch',
+            new AfterDispatchEvent('onAfterDispatch', ['subject' => $this])
+        );
     }
 
     /**
@@ -786,8 +798,11 @@ protected function route()
         }
 
         // Trigger the onAfterRoute event.
-        PluginHelper::importPlugin('system');
-        $this->triggerEvent('onAfterRoute');
+        PluginHelper::importPlugin('system', null, true, $this->getDispatcher());
+        $this->dispatchEvent(
+            'onAfterRoute',
+            new AfterRouteEvent('onAfterRoute', ['subject' => $this])
+        );
 
         $Itemid = $this->input->getInt('Itemid', null);
         $this->authorise($Itemid);
diff --git a/libraries/src/Application/WebApplication.php b/libraries/src/Application/WebApplication.php
index de21e3fbcabc4..5e1635ae9355f 100644
--- a/libraries/src/Application/WebApplication.php
+++ b/libraries/src/Application/WebApplication.php
@@ -12,6 +12,12 @@
 use Joomla\Application\AbstractWebApplication;
 use Joomla\Application\Web\WebClient;
 use Joomla\CMS\Document\Document;
+use Joomla\CMS\Event\Application\AfterExecuteEvent;
+use Joomla\CMS\Event\Application\AfterRenderEvent;
+use Joomla\CMS\Event\Application\AfterRespondEvent;
+use Joomla\CMS\Event\Application\BeforeExecuteEvent;
+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;
@@ -19,12 +25,13 @@
 use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\User\User;
 use Joomla\CMS\Version;
+use Joomla\Filter\OutputFilter;
 use Joomla\Registry\Registry;
 use Joomla\Session\SessionEvent;
 use Psr\Http\Message\ResponseInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -51,7 +58,7 @@ abstract class WebApplication extends AbstractWebApplication
      * @var    integer
      * @since  4.3.0
      *
-     * @deprecated __DEPLOY_VERSION__ will be removed in 6.0 as this property is not used anymore
+     * @deprecated 4.4.0 will be removed in 6.0 as this property is not used anymore
      */
     public $item_associations;
 
@@ -82,19 +89,19 @@ 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
-     *                                        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 application's config object, otherwise a default config object is created.
-     * @param   WebClient          $client    An optional argument to provide dependency injection for the application's
-     *                                        client object.  If the argument is a WebClient object that object will become
-     *                                        the application's client object, otherwise a default client object is created.
-     * @param   ResponseInterface  $response  An optional argument to provide dependency injection for the application's
-     *                                        response object.  If the argument is a ResponseInterface object that object
-     *                                        will become the application's response object, otherwise a default response
-     *                                        object is created.
+     * @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 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 application's config object, otherwise a default config object is created.
+     * @param   ?WebClient          $client    An optional argument to provide dependency injection for the application's
+     *                                         client object.  If the argument is a WebClient object that object will become
+     *                                         the application's client object, otherwise a default client object is created.
+     * @param   ?ResponseInterface  $response  An optional argument to provide dependency injection for the application's
+     *                                         response object.  If the argument is a ResponseInterface object that object
+     *                                         will become the application's response object, otherwise a default response
+     *                                         object is created.
      *
      * @since   1.7.3
      */
@@ -153,24 +160,36 @@ public static function getInstance($name = null)
     public function execute()
     {
         // Trigger the onBeforeExecute event.
-        $this->triggerEvent('onBeforeExecute');
+        $this->dispatchEvent(
+            'onBeforeExecute',
+            new BeforeExecuteEvent('onBeforeExecute', ['subject' => $this])
+        );
 
         // Perform application routines.
         $this->doExecute();
 
         // Trigger the onAfterExecute event.
-        $this->triggerEvent('onAfterExecute');
+        $this->dispatchEvent(
+            'onAfterExecute',
+            new AfterExecuteEvent('onAfterExecute', ['subject' => $this])
+        );
 
         // If we have an application document object, render it.
         if ($this->document instanceof Document) {
             // Trigger the onBeforeRender event.
-            $this->triggerEvent('onBeforeRender');
+            $this->dispatchEvent(
+                'onBeforeRender',
+                new BeforeRenderEvent('onBeforeRender', ['subject' => $this])
+            );
 
             // Render the application output.
             $this->render();
 
             // Trigger the onAfterRender event.
-            $this->triggerEvent('onAfterRender');
+            $this->dispatchEvent(
+                'onAfterRender',
+                new AfterRenderEvent('onAfterRender', ['subject' => $this])
+            );
         }
 
         // If gzip compression is enabled in configuration and the server is compliant, compress the output.
@@ -179,13 +198,19 @@ public function execute()
         }
 
         // Trigger the onBeforeRespond event.
-        $this->triggerEvent('onBeforeRespond');
+        $this->dispatchEvent(
+            'onBeforeRespond',
+            new BeforeRespondEvent('onBeforeRespond', ['subject' => $this])
+        );
 
         // Send the application response.
         $this->respond();
 
         // Trigger the onAfterRespond event.
-        $this->triggerEvent('onAfterRespond');
+        $this->dispatchEvent(
+            'onAfterRespond',
+            new AfterRespondEvent('onAfterRespond', ['subject' => $this])
+        );
     }
 
     /**
@@ -267,7 +292,7 @@ public function flushAssets()
      * but for many applications it will make sense to override this method and create a document,
      * if required, based on more specific needs.
      *
-     * @param   Document  $document  An optional document object. If omitted, the factory document is created.
+     * @param   ?Document  $document  An optional document object. If omitted, the factory document is created.
      *
      * @return  WebApplication This method is chainable.
      *
@@ -287,7 +312,7 @@ public function loadDocument(Document $document = null)
      * but for many applications it will make sense to override this method and create a language,
      * if required, based on more specific needs.
      *
-     * @param   Language  $language  An optional language object. If omitted, the factory language is created.
+     * @param   ?Language  $language  An optional language object. If omitted, the factory language is created.
      *
      * @return  WebApplication This method is chainable.
      *
@@ -296,6 +321,7 @@ public function loadDocument(Document $document = null)
     public function loadLanguage(Language $language = null)
     {
         $this->language = $language ?? Factory::getLanguage();
+        OutputFilter::setLanguage($this->language);
 
         return $this;
     }
@@ -307,7 +333,7 @@ public function loadLanguage(Language $language = null)
      * but for many applications it will make sense to override this method and create a session,
      * if required, based on more specific needs.
      *
-     * @param   Session  $session  An optional session object. If omitted, the session is created.
+     * @param   ?Session  $session  An optional session object. If omitted, the session is created.
      *
      * @return  WebApplication This method is chainable.
      *
diff --git a/libraries/src/Association/AssociationExtensionHelper.php b/libraries/src/Association/AssociationExtensionHelper.php
index 64ab6951fe009..635509c38cf13 100644
--- a/libraries/src/Association/AssociationExtensionHelper.php
+++ b/libraries/src/Association/AssociationExtensionHelper.php
@@ -12,7 +12,7 @@
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Association/AssociationExtensionInterface.php b/libraries/src/Association/AssociationExtensionInterface.php
index ac04d06534cbf..9f16eb6a52f4c 100644
--- a/libraries/src/Association/AssociationExtensionInterface.php
+++ b/libraries/src/Association/AssociationExtensionInterface.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Association;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Association/AssociationServiceInterface.php b/libraries/src/Association/AssociationServiceInterface.php
index db5efd251d8e8..f8f2915630341 100644
--- a/libraries/src/Association/AssociationServiceInterface.php
+++ b/libraries/src/Association/AssociationServiceInterface.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Association;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Association/AssociationServiceTrait.php b/libraries/src/Association/AssociationServiceTrait.php
index 5e30dcc7d650c..192c176db959c 100644
--- a/libraries/src/Association/AssociationServiceTrait.php
+++ b/libraries/src/Association/AssociationServiceTrait.php
@@ -4,13 +4,13 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Association;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Authentication/Authentication.php b/libraries/src/Authentication/Authentication.php
index 1deb76aa4e3f5..c1902b894762f 100644
--- a/libraries/src/Authentication/Authentication.php
+++ b/libraries/src/Authentication/Authentication.php
@@ -9,15 +9,18 @@
 
 namespace Joomla\CMS\Authentication;
 
+use Joomla\CMS\Event\User\AuthenticationEvent;
+use Joomla\CMS\Event\User\AuthorisationEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\Event\Dispatcher;
 use Joomla\Event\DispatcherAwareTrait;
 use Joomla\Event\DispatcherInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -149,40 +152,18 @@ public static function getInstance(string $pluginType = 'authentication')
      */
     public function authenticate($credentials, $options = [])
     {
-        // Get plugins
-        $plugins = PluginHelper::getPlugin($this->pluginType);
-
         // Create authentication response
         $response = new AuthenticationResponse();
 
-        /*
-         * Loop through the plugins and check if the credentials can be used to authenticate
-         * the user
-         *
-         * Any errors raised in the plugin should be returned via the AuthenticationResponse
-         * and handled appropriately.
-         */
-        foreach ($plugins as $plugin) {
-            $plugin = Factory::getApplication()->bootPlugin($plugin->name, $plugin->type);
-
-            if (!method_exists($plugin, 'onUserAuthenticate')) {
-                // Bail here if the plugin can't be created
-                Log::add(Text::sprintf('JLIB_USER_ERROR_AUTHENTICATION_FAILED_LOAD_PLUGIN', $plugin->name), Log::WARNING, 'jerror');
-                continue;
-            }
-
-            // Try to authenticate
-            $plugin->onUserAuthenticate($credentials, $options, $response);
-
-            // If authentication is successful break out of the loop
-            if ($response->status === self::STATUS_SUCCESS) {
-                if (empty($response->type)) {
-                    $response->type = $plugin->_name ?? $plugin->name;
-                }
-
-                break;
-            }
-        }
+        // Dispatch onUserAuthenticate event in the isolated dispatcher
+        $dispatcher = new Dispatcher();
+        PluginHelper::importPlugin($this->pluginType, null, true, $dispatcher);
+
+        $dispatcher->dispatch('onUserAuthenticate', new AuthenticationEvent('onUserAuthenticate', [
+            'credentials' => $credentials,
+            'options'     => $options,
+            'subject'     => $response,
+        ]));
 
         if (empty($response->username)) {
             $response->username = $credentials['username'];
@@ -212,10 +193,14 @@ public function authenticate($credentials, $options = [])
      */
     public function authorise($response, $options = [])
     {
+        $dispatcher = $this->getDispatcher();
+
         // Get plugins in case they haven't been imported already
-        PluginHelper::importPlugin('user');
-        $results = Factory::getApplication()->triggerEvent('onUserAuthorisation', [$response, $options]);
+        PluginHelper::importPlugin('user', null, true, $dispatcher);
+
+        $event = new AuthorisationEvent('onUserAuthorisation', ['subject' => $response, 'options' => $options]);
+        $dispatcher->dispatch('onUserAuthorisation', $event);
 
-        return $results;
+        return $event['result'] ?? [];
     }
 }
diff --git a/libraries/src/Authentication/AuthenticationResponse.php b/libraries/src/Authentication/AuthenticationResponse.php
index e1f5a309045b2..6251a81c9c01c 100644
--- a/libraries/src/Authentication/AuthenticationResponse.php
+++ b/libraries/src/Authentication/AuthenticationResponse.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Authentication;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Authentication/Password/Argon2iHandler.php b/libraries/src/Authentication/Password/Argon2iHandler.php
index d6517173d6f72..d470fc284ea7a 100644
--- a/libraries/src/Authentication/Password/Argon2iHandler.php
+++ b/libraries/src/Authentication/Password/Argon2iHandler.php
@@ -12,7 +12,7 @@
 use Joomla\Authentication\Password\Argon2iHandler as BaseArgon2iHandler;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Authentication/Password/Argon2idHandler.php b/libraries/src/Authentication/Password/Argon2idHandler.php
index cba7d23e4e97d..28556c5768daa 100644
--- a/libraries/src/Authentication/Password/Argon2idHandler.php
+++ b/libraries/src/Authentication/Password/Argon2idHandler.php
@@ -12,7 +12,7 @@
 use Joomla\Authentication\Password\Argon2idHandler as BaseArgon2idHandler;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Authentication/Password/BCryptHandler.php b/libraries/src/Authentication/Password/BCryptHandler.php
index e78492d88feaa..ae6e30fbb2f45 100644
--- a/libraries/src/Authentication/Password/BCryptHandler.php
+++ b/libraries/src/Authentication/Password/BCryptHandler.php
@@ -12,7 +12,7 @@
 use Joomla\Authentication\Password\BCryptHandler as BaseBCryptHandler;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Authentication/Password/ChainedHandler.php b/libraries/src/Authentication/Password/ChainedHandler.php
index 349f571882884..d24c097190ccc 100644
--- a/libraries/src/Authentication/Password/ChainedHandler.php
+++ b/libraries/src/Authentication/Password/ChainedHandler.php
@@ -12,7 +12,7 @@
 use Joomla\Authentication\Password\HandlerInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Authentication/Password/CheckIfRehashNeededHandlerInterface.php b/libraries/src/Authentication/Password/CheckIfRehashNeededHandlerInterface.php
index bf4d9bab298d2..01cc5ffa891a5 100644
--- a/libraries/src/Authentication/Password/CheckIfRehashNeededHandlerInterface.php
+++ b/libraries/src/Authentication/Password/CheckIfRehashNeededHandlerInterface.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Authentication\Password;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Authentication/Password/MD5Handler.php b/libraries/src/Authentication/Password/MD5Handler.php
index 97c76e7dcb8cf..ff600cd0cc6b0 100644
--- a/libraries/src/Authentication/Password/MD5Handler.php
+++ b/libraries/src/Authentication/Password/MD5Handler.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\User\UserHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Authentication/Password/PHPassHandler.php b/libraries/src/Authentication/Password/PHPassHandler.php
index 3f534dbabbf44..823123e5bb178 100644
--- a/libraries/src/Authentication/Password/PHPassHandler.php
+++ b/libraries/src/Authentication/Password/PHPassHandler.php
@@ -12,7 +12,7 @@
 use Joomla\Authentication\Password\HandlerInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Authentication/ProviderAwareAuthenticationPluginInterface.php b/libraries/src/Authentication/ProviderAwareAuthenticationPluginInterface.php
index 40f75e33c52ba..d1baa474e8f6e 100644
--- a/libraries/src/Authentication/ProviderAwareAuthenticationPluginInterface.php
+++ b/libraries/src/Authentication/ProviderAwareAuthenticationPluginInterface.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Authentication;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Cache/Cache.php b/libraries/src/Cache/Cache.php
index 1666375837e2e..312fdf892d35f 100644
--- a/libraries/src/Cache/Cache.php
+++ b/libraries/src/Cache/Cache.php
@@ -12,8 +12,8 @@
 use Joomla\Application\Web\WebClient;
 use Joomla\CMS\Cache\Exception\CacheExceptionInterface;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Session\Session;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
diff --git a/libraries/src/Cache/CacheController.php b/libraries/src/Cache/CacheController.php
index d0409c550a73a..b90898ded0654 100644
--- a/libraries/src/Cache/CacheController.php
+++ b/libraries/src/Cache/CacheController.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Cache;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
diff --git a/libraries/src/Cache/CacheStorage.php b/libraries/src/Cache/CacheStorage.php
index 32e5647634c86..1684cce651e24 100644
--- a/libraries/src/Cache/CacheStorage.php
+++ b/libraries/src/Cache/CacheStorage.php
@@ -11,7 +11,7 @@
 
 use Joomla\CMS\Cache\Exception\UnsupportedCacheException;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
diff --git a/libraries/src/Captcha/Captcha.php b/libraries/src/Captcha/Captcha.php
index 5a39d7a440af6..31128e5aa0850 100644
--- a/libraries/src/Captcha/Captcha.php
+++ b/libraries/src/Captcha/Captcha.php
@@ -19,7 +19,7 @@
 use Joomla\Event\DispatcherInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -37,9 +37,19 @@ class Captcha implements DispatcherAwareInterface
      *
      * @var    CMSPlugin
      * @since  2.5
+     *
+     * @deprecated  Should use Provider instance
      */
     private $captcha;
 
+    /**
+     * Captcha Provider instance
+     *
+     * @var    CaptchaProviderInterface
+     * @since  5.0.0
+     */
+    private $provider;
+
     /**
      * Editor Plugin name
      *
@@ -69,13 +79,25 @@ public function __construct($captcha, $options)
     {
         $this->name = $captcha;
 
-        if (!empty($options['dispatcher']) && $options['dispatcher'] instanceof DispatcherInterface) {
-            $this->setDispatcher($options['dispatcher']);
+        /** @var  CaptchaRegistry  $registry */
+        $registry = $options['registry'] ?? Factory::getContainer()->get(CaptchaRegistry::class);
+
+        if ($registry->has($captcha)) {
+            $this->provider = $registry->get($captcha);
         } else {
-            $this->setDispatcher(Factory::getApplication()->getDispatcher());
+            @trigger_error(
+                'Use of legacy Captcha is deprecated. Use onCaptchaSetup event to register your Captcha provider.',
+                E_USER_DEPRECATED
+            );
+
+            if (!empty($options['dispatcher']) && $options['dispatcher'] instanceof DispatcherInterface) {
+                $this->setDispatcher($options['dispatcher']);
+            } else {
+                $this->setDispatcher(Factory::getApplication()->getDispatcher());
+            }
+
+            $this->_load($options);
         }
-
-        $this->_load($options);
     }
 
     /**
@@ -110,9 +132,15 @@ public static function getInstance($captcha, array $options = [])
      *
      * @since   2.5
      * @throws  \RuntimeException
+     *
+     * @deprecated  Without replacement
      */
     public function initialise($id)
     {
+        if ($this->provider) {
+            return true;
+        }
+
         $arg = ['id' => $id];
 
         $this->update('onInit', $arg);
@@ -134,6 +162,13 @@ public function initialise($id)
      */
     public function display($name, $id, $class = '')
     {
+        if ($this->provider) {
+            return $this->provider->display($name, [
+                'id'    => $id ?: $name,
+                'class' => $class,
+            ]);
+        }
+
         // Check if captcha is already loaded.
         if ($this->captcha === null) {
             return '';
@@ -167,6 +202,10 @@ public function display($name, $id, $class = '')
      */
     public function checkAnswer($code)
     {
+        if ($this->provider) {
+            return $this->provider->checkAnswer($code);
+        }
+
         // Check if captcha is already loaded
         if ($this->captcha === null) {
             return false;
@@ -190,6 +229,11 @@ public function checkAnswer($code)
      */
     public function setupField(CaptchaField $field, \SimpleXMLElement $element)
     {
+        if ($this->provider) {
+            $this->provider->setupField($field, $element);
+            return;
+        }
+
         if ($this->captcha === null) {
             return;
         }
@@ -208,6 +252,8 @@ public function setupField(CaptchaField $field, \SimpleXMLElement $element)
      * @return  mixed
      *
      * @since   4.0.0
+     *
+     * @deprecated  Without replacement
      */
     private function update($name, &$args)
     {
@@ -227,6 +273,8 @@ private function update($name, &$args)
      *
      * @since   2.5
      * @throws  \RuntimeException
+     *
+     * @deprecated  Should use CaptchaRegistry
      */
     private function _load(array $options = [])
     {
diff --git a/libraries/src/Captcha/CaptchaProviderInterface.php b/libraries/src/Captcha/CaptchaProviderInterface.php
new file mode 100644
index 0000000000000..4aa4536f94620
--- /dev/null
+++ b/libraries/src/Captcha/CaptchaProviderInterface.php
@@ -0,0 +1,70 @@
+<?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\Captcha;
+
+use Joomla\CMS\Form\FormField;
+
+/**
+ * Captcha Provider Interface
+ *
+ * @since   5.0.0
+ */
+interface CaptchaProviderInterface
+{
+    /**
+     * Return Captcha name, CMD string.
+     *
+     * @return string
+     * @since   5.0.0
+     */
+    public function getName(): string;
+
+    /**
+     * Gets the challenge HTML
+     *
+     * @param   string  $name        Input name
+     * @param   array   $attributes  The class of the field
+     *
+     * @return  string  The HTML to be embedded in the form
+     *
+     * @since   5.0.0
+     *
+     * @throws  \RuntimeException
+     */
+    public function display(string $name = '', array $attributes = []): string;
+
+    /**
+     * Calls an HTTP POST function to verify if the user's guess was correct.
+     *
+     * @param   string  $code  Answer provided by user
+     *
+     * @return  bool    If the answer is correct, false otherwise
+     *
+     * @since   5.0.0
+     *
+     * @throws  \RuntimeException
+     */
+    public function checkAnswer(string $code = null): bool;
+
+    /**
+     * 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
+     *
+     * @since  5.0.0
+     *
+     * @throws  \RuntimeException
+     */
+    public function setupField(FormField $field, \SimpleXMLElement $element): void;
+}
diff --git a/libraries/src/Captcha/CaptchaRegistry.php b/libraries/src/Captcha/CaptchaRegistry.php
new file mode 100644
index 0000000000000..49c21182083fd
--- /dev/null
+++ b/libraries/src/Captcha/CaptchaRegistry.php
@@ -0,0 +1,119 @@
+<?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\Captcha;
+
+use Joomla\CMS\Captcha\Exception\CaptchaNotFoundException;
+use Joomla\CMS\Event\Captcha\CaptchaSetupEvent;
+use Joomla\Event\DispatcherAwareInterface;
+use Joomla\Event\DispatcherAwareTrait;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Captcha Registry class
+ * @since   5.0.0
+ */
+final class CaptchaRegistry implements DispatcherAwareInterface
+{
+    use DispatcherAwareTrait;
+
+    /**
+     * List of registered elements
+     *
+     * @var    CaptchaProviderInterface[]
+     * @since   5.0.0
+     */
+    private $registry = [];
+
+    /**
+     * Internal flag of initialisation
+     *
+     * @var    boolean
+     * @since   5.0.0
+     */
+    private $initialised = false;
+
+    /**
+     * Return list of all registered elements
+     *
+     * @return CaptchaProviderInterface[]
+     * @since    5.0.0
+     */
+    public function getAll(): array
+    {
+        return array_values($this->registry);
+    }
+
+    /**
+     * Check whether the element exists in the registry.
+     *
+     * @param   string  $name  Element name
+     *
+     * @return  bool
+     * @since    5.0.0
+     */
+    public function has(string $name): bool
+    {
+        return !empty($this->registry[$name]);
+    }
+
+    /**
+     * Return element by name.
+     *
+     * @param   string  $name  Element name
+     *
+     * @return  CaptchaProviderInterface
+     * @throws  CaptchaNotFoundException
+     * @since    5.0.0
+     */
+    public function get(string $name): CaptchaProviderInterface
+    {
+        if (empty($this->registry[$name])) {
+            throw new CaptchaNotFoundException(sprintf('Captcha element "%s" not found in the registry.', $name));
+        }
+
+        return $this->registry[$name];
+    }
+
+    /**
+     * Register element in registry, add new or override existing.
+     *
+     * @param   CaptchaProviderInterface $instance
+     *
+     * @return  static
+     * @since    5.0.0
+     */
+    public function add(CaptchaProviderInterface $instance)
+    {
+        $this->registry[$instance->getName()] = $instance;
+
+        return $this;
+    }
+
+    /**
+     * Trigger event to allow register the element through plugins.
+     *
+     * @return  static
+     * @since   5.0.0
+     */
+    public function initRegistry()
+    {
+        if (!$this->initialised) {
+            $this->initialised = true;
+
+            $event = new CaptchaSetupEvent('onCaptchaSetup', ['subject' => $this]);
+            $this->getDispatcher()->dispatch($event->getName(), $event);
+        }
+
+        return $this;
+    }
+}
diff --git a/libraries/src/Captcha/Exception/CaptchaNotFoundException.php b/libraries/src/Captcha/Exception/CaptchaNotFoundException.php
new file mode 100644
index 0000000000000..7824f3bfe55b0
--- /dev/null
+++ b/libraries/src/Captcha/Exception/CaptchaNotFoundException.php
@@ -0,0 +1,23 @@
+<?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\Captcha\Exception;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Exception class defining a missing element
+ *
+ * @since  5.0.0
+ */
+class CaptchaNotFoundException extends \RuntimeException
+{
+}
diff --git a/libraries/src/Captcha/Google/HttpBridgePostRequestMethod.php b/libraries/src/Captcha/Google/HttpBridgePostRequestMethod.php
index cb134f89e32f1..77675cf94075d 100644
--- a/libraries/src/Captcha/Google/HttpBridgePostRequestMethod.php
+++ b/libraries/src/Captcha/Google/HttpBridgePostRequestMethod.php
@@ -16,7 +16,7 @@
 use ReCaptcha\RequestParameters;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Categories/Categories.php b/libraries/src/Categories/Categories.php
index 38932df823bc7..1a4181b69f6af 100644
--- a/libraries/src/Categories/Categories.php
+++ b/libraries/src/Categories/Categories.php
@@ -18,7 +18,7 @@
 use Joomla\Database\ParameterType;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -60,7 +60,7 @@ class Categories implements CategoryInterface, DatabaseAwareInterface
      * @var    string
      * @since  1.6
      */
-    protected $_extension = null;
+    protected $_extension;
 
     /**
      * Name of the linked content table to get category content count
@@ -68,7 +68,7 @@ class Categories implements CategoryInterface, DatabaseAwareInterface
      * @var    string
      * @since  1.6
      */
-    protected $_table = null;
+    protected $_table;
 
     /**
      * Name of the category field
@@ -76,7 +76,7 @@ class Categories implements CategoryInterface, DatabaseAwareInterface
      * @var    string
      * @since  1.6
      */
-    protected $_field = null;
+    protected $_field;
 
     /**
      * Name of the key field
@@ -84,7 +84,7 @@ class Categories implements CategoryInterface, DatabaseAwareInterface
      * @var    string
      * @since  1.6
      */
-    protected $_key = null;
+    protected $_key;
 
     /**
      * Name of the items state field
@@ -92,7 +92,7 @@ class Categories implements CategoryInterface, DatabaseAwareInterface
      * @var    string
      * @since  1.6
      */
-    protected $_statefield = null;
+    protected $_statefield;
 
     /**
      * Array of options
@@ -115,11 +115,11 @@ public function __construct($options)
         $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 = isset($options['statefield']) ? $options['statefield'] : 'state';
+        $this->_statefield = $options['statefield'] ?? 'state';
 
-        $options['access']      = isset($options['access']) ? $options['access'] : 'true';
-        $options['published']   = isset($options['published']) ? $options['published'] : 1;
-        $options['countItems']  = isset($options['countItems']) ? $options['countItems'] : 0;
+        $options['access']      = $options['access'] ?? 'true';
+        $options['published']   = $options['published'] ?? 1;
+        $options['countItems']  = $options['countItems'] ?? 0;
         $options['currentlang'] = Multilanguage::isEnabled() ? Factory::getLanguage()->getTag() : 0;
 
         $this->_options = $options;
@@ -211,10 +211,22 @@ public function getExtension()
         return $this->_extension;
     }
 
+    /**
+     * Returns options.
+     *
+     * @return  array
+     *
+     * @since   4.3.2
+     */
+    public function getOptions()
+    {
+        return $this->_options;
+    }
+
     /**
      * Load method
      *
-     * @param   integer  $id  Id of category to load
+     * @param   int|string  $id  Id of category to load
      *
      * @return  void
      *
@@ -313,20 +325,20 @@ protected function _load($id)
                     'INNER',
                     $db->quoteName('#__categories', 'c'),
                     '(' . $db->quoteName('s.lft') . ' < ' . $db->quoteName('c.lft')
-                        . ' AND ' . $db->quoteName('c.lft') . ' < ' . $db->quoteName('s.rgt')
-                        . ' AND ' . $db->quoteName('c.language')
-                        . ' IN (' . implode(',', $query->bindArray([Factory::getLanguage()->getTag(), '*'], ParameterType::STRING)) . '))'
-                        . ' OR (' . $db->quoteName('c.lft') . ' <= ' . $db->quoteName('s.lft')
-                        . ' AND ' . $db->quoteName('s.rgt') . ' <= ' . $db->quoteName('c.rgt') . ')'
+                    . ' AND ' . $db->quoteName('c.lft') . ' < ' . $db->quoteName('s.rgt')
+                    . ' AND ' . $db->quoteName('c.language')
+                    . ' IN (' . implode(',', $query->bindArray([Factory::getLanguage()->getTag(), '*'], ParameterType::STRING)) . '))'
+                    . ' OR (' . $db->quoteName('c.lft') . ' <= ' . $db->quoteName('s.lft')
+                    . ' AND ' . $db->quoteName('s.rgt') . ' <= ' . $db->quoteName('c.rgt') . ')'
                 );
             } else {
                 $query->join(
                     'INNER',
                     $db->quoteName('#__categories', 'c'),
                     '(' . $db->quoteName('s.lft') . ' <= ' . $db->quoteName('c.lft')
-                        . ' AND ' . $db->quoteName('c.lft') . ' < ' . $db->quoteName('s.rgt') . ')'
-                        . ' OR (' . $db->quoteName('c.lft') . ' < ' . $db->quoteName('s.lft')
-                        . ' AND ' . $db->quoteName('s.rgt') . ' < ' . $db->quoteName('c.rgt') . ')'
+                    . ' AND ' . $db->quoteName('c.lft') . ' < ' . $db->quoteName('s.rgt') . ')'
+                    . ' OR (' . $db->quoteName('c.lft') . ' < ' . $db->quoteName('s.lft')
+                    . ' AND ' . $db->quoteName('s.rgt') . ' < ' . $db->quoteName('c.rgt') . ')'
                 );
             }
         } else {
@@ -351,7 +363,7 @@ protected function _load($id)
             if ($this->_options['currentlang'] !== 0) {
                 $subQuery->where(
                     $db->quoteName('i.language')
-                        . ' IN (' . implode(',', $query->bindArray([$this->_options['currentlang'], '*'], ParameterType::STRING)) . ')'
+                    . ' IN (' . implode(',', $query->bindArray([$this->_options['currentlang'], '*'], ParameterType::STRING)) . ')'
                 );
             }
 
diff --git a/libraries/src/Categories/CategoryFactory.php b/libraries/src/Categories/CategoryFactory.php
index 76495d3c53b31..be517f39d9bfb 100644
--- a/libraries/src/Categories/CategoryFactory.php
+++ b/libraries/src/Categories/CategoryFactory.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Categories;
diff --git a/libraries/src/Categories/CategoryInterface.php b/libraries/src/Categories/CategoryInterface.php
index e302694758b2a..dbd04209bfb82 100644
--- a/libraries/src/Categories/CategoryInterface.php
+++ b/libraries/src/Categories/CategoryInterface.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Categories;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Categories/CategoryNode.php b/libraries/src/Categories/CategoryNode.php
index 286537d2ca03f..ebdcc61b51945 100644
--- a/libraries/src/Categories/CategoryNode.php
+++ b/libraries/src/Categories/CategoryNode.php
@@ -10,13 +10,14 @@
 namespace Joomla\CMS\Categories;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Object\CMSObject;
+use Joomla\CMS\Object\LegacyErrorHandlingTrait;
+use Joomla\CMS\Object\LegacyPropertyManagementTrait;
 use Joomla\CMS\Tree\NodeInterface;
 use Joomla\CMS\Tree\NodeTrait;
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -24,8 +25,11 @@
  *
  * @since  1.6
  */
-class CategoryNode extends CMSObject implements NodeInterface
+#[\AllowDynamicProperties]
+class CategoryNode implements NodeInterface
 {
+    use LegacyErrorHandlingTrait;
+    use LegacyPropertyManagementTrait;
     use NodeTrait;
 
     /**
@@ -34,7 +38,7 @@ class CategoryNode extends CMSObject implements NodeInterface
      * @var    integer
      * @since  1.6
      */
-    public $id = null;
+    public $id;
 
     /**
      * The id of the category in the asset table
@@ -42,7 +46,7 @@ class CategoryNode extends CMSObject implements NodeInterface
      * @var    integer
      * @since  1.6
      */
-    public $asset_id = null;
+    public $asset_id;
 
     /**
      * The id of the parent of category in the asset table, 0 for category root
@@ -50,7 +54,7 @@ class CategoryNode extends CMSObject implements NodeInterface
      * @var    integer
      * @since  1.6
      */
-    public $parent_id = null;
+    public $parent_id;
 
     /**
      * The lft value for this category in the category tree
@@ -58,7 +62,7 @@ class CategoryNode extends CMSObject implements NodeInterface
      * @var    integer
      * @since  1.6
      */
-    public $lft = null;
+    public $lft;
 
     /**
      * The rgt value for this category in the category tree
@@ -66,7 +70,7 @@ class CategoryNode extends CMSObject implements NodeInterface
      * @var    integer
      * @since  1.6
      */
-    public $rgt = null;
+    public $rgt;
 
     /**
      * The depth of this category's position in the category tree
@@ -74,7 +78,7 @@ class CategoryNode extends CMSObject implements NodeInterface
      * @var    integer
      * @since  1.6
      */
-    public $level = null;
+    public $level;
 
     /**
      * The extension this category is associated with
@@ -82,7 +86,7 @@ class CategoryNode extends CMSObject implements NodeInterface
      * @var    integer
      * @since  1.6
      */
-    public $extension = null;
+    public $extension;
 
     /**
      * The menu title for the category (a short name)
@@ -90,15 +94,15 @@ class CategoryNode extends CMSObject implements NodeInterface
      * @var    string
      * @since  1.6
      */
-    public $title = null;
+    public $title;
 
     /**
-     * The the alias for the category
+     * The alias for the category
      *
      * @var    string
      * @since  1.6
      */
-    public $alias = null;
+    public $alias;
 
     /**
      * Description of the category.
@@ -106,7 +110,7 @@ class CategoryNode extends CMSObject implements NodeInterface
      * @var    string
      * @since  1.6
      */
-    public $description = null;
+    public $description;
 
     /**
      * The publication status of the category
@@ -114,7 +118,7 @@ class CategoryNode extends CMSObject implements NodeInterface
      * @var    boolean
      * @since  1.6
      */
-    public $published = null;
+    public $published;
 
     /**
      * Whether the category is or is not checked out
@@ -122,7 +126,7 @@ class CategoryNode extends CMSObject implements NodeInterface
      * @var    boolean
      * @since  1.6
      */
-    public $checked_out = null;
+    public $checked_out;
 
     /**
      * The time at which the category was checked out
@@ -130,7 +134,7 @@ class CategoryNode extends CMSObject implements NodeInterface
      * @var    string
      * @since  1.6
      */
-    public $checked_out_time = null;
+    public $checked_out_time;
 
     /**
      * Access level for the category
@@ -138,7 +142,7 @@ class CategoryNode extends CMSObject implements NodeInterface
      * @var    integer
      * @since  1.6
      */
-    public $access = null;
+    public $access;
 
     /**
      * JSON string of parameters
@@ -146,7 +150,7 @@ class CategoryNode extends CMSObject implements NodeInterface
      * @var    string
      * @since  1.6
      */
-    public $params = null;
+    public $params;
 
     /**
      * Metadata description
@@ -154,15 +158,15 @@ class CategoryNode extends CMSObject implements NodeInterface
      * @var    string
      * @since  1.6
      */
-    public $metadesc = null;
+    public $metadesc;
 
     /**
-     * Key words for metadata
+     * Keywords for metadata
      *
      * @var    string
      * @since  1.6
      */
-    public $metakey = null;
+    public $metakey;
 
     /**
      * JSON string of other metadata
@@ -170,7 +174,7 @@ class CategoryNode extends CMSObject implements NodeInterface
      * @var    string
      * @since  1.6
      */
-    public $metadata = null;
+    public $metadata;
 
     /**
      * The ID of the user who created the category
@@ -178,7 +182,7 @@ class CategoryNode extends CMSObject implements NodeInterface
      * @var    integer
      * @since  1.6
      */
-    public $created_user_id = null;
+    public $created_user_id;
 
     /**
      * The time at which the category was created
@@ -186,7 +190,7 @@ class CategoryNode extends CMSObject implements NodeInterface
      * @var    string
      * @since  1.6
      */
-    public $created_time = null;
+    public $created_time;
 
     /**
      * The ID of the user who last modified the category
@@ -194,7 +198,7 @@ class CategoryNode extends CMSObject implements NodeInterface
      * @var    integer
      * @since  1.6
      */
-    public $modified_user_id = null;
+    public $modified_user_id;
 
     /**
      * The time at which the category was modified
@@ -202,7 +206,7 @@ class CategoryNode extends CMSObject implements NodeInterface
      * @var    string
      * @since  1.6
      */
-    public $modified_time = null;
+    public $modified_time;
 
     /**
      * Number of times the category has been viewed
@@ -210,7 +214,7 @@ class CategoryNode extends CMSObject implements NodeInterface
      * @var    integer
      * @since  1.6
      */
-    public $hits = null;
+    public $hits;
 
     /**
      * The language for the category in xx-XX format
@@ -218,7 +222,7 @@ class CategoryNode extends CMSObject implements NodeInterface
      * @var    string
      * @since  1.6
      */
-    public $language = null;
+    public $language;
 
     /**
      * Number of items in this category or descendants of this category
@@ -226,15 +230,7 @@ class CategoryNode extends CMSObject implements NodeInterface
      * @var    integer
      * @since  1.6
      */
-    public $numitems = null;
-
-    /**
-     * Number of children items
-     *
-     * @var    integer
-     * @since  1.6
-     */
-    public $childrennumitems = null;
+    public $numitems;
 
     /**
      * Slug for the category (used in URL)
@@ -242,7 +238,7 @@ class CategoryNode extends CMSObject implements NodeInterface
      * @var    string
      * @since  1.6
      */
-    public $slug = null;
+    public $slug;
 
     /**
      * Array of  assets
@@ -250,7 +246,7 @@ class CategoryNode extends CMSObject implements NodeInterface
      * @var    array
      * @since  1.6
      */
-    public $assets = null;
+    public $assets;
 
     /**
      * Path from root to this category
@@ -274,7 +270,7 @@ class CategoryNode extends CMSObject implements NodeInterface
      * @var    Categories
      * @since  1.6
      */
-    protected $_constructor = null;
+    protected $_constructor;
 
     /**
      * Class constructor
@@ -292,11 +288,7 @@ public function __construct($category = null, $constructor = null)
             if ($constructor) {
                 $this->_constructor = $constructor;
             }
-
-            return true;
         }
-
-        return false;
     }
 
     /**
@@ -304,7 +296,7 @@ public function __construct($category = null, $constructor = null)
      *
      * If the category already has a parent, the link is unset
      *
-     * @param   CategoryNode|null  $parent  CategoryNode for the parent to be set or null
+     * @param   NodeInterface  $parent  CategoryNode for the parent to be set or null
      *
      * @return  void
      *
@@ -319,12 +311,12 @@ public function setParent(NodeInterface $parent)
 
         $this->_parent = $parent;
 
-        $this->_parent->_children[] = & $this;
+        $this->_parent->_children[] = &$this;
 
         if (\count($this->_parent->_children) > 1) {
             end($this->_parent->_children);
             $this->_leftSibling                = prev($this->_parent->_children);
-            $this->_leftSibling->_rightsibling = & $this;
+            $this->_leftSibling->_rightsibling = &$this;
         }
 
         if ($this->parent_id != 1) {
@@ -391,9 +383,9 @@ public function getSibling($right = true)
 
         if ($right) {
             return $this->_rightSibling;
-        } else {
-            return $this->_leftSibling;
         }
+
+        return $this->_leftSibling;
     }
 
     /**
@@ -489,7 +481,7 @@ public function getNumItems($recursive = false)
             $count = $this->numitems;
 
             foreach ($this->getChildren() as $child) {
-                $count = $count + $child->getNumItems(true);
+                $count += $child->getNumItems(true);
             }
 
             return $count;
@@ -497,4 +489,40 @@ public function getNumItems($recursive = false)
 
         return $this->numitems;
     }
+
+    /**
+     * Serialize the node.
+     *
+     * @since   4.3.2
+     */
+    public function __serialize()
+    {
+        $vars = get_object_vars($this);
+
+        // Store constructor as array of options.
+        if ($this->_constructor) {
+            $vars['_constructor'] = $this->_constructor->getOptions();
+        }
+
+        return $vars;
+    }
+
+    /**
+     * Unserialize the node.
+     *
+     * @param   array  $data
+     *
+     * @since   4.3.2
+     */
+    public function __unserialize($data)
+    {
+        foreach ($data as $key => $value) {
+            $this->$key = $value;
+        }
+
+        // Restore constructor from array of options.
+        if ($this->_constructor) {
+            $this->_constructor = Categories::getInstance($this->_constructor['extension'], $this->_constructor);
+        }
+    }
 }
diff --git a/libraries/src/Categories/CategoryServiceInterface.php b/libraries/src/Categories/CategoryServiceInterface.php
index 00b20ecf87a66..19979f6a561e7 100644
--- a/libraries/src/Categories/CategoryServiceInterface.php
+++ b/libraries/src/Categories/CategoryServiceInterface.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Form\Form;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Categories/CategoryServiceTrait.php b/libraries/src/Categories/CategoryServiceTrait.php
index 1872736fd17e7..b23570ef09c85 100644
--- a/libraries/src/Categories/CategoryServiceTrait.php
+++ b/libraries/src/Categories/CategoryServiceTrait.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Categories;
@@ -13,7 +13,7 @@
 use Joomla\CMS\Helper\ContentHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Changelog/Changelog.php b/libraries/src/Changelog/Changelog.php
index a259789195723..268f1b12e5463 100644
--- a/libraries/src/Changelog/Changelog.php
+++ b/libraries/src/Changelog/Changelog.php
@@ -12,13 +12,13 @@
 use Joomla\CMS\Http\HttpFactory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
-use Joomla\CMS\Object\CMSObject;
+use Joomla\CMS\Object\LegacyErrorHandlingTrait;
+use Joomla\CMS\Object\LegacyPropertyManagementTrait;
 use Joomla\CMS\Version;
 use Joomla\Registry\Registry;
-use RuntimeException;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -26,8 +26,11 @@
  *
  * @since  4.0.0
  */
-class Changelog extends CMSObject
+class Changelog
 {
+    use LegacyErrorHandlingTrait;
+    use LegacyPropertyManagementTrait;
+
     /**
      * Update manifest `<element>` element
      *
@@ -338,7 +341,7 @@ public function loadFromXml($url)
         try {
             $http     = HttpFactory::getHttp($httpOption);
             $response = $http->get($url);
-        } catch (RuntimeException $e) {
+        } catch (\RuntimeException $e) {
             $response = null;
         }
 
diff --git a/libraries/src/Client/ClientHelper.php b/libraries/src/Client/ClientHelper.php
index e23c5449803db..0095285ee5e4e 100644
--- a/libraries/src/Client/ClientHelper.php
+++ b/libraries/src/Client/ClientHelper.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Factory;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Client/FtpClient.php b/libraries/src/Client/FtpClient.php
index 027b65b44f5e4..5adb2992b7906 100644
--- a/libraries/src/Client/FtpClient.php
+++ b/libraries/src/Client/FtpClient.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\CMS\Client;
 
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
@@ -208,7 +208,7 @@ public function __construct(array $options = [])
      */
     public function __destruct()
     {
-        if (\is_resource($this->_conn)) {
+        if ($this->_conn) {
             $this->quit();
         }
     }
@@ -293,7 +293,7 @@ public function connect($host = '127.0.0.1', $port = 21)
         $err   = null;
 
         // If already connected, return
-        if (\is_resource($this->_conn)) {
+        if ($this->_conn) {
             return true;
         }
 
@@ -301,7 +301,7 @@ public function connect($host = '127.0.0.1', $port = 21)
         if (FTP_NATIVE) {
             $this->_conn = @ftp_connect($host, $port, $this->_timeout);
 
-            if ($this->_conn === false) {
+            if (!$this->_conn) {
                 Log::add(Text::sprintf('JLIB_CLIENT_ERROR_FTP_NO_CONNECT', __METHOD__, $host, $port), Log::WARNING, 'jerror');
 
                 return false;
@@ -323,7 +323,7 @@ public function connect($host = '127.0.0.1', $port = 21)
         }
 
         // Set the timeout for this connection
-        socket_set_timeout($this->_conn, $this->_timeout, 0);
+        stream_set_timeout($this->_conn, $this->_timeout, 0);
 
         // Check for welcome response code
         if (!$this->_verifyResponse(220)) {
@@ -344,7 +344,7 @@ public function connect($host = '127.0.0.1', $port = 21)
      */
     public function isConnected()
     {
-        return \is_resource($this->_conn);
+        return ($this->_conn);
     }
 
     /**
@@ -1495,7 +1495,7 @@ public function listDetails($path = null, $type = 'all')
         // Here is where it is going to get dirty....
         if ($osType === 'UNIX' || $osType === 'MAC') {
             foreach ($contents as $file) {
-                $tmp_array = null;
+                $tmp_array = [];
 
                 if (@preg_match($regexp, $file, $regs)) {
                     $fType = (int) strpos('-dl', $regs[1][0]);
@@ -1523,13 +1523,13 @@ public function listDetails($path = null, $type = 'all')
                     continue;
                 }
 
-                if (\is_array($tmp_array) && $tmp_array['name'] != '.' && $tmp_array['name'] != '..') {
+                if (\count($tmp_array) && $tmp_array['name'] != '.' && $tmp_array['name'] != '..') {
                     $dir_list[] = $tmp_array;
                 }
             }
         } else {
             foreach ($contents as $file) {
-                $tmp_array = null;
+                $tmp_array = [];
 
                 if (@preg_match($regexp, $file, $regs)) {
                     $fType     = (int) ($regs[7] === '<DIR>');
@@ -1558,7 +1558,7 @@ public function listDetails($path = null, $type = 'all')
                     continue;
                 }
 
-                if (\is_array($tmp_array) && $tmp_array['name'] != '.' && $tmp_array['name'] != '..') {
+                if (\count($tmp_array) && $tmp_array['name'] != '.' && $tmp_array['name'] != '..') {
                     $dir_list[] = $tmp_array;
                 }
             }
@@ -1580,7 +1580,7 @@ public function listDetails($path = null, $type = 'all')
     protected function _putCmd($cmd, $expectedResponse)
     {
         // Make sure we have a connection to the server
-        if (!\is_resource($this->_conn)) {
+        if (!$this->_conn) {
             Log::add(Text::sprintf('JLIB_CLIENT_ERROR_FTP_PUTCMD_UNCONNECTED', __METHOD__), Log::WARNING, 'jerror');
 
             return false;
@@ -1659,7 +1659,7 @@ protected function _passive()
         $err   = null;
 
         // Make sure we have a connection to the server
-        if (!\is_resource($this->_conn)) {
+        if (!$this->_conn) {
             Log::add(Text::sprintf('JLIB_CLIENT_ERROR_FTP_NO_CONNECT', __METHOD__), Log::WARNING, 'jerror');
 
             return false;
@@ -1718,7 +1718,7 @@ protected function _passive()
         }
 
         // Set the timeout for this connection
-        socket_set_timeout($this->_conn, $this->_timeout, 0);
+        stream_set_timeout($this->_conn, $this->_timeout, 0);
 
         return true;
     }
diff --git a/libraries/src/Component/ComponentHelper.php b/libraries/src/Component/ComponentHelper.php
index d9f270471e30b..b7f0ca0294b82 100644
--- a/libraries/src/Component/ComponentHelper.php
+++ b/libraries/src/Component/ComponentHelper.php
@@ -23,7 +23,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Component/ComponentRecord.php b/libraries/src/Component/ComponentRecord.php
index 67a540cd51b3d..3b21ee01a65fd 100644
--- a/libraries/src/Component/ComponentRecord.php
+++ b/libraries/src/Component/ComponentRecord.php
@@ -12,7 +12,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Component/Exception/MissingComponentException.php b/libraries/src/Component/Exception/MissingComponentException.php
index 238f00fff2b25..d862b517f1b50 100644
--- a/libraries/src/Component/Exception/MissingComponentException.php
+++ b/libraries/src/Component/Exception/MissingComponentException.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Router\Exception\RouteNotFoundException;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Component/Router/RouterBase.php b/libraries/src/Component/Router/RouterBase.php
index fe97a039ef608..0755c34336479 100644
--- a/libraries/src/Component/Router/RouterBase.php
+++ b/libraries/src/Component/Router/RouterBase.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Factory;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Component/Router/RouterInterface.php b/libraries/src/Component/Router/RouterInterface.php
index 1f94b56c3a691..4d657632c58de 100644
--- a/libraries/src/Component/Router/RouterInterface.php
+++ b/libraries/src/Component/Router/RouterInterface.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Component\Router;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Component/Router/RouterLegacy.php b/libraries/src/Component/Router/RouterLegacy.php
index 93e2d271ad4e9..cbdee4c6a834f 100644
--- a/libraries/src/Component/Router/RouterLegacy.php
+++ b/libraries/src/Component/Router/RouterLegacy.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Component\Router;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Component/Router/RouterServiceInterface.php b/libraries/src/Component/Router/RouterServiceInterface.php
index 2cb128fb96b2c..b807830021684 100644
--- a/libraries/src/Component/Router/RouterServiceInterface.php
+++ b/libraries/src/Component/Router/RouterServiceInterface.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Menu\AbstractMenu;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Component/Router/RouterServiceTrait.php b/libraries/src/Component/Router/RouterServiceTrait.php
index 2099c2032b97b..c22e3bf853fd4 100644
--- a/libraries/src/Component/Router/RouterServiceTrait.php
+++ b/libraries/src/Component/Router/RouterServiceTrait.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Menu\AbstractMenu;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Component/Router/RouterView.php b/libraries/src/Component/Router/RouterView.php
index 83809c0f40a12..471224f74564a 100644
--- a/libraries/src/Component/Router/RouterView.php
+++ b/libraries/src/Component/Router/RouterView.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Component\Router\Rules\RulesInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Component/Router/Rules/MenuRules.php b/libraries/src/Component/Router/Rules/MenuRules.php
index eddb245693c57..d0dc642ee4a0e 100644
--- a/libraries/src/Component/Router/Rules/MenuRules.php
+++ b/libraries/src/Component/Router/Rules/MenuRules.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Language\Multilanguage;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Component/Router/Rules/NomenuRules.php b/libraries/src/Component/Router/Rules/NomenuRules.php
index 0bbef75499d5e..630c9a82e61b2 100644
--- a/libraries/src/Component/Router/Rules/NomenuRules.php
+++ b/libraries/src/Component/Router/Rules/NomenuRules.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Component\Router\RouterView;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Component/Router/Rules/RulesInterface.php b/libraries/src/Component/Router/Rules/RulesInterface.php
index 2bb970327142e..1690d36109c99 100644
--- a/libraries/src/Component/Router/Rules/RulesInterface.php
+++ b/libraries/src/Component/Router/Rules/RulesInterface.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Component\Router\Rules;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Component/Router/Rules/StandardRules.php b/libraries/src/Component/Router/Rules/StandardRules.php
index 03867c0795ee0..d64a3708d5f25 100644
--- a/libraries/src/Component/Router/Rules/StandardRules.php
+++ b/libraries/src/Component/Router/Rules/StandardRules.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Component\Router\RouterView;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -186,6 +186,9 @@ public function build(&$query, &$segments)
         // Get menu item layout
         $mLayout = isset($item->query['layout']) ? $item->query['layout'] : null;
 
+        // Get menu item filter_tag
+        $mFilterTag = isset($item->query['filter_tag']) ? $item->query['filter_tag'] : null;
+
         // Get all views for this component
         $views = $this->router->getViews();
 
@@ -200,6 +203,10 @@ public function build(&$query, &$segments)
                     unset($query['layout']);
                 }
 
+                if (isset($query['filter_tag']) && $mFilterTag === $query['filter_tag']) {
+                    unset($query['filter_tag']);
+                }
+
                 return;
             }
 
@@ -218,6 +225,10 @@ public function build(&$query, &$segments)
                     unset($query['layout']);
                 }
 
+                if (isset($query['filter_tag']) && $mFilterTag === $query['filter_tag']) {
+                    unset($query['filter_tag']);
+                }
+
                 return;
             }
         }
@@ -274,6 +285,10 @@ public function build(&$query, &$segments)
             if (isset($query['layout']) && $mLayout === $query['layout']) {
                 unset($query['layout']);
             }
+
+            if (isset($query['filter_tag']) && $mFilterTag === $query['filter_tag']) {
+                unset($query['filter_tag']);
+            }
         }
     }
 }
diff --git a/libraries/src/Console/AddUserCommand.php b/libraries/src/Console/AddUserCommand.php
index 5ef793c60433a..93c944641852a 100644
--- a/libraries/src/Console/AddUserCommand.php
+++ b/libraries/src/Console/AddUserCommand.php
@@ -23,7 +23,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Console/AddUserToGroupCommand.php b/libraries/src/Console/AddUserToGroupCommand.php
index f5925e3ba8bca..bd2bcf9fc274b 100644
--- a/libraries/src/Console/AddUserToGroupCommand.php
+++ b/libraries/src/Console/AddUserToGroupCommand.php
@@ -24,7 +24,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Console/ChangeUserPasswordCommand.php b/libraries/src/Console/ChangeUserPasswordCommand.php
index 1468b33636cd6..ee696777f6aa6 100644
--- a/libraries/src/Console/ChangeUserPasswordCommand.php
+++ b/libraries/src/Console/ChangeUserPasswordCommand.php
@@ -19,7 +19,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Console/CheckJoomlaUpdatesCommand.php b/libraries/src/Console/CheckJoomlaUpdatesCommand.php
index fafa4bcff2fb2..46e78b141553b 100644
--- a/libraries/src/Console/CheckJoomlaUpdatesCommand.php
+++ b/libraries/src/Console/CheckJoomlaUpdatesCommand.php
@@ -17,7 +17,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Console/CheckUpdatesCommand.php b/libraries/src/Console/CheckUpdatesCommand.php
index 2861a91acdc5e..4d86e6e4f11a3 100644
--- a/libraries/src/Console/CheckUpdatesCommand.php
+++ b/libraries/src/Console/CheckUpdatesCommand.php
@@ -17,7 +17,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Console/CleanCacheCommand.php b/libraries/src/Console/CleanCacheCommand.php
index 72ce0dd27b87e..4eb43fa4734b5 100644
--- a/libraries/src/Console/CleanCacheCommand.php
+++ b/libraries/src/Console/CleanCacheCommand.php
@@ -17,7 +17,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Console/DeleteUserCommand.php b/libraries/src/Console/DeleteUserCommand.php
index b71cdc3a8221e..6dc7f5c8f9dd9 100644
--- a/libraries/src/Console/DeleteUserCommand.php
+++ b/libraries/src/Console/DeleteUserCommand.php
@@ -23,7 +23,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Console/ExtensionDiscoverCommand.php b/libraries/src/Console/ExtensionDiscoverCommand.php
index 078ce209c2c7a..c4e5c3efd86b1 100644
--- a/libraries/src/Console/ExtensionDiscoverCommand.php
+++ b/libraries/src/Console/ExtensionDiscoverCommand.php
@@ -16,7 +16,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Console/ExtensionDiscoverInstallCommand.php b/libraries/src/Console/ExtensionDiscoverInstallCommand.php
index e58aba2ca928b..11265c607e8f3 100644
--- a/libraries/src/Console/ExtensionDiscoverInstallCommand.php
+++ b/libraries/src/Console/ExtensionDiscoverInstallCommand.php
@@ -20,7 +20,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Console/ExtensionDiscoverListCommand.php b/libraries/src/Console/ExtensionDiscoverListCommand.php
index 70c5f4d505d8c..db26185fa68d3 100644
--- a/libraries/src/Console/ExtensionDiscoverListCommand.php
+++ b/libraries/src/Console/ExtensionDiscoverListCommand.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Console/ExtensionInstallCommand.php b/libraries/src/Console/ExtensionInstallCommand.php
index f535746bd5a74..9a08b58784b42 100644
--- a/libraries/src/Console/ExtensionInstallCommand.php
+++ b/libraries/src/Console/ExtensionInstallCommand.php
@@ -18,7 +18,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Console/ExtensionRemoveCommand.php b/libraries/src/Console/ExtensionRemoveCommand.php
index 96381258b69d0..78728815bd74c 100644
--- a/libraries/src/Console/ExtensionRemoveCommand.php
+++ b/libraries/src/Console/ExtensionRemoveCommand.php
@@ -22,7 +22,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Console/ExtensionsListCommand.php b/libraries/src/Console/ExtensionsListCommand.php
index fb1e0c88907aa..6015d3eb66806 100644
--- a/libraries/src/Console/ExtensionsListCommand.php
+++ b/libraries/src/Console/ExtensionsListCommand.php
@@ -19,7 +19,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Console/FinderIndexCommand.php b/libraries/src/Console/FinderIndexCommand.php
index be127e945e794..f58d4560c7821 100644
--- a/libraries/src/Console/FinderIndexCommand.php
+++ b/libraries/src/Console/FinderIndexCommand.php
@@ -9,8 +9,9 @@
 
 namespace Joomla\CMS\Console;
 
-use Exception;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Language\LanguageAwareInterface;
+use Joomla\CMS\Language\LanguageAwareTrait;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\Component\Finder\Administrator\Indexer\Indexer;
@@ -24,7 +25,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -32,8 +33,10 @@
  *
  * @since  4.0.0
  */
-class FinderIndexCommand extends AbstractCommand
+class FinderIndexCommand extends AbstractCommand implements LanguageAwareInterface
 {
+    use LanguageAwareTrait;
+
     /**
      * The default command name
      *
@@ -239,7 +242,14 @@ private function configureIO(InputInterface $input, OutputInterface $output): vo
     {
         $this->cliInput = $input;
         $this->ioStyle  = new SymfonyStyle($input, $output);
-        $language       = Factory::getLanguage();
+
+        try {
+            $language = $this->getLanguage();
+        } catch (\UnexpectedValueException $e) {
+            @trigger_error(sprintf('Language must be set in 6.0 in %s', __METHOD__), E_USER_DEPRECATED);
+            $language = Factory::getLanguage();
+        }
+
         $language->load('', JPATH_ADMINISTRATOR, null, false, false) ||
         $language->load('', JPATH_ADMINISTRATOR, null, true);
         $language->load('finder_cli', JPATH_SITE, null, false, false) ||
@@ -317,7 +327,7 @@ private function purge()
         // Attempt to purge the index.
         $return = $model->purge();
 
-        // If unsuccessful then abort.
+        // If unsuccessful then stop.
         if (!$return) {
             $message = Text::_('FINDER_CLI_INDEX_PURGE_FAILED', $model->getError());
             $this->ioStyle->error($message);
@@ -425,7 +435,7 @@ private function index()
                     // End of Pausing Section
                 }
             }
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             // Display the error
             $this->ioStyle->error($e->getMessage());
 
diff --git a/libraries/src/Console/GetConfigurationCommand.php b/libraries/src/Console/GetConfigurationCommand.php
index 674a823cad5fb..c0e297a147860 100644
--- a/libraries/src/Console/GetConfigurationCommand.php
+++ b/libraries/src/Console/GetConfigurationCommand.php
@@ -17,7 +17,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Console/ListUserCommand.php b/libraries/src/Console/ListUserCommand.php
index 37c33f6f56ad0..a9a2d593d594f 100644
--- a/libraries/src/Console/ListUserCommand.php
+++ b/libraries/src/Console/ListUserCommand.php
@@ -18,7 +18,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Console/Loader/WritableContainerLoader.php b/libraries/src/Console/Loader/WritableContainerLoader.php
index 05f722366616e..e41b0d789da01 100644
--- a/libraries/src/Console/Loader/WritableContainerLoader.php
+++ b/libraries/src/Console/Loader/WritableContainerLoader.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Console\Exception\CommandNotFoundException;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Console/Loader/WritableLoaderInterface.php b/libraries/src/Console/Loader/WritableLoaderInterface.php
index d63feb8996c30..6ece9579179cc 100644
--- a/libraries/src/Console/Loader/WritableLoaderInterface.php
+++ b/libraries/src/Console/Loader/WritableLoaderInterface.php
@@ -12,7 +12,7 @@
 use Joomla\Console\Loader\LoaderInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Console/RemoveOldFilesCommand.php b/libraries/src/Console/RemoveOldFilesCommand.php
index 471442b03eeb6..ea2d13878c229 100644
--- a/libraries/src/Console/RemoveOldFilesCommand.php
+++ b/libraries/src/Console/RemoveOldFilesCommand.php
@@ -17,7 +17,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Console/RemoveUserFromGroupCommand.php b/libraries/src/Console/RemoveUserFromGroupCommand.php
index 6b4f541f5a55d..39f04bbb43c66 100644
--- a/libraries/src/Console/RemoveUserFromGroupCommand.php
+++ b/libraries/src/Console/RemoveUserFromGroupCommand.php
@@ -24,7 +24,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Console/SessionGcCommand.php b/libraries/src/Console/SessionGcCommand.php
index 860f357c1e03f..c7b5ee557a09a 100644
--- a/libraries/src/Console/SessionGcCommand.php
+++ b/libraries/src/Console/SessionGcCommand.php
@@ -20,7 +20,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Console/SessionMetadataGcCommand.php b/libraries/src/Console/SessionMetadataGcCommand.php
index 77588544a6e6d..b04027cf9c102 100644
--- a/libraries/src/Console/SessionMetadataGcCommand.php
+++ b/libraries/src/Console/SessionMetadataGcCommand.php
@@ -18,7 +18,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Console/SetConfigurationCommand.php b/libraries/src/Console/SetConfigurationCommand.php
index 6e3d8325d2837..d144a4e0102ce 100644
--- a/libraries/src/Console/SetConfigurationCommand.php
+++ b/libraries/src/Console/SetConfigurationCommand.php
@@ -21,7 +21,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Console/SiteDownCommand.php b/libraries/src/Console/SiteDownCommand.php
index af0cc96069d6f..2419eac5b6bc6 100644
--- a/libraries/src/Console/SiteDownCommand.php
+++ b/libraries/src/Console/SiteDownCommand.php
@@ -16,7 +16,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Console/SiteUpCommand.php b/libraries/src/Console/SiteUpCommand.php
index 82a670cc21e72..cc758881f1eb6 100644
--- a/libraries/src/Console/SiteUpCommand.php
+++ b/libraries/src/Console/SiteUpCommand.php
@@ -16,7 +16,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Console/TasksListCommand.php b/libraries/src/Console/TasksListCommand.php
index 25014165b2780..dfefb3937abe8 100644
--- a/libraries/src/Console/TasksListCommand.php
+++ b/libraries/src/Console/TasksListCommand.php
@@ -18,7 +18,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Console/TasksRunCommand.php b/libraries/src/Console/TasksRunCommand.php
index 1a3a0cd09eeca..715340e89eaca 100644
--- a/libraries/src/Console/TasksRunCommand.php
+++ b/libraries/src/Console/TasksRunCommand.php
@@ -19,7 +19,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Console/TasksStateCommand.php b/libraries/src/Console/TasksStateCommand.php
index 26b9faa826ae8..f7fc3fc428a3e 100644
--- a/libraries/src/Console/TasksStateCommand.php
+++ b/libraries/src/Console/TasksStateCommand.php
@@ -23,7 +23,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Console/UpdateCoreCommand.php b/libraries/src/Console/UpdateCoreCommand.php
index 0f46978521134..b73091078169c 100644
--- a/libraries/src/Console/UpdateCoreCommand.php
+++ b/libraries/src/Console/UpdateCoreCommand.php
@@ -21,7 +21,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -224,6 +224,13 @@ private function updateJoomlaCore($updatemodel): bool
                 $this->progressBar->advance();
                 $this->progressBar->setMessage("Cleaning up ...");
 
+                // Remove the administrator/cache/autoload_psr4.php file
+                $autoloadFile = JPATH_CACHE . '/autoload_psr4.php';
+
+                if (file_exists($autoloadFile)) {
+                    File::delete($autoloadFile);
+                }
+
                 // Remove the xml
                 if (file_exists(JPATH_BASE . '/joomla.xml')) {
                     File::delete(JPATH_BASE . '/joomla.xml');
diff --git a/libraries/src/Crypt/Cipher/CryptoCipher.php b/libraries/src/Crypt/Cipher/CryptoCipher.php
index 289229857fd79..5c4b25c2e2133 100644
--- a/libraries/src/Crypt/Cipher/CryptoCipher.php
+++ b/libraries/src/Crypt/Cipher/CryptoCipher.php
@@ -13,7 +13,7 @@
 use Joomla\Crypt\Key;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Crypt/Cipher/SodiumCipher.php b/libraries/src/Crypt/Cipher/SodiumCipher.php
index 557ac66e80ff1..8cf156aedb7ed 100644
--- a/libraries/src/Crypt/Cipher/SodiumCipher.php
+++ b/libraries/src/Crypt/Cipher/SodiumCipher.php
@@ -14,7 +14,7 @@
 use ParagonIE\Sodium\Compat;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Crypt/Crypt.php b/libraries/src/Crypt/Crypt.php
index 8528f2163b8fa..9943c526b2357 100644
--- a/libraries/src/Crypt/Crypt.php
+++ b/libraries/src/Crypt/Crypt.php
@@ -12,7 +12,7 @@
 use Joomla\Crypt\Crypt as JCrypt;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -52,7 +52,7 @@ public static function timingSafeCompare($known, $unknown)
         /**
          * If hash_equals is not available we use a pure PHP implementation by Anthony Ferrara.
          *
-         * @see https://blog.ircmaxell.com/2014/11/its-all-about-time.html
+         * @link https://blog.ircmaxell.com/2014/11/its-all-about-time.html
          */
         $safeLen = strlen($known);
         $userLen = strlen($unknown);
diff --git a/libraries/src/Date/Date.php b/libraries/src/Date/Date.php
index 95f381083359c..bcddd13a98454 100644
--- a/libraries/src/Date/Date.php
+++ b/libraries/src/Date/Date.php
@@ -14,7 +14,7 @@
 use Joomla\Database\DatabaseDriver;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Dispatcher/AbstractModuleDispatcher.php b/libraries/src/Dispatcher/AbstractModuleDispatcher.php
index a2fba15af34ae..dc25399578e50 100644
--- a/libraries/src/Dispatcher/AbstractModuleDispatcher.php
+++ b/libraries/src/Dispatcher/AbstractModuleDispatcher.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Dispatcher;
@@ -62,7 +62,7 @@ public function dispatch()
 
         $displayData = $this->getLayoutData();
 
-        // Abort when display data is false
+        // Stop when display data is false
         if ($displayData === false) {
             return;
         }
@@ -94,7 +94,7 @@ public function dispatch()
      * Returns the layout data. This function can be overridden by subclasses to add more
      * attributes for the layout.
      *
-     * If false is returned, then it means that the dispatch process should be aborted.
+     * If false is returned, then it means that the dispatch process should be stopped.
      *
      * @return  array|false
      *
diff --git a/libraries/src/Dispatcher/ApiDispatcher.php b/libraries/src/Dispatcher/ApiDispatcher.php
index 31552244d3952..6b47e6753bb55 100644
--- a/libraries/src/Dispatcher/ApiDispatcher.php
+++ b/libraries/src/Dispatcher/ApiDispatcher.php
@@ -4,7 +4,7 @@
  * 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
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Dispatcher;
diff --git a/libraries/src/Dispatcher/ComponentDispatcher.php b/libraries/src/Dispatcher/ComponentDispatcher.php
index 14178b2c8d7aa..6e61347d931a4 100644
--- a/libraries/src/Dispatcher/ComponentDispatcher.php
+++ b/libraries/src/Dispatcher/ComponentDispatcher.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Dispatcher;
diff --git a/libraries/src/Dispatcher/ComponentDispatcherFactory.php b/libraries/src/Dispatcher/ComponentDispatcherFactory.php
index 8db87ddb22088..ab1289dd74499 100644
--- a/libraries/src/Dispatcher/ComponentDispatcherFactory.php
+++ b/libraries/src/Dispatcher/ComponentDispatcherFactory.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Dispatcher;
diff --git a/libraries/src/Dispatcher/Dispatcher.php b/libraries/src/Dispatcher/Dispatcher.php
index ffa2a48c2583b..6c59f021c268b 100644
--- a/libraries/src/Dispatcher/Dispatcher.php
+++ b/libraries/src/Dispatcher/Dispatcher.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Dispatcher;
diff --git a/libraries/src/Dispatcher/DispatcherInterface.php b/libraries/src/Dispatcher/DispatcherInterface.php
index e01f1f9320443..d8bbc6896a3ff 100644
--- a/libraries/src/Dispatcher/DispatcherInterface.php
+++ b/libraries/src/Dispatcher/DispatcherInterface.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright   (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Dispatcher;
diff --git a/libraries/src/Dispatcher/LegacyComponentDispatcher.php b/libraries/src/Dispatcher/LegacyComponentDispatcher.php
index 1694a708db480..fdb12e1801c5f 100644
--- a/libraries/src/Dispatcher/LegacyComponentDispatcher.php
+++ b/libraries/src/Dispatcher/LegacyComponentDispatcher.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Dispatcher;
diff --git a/libraries/src/Dispatcher/ModuleDispatcher.php b/libraries/src/Dispatcher/ModuleDispatcher.php
index 56341692d9369..8261424d5805d 100644
--- a/libraries/src/Dispatcher/ModuleDispatcher.php
+++ b/libraries/src/Dispatcher/ModuleDispatcher.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Dispatcher;
diff --git a/libraries/src/Dispatcher/ModuleDispatcherFactory.php b/libraries/src/Dispatcher/ModuleDispatcherFactory.php
index d1fd006f10212..360c06c477c47 100644
--- a/libraries/src/Dispatcher/ModuleDispatcherFactory.php
+++ b/libraries/src/Dispatcher/ModuleDispatcherFactory.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Dispatcher;
diff --git a/libraries/src/Document/Document.php b/libraries/src/Document/Document.php
index 1de51e119cd7e..73e373403027b 100644
--- a/libraries/src/Document/Document.php
+++ b/libraries/src/Document/Document.php
@@ -16,7 +16,7 @@
 use Symfony\Component\WebLink\HttpHeaderSerializer;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Document/DocumentAwareInterface.php b/libraries/src/Document/DocumentAwareInterface.php
new file mode 100644
index 0000000000000..3a202072b930c
--- /dev/null
+++ b/libraries/src/Document/DocumentAwareInterface.php
@@ -0,0 +1,33 @@
+<?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\Document;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Interface to be implemented by classes depending on a document.
+ *
+ * @since  4.4.0
+ */
+interface DocumentAwareInterface
+{
+    /**
+     * Set the document to use.
+     *
+     * @param   Document  $document  The document to use.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function setDocument(Document $document): void;
+}
diff --git a/libraries/src/Document/DocumentAwareTrait.php b/libraries/src/Document/DocumentAwareTrait.php
new file mode 100644
index 0000000000000..b4a4d50199cfb
--- /dev/null
+++ b/libraries/src/Document/DocumentAwareTrait.php
@@ -0,0 +1,61 @@
+<?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\Document;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Defines the trait for a document aware class.
+ *
+ * @since  4.4.0
+ */
+trait DocumentAwareTrait
+{
+    /**
+     * Document
+     *
+     * @var    Document
+     * @since  4.4.0
+     */
+    private $document;
+
+    /**
+     * Get the Document.
+     *
+     * @return  Document
+     *
+     * @since   4.4.0
+     * @throws  \UnexpectedValueException May be thrown if the document has not been set.
+     */
+    protected function getDocument(): Document
+    {
+        if ($this->document) {
+            return $this->document;
+        }
+
+        throw new \UnexpectedValueException('Document not set in ' . __CLASS__);
+    }
+
+    /**
+     * Set the document to use.
+     *
+     * @param   Document  $document  The document to use
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function setDocument(Document $document): void
+    {
+        $this->document = $document;
+    }
+}
diff --git a/libraries/src/Document/DocumentRenderer.php b/libraries/src/Document/DocumentRenderer.php
index 5996cb8b59020..3626e3be6a682 100644
--- a/libraries/src/Document/DocumentRenderer.php
+++ b/libraries/src/Document/DocumentRenderer.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Uri\Uri;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Document/ErrorDocument.php b/libraries/src/Document/ErrorDocument.php
index 9136b1a124e22..b1619728b9129 100644
--- a/libraries/src/Document/ErrorDocument.php
+++ b/libraries/src/Document/ErrorDocument.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Layout\LayoutHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Document/Feed/FeedEnclosure.php b/libraries/src/Document/Feed/FeedEnclosure.php
index 6ae544a79182e..623bca53d2b70 100644
--- a/libraries/src/Document/Feed/FeedEnclosure.php
+++ b/libraries/src/Document/Feed/FeedEnclosure.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Document\Feed;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Document/Feed/FeedImage.php b/libraries/src/Document/Feed/FeedImage.php
index c3cc1a0ebde4d..306d890ae2cab 100644
--- a/libraries/src/Document/Feed/FeedImage.php
+++ b/libraries/src/Document/Feed/FeedImage.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Document\Feed;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Document/Feed/FeedItem.php b/libraries/src/Document/Feed/FeedItem.php
index 31ee73722eafa..c8df8f3572980 100644
--- a/libraries/src/Document/Feed/FeedItem.php
+++ b/libraries/src/Document/Feed/FeedItem.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Document\Feed;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Document/FeedDocument.php b/libraries/src/Document/FeedDocument.php
index 7ac32d509ce75..d874c4600b61f 100644
--- a/libraries/src/Document/FeedDocument.php
+++ b/libraries/src/Document/FeedDocument.php
@@ -15,7 +15,7 @@
 use Joomla\CMS\Language\Text;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Document/HtmlDocument.php b/libraries/src/Document/HtmlDocument.php
index fc3827838b21e..60b19a06077be 100644
--- a/libraries/src/Document/HtmlDocument.php
+++ b/libraries/src/Document/HtmlDocument.php
@@ -16,13 +16,14 @@
 use Joomla\CMS\Filter\InputFilter;
 use Joomla\CMS\Helper\ModuleHelper;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\Toolbar\Toolbar;
+use Joomla\CMS\Toolbar\ToolbarFactoryInterface;
 use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\Utility\Utility;
-use Joomla\Database\ParameterType;
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -122,6 +123,14 @@ class HtmlDocument extends Document implements CacheControllerFactoryAwareInterf
      */
     private $html5 = true;
 
+    /**
+     * List of type \Joomla\CMS\Toolbar\Toolbar
+     *
+     * @var    Toolbar[]
+     * @since  5.0.0
+     */
+    private $toolbars = [];
+
     /**
      * Class constructor
      *
@@ -449,7 +458,7 @@ public function addHeadLink($href, $relation, $relType = 'rel', $attribs = [])
      *
      * @since   1.7.0
      */
-    public function addFavicon($href, $type = 'image/vnd.microsoft.icon', $relation = 'shortcut icon')
+    public function addFavicon($href, $type = 'image/vnd.microsoft.icon', $relation = 'icon')
     {
         $href = str_replace('\\', '/', $href);
         $this->addHeadLink($href, $relation, 'rel', ['type' => $type]);
@@ -590,7 +599,11 @@ public function setBuffer($content, $options = [])
             $options['title'] = $args[3] ?? null;
         }
 
-        parent::$_buffer[$options['type']][$options['name']][$options['title']] = $content;
+        $type  = $options['type'] ?? '';
+        $name  = $options['name'] ?? '';
+        $title = $options['title'] ?? '';
+
+        parent::$_buffer[$type][$name][$title] = $content;
 
         return $this;
     }
@@ -682,35 +695,16 @@ public function countModules(string $positionName, bool $withContentOnly = false
      * @return  integer  Number of child menu items
      *
      * @since   1.7.0
+     *
+     * @deprecated  4.4 will be removed in 6.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`
      */
     public function countMenuChildren()
     {
-        static $children;
-
-        if (!isset($children)) {
-            $db       = CmsFactory::getDbo();
-            $app      = CmsFactory::getApplication();
-            $menu     = $app->getMenu();
-            $active   = $menu->getActive();
-            $children = 0;
-
-            if ($active) {
-                $query = $db->getQuery(true)
-                    ->select('COUNT(*)')
-                    ->from($db->quoteName('#__menu'))
-                    ->where(
-                        [
-                            $db->quoteName('parent_id') . ' = :id',
-                            $db->quoteName('published') . ' = 1',
-                        ]
-                    )
-                    ->bind(':id', $active->id, ParameterType::INTEGER);
-                $db->setQuery($query);
-                $children = $db->loadResult();
-            }
-        }
+        $active = CmsFactory::getApplication()->getMenu()->getActive();
 
-        return $children;
+        return $active ? count($active->getChildren()) : 0;
     }
 
     /**
@@ -794,6 +788,58 @@ protected function _fetchTemplate($params = [])
         return $this;
     }
 
+    /**
+     * Returns a toolbar object or null
+     *
+     * @param   string   $toolbar
+     * @param   boolean  $create
+     *
+     * @return  ?Toolbar
+     *
+     * @since   5.0.0
+     */
+    public function getToolbar(string $toolbar = 'toolbar', bool $create = true): ?Toolbar
+    {
+        if (empty($this->toolbars[$toolbar])) {
+            if (!$create) {
+                return null;
+            }
+
+            $this->toolbars[$toolbar] = CmsFactory::getContainer()->get(ToolbarFactoryInterface::class)->createToolbar($toolbar);
+        }
+
+        return $this->toolbars[$toolbar];
+    }
+
+    /**
+     * Returns the toolbar array
+     *
+     * @return  array
+     *
+     * @since   5.0.0
+     */
+    public function getToolbars(): array
+    {
+        return $this->toolbars;
+    }
+
+    /**
+     * Adds a new or replace an existing toolbar object
+     *
+     * @param   string   $name
+     * @param   Toolbar  $toolbar
+     *
+     * @return  $this
+     *
+     * @since   5.0.0
+     */
+    public function setToolbar(string $name, Toolbar $toolbar): self
+    {
+        $this->toolbars[$name] = $toolbar;
+
+        return $this;
+    }
+
     /**
      * Parse a document template
      *
diff --git a/libraries/src/Document/ImageDocument.php b/libraries/src/Document/ImageDocument.php
index 8a03f30c69b64..cc95458b75b0c 100644
--- a/libraries/src/Document/ImageDocument.php
+++ b/libraries/src/Document/ImageDocument.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Factory;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Document/JsonDocument.php b/libraries/src/Document/JsonDocument.php
index 15c70ee3ef9d2..29e9f4cbb002f 100644
--- a/libraries/src/Document/JsonDocument.php
+++ b/libraries/src/Document/JsonDocument.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Factory as CmsFactory;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -43,16 +43,7 @@ public function __construct($options = [])
         parent::__construct($options);
 
         // Set mime type
-        if (
-            isset($_SERVER['HTTP_ACCEPT'])
-            && strpos($_SERVER['HTTP_ACCEPT'], 'application/json') === false
-            && strpos($_SERVER['HTTP_ACCEPT'], 'text/html') !== false
-        ) {
-            // Internet Explorer < 10
-            $this->_mime = 'text/plain';
-        } else {
-            $this->_mime = 'application/json';
-        }
+        $this->_mime = 'application/json';
 
         // Set document type
         $this->_type = 'json';
@@ -75,11 +66,6 @@ public function render($cache = false, $params = [])
 
         $app->allowCache($cache);
 
-        if ($this->_mime === 'application/json') {
-            // Browser other than Internet Explorer < 10
-            $app->setHeader('Content-Disposition', 'attachment; filename="' . $this->getName() . '.json"', true);
-        }
-
         parent::render($cache, $params);
 
         return $this->getBuffer();
diff --git a/libraries/src/Document/JsonapiDocument.php b/libraries/src/Document/JsonapiDocument.php
index 0daea767a2a32..3efb62a6415f2 100644
--- a/libraries/src/Document/JsonapiDocument.php
+++ b/libraries/src/Document/JsonapiDocument.php
@@ -4,7 +4,7 @@
  * 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
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Document;
@@ -14,7 +14,7 @@
 use Tobscure\JsonApi\ElementInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Document/Opensearch/OpensearchImage.php b/libraries/src/Document/Opensearch/OpensearchImage.php
index 08825454d9ddc..f08e5cbef92da 100644
--- a/libraries/src/Document/Opensearch/OpensearchImage.php
+++ b/libraries/src/Document/Opensearch/OpensearchImage.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Document\Opensearch;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Document/Opensearch/OpensearchUrl.php b/libraries/src/Document/Opensearch/OpensearchUrl.php
index 7284eed464bf7..a545b15d56feb 100644
--- a/libraries/src/Document/Opensearch/OpensearchUrl.php
+++ b/libraries/src/Document/Opensearch/OpensearchUrl.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Document\Opensearch;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Document/OpensearchDocument.php b/libraries/src/Document/OpensearchDocument.php
index 17d1cc917a251..2b2f045b8bc50 100644
--- a/libraries/src/Document/OpensearchDocument.php
+++ b/libraries/src/Document/OpensearchDocument.php
@@ -16,7 +16,7 @@
 use Joomla\CMS\Uri\Uri;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -42,7 +42,7 @@ class OpensearchDocument extends Document
      *
      * optional
      *
-     * @var    object
+     * @var    object[]
      * @since  1.7.0
      */
     private $_images = [];
diff --git a/libraries/src/Document/RawDocument.php b/libraries/src/Document/RawDocument.php
index 4835110c785ca..463bf854bb56e 100644
--- a/libraries/src/Document/RawDocument.php
+++ b/libraries/src/Document/RawDocument.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Document;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Document/Renderer/Feed/AtomRenderer.php b/libraries/src/Document/Renderer/Feed/AtomRenderer.php
index ead0e2ba7409f..3598db8a3e3a9 100644
--- a/libraries/src/Document/Renderer/Feed/AtomRenderer.php
+++ b/libraries/src/Document/Renderer/Feed/AtomRenderer.php
@@ -17,7 +17,7 @@
 use Joomla\CMS\Version;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Document/Renderer/Feed/RssRenderer.php b/libraries/src/Document/Renderer/Feed/RssRenderer.php
index 63852527ba8a4..9c6d533027cb0 100644
--- a/libraries/src/Document/Renderer/Feed/RssRenderer.php
+++ b/libraries/src/Document/Renderer/Feed/RssRenderer.php
@@ -17,7 +17,7 @@
 use Joomla\CMS\Uri\Uri;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Document/Renderer/Html/ComponentRenderer.php b/libraries/src/Document/Renderer/Html/ComponentRenderer.php
index ef26536f28ad0..09f06d1b2054a 100644
--- a/libraries/src/Document/Renderer/Html/ComponentRenderer.php
+++ b/libraries/src/Document/Renderer/Html/ComponentRenderer.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Document\DocumentRenderer;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Document/Renderer/Html/HeadRenderer.php b/libraries/src/Document/Renderer/Html/HeadRenderer.php
index 3a7df26da8409..62da32d411561 100644
--- a/libraries/src/Document/Renderer/Html/HeadRenderer.php
+++ b/libraries/src/Document/Renderer/Html/HeadRenderer.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Document\DocumentRenderer;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Document/Renderer/Html/MessageRenderer.php b/libraries/src/Document/Renderer/Html/MessageRenderer.php
index 21a4760207f99..29891ed6e155e 100644
--- a/libraries/src/Document/Renderer/Html/MessageRenderer.php
+++ b/libraries/src/Document/Renderer/Html/MessageRenderer.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Layout\LayoutHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Document/Renderer/Html/MetasRenderer.php b/libraries/src/Document/Renderer/Html/MetasRenderer.php
index 0f01a38c69bf1..8773d9290dde6 100644
--- a/libraries/src/Document/Renderer/Html/MetasRenderer.php
+++ b/libraries/src/Document/Renderer/Html/MetasRenderer.php
@@ -4,12 +4,13 @@
  * Joomla! Content Management System
  *
  * @copyright   (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Document\Renderer\Html;
 
 use Joomla\CMS\Document\DocumentRenderer;
+use Joomla\CMS\Event\Application\BeforeCompileHeadEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\TagsHelper;
 use Joomla\CMS\Uri\Uri;
@@ -17,7 +18,7 @@
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -58,14 +59,17 @@ public function render($head, $params = [], $content = null)
         }
 
         // Trigger the onBeforeCompileHead event
-        $app->triggerEvent('onBeforeCompileHead');
+        $app->getDispatcher()->dispatch(
+            'onBeforeCompileHead',
+            new BeforeCompileHeadEvent('onBeforeCompileHead', ['subject' => $app, 'document' => $this->_doc])
+        );
 
         // Add Script Options as inline asset
         $scriptOptions = $this->_doc->getScriptOptions();
 
         if ($scriptOptions) {
-            $prettyPrint = (JDEBUG && \defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : false);
-            $jsonOptions = json_encode($scriptOptions, $prettyPrint);
+            $jsonFlags   = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | (JDEBUG ? JSON_PRETTY_PRINT : 0);
+            $jsonOptions = json_encode($scriptOptions, $jsonFlags);
             $jsonOptions = $jsonOptions ?: '{}';
 
             $wa->addInlineScript(
diff --git a/libraries/src/Document/Renderer/Html/ModuleRenderer.php b/libraries/src/Document/Renderer/Html/ModuleRenderer.php
index 58d2a4d2556b5..a61ec98592524 100644
--- a/libraries/src/Document/Renderer/Html/ModuleRenderer.php
+++ b/libraries/src/Document/Renderer/Html/ModuleRenderer.php
@@ -15,7 +15,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Document/Renderer/Html/ModulesRenderer.php b/libraries/src/Document/Renderer/Html/ModulesRenderer.php
index 57d51c4778be6..acb00b6e20735 100644
--- a/libraries/src/Document/Renderer/Html/ModulesRenderer.php
+++ b/libraries/src/Document/Renderer/Html/ModulesRenderer.php
@@ -10,12 +10,14 @@
 namespace Joomla\CMS\Document\Renderer\Html;
 
 use Joomla\CMS\Document\DocumentRenderer;
+use Joomla\CMS\Event\Module;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ModuleHelper;
 use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Proxy\ArrayProxy;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -57,7 +59,13 @@ public function render($position, $params = [], $content = null)
             $buffer .= $moduleHtml;
         }
 
-        $app->triggerEvent('onAfterRenderModules', [&$buffer, &$params]);
+        // Dispatch onAfterRenderModules event
+        $event = new Module\AfterRenderModulesEvent('onAfterRenderModules', [
+            'subject'    => &$buffer, // TODO: Remove reference in Joomla 6, see AfterRenderModulesEvent::__constructor()
+            'attributes' => new ArrayProxy($params),
+        ]);
+        $app->getDispatcher()->dispatch('onAfterRenderModules', $event);
+        $buffer = $event->getContent();
 
         return $buffer;
     }
diff --git a/libraries/src/Document/Renderer/Html/ScriptsRenderer.php b/libraries/src/Document/Renderer/Html/ScriptsRenderer.php
index 447857765b2fa..44787c2002378 100644
--- a/libraries/src/Document/Renderer/Html/ScriptsRenderer.php
+++ b/libraries/src/Document/Renderer/Html/ScriptsRenderer.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright   (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Document\Renderer\Html;
@@ -13,7 +13,7 @@
 use Joomla\CMS\WebAsset\WebAssetItemInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -56,6 +56,9 @@ public function render($head, $params = [], $content = null)
         $inlineAssets   = $wam->filterOutInlineAssets($assets);
         $inlineRelation = $wam->getInlineRelation($inlineAssets);
 
+        // Generate importmap first
+        $buffer .= $this->renderImportmap($assets);
+
         // Merge with existing scripts, for rendering
         $assets = array_merge(array_values($assets), $this->_doc->_scripts);
 
@@ -138,7 +141,7 @@ private function renderElement($item): string
         $src    = $asset ? $asset->getUri() : ($item['src'] ?? '');
 
         // Make sure we have a src, and it not already rendered
-        if (!$src || !empty($this->renderedSrc[$src]) || ($asset && $asset->getOption('webcomponent'))) {
+        if (!$src || !empty($this->renderedSrc[$src])) {
             return '';
         }
 
@@ -159,6 +162,13 @@ private function renderElement($item): string
                 if ($asset->getDependencies()) {
                     $attribs['data-asset-dependencies'] = implode(',', $asset->getDependencies());
                 }
+
+                if ($asset->getOption('deprecated')) {
+                    @trigger_error(
+                        sprintf('Web Asset script [%s] is deprecated. %s', $asset->getName(), $asset->getOption('deprecatedMsg', '')),
+                        E_USER_DEPRECATED
+                    );
+                }
             }
         } else {
             $attribs     = $item;
@@ -313,4 +323,77 @@ private function renderAttributes(array $attributes): string
 
         return $buffer;
     }
+
+    /**
+     * Renders ESM importmap element
+     *
+     * @param   WebAssetItemInterface[]  $assets  The assets list
+     *
+     * @return  string  The attributes string
+     *
+     * @since   5.0.0
+     */
+    private function renderImportmap(array &$assets)
+    {
+        $buffer       = '';
+        $importmap    = ['imports' => []];
+        $tab          = $this->_doc->_getTab();
+        $mediaVersion = $this->_doc->getMediaVersion();
+
+        // Collect a modules for the map
+        foreach ($assets as $k => $item) {
+            // Only importmap:true can be mapped
+            if (!$item->getOption('importmap')) {
+                continue;
+            }
+
+            $esmName  = $item->getOption('importmapName') ?: $item->getName();
+            $esmScope = $item->getOption('importmapScope');
+            $version  = $item->getVersion();
+            $src      = $item->getUri();
+
+            if (!$src) {
+                continue;
+            }
+
+            // Check if script uses media version.
+            if ($version && !str_contains($src, '?') && !str_ends_with($src, '/') && ($mediaVersion || $version !== 'auto')) {
+                $src .= '?' . ($version === 'auto' ? $mediaVersion : $version);
+            }
+
+            if (!$esmScope) {
+                $importmap['imports'][$esmName] = $src;
+            } else {
+                $importmap['scopes'][$esmScope][$esmName] = $src;
+            }
+
+            // Remove the item from list of assets after it were added to the map.
+            unset($assets[$k]);
+        }
+
+        if (!empty($importmap['imports'])) {
+            // Add polyfill when exists
+            if (!empty($assets['es-module-shims'])) {
+                $buffer .= $this->renderElement($assets['es-module-shims']);
+            }
+
+            // Render importmap
+            $jsonImports = json_encode($importmap, JDEBUG ? JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES : JSON_UNESCAPED_SLASHES);
+            $attribs     = ['type' => 'importmap'];
+
+            // Add "nonce" attribute if exist
+            if ($this->_doc->cspNonce && !is_null($this->_doc->cspNonce)) {
+                $attribs['nonce'] = $this->_doc->cspNonce;
+            }
+
+            $buffer .= $tab . '<script';
+            $buffer .= $this->renderAttributes($attribs);
+            $buffer .= '>' . $jsonImports . '</script>';
+        }
+
+        // Remove polyfill for "importmap" from assets list
+        unset($assets['es-module-shims']);
+
+        return $buffer;
+    }
 }
diff --git a/libraries/src/Document/Renderer/Html/StylesRenderer.php b/libraries/src/Document/Renderer/Html/StylesRenderer.php
index 5010ce05e8146..4c637012a837b 100644
--- a/libraries/src/Document/Renderer/Html/StylesRenderer.php
+++ b/libraries/src/Document/Renderer/Html/StylesRenderer.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright   (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Document\Renderer\Html;
@@ -13,7 +13,7 @@
 use Joomla\CMS\WebAsset\WebAssetItemInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -151,6 +151,13 @@ private function renderElement($item): string
                 if ($asset->getDependencies()) {
                     $attribs['data-asset-dependencies'] = implode(',', $asset->getDependencies());
                 }
+
+                if ($asset->getOption('deprecated')) {
+                    @trigger_error(
+                        sprintf('Web Asset style [%s] is deprecated. %s', $asset->getName(), $asset->getOption('deprecatedMsg', '')),
+                        E_USER_DEPRECATED
+                    );
+                }
             }
         } else {
             $attribs     = $item;
diff --git a/libraries/src/Document/XmlDocument.php b/libraries/src/Document/XmlDocument.php
index b350b14f868b0..8d3bf4408b06e 100644
--- a/libraries/src/Document/XmlDocument.php
+++ b/libraries/src/Document/XmlDocument.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Factory as CmsFactory;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Editor/AbstractEditorProvider.php b/libraries/src/Editor/AbstractEditorProvider.php
new file mode 100644
index 0000000000000..fd3efb5f1d6ff
--- /dev/null
+++ b/libraries/src/Editor/AbstractEditorProvider.php
@@ -0,0 +1,100 @@
+<?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\Editor;
+
+use Joomla\CMS\Editor\Button\ButtonInterface;
+use Joomla\CMS\Editor\Button\ButtonsRegistry;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\Event\DispatcherAwareInterface;
+use Joomla\Event\DispatcherAwareTrait;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Abstract editor provider
+ *
+ * @since   5.0.0
+ */
+abstract class AbstractEditorProvider implements EditorProviderInterface, DispatcherAwareInterface
+{
+    use DispatcherAwareTrait;
+
+    /**
+     * Load the editor buttons.
+     *
+     * @param   mixed   $buttons  Array with button names to be excluded. Empty array or boolean true to display all buttons.
+     * @param   array   $options  Associative array with additional parameters
+     *
+     * @return  ButtonInterface[]
+     * @throws \Exception
+     *
+     * @since   5.0.0
+     */
+    public function getButtons($buttons, array $options = []): array
+    {
+        if ($buttons === false) {
+            return [];
+        }
+
+        $loadAll = false;
+
+        if ($buttons === true || $buttons === []) {
+            $buttons = [];
+            $loadAll = true;
+        }
+
+        if (!\is_array($buttons)) {
+            throw new \UnexpectedValueException('The Buttons variable should be an array of names of disabled buttons or boolean.');
+        }
+
+        // Retrieve buttons for current editor
+        $result  = [];
+        $btnsReg = new ButtonsRegistry();
+        $btnsReg->setDispatcher($this->getDispatcher())->initRegistry([
+            'editorType'      => $this->getName(),
+            'disabledButtons' => $buttons,
+            'editorId'        => $options['editorId'] ?? '',
+            'asset'           => (int) ($options['asset'] ?? 0),
+            'author'          => (int) ($options['author'] ?? 0),
+        ]);
+
+        // Go through all and leave only allowed buttons
+        foreach ($btnsReg->getAll() as $button) {
+            $btnName = $button->getButtonName();
+
+            if (!$loadAll && \in_array($btnName, $buttons)) {
+                continue;
+            }
+
+            $result[] = $button;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Helper method for rendering the editor buttons.
+     *
+     * @param   mixed   $buttons  Array with button names to be excluded. Empty array or boolean true to display all buttons.
+     * @param   array   $options  Associative array with additional parameters
+     *
+     * @return  string
+     *
+     * @since   5.0.0
+     */
+    protected function displayButtons($buttons, array $options = [])
+    {
+        $list = $this->getButtons($buttons, $options);
+
+        return $list ? LayoutHelper::render('joomla.editors.buttons', $list) : '';
+    }
+}
diff --git a/libraries/src/Editor/Button/Button.php b/libraries/src/Editor/Button/Button.php
new file mode 100644
index 0000000000000..27a0814da7e81
--- /dev/null
+++ b/libraries/src/Editor/Button/Button.php
@@ -0,0 +1,176 @@
+<?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\Editor\Button;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+final class Button implements ButtonInterface
+{
+    /**
+     * Button name, CMD string.
+     *
+     * @return string
+     * @since   5.0.0
+     */
+    protected $name;
+
+    /**
+     * Button properties.
+     *
+     * @return array
+     * @since   5.0.0
+     */
+    protected $props = [];
+
+    /**
+     * Button options.
+     *
+     * @return array
+     * @since   5.0.0
+     */
+    protected $options = [];
+
+    /**
+     * Class constructor;
+     *
+     * @param string $name    The button name
+     * @param array  $props   The button properties.
+     * @param array  $options The button options.
+     *
+     * @since   5.0.0
+     */
+    public function __construct(string $name, array $props = [], array $options = [])
+    {
+        $this->name    = $name;
+        $this->props   = $props;
+        $this->options = $options;
+    }
+
+    /**
+     * Return Button name, CMD string.
+     *
+     * @return string
+     * @since   5.0.0
+     */
+    public function getButtonName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * Return Button property or null.
+     *
+     * @param string $name Property name
+     *
+     * @return mixed
+     * @since   5.0.0
+     */
+    public function get(string $name)
+    {
+        if ($name === 'options') {
+            @trigger_error(
+                'Accessing options property is deprecated. To access the Button options use getOptions() method.',
+                \E_USER_DEPRECATED
+            );
+
+            return $this->getOptions();
+        }
+
+        return array_key_exists($name, $this->props) ? $this->props[$name] : null;
+    }
+
+    /**
+     * Set Button property.
+     *
+     * @param string $name  Property name
+     * @param mixed  $value Property value
+     *
+     * @return ButtonInterface
+     * @since   5.0.0
+     */
+    public function set(string $name, $value): ButtonInterface
+    {
+        if ($name === 'options') {
+            @trigger_error(
+                'Accessing options property is deprecated. To set the Button options use setOptions() method.',
+                \E_USER_DEPRECATED
+            );
+
+            return $this->setOptions($value);
+        }
+
+        $this->props[$name] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Return Button options.
+     *
+     * @return array
+     * @since   5.0.0
+     */
+    public function getOptions(): array
+    {
+        return $this->options;
+    }
+
+    /**
+     * Set Button options.
+     *
+     * @param array  $options The button options.
+     *
+     * @return ButtonInterface
+     * @since   5.0.0
+     */
+    public function setOptions(array $options): ButtonInterface
+    {
+        $this->options = $options;
+
+        return $this;
+    }
+
+    /**
+     * Magic method to access a property.
+     *
+     * @param  string  $name  The name of the property.
+     *
+     * @return string|null A value if the property name is valid, null otherwise.
+     *
+     * @since       5.0.0
+     * @deprecated  6.0  This is a B/C proxy for deprecated read accesses
+     */
+    public function __get($name)
+    {
+        @trigger_error('Property access is deprecated in Joomla\CMS\Editor\Button class, use get/set methods.', \E_USER_DEPRECATED);
+
+        return $this->get($name);
+    }
+
+    /**
+     * Magic method to access property.
+     *
+     * @param  string  $name   The name of the property.
+     * @param  mixed   $value  The value of the property.
+     *
+     * @return void
+     *
+     * @since       5.0.0
+     * @deprecated  6.0  This is a B/C proxy for deprecated write accesses
+     */
+    public function __set($name, $value)
+    {
+        @trigger_error('Property access is deprecated in Joomla\CMS\Editor\Button class, use get/set methods.', \E_USER_DEPRECATED);
+
+        $this->set($name, $value);
+    }
+}
diff --git a/libraries/src/Editor/Button/ButtonInterface.php b/libraries/src/Editor/Button/ButtonInterface.php
new file mode 100644
index 0000000000000..fb59f82000752
--- /dev/null
+++ b/libraries/src/Editor/Button/ButtonInterface.php
@@ -0,0 +1,69 @@
+<?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\Editor\Button;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Editor button interface
+ *
+ * @since   5.0.0
+ */
+interface ButtonInterface
+{
+    /**
+     * Return Button name, CMD string.
+     *
+     * @return string
+     * @since   5.0.0
+     */
+    public function getButtonName(): string;
+
+    /**
+     * Return Button property or null.
+     *
+     * @param string $name Property name
+     *
+     * @return mixed
+     * @since   5.0.0
+     */
+    public function get(string $name);
+
+    /**
+     * Set Button property.
+     *
+     * @param string $name  Property name
+     * @param mixed  $value Property value
+     *
+     * @return ButtonInterface
+     * @since   5.0.0
+     */
+    public function set(string $name, $value): ButtonInterface;
+
+    /**
+     * Return Button options.
+     *
+     * @return array
+     * @since   5.0.0
+     */
+    public function getOptions(): array;
+
+    /**
+     * Set Button options.
+     *
+     * @param array  $options The button options.
+     *
+     * @return ButtonInterface
+     * @since   5.0.0
+     */
+    public function setOptions(array $options): ButtonInterface;
+}
diff --git a/libraries/src/Editor/Button/ButtonsRegistry.php b/libraries/src/Editor/Button/ButtonsRegistry.php
new file mode 100644
index 0000000000000..be7f11d5cb16e
--- /dev/null
+++ b/libraries/src/Editor/Button/ButtonsRegistry.php
@@ -0,0 +1,149 @@
+<?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\Editor\Button;
+
+use Joomla\CMS\Event\Editor\EditorButtonsSetupEvent;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Object\CMSObject;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\Event\DispatcherAwareInterface;
+use Joomla\Event\DispatcherAwareTrait;
+use Joomla\Event\SubscriberInterface;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Buttons Registry class
+ * @since   5.0.0
+ */
+final class ButtonsRegistry implements ButtonsRegistryInterface, DispatcherAwareInterface
+{
+    use DispatcherAwareTrait;
+
+    /**
+     * List of registered elements
+     *
+     * @var    array
+     * @since   5.0.0
+     */
+    protected $registry = [];
+
+    /**
+     * Internal flag of initialisation
+     *
+     * @var    boolean
+     * @since   5.0.0
+     */
+    private $initialised = false;
+
+    /**
+     * Register element in registry, add new or override existing.
+     *
+     * @param   ButtonInterface $instance  A button instance.
+     *
+     * @return  static
+     * @since    5.0.0
+     */
+    public function add(ButtonInterface $instance): ButtonsRegistryInterface
+    {
+        $this->registry[$instance->getButtonName()] = $instance;
+
+        return $this;
+    }
+
+    /**
+     * Return list of all registered elements.
+     *
+     * @return ButtonInterface[]
+     * @since    5.0.0
+     */
+    public function getAll(): array
+    {
+        return array_values($this->registry);
+    }
+
+    /**
+     * Trigger event to allow to register the elements through plugins.
+     *
+     * @param array $options  Extra data with editor information.
+     *
+     * @return  ButtonsRegistryInterface
+     * @since   5.0.0
+     */
+    public function initRegistry(array $options = []): ButtonsRegistryInterface
+    {
+        if ($this->initialised) {
+            return $this;
+        }
+
+        $this->initialised = true;
+
+        $options['subject']         = $this;
+        $options['editorType']      = $options['editorType'] ?? '';
+        $options['disabledButtons'] = $options['disabledButtons'] ?? [];
+
+        $event      = new EditorButtonsSetupEvent('onEditorButtonsSetup', $options);
+        $dispatcher = $this->getDispatcher();
+
+        PluginHelper::importPlugin('editors-xtd', null, true, $dispatcher);
+        $dispatcher->dispatch($event->getName(), $event);
+
+        // Load legacy buttons for backward compatibility
+        $plugins  = PluginHelper::getPlugin('editors-xtd');
+        $editorId = $options['editorId'] ?? '';
+        $asset    = (int) ($options['asset'] ?? 0);
+        $author   = (int) ($options['author'] ?? 0);
+
+        foreach ($plugins as $plugin) {
+            $pluginInst = Factory::getApplication()->bootPlugin($plugin->name, 'editors-xtd');
+
+            if (!$pluginInst || $pluginInst instanceof SubscriberInterface) {
+                continue;
+            }
+
+            if (!method_exists($pluginInst, 'onDisplay')) {
+                continue;
+            }
+
+            $legacyButton = $pluginInst->onDisplay($editorId, $asset, $author);
+
+            if (empty($legacyButton)) {
+                continue;
+            }
+
+            @trigger_error('6.0 Button "' . $plugin->name . '" instance should be set up onEditorButtonsSetup event.', \E_USER_DEPRECATED);
+
+            // Transform Legacy buttons to Button object
+            if (\is_array($legacyButton)) {
+                foreach ($legacyButton as $item) {
+                    if ($item instanceof CMSObject) {
+                        $props   = $item->getProperties();
+                        $options = $props['options'] ?? [];
+                        unset($props['options']);
+
+                        $button = new Button($plugin->name, $props, $options);
+                        $this->add($button);
+                    }
+                }
+            } elseif ($legacyButton instanceof CMSObject) {
+                $props   = $legacyButton->getProperties();
+                $options = $props['options'] ?? [];
+                unset($props['options']);
+
+                $button = new Button($plugin->name, $props, $options);
+                $this->add($button);
+            }
+        }
+
+        return $this;
+    }
+}
diff --git a/libraries/src/Editor/Button/ButtonsRegistryInterface.php b/libraries/src/Editor/Button/ButtonsRegistryInterface.php
new file mode 100644
index 0000000000000..081bd2be9a5f3
--- /dev/null
+++ b/libraries/src/Editor/Button/ButtonsRegistryInterface.php
@@ -0,0 +1,49 @@
+<?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\Editor\Button;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Buttons Registry class
+ * @since   5.0.0
+ */
+interface ButtonsRegistryInterface
+{
+    /**
+     * Register element in registry, add new or override existing.
+     *
+     * @param   ButtonInterface $instance
+     *
+     * @return  static
+     * @since    5.0.0
+     */
+    public function add(ButtonInterface $instance): ButtonsRegistryInterface;
+
+    /**
+     * Return list of all registered elements
+     *
+     * @return ButtonInterface[]
+     * @since    5.0.0
+     */
+    public function getAll(): array;
+
+    /**
+     * Initialise the registry, eg: auto-register elements.
+     *
+     * @param array $options  Extra data with editor information.
+     *
+     * @return  ButtonsRegistryInterface
+     * @since   5.0.0
+     */
+    public function initRegistry(array $options = []): ButtonsRegistryInterface;
+}
diff --git a/libraries/src/Editor/Editor.php b/libraries/src/Editor/Editor.php
index d2960279de701..43cee5d56d98b 100644
--- a/libraries/src/Editor/Editor.php
+++ b/libraries/src/Editor/Editor.php
@@ -9,6 +9,7 @@
 
 namespace Joomla\CMS\Editor;
 
+use Joomla\CMS\Editor\Button\ButtonsRegistry;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filter\InputFilter;
 use Joomla\CMS\Language\Text;
@@ -20,7 +21,7 @@
 use Joomla\Event\DispatcherInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -37,9 +38,19 @@ class Editor implements DispatcherAwareInterface
      *
      * @var    object
      * @since  1.5
+     *
+     * @deprecated  Should use Provider instance
      */
     protected $_editor = null;
 
+    /**
+     * Captcha Provider instance
+     *
+     * @var    EditorProviderInterface
+     * @since  5.0.0
+     */
+    private $provider;
+
     /**
      * Editor Plugin name
      *
@@ -75,30 +86,51 @@ class Editor implements DispatcherAwareInterface
     /**
      * Constructor
      *
-     * @param   string               $editor      The editor name
-     * @param   DispatcherInterface  $dispatcher  The event dispatcher we're going to use
+     * @param   string                    $editor      The editor name
+     * @param   DispatcherInterface|null  $dispatcher  The event dispatcher we're going to use
+     * @param   EditorsRegistry|null      $registry    The editors registry
+     *
+     * @since  1.5
      */
-    public function __construct($editor = 'none', DispatcherInterface $dispatcher = null)
+    public function __construct(string $editor = 'none', DispatcherInterface $dispatcher = null, EditorsRegistry $registry = null)
     {
         $this->_name = $editor;
 
-        // Set the dispatcher
-        if (!\is_object($dispatcher)) {
-            $dispatcher = Factory::getContainer()->get('dispatcher');
-        }
-
-        $this->setDispatcher($dispatcher);
-
-        // Register the getButtons event
-        $this->getDispatcher()->addListener(
-            'getButtons',
-            function (AbstractEvent $event) {
-                $event['result'] = (array) $this->getButtons(
-                    $event->getArgument('editor', null),
-                    $event->getArgument('buttons', null)
-                );
+        /** @var  EditorsRegistry  $registry */
+        $registry = $registry ?? Factory::getContainer()->get(EditorsRegistry::class);
+
+        if ($registry->has($editor)) {
+            $this->provider = $registry->get($editor);
+        } else {
+            // Fallback to legacy editor logic
+            @trigger_error(
+                '6.0 Discovering an editor "' . $this->_name . '" outside of EditorsRegistry is deprecated.',
+                \E_USER_DEPRECATED
+            );
+
+            // Set the dispatcher
+            if (!\is_object($dispatcher)) {
+                $dispatcher = Factory::getContainer()->get('dispatcher');
             }
-        );
+
+            $this->setDispatcher($dispatcher);
+
+            // Register the getButtons event
+            $this->getDispatcher()->addListener(
+                'getButtons',
+                function (AbstractEvent $event) {
+                    @trigger_error(
+                        '6.0 Use Button "getButtons" event is deprecated,  buttons should be set up onEditorButtonsSetup event.',
+                        \E_USER_DEPRECATED
+                    );
+
+                    $event['result'] = (array)$this->getButtons(
+                        $event->getArgument('editor', null),
+                        $event->getArgument('buttons', null)
+                    );
+                }
+            );
+        }
     }
 
     /**
@@ -113,7 +145,7 @@ function (AbstractEvent $event) {
      */
     public static function getInstance($editor = 'none')
     {
-        $signature = serialize($editor);
+        $signature = $editor;
 
         if (empty(self::$instances[$signature])) {
             self::$instances[$signature] = new static($editor);
@@ -128,14 +160,22 @@ public static function getInstance($editor = 'none')
      * @return  void
      *
      * @since   1.5
+     *
+     * @deprecated  6.0 Without replacement
      */
     public function initialise()
     {
+        if ($this->provider) {
+            return;
+        }
+
         // Check if editor is already loaded
         if ($this->_editor === null) {
             return;
         }
 
+        @trigger_error('6.0 Method onInit() for Editor instance is deprecated, without replacement.', \E_USER_DEPRECATED);
+
         if (method_exists($this->_editor, 'onInit')) {
             \call_user_func([$this->_editor, 'onInit']);
         }
@@ -162,6 +202,20 @@ public function initialise()
      */
     public function display($name, $html, $width, $height, $col, $row, $buttons = true, $id = null, $asset = null, $author = null, $params = [])
     {
+        if ($this->provider) {
+            $params['buttons'] = $params['buttons'] ?? $buttons;
+            $params['asset']   = $params['asset'] ?? $asset;
+            $params['author']  = $params['author'] ?? $author;
+
+            return $this->provider->display($name, $html, [
+                'width'  => $width,
+                'height' => $height,
+                'col'    => $col,
+                'row'    => $row,
+                'id'     => $id,
+            ], $params);
+        }
+
         $this->asset  = $asset;
         $this->author = $author;
         $this->_loadEditor($params);
@@ -170,9 +224,12 @@ public function display($name, $html, $width, $height, $col, $row, $buttons = tr
         if ($this->_editor === null) {
             Factory::getApplication()->enqueueMessage(Text::_('JLIB_NO_EDITOR_PLUGIN_PUBLISHED'), 'danger');
 
-            return;
+            return '';
         }
 
+        // Make sure editors api is loaded
+        Factory::getApplication()->getDocument()->getWebAssetManager()->useScript('editors');
+
         // Backwards compatibility. Width and height should be passed without a semicolon from now on.
         // If editor plugins need a unit like "px" for CSS styling, they need to take care of that
         $width  = str_replace(';', '', $width);
@@ -198,54 +255,51 @@ public function display($name, $html, $width, $height, $col, $row, $buttons = tr
     /**
      * Get the editor extended buttons (usually from plugins)
      *
-     * @param   string  $editor   The name of the editor.
+     * @param   string  $editor   The ID of the editor.
      * @param   mixed   $buttons  Can be boolean or array, if boolean defines if the buttons are
      *                            displayed, if array defines a list of buttons not to show.
      *
      * @return  array
      *
      * @since   1.5
+     *
      */
     public function getButtons($editor, $buttons = true)
     {
-        $result = [];
-
-        if (\is_bool($buttons) && !$buttons) {
-            return $result;
+        if ($this->provider) {
+            return $this->provider->getButtons($buttons, ['editorId' => $editor]);
         }
 
-        // Get plugins
-        $plugins = PluginHelper::getPlugin('editors-xtd');
-
-        foreach ($plugins as $plugin) {
-            if (\is_array($buttons) && \in_array($plugin->name, $buttons)) {
-                continue;
-            }
-
-            $plugin = Factory::getApplication()->bootPlugin($plugin->name, 'editors-xtd');
-
-            if (!$plugin) {
-                return $result;
-            }
-
-            // Try to authenticate
-            if (!method_exists($plugin, 'onDisplay')) {
-                continue;
-            }
+        if ($buttons === false) {
+            return [];
+        }
 
-            $button = $plugin->onDisplay($editor, $this->asset, $this->author);
+        $loadAll = false;
 
-            if (empty($button)) {
-                continue;
-            }
+        if ($buttons === true || $buttons === []) {
+            $buttons = [];
+            $loadAll = true;
+        }
 
-            if (\is_array($button)) {
-                $result = array_merge($result, $button);
+        // Retrieve buttons for legacy editor
+        $result  = [];
+        $btnsReg = new ButtonsRegistry();
+        $btnsReg->setDispatcher($this->getDispatcher())->initRegistry([
+            'editorType'      => $this->_name,
+            'disabledButtons' => $buttons,
+            'editorId'        => $editor,
+            'asset'           => (int) $this->asset,
+            'author'          => (int) $this->author,
+        ]);
+
+        // Go through all and leave only allowed buttons
+        foreach ($btnsReg->getAll() as $button) {
+            $btnName = $button->getButtonName();
+
+            if (!$loadAll && \in_array($btnName, $buttons)) {
                 continue;
             }
 
-            $button->editor = $editor;
-
             $result[] = $button;
         }
 
@@ -260,6 +314,8 @@ public function getButtons($editor, $buttons = true)
      * @return  mixed
      *
      * @since   1.5
+     *
+     * @deprecated  6.0 Should use EditorRegistry
      */
     protected function _loadEditor($config = [])
     {
@@ -268,6 +324,8 @@ protected function _loadEditor($config = [])
             return false;
         }
 
+        @trigger_error('6.0 Editor "' . $this->_name . '" instance should be set up onEditorSetup event.', \E_USER_DEPRECATED);
+
         // Build the path to the needed editor plugin
         $name = InputFilter::getInstance()->clean($this->_name, 'cmd');
 
diff --git a/libraries/src/Editor/EditorProviderInterface.php b/libraries/src/Editor/EditorProviderInterface.php
new file mode 100644
index 0000000000000..8186b98962c8b
--- /dev/null
+++ b/libraries/src/Editor/EditorProviderInterface.php
@@ -0,0 +1,54 @@
+<?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\Editor;
+
+use Joomla\CMS\Editor\Button\ButtonInterface;
+
+/**
+ * Editor provider interface
+ *
+ * @since   5.0.0
+ */
+interface EditorProviderInterface
+{
+    /**
+     * Return Editor name, CMD string.
+     *
+     * @return string
+     * @since   5.0.0
+     */
+    public function getName(): string;
+
+    /**
+     * Gets the editor HTML markup
+     *
+     * @param   string  $name        Input name.
+     * @param   string  $content     The content of the field.
+     * @param   array   $attributes  Associative array of editor attributes.
+     * @param   array   $params      Associative array of editor parameters.
+     *
+     * @return  string  The HTML markup of the editor
+     *
+     * @since   5.0.0
+     */
+    public function display(string $name, string $content = '', array $attributes = [], array $params = []): string;
+
+    /**
+     * Load the editor buttons.
+     *
+     * @param   mixed   $buttons  Array with button names to be excluded. Empty array or boolean true to display all buttons.
+     * @param   array   $options  Associative array with additional parameters
+     *
+     * @return  ButtonInterface[]
+     *
+     * @since   5.0.0
+     */
+    public function getButtons($buttons, array $options = []): array;
+}
diff --git a/libraries/src/Editor/EditorsRegistry.php b/libraries/src/Editor/EditorsRegistry.php
new file mode 100644
index 0000000000000..ec0712b671bcf
--- /dev/null
+++ b/libraries/src/Editor/EditorsRegistry.php
@@ -0,0 +1,119 @@
+<?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\Editor;
+
+use Joomla\CMS\Editor\Exception\EditorNotFoundException;
+use Joomla\CMS\Event\Editor\EditorSetupEvent;
+use Joomla\Event\DispatcherAwareInterface;
+use Joomla\Event\DispatcherAwareTrait;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Editor Registry class
+ * @since   5.0.0
+ */
+final class EditorsRegistry implements EditorsRegistryInterface, DispatcherAwareInterface
+{
+    use DispatcherAwareTrait;
+
+    /**
+     * List of registered elements
+     *
+     * @var    EditorProviderInterface[]
+     * @since   5.0.0
+     */
+    private $registry = [];
+
+    /**
+     * Internal flag of initialisation
+     *
+     * @var    boolean
+     * @since   5.0.0
+     */
+    private $initialised = false;
+
+    /**
+     * Return list of all registered elements
+     *
+     * @return EditorProviderInterface[]
+     * @since    5.0.0
+     */
+    public function getAll(): array
+    {
+        return array_values($this->registry);
+    }
+
+    /**
+     * Check whether the element exists in the registry.
+     *
+     * @param   string  $name  Element name
+     *
+     * @return  bool
+     * @since    5.0.0
+     */
+    public function has(string $name): bool
+    {
+        return !empty($this->registry[$name]);
+    }
+
+    /**
+     * Return element by name.
+     *
+     * @param   string  $name  Element name
+     *
+     * @return  EditorProviderInterface
+     * @throws  EditorNotFoundException
+     * @since    5.0.0
+     */
+    public function get(string $name): EditorProviderInterface
+    {
+        if (empty($this->registry[$name])) {
+            throw new EditorNotFoundException(sprintf('Editor element "%s" not found in the registry.', $name));
+        }
+
+        return $this->registry[$name];
+    }
+
+    /**
+     * Register element in registry, add new or override existing.
+     *
+     * @param   EditorProviderInterface $instance
+     *
+     * @return  EditorsRegistryInterface
+     * @since    5.0.0
+     */
+    public function add(EditorProviderInterface $instance): EditorsRegistryInterface
+    {
+        $this->registry[$instance->getName()] = $instance;
+
+        return $this;
+    }
+
+    /**
+     * Trigger event to allow register the element through plugins.
+     *
+     * @return  EditorsRegistryInterface
+     * @since   5.0.0
+     */
+    public function initRegistry(): EditorsRegistryInterface
+    {
+        if (!$this->initialised) {
+            $this->initialised = true;
+
+            $event = new EditorSetupEvent('onEditorSetup', ['subject' => $this]);
+            $this->getDispatcher()->dispatch($event->getName(), $event);
+        }
+
+        return $this;
+    }
+}
diff --git a/libraries/src/Editor/EditorsRegistryInterface.php b/libraries/src/Editor/EditorsRegistryInterface.php
new file mode 100644
index 0000000000000..2a7643c8044e7
--- /dev/null
+++ b/libraries/src/Editor/EditorsRegistryInterface.php
@@ -0,0 +1,71 @@
+<?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\Editor;
+
+use Joomla\CMS\Editor\Exception\EditorNotFoundException;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Interface for Editor Registry classes
+ *
+ * @since   5.0.0
+ */
+interface EditorsRegistryInterface
+{
+    /**
+     * Check whether the element exists in the registry.
+     *
+     * @param   string  $name  Element name
+     *
+     * @return  bool
+     * @since    5.0.0
+     */
+    public function has(string $name): bool;
+
+    /**
+     * Return element by name.
+     *
+     * @param   string  $name  Element name
+     *
+     * @return  EditorProviderInterface
+     * @throws  EditorNotFoundException
+     * @since    5.0.0
+     */
+    public function get(string $name): EditorProviderInterface;
+
+    /**
+     * Register element in registry, add new or override existing.
+     *
+     * @param   EditorProviderInterface $instance
+     *
+     * @return  EditorsRegistryInterface
+     * @since    5.0.0
+     */
+    public function add(EditorProviderInterface $instance): EditorsRegistryInterface;
+
+    /**
+     * Return list of all registered elements
+     *
+     * @return EditorProviderInterface[]
+     * @since    5.0.0
+     */
+    public function getAll(): array;
+
+    /**
+     * Initial set up of the registry elements through plugins etc.
+     *
+     * @return  EditorsRegistryInterface
+     * @since   5.0.0
+     */
+    public function initRegistry(): EditorsRegistryInterface;
+}
diff --git a/libraries/src/Editor/Exception/EditorNotFoundException.php b/libraries/src/Editor/Exception/EditorNotFoundException.php
new file mode 100644
index 0000000000000..288ccd8cd8a95
--- /dev/null
+++ b/libraries/src/Editor/Exception/EditorNotFoundException.php
@@ -0,0 +1,23 @@
+<?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\Editor\Exception;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Exception class defining a missing element
+ *
+ * @since  5.0.0
+ */
+class EditorNotFoundException extends \RuntimeException
+{
+}
diff --git a/libraries/src/Encrypt/AES/AbstractAES.php b/libraries/src/Encrypt/AES/AbstractAES.php
index f3cd327f0477e..7e2fd8f79948f 100644
--- a/libraries/src/Encrypt/AES/AbstractAES.php
+++ b/libraries/src/Encrypt/AES/AbstractAES.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Encrypt\AES;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Encrypt/AES/AesInterface.php b/libraries/src/Encrypt/AES/AesInterface.php
index 37c82f5567655..ad844d086cb69 100644
--- a/libraries/src/Encrypt/AES/AesInterface.php
+++ b/libraries/src/Encrypt/AES/AesInterface.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Encrypt\AES;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Encrypt/AES/Mcrypt.php b/libraries/src/Encrypt/AES/Mcrypt.php
index 11bf84cb92e85..207b70e46b375 100644
--- a/libraries/src/Encrypt/AES/Mcrypt.php
+++ b/libraries/src/Encrypt/AES/Mcrypt.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Encrypt\Randval;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Encrypt/AES/OpenSSL.php b/libraries/src/Encrypt/AES/OpenSSL.php
index 6ff617a5e2d4a..9925250da571b 100644
--- a/libraries/src/Encrypt/AES/OpenSSL.php
+++ b/libraries/src/Encrypt/AES/OpenSSL.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Encrypt\Randval;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Encrypt/Aes.php b/libraries/src/Encrypt/Aes.php
index 987cbde96f617..c86af4472704e 100644
--- a/libraries/src/Encrypt/Aes.php
+++ b/libraries/src/Encrypt/Aes.php
@@ -15,7 +15,7 @@
 use Joomla\CMS\Encrypt\AES\OpenSSL;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Encrypt/Base32.php b/libraries/src/Encrypt/Base32.php
index 1ae7e90f17058..d0c938bae2a84 100644
--- a/libraries/src/Encrypt/Base32.php
+++ b/libraries/src/Encrypt/Base32.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Encrypt;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Encrypt/RandValInterface.php b/libraries/src/Encrypt/RandValInterface.php
index 946d39d7b8c71..4969abe96547b 100644
--- a/libraries/src/Encrypt/RandValInterface.php
+++ b/libraries/src/Encrypt/RandValInterface.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Encrypt;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Encrypt/Randval.php b/libraries/src/Encrypt/Randval.php
index 0eafbeda5d5f2..0dd68c35412ef 100644
--- a/libraries/src/Encrypt/Randval.php
+++ b/libraries/src/Encrypt/Randval.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Encrypt;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Encrypt/Totp.php b/libraries/src/Encrypt/Totp.php
index 01619c878bfe5..5cb0c4f5941eb 100644
--- a/libraries/src/Encrypt/Totp.php
+++ b/libraries/src/Encrypt/Totp.php
@@ -11,7 +11,7 @@
 namespace Joomla\CMS\Encrypt;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Environment/Browser.php b/libraries/src/Environment/Browser.php
index 48c81cdc3e37d..a4f70345a05b1 100644
--- a/libraries/src/Environment/Browser.php
+++ b/libraries/src/Environment/Browser.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Environment;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Error/AbstractRenderer.php b/libraries/src/Error/AbstractRenderer.php
index b1c68a0ae81d9..4f21e5138b7cb 100644
--- a/libraries/src/Error/AbstractRenderer.php
+++ b/libraries/src/Error/AbstractRenderer.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Error;
@@ -14,7 +14,7 @@
 use Joomla\CMS\Factory;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Error/JsonApi/AuthenticationFailedExceptionHandler.php b/libraries/src/Error/JsonApi/AuthenticationFailedExceptionHandler.php
index b42c737d22c7d..2658b36e80f3f 100644
--- a/libraries/src/Error/JsonApi/AuthenticationFailedExceptionHandler.php
+++ b/libraries/src/Error/JsonApi/AuthenticationFailedExceptionHandler.php
@@ -4,7 +4,7 @@
  * 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
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Error\JsonApi;
@@ -15,7 +15,7 @@
 use Tobscure\JsonApi\Exception\Handler\ResponseBag;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -35,7 +35,7 @@ class AuthenticationFailedExceptionHandler implements ExceptionHandlerInterface
      *
      * @since  4.0.0
      */
-    public function manages(Exception $e)
+    public function manages(\Exception $e)
     {
         return $e instanceof AuthenticationFailed;
     }
@@ -43,13 +43,13 @@ public function manages(Exception $e)
     /**
      * Handle the provided exception.
      *
-     * @param   Exception  $e  The exception being handled
+     * @param   \Exception  $e  The exception being handled
      *
      * @return  \Tobscure\JsonApi\Exception\Handler\ResponseBag
      *
      * @since  4.0.0
      */
-    public function handle(Exception $e)
+    public function handle(\Exception $e)
     {
         $status = 401;
         $error  = ['title' => 'Forbidden'];
diff --git a/libraries/src/Error/JsonApi/CheckinCheckoutExceptionHandler.php b/libraries/src/Error/JsonApi/CheckinCheckoutExceptionHandler.php
index 0900a8fef1c99..dafb3523a214f 100644
--- a/libraries/src/Error/JsonApi/CheckinCheckoutExceptionHandler.php
+++ b/libraries/src/Error/JsonApi/CheckinCheckoutExceptionHandler.php
@@ -4,7 +4,7 @@
  * 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
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Error\JsonApi;
@@ -35,7 +35,7 @@ class CheckinCheckoutExceptionHandler implements ExceptionHandlerInterface
      *
      * @since  4.0.0
      */
-    public function manages(Exception $e)
+    public function manages(\Exception $e)
     {
         return $e instanceof CheckinCheckout;
     }
@@ -43,13 +43,13 @@ public function manages(Exception $e)
     /**
      * Handle the provided exception.
      *
-     * @param   Exception  $e  The exception being handled
+     * @param   \Exception  $e  The exception being handled
      *
      * @return  \Tobscure\JsonApi\Exception\Handler\ResponseBag
      *
      * @since  4.0.0
      */
-    public function handle(Exception $e)
+    public function handle(\Exception $e)
     {
         $status = 400;
 
diff --git a/libraries/src/Error/JsonApi/InvalidParameterExceptionHandler.php b/libraries/src/Error/JsonApi/InvalidParameterExceptionHandler.php
index b4d5884cd7762..73f8c0b312b45 100644
--- a/libraries/src/Error/JsonApi/InvalidParameterExceptionHandler.php
+++ b/libraries/src/Error/JsonApi/InvalidParameterExceptionHandler.php
@@ -4,7 +4,7 @@
  * 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
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Error\JsonApi;
@@ -13,7 +13,7 @@
 use Tobscure\JsonApi\Exception\Handler\ResponseBag;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -26,13 +26,13 @@ class InvalidParameterExceptionHandler extends \Tobscure\JsonApi\Exception\Handl
     /**
      * Handle the provided exception.
      *
-     * @param   Exception  $e  The exception being handled
+     * @param   \Exception  $e  The exception being handled
      *
      * @return  \Tobscure\JsonApi\Exception\Handler\ResponseBag
      *
      * @since  4.0.0
      */
-    public function handle(Exception $e)
+    public function handle(\Exception $e)
     {
         $status = 400;
         $error  = ['title' => $e->getMessage()];
diff --git a/libraries/src/Error/JsonApi/InvalidRouteExceptionHandler.php b/libraries/src/Error/JsonApi/InvalidRouteExceptionHandler.php
index 94d8886f2474a..f47dc12c6607d 100644
--- a/libraries/src/Error/JsonApi/InvalidRouteExceptionHandler.php
+++ b/libraries/src/Error/JsonApi/InvalidRouteExceptionHandler.php
@@ -4,7 +4,7 @@
  * 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
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Error\JsonApi;
@@ -15,7 +15,7 @@
 use Tobscure\JsonApi\Exception\Handler\ResponseBag;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -35,7 +35,7 @@ class InvalidRouteExceptionHandler implements ExceptionHandlerInterface
      *
      * @since  4.0.0
      */
-    public function manages(Exception $e)
+    public function manages(\Exception $e)
     {
         return $e instanceof RouteNotFoundException;
     }
@@ -43,13 +43,13 @@ public function manages(Exception $e)
     /**
      * Handle the provided exception.
      *
-     * @param   Exception  $e  The exception being handled
+     * @param   \Exception  $e  The exception being handled
      *
      * @return  \Tobscure\JsonApi\Exception\Handler\ResponseBag
      *
      * @since  4.0.0
      */
-    public function handle(Exception $e)
+    public function handle(\Exception $e)
     {
         $status = 404;
         $error  = ['title' => 'Resource not found'];
diff --git a/libraries/src/Error/JsonApi/NotAcceptableExceptionHandler.php b/libraries/src/Error/JsonApi/NotAcceptableExceptionHandler.php
index 20072ee109448..75e8e1f8474c0 100644
--- a/libraries/src/Error/JsonApi/NotAcceptableExceptionHandler.php
+++ b/libraries/src/Error/JsonApi/NotAcceptableExceptionHandler.php
@@ -4,7 +4,7 @@
  * 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
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Error\JsonApi;
@@ -15,7 +15,7 @@
 use Tobscure\JsonApi\Exception\Handler\ResponseBag;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -35,7 +35,7 @@ class NotAcceptableExceptionHandler implements ExceptionHandlerInterface
      *
      * @since  4.0.0
      */
-    public function manages(Exception $e)
+    public function manages(\Exception $e)
     {
         return $e instanceof NotAcceptable;
     }
@@ -43,13 +43,13 @@ public function manages(Exception $e)
     /**
      * Handle the provided exception.
      *
-     * @param   Exception  $e  The exception being handled
+     * @param   \Exception  $e  The exception being handled
      *
      * @return  \Tobscure\JsonApi\Exception\Handler\ResponseBag
      *
      * @since  4.0.0
      */
-    public function handle(Exception $e)
+    public function handle(\Exception $e)
     {
         $status = 406;
         $error  = ['title' => 'Not Acceptable'];
diff --git a/libraries/src/Error/JsonApi/NotAllowedExceptionHandler.php b/libraries/src/Error/JsonApi/NotAllowedExceptionHandler.php
index 5453cf2d6fc16..662d153fedefd 100644
--- a/libraries/src/Error/JsonApi/NotAllowedExceptionHandler.php
+++ b/libraries/src/Error/JsonApi/NotAllowedExceptionHandler.php
@@ -4,7 +4,7 @@
  * 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
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Error\JsonApi;
@@ -15,7 +15,7 @@
 use Tobscure\JsonApi\Exception\Handler\ResponseBag;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -35,7 +35,7 @@ class NotAllowedExceptionHandler implements ExceptionHandlerInterface
      *
      * @since  4.0.0
      */
-    public function manages(Exception $e)
+    public function manages(\Exception $e)
     {
         return $e instanceof NotAllowed;
     }
@@ -43,13 +43,13 @@ public function manages(Exception $e)
     /**
      * Handle the provided exception.
      *
-     * @param   Exception  $e  The exception being handled
+     * @param   \Exception  $e  The exception being handled
      *
      * @return  \Tobscure\JsonApi\Exception\Handler\ResponseBag
      *
      * @since  4.0.0
      */
-    public function handle(Exception $e)
+    public function handle(\Exception $e)
     {
         $status = 403;
         $error  = ['title' => 'Access Denied'];
diff --git a/libraries/src/Error/JsonApi/ResourceNotFoundExceptionHandler.php b/libraries/src/Error/JsonApi/ResourceNotFoundExceptionHandler.php
index aafd7d4958e74..238ab9642a4a0 100644
--- a/libraries/src/Error/JsonApi/ResourceNotFoundExceptionHandler.php
+++ b/libraries/src/Error/JsonApi/ResourceNotFoundExceptionHandler.php
@@ -4,7 +4,7 @@
  * 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
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Error\JsonApi;
@@ -35,7 +35,7 @@ class ResourceNotFoundExceptionHandler implements ExceptionHandlerInterface
      *
      * @since  4.0.0
      */
-    public function manages(Exception $e)
+    public function manages(\Exception $e)
     {
         return $e instanceof ResourceNotFound;
     }
@@ -43,13 +43,13 @@ public function manages(Exception $e)
     /**
      * Handle the provided exception.
      *
-     * @param   Exception  $e  The exception being handled
+     * @param   \Exception  $e  The exception being handled
      *
      * @return  \Tobscure\JsonApi\Exception\Handler\ResponseBag
      *
      * @since  4.0.0
      */
-    public function handle(Exception $e)
+    public function handle(\Exception $e)
     {
         $status = 404;
         $error  = ['title' => 'Resource not found'];
diff --git a/libraries/src/Error/JsonApi/SaveExceptionHandler.php b/libraries/src/Error/JsonApi/SaveExceptionHandler.php
index a75e8bf372fd8..7a203b4a64f1c 100644
--- a/libraries/src/Error/JsonApi/SaveExceptionHandler.php
+++ b/libraries/src/Error/JsonApi/SaveExceptionHandler.php
@@ -4,7 +4,7 @@
  * 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
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Error\JsonApi;
@@ -35,7 +35,7 @@ class SaveExceptionHandler implements ExceptionHandlerInterface
      *
      * @since  4.0.0
      */
-    public function manages(Exception $e)
+    public function manages(\Exception $e)
     {
         return $e instanceof Save;
     }
@@ -43,13 +43,13 @@ public function manages(Exception $e)
     /**
      * Handle the provided exception.
      *
-     * @param   Exception  $e  The exception being handled
+     * @param   \Exception  $e  The exception being handled
      *
      * @return  \Tobscure\JsonApi\Exception\Handler\ResponseBag
      *
      * @since  4.0.0
      */
-    public function handle(Exception $e)
+    public function handle(\Exception $e)
     {
         $status = 400;
 
diff --git a/libraries/src/Error/JsonApi/SendEmailExceptionHandler.php b/libraries/src/Error/JsonApi/SendEmailExceptionHandler.php
index 6be64c66de7bd..44ca11f2a8f00 100644
--- a/libraries/src/Error/JsonApi/SendEmailExceptionHandler.php
+++ b/libraries/src/Error/JsonApi/SendEmailExceptionHandler.php
@@ -4,7 +4,7 @@
  * 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
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Error\JsonApi;
@@ -35,7 +35,7 @@ class SendEmailExceptionHandler implements ExceptionHandlerInterface
      *
      * @since  4.0.0
      */
-    public function manages(Exception $e)
+    public function manages(\Exception $e)
     {
         return $e instanceof SendEmail;
     }
@@ -43,13 +43,13 @@ public function manages(Exception $e)
     /**
      * Handle the provided exception.
      *
-     * @param   Exception  $e  The exception being handled
+     * @param   \Exception  $e  The exception being handled
      *
      * @return  \Tobscure\JsonApi\Exception\Handler\ResponseBag
      *
      * @since  4.0.0
      */
-    public function handle(Exception $e)
+    public function handle(\Exception $e)
     {
         $status = 400;
 
diff --git a/libraries/src/Error/Renderer/CliRenderer.php b/libraries/src/Error/Renderer/CliRenderer.php
index 42b54e0422589..52ca9a8052358 100644
--- a/libraries/src/Error/Renderer/CliRenderer.php
+++ b/libraries/src/Error/Renderer/CliRenderer.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2017 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Error\Renderer;
@@ -12,7 +12,7 @@
 use Joomla\CMS\Error\AbstractRenderer;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Error/Renderer/FeedRenderer.php b/libraries/src/Error/Renderer/FeedRenderer.php
index 6c0e59f08dff9..2161a4d5dc001 100644
--- a/libraries/src/Error/Renderer/FeedRenderer.php
+++ b/libraries/src/Error/Renderer/FeedRenderer.php
@@ -4,13 +4,13 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Error\Renderer;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Error/Renderer/HtmlRenderer.php b/libraries/src/Error/Renderer/HtmlRenderer.php
index 937fb1e02ed95..5cd39a7e9c170 100644
--- a/libraries/src/Error/Renderer/HtmlRenderer.php
+++ b/libraries/src/Error/Renderer/HtmlRenderer.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Error\Renderer;
@@ -14,7 +14,7 @@
 use Joomla\CMS\Language\Text;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Error/Renderer/JsonRenderer.php b/libraries/src/Error/Renderer/JsonRenderer.php
index 75e96b5f568ae..a0c677d149f6a 100644
--- a/libraries/src/Error/Renderer/JsonRenderer.php
+++ b/libraries/src/Error/Renderer/JsonRenderer.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Error\Renderer;
@@ -14,7 +14,7 @@
 use Joomla\CMS\Factory;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Error/Renderer/JsonapiRenderer.php b/libraries/src/Error/Renderer/JsonapiRenderer.php
index 2ce8818e2292c..b392b6c5f7d07 100644
--- a/libraries/src/Error/Renderer/JsonapiRenderer.php
+++ b/libraries/src/Error/Renderer/JsonapiRenderer.php
@@ -4,7 +4,7 @@
  * 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
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Error\Renderer;
@@ -25,7 +25,7 @@
 use Tobscure\JsonApi\Exception\Handler\ResponseBag;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Error/Renderer/XmlRenderer.php b/libraries/src/Error/Renderer/XmlRenderer.php
index efb4ad6c5ee41..7dff7bf193fca 100644
--- a/libraries/src/Error/Renderer/XmlRenderer.php
+++ b/libraries/src/Error/Renderer/XmlRenderer.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Error\Renderer;
@@ -12,7 +12,7 @@
 use Joomla\CMS\Error\AbstractRenderer;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Error/RendererInterface.php b/libraries/src/Error/RendererInterface.php
index 36efa057d79b4..36d1dbeea4e6d 100644
--- a/libraries/src/Error/RendererInterface.php
+++ b/libraries/src/Error/RendererInterface.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Error;
@@ -12,7 +12,7 @@
 use Joomla\CMS\Document\Document;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Event/AbstractEvent.php b/libraries/src/Event/AbstractEvent.php
index c5587808a94d3..bd0ce4b9d3ea8 100644
--- a/libraries/src/Event/AbstractEvent.php
+++ b/libraries/src/Event/AbstractEvent.php
@@ -4,18 +4,16 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event;
 
-use BadMethodCallException;
 use Joomla\Event\Event;
-use Joomla\Event\Event as BaseEvent;
 use Joomla\String\Normalise;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -38,7 +36,7 @@
  *
  * @since  4.0.0
  */
-abstract class AbstractEvent extends BaseEvent
+abstract class AbstractEvent extends Event
 {
     use CoreEventAware;
 
@@ -54,10 +52,15 @@ abstract class AbstractEvent extends BaseEvent
      * @return  static
      *
      * @since   4.0.0
-     * @throws  BadMethodCallException  If you do not provide a subject argument
+     * @throws  \BadMethodCallException  If you do not provide a subject argument
      */
     public static function create(string $eventName, array $arguments = [])
     {
+        // Make sure a non-empty subject argument exists and that it is an object
+        if (empty($arguments['subject']) || !\is_object($arguments['subject'])) {
+            throw new \BadMethodCallException("No subject given for the $eventName event");
+        }
+
         // Get the class name from the arguments, if specified
         $eventClassName = '';
 
@@ -67,11 +70,20 @@ public static function create(string $eventName, array $arguments = [])
             unset($arguments['eventClass']);
         }
 
+        if (!$eventClassName) {
+            // Look for known class name.
+            $eventClassName = self::getEventClassByEventName($eventName);
+
+            if ($eventClassName === Event::class) {
+                $eventClassName = '';
+            }
+        }
+
         /**
-         * If the class name isn't set/found determine it from the event name, e.g. TableBeforeLoadEvent from
+         * If the class name isn't set/found determine it from the event name, e.g. Table\BeforeLoadEvent from
          * the onTableBeforeLoad event name.
          */
-        if (empty($eventClassName) || !class_exists($eventClassName, true)) {
+        if (!$eventClassName || !class_exists($eventClassName, true)) {
             $bareName       = strpos($eventName, 'on') === 0 ? substr($eventName, 2) : $eventName;
             $parts          = Normalise::fromCamelCase($bareName, true);
             $eventClassName = __NAMESPACE__ . '\\' . ucfirst(array_shift($parts)) . '\\';
@@ -79,27 +91,11 @@ public static function create(string $eventName, array $arguments = [])
             $eventClassName .= 'Event';
         }
 
-        // Make sure a non-empty subject argument exists and that it is an object
-        if (!isset($arguments['subject']) || empty($arguments['subject']) || !\is_object($arguments['subject'])) {
-            throw new BadMethodCallException("No subject given for the $eventName event");
-        }
-
         // Create and return the event object
         if (class_exists($eventClassName, true)) {
             return new $eventClassName($eventName, $arguments);
         }
 
-        /**
-         * The detection code above failed. This is to be expected, it was written back when we only
-         * had the Table events. It does not address most other core events. So, let's use our
-         * fancier detection instead.
-         */
-        $eventClassName = self::getEventClassByEventName($eventName);
-
-        if (!empty($eventClassName) && ($eventClassName !== Event::class)) {
-            return new $eventClassName($eventName, $arguments);
-        }
-
         return new GenericEvent($eventName, $arguments);
     }
 
@@ -115,8 +111,6 @@ public function __construct(string $name, array $arguments = [])
     {
         parent::__construct($name, $arguments);
 
-        $this->arguments = [];
-
         foreach ($arguments as $argumentName => $value) {
             $this->setArgument($argumentName, $value);
         }
@@ -141,6 +135,23 @@ public function __construct(string $name, array $arguments = [])
      */
     public function getArgument($name, $default = null)
     {
+        // B/C check for numeric access to named argument, eg $event->getArgument('0').
+        if (is_numeric($name)) {
+            if (key($this->arguments) != 0) {
+                $argNames = \array_keys($this->arguments);
+                $name     = $argNames[$name] ?? '';
+            }
+
+            @trigger_error(
+                sprintf(
+                    'Numeric access to named event arguments is deprecated, and will not work in Joomla 6. Event %s argument %s',
+                    \get_class($this),
+                    $name
+                ),
+                E_USER_DEPRECATED
+            );
+        }
+
         $methodName = 'get' . ucfirst($name);
 
         $value = parent::getArgument($name, $default);
@@ -171,6 +182,23 @@ public function getArgument($name, $default = null)
      */
     public function setArgument($name, $value)
     {
+        // B/C check for numeric access to named argument, eg $event->setArgument('0', $value).
+        if (is_numeric($name)) {
+            if (key($this->arguments) != 0) {
+                $argNames = \array_keys($this->arguments);
+                $name     = $argNames[$name] ?? '';
+            }
+
+            @trigger_error(
+                sprintf(
+                    'Numeric access to named event arguments is deprecated, and will not work in Joomla 6. Event %s argument %s',
+                    \get_class($this),
+                    $name
+                ),
+                E_USER_DEPRECATED
+            );
+        }
+
         $methodName = 'set' . ucfirst($name);
 
         if (method_exists($this, $methodName)) {
diff --git a/libraries/src/Event/AbstractImmutableEvent.php b/libraries/src/Event/AbstractImmutableEvent.php
index 85fe533edc6fc..5bb65cd3697fc 100644
--- a/libraries/src/Event/AbstractImmutableEvent.php
+++ b/libraries/src/Event/AbstractImmutableEvent.php
@@ -4,15 +4,13 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event;
 
-use BadMethodCallException;
-
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -38,12 +36,12 @@ class AbstractImmutableEvent extends AbstractEvent
      * @param   array   $arguments  The event arguments.
      *
      * @since   4.0.0
-     * @throws  BadMethodCallException
+     * @throws  \BadMethodCallException
      */
     public function __construct(string $name, array $arguments = [])
     {
         if ($this->constructed) {
-            throw new BadMethodCallException(
+            throw new \BadMethodCallException(
                 sprintf('Cannot reconstruct the AbstractImmutableEvent %s.', $this->name)
             );
         }
@@ -62,11 +60,11 @@ public function __construct(string $name, array $arguments = [])
      * @return  void
      *
      * @since   4.0.0
-     * @throws  BadMethodCallException
+     * @throws  \BadMethodCallException
      */
     public function offsetSet($name, $value)
     {
-        throw new BadMethodCallException(
+        throw new \BadMethodCallException(
             sprintf(
                 'Cannot set the argument %s of the immutable event %s.',
                 $name,
@@ -83,11 +81,11 @@ public function offsetSet($name, $value)
      * @return  void
      *
      * @since   4.0.0
-     * @throws  BadMethodCallException
+     * @throws  \BadMethodCallException
      */
     public function offsetUnset($name)
     {
-        throw new BadMethodCallException(
+        throw new \BadMethodCallException(
             sprintf(
                 'Cannot remove the argument %s of the immutable event %s.',
                 $name,
diff --git a/libraries/src/Event/ActionLog/AfterLogExportEvent.php b/libraries/src/Event/ActionLog/AfterLogExportEvent.php
new file mode 100644
index 0000000000000..d6174b36f011e
--- /dev/null
+++ b/libraries/src/Event/ActionLog/AfterLogExportEvent.php
@@ -0,0 +1,25 @@
+<?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\Event\ActionLog;
+
+use Joomla\CMS\Event\AbstractImmutableEvent;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for ActionLog events
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class AfterLogExportEvent extends AbstractImmutableEvent
+{
+}
diff --git a/libraries/src/Event/ActionLog/AfterLogPurgeEvent.php b/libraries/src/Event/ActionLog/AfterLogPurgeEvent.php
new file mode 100644
index 0000000000000..c1a363e62725c
--- /dev/null
+++ b/libraries/src/Event/ActionLog/AfterLogPurgeEvent.php
@@ -0,0 +1,25 @@
+<?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\Event\ActionLog;
+
+use Joomla\CMS\Event\AbstractImmutableEvent;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for ActionLog events
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class AfterLogPurgeEvent extends AbstractImmutableEvent
+{
+}
diff --git a/libraries/src/Event/AfterExtensionBootEvent.php b/libraries/src/Event/AfterExtensionBootEvent.php
index 1e0cd81e44165..a1c04bf5d8152 100644
--- a/libraries/src/Event/AfterExtensionBootEvent.php
+++ b/libraries/src/Event/AfterExtensionBootEvent.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event;
@@ -12,7 +12,7 @@
 use Joomla\DI\Container;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Event/Application/AfterApiRouteEvent.php b/libraries/src/Event/Application/AfterApiRouteEvent.php
new file mode 100644
index 0000000000000..32647595210d4
--- /dev/null
+++ b/libraries/src/Event/Application/AfterApiRouteEvent.php
@@ -0,0 +1,23 @@
+<?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\Event\Application;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for AfterApiRoute event
+ *
+ * @since  5.0.0
+ */
+class AfterApiRouteEvent extends ApplicationEvent
+{
+}
diff --git a/libraries/src/Event/Application/AfterCompressEvent.php b/libraries/src/Event/Application/AfterCompressEvent.php
new file mode 100644
index 0000000000000..233476c77f36a
--- /dev/null
+++ b/libraries/src/Event/Application/AfterCompressEvent.php
@@ -0,0 +1,23 @@
+<?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\Event\Application;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for AfterCompress event
+ *
+ * @since  5.0.0
+ */
+class AfterCompressEvent extends ApplicationEvent
+{
+}
diff --git a/libraries/src/Event/Application/AfterDispatchEvent.php b/libraries/src/Event/Application/AfterDispatchEvent.php
new file mode 100644
index 0000000000000..f80a2c21dd7a2
--- /dev/null
+++ b/libraries/src/Event/Application/AfterDispatchEvent.php
@@ -0,0 +1,23 @@
+<?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\Event\Application;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for AfterDispatch event
+ *
+ * @since  5.0.0
+ */
+class AfterDispatchEvent extends ApplicationEvent
+{
+}
diff --git a/libraries/src/Event/Application/AfterExecuteEvent.php b/libraries/src/Event/Application/AfterExecuteEvent.php
new file mode 100644
index 0000000000000..b19a428141957
--- /dev/null
+++ b/libraries/src/Event/Application/AfterExecuteEvent.php
@@ -0,0 +1,23 @@
+<?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\Event\Application;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for AfterExecute event
+ *
+ * @since  5.0.0
+ */
+class AfterExecuteEvent extends ApplicationEvent
+{
+}
diff --git a/libraries/src/Event/Application/AfterInitialiseDocumentEvent.php b/libraries/src/Event/Application/AfterInitialiseDocumentEvent.php
new file mode 100644
index 0000000000000..45014bc232eec
--- /dev/null
+++ b/libraries/src/Event/Application/AfterInitialiseDocumentEvent.php
@@ -0,0 +1,23 @@
+<?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\Event\Application;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Event class for AfterInitialiseDocument event
+ *
+ * @since  5.0.0
+ */
+class AfterInitialiseDocumentEvent extends ApplicationDocumentEvent
+{
+}
diff --git a/libraries/src/Event/Application/AfterInitialiseEvent.php b/libraries/src/Event/Application/AfterInitialiseEvent.php
new file mode 100644
index 0000000000000..5bc01b0826ee0
--- /dev/null
+++ b/libraries/src/Event/Application/AfterInitialiseEvent.php
@@ -0,0 +1,23 @@
+<?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\Event\Application;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for AfterInitialise event
+ *
+ * @since  5.0.0
+ */
+class AfterInitialiseEvent extends ApplicationEvent
+{
+}
diff --git a/libraries/src/Event/Application/AfterRenderEvent.php b/libraries/src/Event/Application/AfterRenderEvent.php
new file mode 100644
index 0000000000000..7105ea40625ab
--- /dev/null
+++ b/libraries/src/Event/Application/AfterRenderEvent.php
@@ -0,0 +1,23 @@
+<?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\Event\Application;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for AfterRender event
+ *
+ * @since  5.0.0
+ */
+class AfterRenderEvent extends ApplicationEvent
+{
+}
diff --git a/libraries/src/Event/Application/AfterRespondEvent.php b/libraries/src/Event/Application/AfterRespondEvent.php
new file mode 100644
index 0000000000000..3e68525e7911a
--- /dev/null
+++ b/libraries/src/Event/Application/AfterRespondEvent.php
@@ -0,0 +1,23 @@
+<?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\Event\Application;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for AfterRespond event
+ *
+ * @since  5.0.0
+ */
+class AfterRespondEvent extends ApplicationEvent
+{
+}
diff --git a/libraries/src/Event/Application/AfterRouteEvent.php b/libraries/src/Event/Application/AfterRouteEvent.php
new file mode 100644
index 0000000000000..51ce22b9a8102
--- /dev/null
+++ b/libraries/src/Event/Application/AfterRouteEvent.php
@@ -0,0 +1,23 @@
+<?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\Event\Application;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for AfterRoute event
+ *
+ * @since  5.0.0
+ */
+class AfterRouteEvent extends ApplicationEvent
+{
+}
diff --git a/libraries/src/Event/Application/AfterSaveConfigurationEvent.php b/libraries/src/Event/Application/AfterSaveConfigurationEvent.php
new file mode 100644
index 0000000000000..5b764b41e2b47
--- /dev/null
+++ b/libraries/src/Event/Application/AfterSaveConfigurationEvent.php
@@ -0,0 +1,23 @@
+<?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\Event\Application;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Application Configuration events
+ *
+ * @since  5.0.0
+ */
+class AfterSaveConfigurationEvent extends ApplicationConfigurationEvent
+{
+}
diff --git a/libraries/src/Event/Application/ApplicationConfigurationEvent.php b/libraries/src/Event/Application/ApplicationConfigurationEvent.php
new file mode 100644
index 0000000000000..d0d42ac976b01
--- /dev/null
+++ b/libraries/src/Event/Application/ApplicationConfigurationEvent.php
@@ -0,0 +1,70 @@
+<?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\Event\Application;
+
+use Joomla\CMS\Event\AbstractImmutableEvent;
+use Joomla\Registry\Registry;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Application Configuration events
+ *
+ * @since  5.0.0
+ */
+abstract class ApplicationConfigurationEvent extends AbstractImmutableEvent
+{
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   5.0.0
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        parent::__construct($name, $arguments);
+
+        if (!\array_key_exists('subject', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'subject' of event {$name} is required but has not been provided");
+        }
+    }
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   Registry  $value  The value to set
+     *
+     * @return  Registry
+     *
+     * @since  5.0.0
+     */
+    protected function setSubject(Registry $value): Registry
+    {
+        return $value;
+    }
+
+    /**
+     * Get the configuration object
+     *
+     * @return  Registry
+     *
+     * @since  5.0.0
+     */
+    public function getConfiguration(): Registry
+    {
+        return $this->arguments['subject'];
+    }
+}
diff --git a/libraries/src/Event/Application/ApplicationDocumentEvent.php b/libraries/src/Event/Application/ApplicationDocumentEvent.php
new file mode 100644
index 0000000000000..42da05c3a9740
--- /dev/null
+++ b/libraries/src/Event/Application/ApplicationDocumentEvent.php
@@ -0,0 +1,69 @@
+<?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\Event\Application;
+
+use Joomla\CMS\Document\Document;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Application's Document events
+ *
+ * @since  5.0.0
+ */
+abstract class ApplicationDocumentEvent extends ApplicationEvent
+{
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   5.0.0
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        if (!\array_key_exists('document', $arguments)) {
+            throw new \BadMethodCallException("Argument 'document' of event {$name} is required but has not been provided");
+        }
+
+        parent::__construct($name, $arguments);
+    }
+
+    /**
+     * Setter for the document argument.
+     *
+     * @param   Document  $value  The value to set
+     *
+     * @return  Document
+     *
+     * @since  5.0.0
+     */
+    protected function setDocument(Document $value): Document
+    {
+        return $value;
+    }
+
+    /**
+     * Get the event's document object
+     *
+     * @return  Document
+     *
+     * @since  5.0.0
+     */
+    public function getDocument(): Document
+    {
+        return $this->arguments['document'];
+    }
+}
diff --git a/libraries/src/Event/Application/ApplicationEvent.php b/libraries/src/Event/Application/ApplicationEvent.php
new file mode 100644
index 0000000000000..b3fd8004c2fc5
--- /dev/null
+++ b/libraries/src/Event/Application/ApplicationEvent.php
@@ -0,0 +1,70 @@
+<?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\Event\Application;
+
+use Joomla\Application\AbstractApplication;
+use Joomla\CMS\Event\AbstractImmutableEvent;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Application events
+ *
+ * @since  5.0.0
+ */
+abstract class ApplicationEvent extends AbstractImmutableEvent
+{
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   5.0.0
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        if (!\array_key_exists('subject', $arguments)) {
+            throw new \BadMethodCallException("Argument 'subject' of event {$name} is required but has not been provided");
+        }
+
+        parent::__construct($name, $arguments);
+    }
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   AbstractApplication  $value  The value to set
+     *
+     * @return  AbstractApplication
+     *
+     * @since  5.0.0
+     */
+    final protected function setSubject(AbstractApplication $value): AbstractApplication
+    {
+        return $value;
+    }
+
+    /**
+     * Get the event's application object
+     *
+     * @return  AbstractApplication
+     *
+     * @since  5.0.0
+     */
+    final public function getApplication(): AbstractApplication
+    {
+        return $this->getArgument('subject');
+    }
+}
diff --git a/libraries/src/Event/Application/BeforeApiRouteEvent.php b/libraries/src/Event/Application/BeforeApiRouteEvent.php
new file mode 100644
index 0000000000000..b5758948037d2
--- /dev/null
+++ b/libraries/src/Event/Application/BeforeApiRouteEvent.php
@@ -0,0 +1,69 @@
+<?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\Event\Application;
+
+use Joomla\CMS\Router\ApiRouter;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for BeforeApiRoute event
+ *
+ * @since  5.0.0
+ */
+class BeforeApiRouteEvent extends ApplicationEvent
+{
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   5.0.0
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        if (!\array_key_exists('router', $arguments)) {
+            throw new \BadMethodCallException("Argument 'router' of event {$name} is required but has not been provided");
+        }
+
+        parent::__construct($name, $arguments);
+    }
+
+    /**
+     * Setter for the router argument.
+     *
+     * @param   ApiRouter  $value  The value to set
+     *
+     * @return  ApiRouter
+     *
+     * @since  5.0.0
+     */
+    protected function setRouter(ApiRouter $value): ApiRouter
+    {
+        return $value;
+    }
+
+    /**
+     * Get the event's document object
+     *
+     * @return  ApiRouter
+     *
+     * @since  5.0.0
+     */
+    public function getRouter(): ApiRouter
+    {
+        return $this->arguments['router'];
+    }
+}
diff --git a/libraries/src/Event/Application/BeforeCompileHeadEvent.php b/libraries/src/Event/Application/BeforeCompileHeadEvent.php
new file mode 100644
index 0000000000000..87a019dfaa1a9
--- /dev/null
+++ b/libraries/src/Event/Application/BeforeCompileHeadEvent.php
@@ -0,0 +1,24 @@
+<?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\Event\Application;
+
+// phpcs:disable PSR1.Files.SideEffects
+
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for BeforeCompileHead event
+ *
+ * @since  5.0.0
+ */
+class BeforeCompileHeadEvent extends ApplicationDocumentEvent
+{
+}
diff --git a/libraries/src/Event/Application/BeforeExecuteEvent.php b/libraries/src/Event/Application/BeforeExecuteEvent.php
new file mode 100644
index 0000000000000..d0f26b8118aa0
--- /dev/null
+++ b/libraries/src/Event/Application/BeforeExecuteEvent.php
@@ -0,0 +1,36 @@
+<?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\Event\Application;
+
+use Joomla\DI\Container;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for BeforeExecute event
+ *
+ * @since  5.0.0
+ */
+class BeforeExecuteEvent extends ApplicationEvent
+{
+    /**
+     * Get the event's container object
+     *
+     * @return  ?Container
+     *
+     * @since  5.0.0
+     */
+    public function getContainer(): ?Container
+    {
+        return $this->arguments['container'] ?? null;
+    }
+}
diff --git a/libraries/src/Event/Application/BeforeRenderEvent.php b/libraries/src/Event/Application/BeforeRenderEvent.php
new file mode 100644
index 0000000000000..65ebe29a92c04
--- /dev/null
+++ b/libraries/src/Event/Application/BeforeRenderEvent.php
@@ -0,0 +1,23 @@
+<?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\Event\Application;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for BeforeRender event
+ *
+ * @since  5.0.0
+ */
+class BeforeRenderEvent extends ApplicationEvent
+{
+}
diff --git a/libraries/src/Event/Application/BeforeRespondEvent.php b/libraries/src/Event/Application/BeforeRespondEvent.php
new file mode 100644
index 0000000000000..006a57365fe93
--- /dev/null
+++ b/libraries/src/Event/Application/BeforeRespondEvent.php
@@ -0,0 +1,23 @@
+<?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\Event\Application;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for BeforeRespond event
+ *
+ * @since  5.0.0
+ */
+class BeforeRespondEvent extends ApplicationEvent
+{
+}
diff --git a/libraries/src/Event/Application/BeforeSaveConfigurationEvent.php b/libraries/src/Event/Application/BeforeSaveConfigurationEvent.php
new file mode 100644
index 0000000000000..d24182f534062
--- /dev/null
+++ b/libraries/src/Event/Application/BeforeSaveConfigurationEvent.php
@@ -0,0 +1,29 @@
+<?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\Event\Application;
+
+use Joomla\CMS\Event\Result\ResultAware;
+use Joomla\CMS\Event\Result\ResultAwareInterface;
+use Joomla\CMS\Event\Result\ResultTypeBooleanAware;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Application Configuration events
+ *
+ * @since  5.0.0
+ */
+class BeforeSaveConfigurationEvent extends ApplicationConfigurationEvent implements ResultAwareInterface
+{
+    use ResultAware;
+    use ResultTypeBooleanAware;
+}
diff --git a/libraries/src/Event/Application/DaemonForkEvent.php b/libraries/src/Event/Application/DaemonForkEvent.php
new file mode 100644
index 0000000000000..ad05a088f88b7
--- /dev/null
+++ b/libraries/src/Event/Application/DaemonForkEvent.php
@@ -0,0 +1,23 @@
+<?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\Event\Application;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Fork event for DaemonApplication
+ *
+ * @since  5.0.0
+ */
+class DaemonForkEvent extends ApplicationEvent
+{
+}
diff --git a/libraries/src/Event/Application/DaemonReceiveSignalEvent.php b/libraries/src/Event/Application/DaemonReceiveSignalEvent.php
new file mode 100644
index 0000000000000..554605f0caff3
--- /dev/null
+++ b/libraries/src/Event/Application/DaemonReceiveSignalEvent.php
@@ -0,0 +1,67 @@
+<?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\Event\Application;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for ReceiveSignal event for DaemonApplication
+ *
+ * @since  5.0.0
+ */
+class DaemonReceiveSignalEvent extends ApplicationEvent
+{
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   5.0.0
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        if (!\array_key_exists('signal', $arguments)) {
+            throw new \BadMethodCallException("Argument 'signal' of event {$name} is required but has not been provided");
+        }
+
+        parent::__construct($name, $arguments);
+    }
+
+    /**
+     * Setter for the signal argument.
+     *
+     * @param   integer  $value  The value to set
+     *
+     * @return  integer
+     *
+     * @since  5.0.0
+     */
+    protected function setSignal(int $value): int
+    {
+        return $value;
+    }
+
+    /**
+     * Get the event's signal object
+     *
+     * @return  integer
+     *
+     * @since  5.0.0
+     */
+    public function getSignal(): int
+    {
+        return $this->arguments['signal'];
+    }
+}
diff --git a/libraries/src/Event/BeforeExtensionBootEvent.php b/libraries/src/Event/BeforeExtensionBootEvent.php
index 14d7bd6604a83..7653fbd9d99e3 100644
--- a/libraries/src/Event/BeforeExtensionBootEvent.php
+++ b/libraries/src/Event/BeforeExtensionBootEvent.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event;
@@ -12,7 +12,7 @@
 use Joomla\DI\Container;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Event/Cache/AfterPurgeEvent.php b/libraries/src/Event/Cache/AfterPurgeEvent.php
new file mode 100644
index 0000000000000..1978b6d0feae1
--- /dev/null
+++ b/libraries/src/Event/Cache/AfterPurgeEvent.php
@@ -0,0 +1,83 @@
+<?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\Event\Cache;
+
+use Joomla\CMS\Event\AbstractImmutableEvent;
+use Joomla\CMS\Event\ReshapeArgumentsAware;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Cache events
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class AfterPurgeEvent extends AbstractImmutableEvent
+{
+    use ReshapeArgumentsAware;
+
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  __DEPLOY_VERSION__
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['subject'];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        // Reshape the arguments array to preserve b/c with legacy listeners
+        if ($this->legacyArgumentsOrder) {
+            $arguments = $this->reshapeArguments($arguments, $this->legacyArgumentsOrder);
+        }
+
+        parent::__construct($name, $arguments);
+    }
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   string  $value  The value to set
+     *
+     * @return  string
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setSubject(string $value): string
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the group.
+     *
+     * @return  string
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getGroup(): string
+    {
+        return $this->arguments['subject'] ?? '';
+    }
+}
diff --git a/libraries/src/Event/Captcha/CaptchaSetupEvent.php b/libraries/src/Event/Captcha/CaptchaSetupEvent.php
new file mode 100644
index 0000000000000..0b4bbe28eef5a
--- /dev/null
+++ b/libraries/src/Event/Captcha/CaptchaSetupEvent.php
@@ -0,0 +1,66 @@
+<?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\Event\Captcha;
+
+use Joomla\CMS\Captcha\CaptchaRegistry;
+use Joomla\CMS\Event\AbstractImmutableEvent;
+
+/**
+ * Captcha setup event
+ *
+ * @since   5.0.0
+ */
+class CaptchaSetupEvent extends AbstractImmutableEvent
+{
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   5.0.0
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        if (!\array_key_exists('subject', $arguments)) {
+            throw new \BadMethodCallException("Argument 'subject' of event {$name} is required but has not been provided");
+        }
+
+        parent::__construct($name, $arguments);
+    }
+
+    /**
+     * Setter for the subject argument
+     *
+     * @param   CaptchaRegistry  $value  The value to set
+     *
+     * @return  CaptchaRegistry
+     *
+     * @since  5.0.0
+     */
+    protected function setSubject(CaptchaRegistry $value): CaptchaRegistry
+    {
+        return $value;
+    }
+
+    /**
+     * Returns Captcha Registry instance.
+     *
+     * @return  CaptchaRegistry
+     *
+     * @since  5.0.0
+     */
+    public function getCaptchaRegistry(): CaptchaRegistry
+    {
+        return $this->getArgument('subject');
+    }
+}
diff --git a/libraries/src/Event/Checkin/AfterCheckinEvent.php b/libraries/src/Event/Checkin/AfterCheckinEvent.php
new file mode 100644
index 0000000000000..e04cdb76f607a
--- /dev/null
+++ b/libraries/src/Event/Checkin/AfterCheckinEvent.php
@@ -0,0 +1,83 @@
+<?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\Event\Checkin;
+
+use Joomla\CMS\Event\AbstractImmutableEvent;
+use Joomla\CMS\Event\ReshapeArgumentsAware;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Checkin events
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class AfterCheckinEvent extends AbstractImmutableEvent
+{
+    use ReshapeArgumentsAware;
+
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  __DEPLOY_VERSION__
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['subject'];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        // Reshape the arguments array to preserve b/c with legacy listeners
+        if ($this->legacyArgumentsOrder) {
+            $arguments = $this->reshapeArguments($arguments, $this->legacyArgumentsOrder);
+        }
+
+        parent::__construct($name, $arguments);
+    }
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   string  $value  The value to set
+     *
+     * @return  string
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setSubject(string $value): string
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the table name.
+     *
+     * @return  string
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getTableName(): string
+    {
+        return $this->arguments['subject'] ?? '';
+    }
+}
diff --git a/libraries/src/Event/Contact/SubmitContactEvent.php b/libraries/src/Event/Contact/SubmitContactEvent.php
new file mode 100644
index 0000000000000..d996d0b9273e9
--- /dev/null
+++ b/libraries/src/Event/Contact/SubmitContactEvent.php
@@ -0,0 +1,117 @@
+<?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\Event\Contact;
+
+use Joomla\CMS\Event\AbstractImmutableEvent;
+use Joomla\CMS\Event\ReshapeArgumentsAware;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Contact events
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class SubmitContactEvent extends AbstractImmutableEvent
+{
+    use ReshapeArgumentsAware;
+
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  __DEPLOY_VERSION__
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['subject', 'data'];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        // Reshape the arguments array to preserve b/c with legacy listeners
+        if ($this->legacyArgumentsOrder) {
+            $arguments = $this->reshapeArguments($arguments, $this->legacyArgumentsOrder);
+        }
+
+        parent::__construct($name, $arguments);
+
+        if (!\array_key_exists('subject', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'subject' of event {$name} is required but has not been provided");
+        }
+
+        if (!\array_key_exists('data', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'data' of event {$name} is required but has not been provided");
+        }
+    }
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   object  $value  The value to set
+     *
+     * @return  object
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setSubject(object $value): object
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the data argument.
+     *
+     * @param   array|\ArrayAccess  $value  The value to set
+     *
+     * @return  array|\ArrayAccess
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setData(array|\ArrayAccess $value): array|\ArrayAccess
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the contact.
+     *
+     * @return  object
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getContact(): object
+    {
+        return $this->arguments['subject'];
+    }
+
+    /**
+     * Getter for the data.
+     *
+     * @return  array|\ArrayAccess
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getData(): array|\ArrayAccess
+    {
+        return $this->arguments['data'];
+    }
+}
diff --git a/libraries/src/Event/Contact/ValidateContactEvent.php b/libraries/src/Event/Contact/ValidateContactEvent.php
new file mode 100644
index 0000000000000..b79d314ff6666
--- /dev/null
+++ b/libraries/src/Event/Contact/ValidateContactEvent.php
@@ -0,0 +1,122 @@
+<?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\Event\Contact;
+
+use Joomla\CMS\Event\AbstractImmutableEvent;
+use Joomla\CMS\Event\ReshapeArgumentsAware;
+use Joomla\CMS\Event\Result\ResultAware;
+use Joomla\CMS\Event\Result\ResultAwareInterface;
+use Joomla\CMS\Event\Result\ResultTypeMixedAware;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Contact events
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class ValidateContactEvent extends AbstractImmutableEvent implements ResultAwareInterface
+{
+    use ResultAware;
+    use ResultTypeMixedAware;
+    use ReshapeArgumentsAware;
+
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  __DEPLOY_VERSION__
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['subject', 'data'];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        // Reshape the arguments array to preserve b/c with legacy listeners
+        if ($this->legacyArgumentsOrder) {
+            $arguments = $this->reshapeArguments($arguments, $this->legacyArgumentsOrder);
+        }
+
+        parent::__construct($name, $arguments);
+
+        if (!\array_key_exists('subject', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'subject' of event {$name} is required but has not been provided");
+        }
+
+        if (!\array_key_exists('data', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'data' of event {$name} is required but has not been provided");
+        }
+    }
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   object  $value  The value to set
+     *
+     * @return  object
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setSubject(object $value): object
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the data argument.
+     *
+     * @param   array|\ArrayAccess  $value  The value to set
+     *
+     * @return  array|\ArrayAccess
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setData(array|\ArrayAccess $value): array|\ArrayAccess
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the contact.
+     *
+     * @return  object
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getContact(): object
+    {
+        return $this->arguments['subject'];
+    }
+
+    /**
+     * Getter for the data.
+     *
+     * @return  array|\ArrayAccess
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getData(): array|\ArrayAccess
+    {
+        return $this->arguments['data'];
+    }
+}
diff --git a/libraries/src/Event/Content/AfterDisplayEvent.php b/libraries/src/Event/Content/AfterDisplayEvent.php
new file mode 100644
index 0000000000000..f5eb9ebaf2839
--- /dev/null
+++ b/libraries/src/Event/Content/AfterDisplayEvent.php
@@ -0,0 +1,31 @@
+<?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\Event\Content;
+
+use Joomla\CMS\Event\Result\ResultAware;
+use Joomla\CMS\Event\Result\ResultAwareInterface;
+use Joomla\CMS\Event\Result\ResultTypeStringAware;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Content event.
+ * Example:
+ *  new AfterDisplayEvent('onEventName', ['context' => 'com_example.example', 'subject' => $contentObject, 'params' => $params, 'page' => $pageNum]);
+ *
+ * @since  5.0.0
+ */
+class AfterDisplayEvent extends ContentPrepareEvent implements ResultAwareInterface
+{
+    use ResultAware;
+    use ResultTypeStringAware;
+}
diff --git a/libraries/src/Event/Content/AfterTitleEvent.php b/libraries/src/Event/Content/AfterTitleEvent.php
new file mode 100644
index 0000000000000..8f9ad338acc62
--- /dev/null
+++ b/libraries/src/Event/Content/AfterTitleEvent.php
@@ -0,0 +1,31 @@
+<?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\Event\Content;
+
+use Joomla\CMS\Event\Result\ResultAware;
+use Joomla\CMS\Event\Result\ResultAwareInterface;
+use Joomla\CMS\Event\Result\ResultTypeStringAware;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Content event.
+ * Example:
+ *  new AfterTitleEvent('onEventName', ['context' => 'com_example.example', 'subject' => $contentObject, 'params' => $params, 'page' => $pageNum]);
+ *
+ * @since  5.0.0
+ */
+class AfterTitleEvent extends ContentPrepareEvent implements ResultAwareInterface
+{
+    use ResultAware;
+    use ResultTypeStringAware;
+}
diff --git a/libraries/src/Event/Content/BeforeDisplayEvent.php b/libraries/src/Event/Content/BeforeDisplayEvent.php
new file mode 100644
index 0000000000000..5a5516b88f1cd
--- /dev/null
+++ b/libraries/src/Event/Content/BeforeDisplayEvent.php
@@ -0,0 +1,31 @@
+<?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\Event\Content;
+
+use Joomla\CMS\Event\Result\ResultAware;
+use Joomla\CMS\Event\Result\ResultAwareInterface;
+use Joomla\CMS\Event\Result\ResultTypeStringAware;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Content event.
+ * Example:
+ *  new BeforeDisplayEvent('onEventName', ['context' => 'com_example.example', 'subject' => $contentObject, 'params' => $params, 'page' => $pageNum]);
+ *
+ * @since  5.0.0
+ */
+class BeforeDisplayEvent extends ContentPrepareEvent implements ResultAwareInterface
+{
+    use ResultAware;
+    use ResultTypeStringAware;
+}
diff --git a/libraries/src/Event/Content/ContentEvent.php b/libraries/src/Event/Content/ContentEvent.php
new file mode 100644
index 0000000000000..f24f03d50fc3a
--- /dev/null
+++ b/libraries/src/Event/Content/ContentEvent.php
@@ -0,0 +1,91 @@
+<?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\Event\Content;
+
+use Joomla\CMS\Event\AbstractImmutableEvent;
+use Joomla\CMS\Event\ReshapeArgumentsAware;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Base class for Content events
+ *
+ * @since  5.0.0
+ */
+abstract class ContentEvent extends AbstractImmutableEvent
+{
+    use ReshapeArgumentsAware;
+
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = [];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   5.0.0
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        // Reshape the arguments array to preserve b/c with legacy listeners
+        if ($this->legacyArgumentsOrder) {
+            $arguments = $this->reshapeArguments($arguments, $this->legacyArgumentsOrder);
+        }
+
+        parent::__construct($name, $arguments);
+
+        if (!\array_key_exists('context', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'context' of event {$name} is required but has not been provided");
+        }
+
+        if (!\array_key_exists('subject', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'subject' of event {$name} is required but has not been provided");
+        }
+    }
+
+    /**
+     * Setter for the context argument.
+     *
+     * @param   string  $value  The value to set
+     *
+     * @return  string
+     *
+     * @since  5.0.0
+     */
+    protected function setContext(string $value): string
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the context argument.
+     *
+     * @return  string
+     *
+     * @since  5.0.0
+     */
+    public function getContext(): string
+    {
+        return $this->arguments['context'];
+    }
+}
diff --git a/libraries/src/Event/Content/ContentPrepareEvent.php b/libraries/src/Event/Content/ContentPrepareEvent.php
new file mode 100644
index 0000000000000..8a92ea7345410
--- /dev/null
+++ b/libraries/src/Event/Content/ContentPrepareEvent.php
@@ -0,0 +1,125 @@
+<?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\Event\Content;
+
+use Joomla\Registry\Registry;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Content event.
+ * Example:
+ *  new ContentPrepareEvent('onEventName', ['context' => 'com_example.example', 'subject' => $contentObject, 'params' => $params, 'page' => $pageNum]);
+ *
+ * @since  5.0.0
+ */
+class ContentPrepareEvent extends ContentEvent
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['context', 'subject', 'params', 'page'];
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   object  $value  The value to set
+     *
+     * @return  object
+     *
+     * @since  5.0.0
+     */
+    protected function setSubject(object $value): object
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the params argument.
+     *
+     * @param   Registry  $value  The value to set
+     *
+     * @return  Registry
+     *
+     * @since  5.0.0
+     */
+    protected function setParams($value): Registry
+    {
+        // This is for b/c compatibility, because some extensions pass a mixed types
+        if (!$value instanceof Registry) {
+            $value = new Registry($value);
+
+            // @TODO: In 6.0 throw an exception
+            @trigger_error(
+                sprintf('The "params" attribute for the event "%s" must be type of Registry. In 6.0 it will throw an exception', $this->getName()),
+                E_USER_DEPRECATED
+            );
+        }
+
+        return $value;
+    }
+
+    /**
+     * Setter for the page argument.
+     *
+     * @param   ?int  $value  The value to set
+     *
+     * @return  ?int
+     *
+     * @since  5.0.0
+     */
+    protected function setPage(?int $value): ?int
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the item argument.
+     *
+     * @return  object
+     *
+     * @since  5.0.0
+     */
+    public function getItem(): object
+    {
+        return $this->arguments['subject'];
+    }
+
+    /**
+     * Getter for the item argument.
+     *
+     * @return  Registry
+     *
+     * @since  5.0.0
+     */
+    public function getParams(): Registry
+    {
+        return $this->arguments['params'];
+    }
+
+    /**
+     * Getter for the page argument.
+     *
+     * @return  ?int
+     *
+     * @since  5.0.0
+     */
+    public function getPage(): ?int
+    {
+        return $this->arguments['page'];
+    }
+}
diff --git a/libraries/src/Event/CoreEventAware.php b/libraries/src/Event/CoreEventAware.php
index c65b8a3173866..1ba8acfd69ec1 100644
--- a/libraries/src/Event/CoreEventAware.php
+++ b/libraries/src/Event/CoreEventAware.php
@@ -4,12 +4,11 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
- * @license        GNU General Public License version 2 or later; see LICENSE
+ * @license        GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event;
 
-use Joomla\CMS\Event\Model\BeforeBatchEvent;
 use Joomla\CMS\Event\Plugin\System\Webauthn\Ajax as PlgSystemWebauthnAjax;
 use Joomla\CMS\Event\Plugin\System\Webauthn\AjaxChallenge as PlgSystemWebauthnAjaxChallenge;
 use Joomla\CMS\Event\Plugin\System\Webauthn\AjaxCreate as PlgSystemWebauthnAjaxCreate;
@@ -17,40 +16,10 @@
 use Joomla\CMS\Event\Plugin\System\Webauthn\AjaxInitCreate as PlgSystemWebauthnAjaxInitCreate;
 use Joomla\CMS\Event\Plugin\System\Webauthn\AjaxLogin as PlgSystemWebauthnAjaxLogin;
 use Joomla\CMS\Event\Plugin\System\Webauthn\AjaxSaveLabel as PlgSystemWebauthnAjaxSaveLabel;
-use Joomla\CMS\Event\QuickIcon\GetIconEvent;
-use Joomla\CMS\Event\Table\AfterBindEvent;
-use Joomla\CMS\Event\Table\AfterCheckinEvent;
-use Joomla\CMS\Event\Table\AfterCheckoutEvent;
-use Joomla\CMS\Event\Table\AfterDeleteEvent;
-use Joomla\CMS\Event\Table\AfterHitEvent;
-use Joomla\CMS\Event\Table\AfterLoadEvent;
-use Joomla\CMS\Event\Table\AfterMoveEvent;
-use Joomla\CMS\Event\Table\AfterPublishEvent;
-use Joomla\CMS\Event\Table\AfterReorderEvent;
-use Joomla\CMS\Event\Table\AfterResetEvent;
-use Joomla\CMS\Event\Table\AfterStoreEvent;
-use Joomla\CMS\Event\Table\BeforeBindEvent;
-use Joomla\CMS\Event\Table\BeforeCheckinEvent;
-use Joomla\CMS\Event\Table\BeforeCheckoutEvent;
-use Joomla\CMS\Event\Table\BeforeDeleteEvent;
-use Joomla\CMS\Event\Table\BeforeHitEvent;
-use Joomla\CMS\Event\Table\BeforeLoadEvent;
-use Joomla\CMS\Event\Table\BeforeMoveEvent;
-use Joomla\CMS\Event\Table\BeforePublishEvent;
-use Joomla\CMS\Event\Table\BeforeReorderEvent;
-use Joomla\CMS\Event\Table\BeforeResetEvent;
-use Joomla\CMS\Event\Table\BeforeStoreEvent;
-use Joomla\CMS\Event\Table\CheckEvent;
-use Joomla\CMS\Event\Table\ObjectCreateEvent;
-use Joomla\CMS\Event\Table\SetNewTagsEvent;
-use Joomla\CMS\Event\View\DisplayEvent;
-use Joomla\CMS\Event\WebAsset\WebAssetRegistryAssetChanged;
-use Joomla\CMS\Event\Workflow\WorkflowFunctionalityUsedEvent;
-use Joomla\CMS\Event\Workflow\WorkflowTransitionEvent;
 use Joomla\Event\Event;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -70,43 +39,59 @@ trait CoreEventAware
      * @since 4.2.0
      */
     private static $eventNameToConcreteClass = [
-        // Model
-        'onBeforeBatch' => BeforeBatchEvent::class,
+        // Application
+        'onBeforeExecute'     => Application\BeforeExecuteEvent::class,
+        'onAfterExecute'      => Application\AfterExecuteEvent::class,
+        'onAfterInitialise'   => Application\AfterInitialiseEvent::class,
+        'onAfterRoute'        => Application\AfterRouteEvent::class,
+        'onBeforeApiRoute'    => Application\BeforeApiRouteEvent::class,
+        'onAfterApiRoute'     => Application\AfterApiRouteEvent::class,
+        'onAfterDispatch'     => Application\AfterDispatchEvent::class,
+        'onBeforeRender'      => Application\BeforeRenderEvent::class,
+        'onAfterRender'       => Application\AfterRenderEvent::class,
+        'onBeforeCompileHead' => Application\BeforeCompileHeadEvent::class,
+        'onAfterCompress'     => Application\AfterCompressEvent::class,
+        'onBeforeRespond'     => Application\BeforeRespondEvent::class,
+        'onAfterRespond'      => Application\AfterRespondEvent::class,
+        'onError'             => ErrorEvent::class,
+        // Application configuration
+        'onApplicationBeforeSave' => Application\BeforeSaveConfigurationEvent::class,
+        'onApplicationAfterSave'  => Application\AfterSaveConfigurationEvent::class,
         // Quickicon
-        'onGetIcon' => GetIconEvent::class,
+        'onGetIcon' => QuickIcon\GetIconEvent::class,
         // Table
-        'onTableAfterBind'      => AfterBindEvent::class,
-        'onTableAfterCheckin'   => AfterCheckinEvent::class,
-        'onTableAfterCheckout'  => AfterCheckoutEvent::class,
-        'onTableAfterDelete'    => AfterDeleteEvent::class,
-        'onTableAfterHit'       => AfterHitEvent::class,
-        'onTableAfterLoad'      => AfterLoadEvent::class,
-        'onTableAfterMove'      => AfterMoveEvent::class,
-        'onTableAfterPublish'   => AfterPublishEvent::class,
-        'onTableAfterReorder'   => AfterReorderEvent::class,
-        'onTableAfterReset'     => AfterResetEvent::class,
-        'onTableAfterStore'     => AfterStoreEvent::class,
-        'onTableBeforeBind'     => BeforeBindEvent::class,
-        'onTableBeforeCheckin'  => BeforeCheckinEvent::class,
-        'onTableBeforeCheckout' => BeforeCheckoutEvent::class,
-        'onTableBeforeDelete'   => BeforeDeleteEvent::class,
-        'onTableBeforeHit'      => BeforeHitEvent::class,
-        'onTableBeforeLoad'     => BeforeLoadEvent::class,
-        'onTableBeforeMove'     => BeforeMoveEvent::class,
-        'onTableBeforePublish'  => BeforePublishEvent::class,
-        'onTableBeforeReorder'  => BeforeReorderEvent::class,
-        'onTableBeforeReset'    => BeforeResetEvent::class,
-        'onTableBeforeStore'    => BeforeStoreEvent::class,
-        'onTableCheck'          => CheckEvent::class,
-        'onTableObjectCreate'   => ObjectCreateEvent::class,
-        'onTableSetNewTags'     => SetNewTagsEvent::class,
+        'onTableAfterBind'      => Table\AfterBindEvent::class,
+        'onTableAfterCheckin'   => Table\AfterCheckinEvent::class,
+        'onTableAfterCheckout'  => Table\AfterCheckoutEvent::class,
+        'onTableAfterDelete'    => Table\AfterDeleteEvent::class,
+        'onTableAfterHit'       => Table\AfterHitEvent::class,
+        'onTableAfterLoad'      => Table\AfterLoadEvent::class,
+        'onTableAfterMove'      => Table\AfterMoveEvent::class,
+        'onTableAfterPublish'   => Table\AfterPublishEvent::class,
+        'onTableAfterReorder'   => Table\AfterReorderEvent::class,
+        'onTableAfterReset'     => Table\AfterResetEvent::class,
+        'onTableAfterStore'     => Table\AfterStoreEvent::class,
+        'onTableBeforeBind'     => Table\BeforeBindEvent::class,
+        'onTableBeforeCheckin'  => Table\BeforeCheckinEvent::class,
+        'onTableBeforeCheckout' => Table\BeforeCheckoutEvent::class,
+        'onTableBeforeDelete'   => Table\BeforeDeleteEvent::class,
+        'onTableBeforeHit'      => Table\BeforeHitEvent::class,
+        'onTableBeforeLoad'     => Table\BeforeLoadEvent::class,
+        'onTableBeforeMove'     => Table\BeforeMoveEvent::class,
+        'onTableBeforePublish'  => Table\BeforePublishEvent::class,
+        'onTableBeforeReorder'  => Table\BeforeReorderEvent::class,
+        'onTableBeforeReset'    => Table\BeforeResetEvent::class,
+        'onTableBeforeStore'    => Table\BeforeStoreEvent::class,
+        'onTableCheck'          => Table\CheckEvent::class,
+        'onTableObjectCreate'   => Table\ObjectCreateEvent::class,
+        'onTableSetNewTags'     => Table\SetNewTagsEvent::class,
         // View
-        'onBeforeDisplay' => DisplayEvent::class,
-        'onAfterDisplay'  => DisplayEvent::class,
+        'onBeforeDisplay' => View\DisplayEvent::class,
+        'onAfterDisplay'  => View\DisplayEvent::class,
         // Workflow
-        'onWorkflowFunctionalityUsed' => WorkflowFunctionalityUsedEvent::class,
-        'onWorkflowAfterTransition'   => WorkflowTransitionEvent::class,
-        'onWorkflowBeforeTransition'  => WorkflowTransitionEvent::class,
+        'onWorkflowFunctionalityUsed' => Workflow\WorkflowFunctionalityUsedEvent::class,
+        'onWorkflowAfterTransition'   => Workflow\WorkflowTransitionEvent::class,
+        'onWorkflowBeforeTransition'  => Workflow\WorkflowTransitionEvent::class,
         // Plugin: System, WebAuthn
         'onAjaxWebauthn'           => PlgSystemWebauthnAjax::class,
         'onAjaxWebauthnChallenge'  => PlgSystemWebauthnAjaxChallenge::class,
@@ -115,6 +100,114 @@ trait CoreEventAware
         'onAjaxWebauthnInitcreate' => PlgSystemWebauthnAjaxInitCreate::class,
         'onAjaxWebauthnLogin'      => PlgSystemWebauthnAjaxLogin::class,
         'onAjaxWebauthnSavelabel'  => PlgSystemWebauthnAjaxSaveLabel::class,
+        // Plugin: System, Schemaorg
+        'onSchemaBeforeCompileHead' => Plugin\System\Schemaorg\BeforeCompileHeadEvent::class,
+        'onSchemaPrepareData'       => Plugin\System\Schemaorg\PrepareDataEvent::class,
+        'onSchemaPrepareForm'       => Plugin\System\Schemaorg\PrepareFormEvent::class,
+        'onSchemaPrepareSave'       => Plugin\System\Schemaorg\PrepareSaveEvent::class,
+        // Extensions
+        'onBeforeExtensionBoot' => BeforeExtensionBootEvent::class,
+        'onAfterExtensionBoot'  => AfterExtensionBootEvent::class,
+        // Content
+        'onContentPrepare'       => Content\ContentPrepareEvent::class,
+        'onContentAfterTitle'    => Content\AfterTitleEvent::class,
+        'onContentBeforeDisplay' => Content\BeforeDisplayEvent::class,
+        'onContentAfterDisplay'  => Content\AfterDisplayEvent::class,
+        // Model
+        'onContentNormaliseRequestData' => Model\NormaliseRequestDataEvent::class,
+        'onContentBeforeValidateData'   => Model\BeforeValidateDataEvent::class,
+        'onContentPrepareForm'          => Model\PrepareFormEvent::class,
+        'onContentPrepareData'          => Model\PrepareDataEvent::class,
+        'onContentBeforeSave'           => Model\BeforeSaveEvent::class,
+        'onContentAfterSave'            => Model\AfterSaveEvent::class,
+        'onContentBeforeDelete'         => Model\BeforeDeleteEvent::class,
+        'onContentAfterDelete'          => Model\AfterDeleteEvent::class,
+        'onContentBeforeChangeState'    => Model\BeforeChangeStateEvent::class,
+        'onContentChangeState'          => Model\AfterChangeStateEvent::class,
+        'onCategoryChangeState'         => Model\AfterCategoryChangeStateEvent::class,
+        'onBeforeBatch'                 => Model\BeforeBatchEvent::class,
+        // User
+        'onUserAuthenticate'         => User\AuthenticationEvent::class,
+        'onUserAuthorisation'        => User\AuthorisationEvent::class,
+        'onUserAuthorisationFailure' => User\AuthorisationFailureEvent::class,
+        'onUserLogin'                => User\LoginEvent::class,
+        'onUserAfterLogin'           => User\AfterLoginEvent::class,
+        'onUserLoginFailure'         => User\LoginFailureEvent::class,
+        'onUserLogout'               => User\LogoutEvent::class,
+        'onUserAfterLogout'          => User\AfterLogoutEvent::class,
+        'onUserLogoutFailure'        => User\LogoutFailureEvent::class,
+        'onUserLoginButtons'         => User\LoginButtonsEvent::class,
+        'onUserBeforeSave'           => User\BeforeSaveEvent::class,
+        'onUserAfterSave'            => User\AfterSaveEvent::class,
+        'onUserBeforeDelete'         => User\BeforeDeleteEvent::class,
+        'onUserAfterDelete'          => User\AfterDeleteEvent::class,
+        'onUserAfterRemind'          => User\AfterRemindEvent::class,
+        // User Group
+        'onUserBeforeSaveGroup'   => Model\BeforeSaveEvent::class,
+        'onUserAfterSaveGroup'    => Model\AfterSaveEvent::class,
+        'onUserBeforeDeleteGroup' => Model\BeforeDeleteEvent::class,
+        'onUserAfterDeleteGroup'  => Model\AfterDeleteEvent::class,
+        // Modules
+        'onRenderModule'         => Module\BeforeRenderModuleEvent::class,
+        'onAfterRenderModule'    => Module\AfterRenderModuleEvent::class,
+        'onAfterRenderModules'   => Module\AfterRenderModulesEvent::class,
+        'onPrepareModuleList'    => Module\PrepareModuleListEvent::class,
+        'onAfterModuleList'      => Module\AfterModuleListEvent::class,
+        'onAfterCleanModuleList' => Module\AfterCleanModuleListEvent::class,
+        // Extension
+        'onExtensionBeforeInstall'   => Extension\BeforeInstallEvent::class,
+        'onExtensionAfterInstall'    => Extension\AfterInstallEvent::class,
+        'onExtensionBeforeUninstall' => Extension\BeforeUninstallEvent::class,
+        'onExtensionAfterUninstall'  => Extension\AfterUninstallEvent::class,
+        'onExtensionBeforeUpdate'    => Extension\BeforeUpdateEvent::class,
+        'onExtensionAfterUpdate'     => Extension\AfterUpdateEvent::class,
+        'onExtensionBeforeSave'      => Model\BeforeSaveEvent::class,
+        'onExtensionAfterSave'       => Model\AfterSaveEvent::class,
+        'onExtensionAfterDelete'     => Model\AfterDeleteEvent::class,
+        // Installer
+        'onInstallerAddInstallationTab'    => Installer\AddInstallationTabEvent::class,
+        'onInstallerBeforeInstallation'    => Installer\BeforeInstallationEvent::class,
+        'onInstallerBeforeInstaller'       => Installer\BeforeInstallerEvent::class,
+        'onInstallerAfterInstaller'        => Installer\AfterInstallerEvent::class,
+        'onInstallerBeforePackageDownload' => Installer\BeforePackageDownloadEvent::class,
+        // Finder
+        'onFinderCategoryChangeState' => Finder\AfterCategoryChangeStateEvent::class,
+        'onFinderChangeState'         => Finder\AfterChangeStateEvent::class,
+        'onFinderAfterDelete'         => Finder\AfterDeleteEvent::class,
+        'onFinderBeforeSave'          => Finder\BeforeSaveEvent::class,
+        'onFinderAfterSave'           => Finder\AfterSaveEvent::class,
+        'onFinderResult'              => Finder\ResultEvent::class,
+        'onPrepareFinderContent'      => Finder\PrepareContentEvent::class,
+        'onBeforeIndex'               => Finder\BeforeIndexEvent::class,
+        'onBuildIndex'                => Finder\BuildIndexEvent::class,
+        'onStartIndex'                => Finder\StartIndexEvent::class,
+        'onFinderGarbageCollection'   => Finder\GarbageCollectionEvent::class,
+        // Menu
+        'onBeforeRenderMenuItems'   => Menu\BeforeRenderMenuItemsViewEvent::class,
+        'onAfterGetMenuTypeOptions' => Menu\AfterGetMenuTypeOptionsEvent::class,
+        'onPreprocessMenuItems'     => Menu\PreprocessMenuItemsEvent::class,
+        // ActionLog
+        'onAfterLogPurge'  => ActionLog\AfterLogPurgeEvent::class,
+        'onAfterLogExport' => ActionLog\AfterLogExportEvent::class,
+        // Cache
+        'onAfterPurge' => Cache\AfterPurgeEvent::class,
+        // Contact
+        'onValidateContact' => Contact\ValidateContactEvent::class,
+        'onSubmitContact'   => Contact\SubmitContactEvent::class,
+        // Checkin
+        'onAfterCheckin' => Checkin\AfterCheckinEvent::class,
+        // Custom Fields
+        'onCustomFieldsGetTypes'           => CustomFields\GetTypesEvent::class,
+        'onCustomFieldsPrepareDom'         => CustomFields\PrepareDomEvent::class,
+        'onCustomFieldsBeforePrepareField' => CustomFields\BeforePrepareFieldEvent::class,
+        'onCustomFieldsPrepareField'       => CustomFields\PrepareFieldEvent::class,
+        'onCustomFieldsAfterPrepareField'  => CustomFields\AfterPrepareFieldEvent::class,
+        // Privacy
+        'onPrivacyCollectAdminCapabilities'    => Privacy\CollectCapabilitiesEvent::class,
+        'onPrivacyCheckPrivacyPolicyPublished' => Privacy\CheckPrivacyPolicyPublishedEvent::class,
+        'onPrivacyExportRequest'               => Privacy\ExportRequestEvent::class,
+        'onPrivacyCanRemoveData'               => Privacy\CanRemoveDataEvent::class,
+        'onPrivacyRemoveData'                  => Privacy\RemoveDataEvent::class,
     ];
 
     /**
@@ -130,10 +223,6 @@ trait CoreEventAware
      */
     protected static function getEventClassByEventName(string $eventName): string
     {
-        if (strpos($eventName, 'onWebAssetRegistryChangedAsset') === 0) {
-            return WebAssetRegistryAssetChanged::class;
-        }
-
         return self::$eventNameToConcreteClass[$eventName] ?? Event::class;
     }
 }
diff --git a/libraries/src/Event/CustomFields/AbstractPrepareFieldEvent.php b/libraries/src/Event/CustomFields/AbstractPrepareFieldEvent.php
new file mode 100644
index 0000000000000..c9ffc4b4bc13e
--- /dev/null
+++ b/libraries/src/Event/CustomFields/AbstractPrepareFieldEvent.php
@@ -0,0 +1,119 @@
+<?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\Event\CustomFields;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for CustomFields events
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+abstract class AbstractPrepareFieldEvent extends CustomFieldsEvent
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  __DEPLOY_VERSION__
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['context', 'item', 'subject'];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        parent::__construct($name, $arguments);
+
+        if (!\array_key_exists('context', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'context' of event {$name} is required but has not been provided");
+        }
+
+        if (!\array_key_exists('item', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'item' of event {$name} is required but has not been provided");
+        }
+    }
+
+    /**
+     * Setter for the context argument.
+     *
+     * @param   string  $value  The value to set
+     *
+     * @return  string
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setContext(string $value): string
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the item argument.
+     *
+     * @param   object  $value  The value to set
+     *
+     * @return  object
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setItem(object $value): object
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the field.
+     *
+     * @return  object
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getField(): object
+    {
+        return $this->arguments['subject'];
+    }
+
+    /**
+     * Getter for the context.
+     *
+     * @return  string
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getContext(): string
+    {
+        return $this->arguments['context'];
+    }
+
+    /**
+     * Getter for the item.
+     *
+     * @return  object
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getItem(): object
+    {
+        return $this->arguments['item'];
+    }
+}
diff --git a/libraries/src/Event/CustomFields/AfterPrepareFieldEvent.php b/libraries/src/Event/CustomFields/AfterPrepareFieldEvent.php
new file mode 100644
index 0000000000000..cff6182ce1c5a
--- /dev/null
+++ b/libraries/src/Event/CustomFields/AfterPrepareFieldEvent.php
@@ -0,0 +1,86 @@
+<?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\Event\CustomFields;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for CustomFields events
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class AfterPrepareFieldEvent extends AbstractPrepareFieldEvent
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  __DEPLOY_VERSION__
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['context', 'item', 'subject', 'value'];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        parent::__construct($name, $arguments);
+
+        if (!\array_key_exists('value', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'value' of event {$name} is required but has not been provided");
+        }
+
+        // For backward compatibility make sure the value is referenced
+        // TODO: Remove in Joomla 6
+        // @deprecated: Passing argument by reference is deprecated, and will not work in Joomla 6
+        if (key($arguments) === 0 && \count($arguments) >= 4) {
+            $this->arguments['value'] = &$arguments[3];
+        } elseif (\array_key_exists('value', $arguments)) {
+            $this->arguments['value'] = &$arguments['value'];
+        }
+    }
+
+    /**
+     * Getter for the value.
+     *
+     * @return  mixed
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getValue(): mixed
+    {
+        return $this->arguments['value'];
+    }
+
+    /**
+     * Update the value.
+     *
+     * @return  mixed
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function updateValue(mixed $value): static
+    {
+        $this->arguments['value'] = $value;
+
+        return $this;
+    }
+}
diff --git a/libraries/src/Event/CustomFields/BeforePrepareFieldEvent.php b/libraries/src/Event/CustomFields/BeforePrepareFieldEvent.php
new file mode 100644
index 0000000000000..f43b5ec33cf4b
--- /dev/null
+++ b/libraries/src/Event/CustomFields/BeforePrepareFieldEvent.php
@@ -0,0 +1,23 @@
+<?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\Event\CustomFields;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for CustomFields events
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class BeforePrepareFieldEvent extends AbstractPrepareFieldEvent
+{
+}
diff --git a/libraries/src/Event/CustomFields/CustomFieldsEvent.php b/libraries/src/Event/CustomFields/CustomFieldsEvent.php
new file mode 100644
index 0000000000000..b2677a8412523
--- /dev/null
+++ b/libraries/src/Event/CustomFields/CustomFieldsEvent.php
@@ -0,0 +1,75 @@
+<?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\Event\CustomFields;
+
+use Joomla\CMS\Event\AbstractImmutableEvent;
+use Joomla\CMS\Event\ReshapeArgumentsAware;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for CustomFields events
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+abstract class CustomFieldsEvent extends AbstractImmutableEvent
+{
+    use ReshapeArgumentsAware;
+
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  __DEPLOY_VERSION__
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = [];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        // Reshape the arguments array to preserve b/c with legacy listeners
+        if ($this->legacyArgumentsOrder) {
+            $arguments = $this->reshapeArguments($arguments, $this->legacyArgumentsOrder);
+        }
+
+        parent::__construct($name, $arguments);
+
+        if (!\array_key_exists('subject', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'subject' of event {$name} is required but has not been provided");
+        }
+    }
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   object  $value  The value to set
+     *
+     * @return  object
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setSubject(object $value): object
+    {
+        return $value;
+    }
+}
diff --git a/libraries/src/Event/CustomFields/GetTypesEvent.php b/libraries/src/Event/CustomFields/GetTypesEvent.php
new file mode 100644
index 0000000000000..1ca52682c6642
--- /dev/null
+++ b/libraries/src/Event/CustomFields/GetTypesEvent.php
@@ -0,0 +1,30 @@
+<?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\Event\CustomFields;
+
+use Joomla\CMS\Event\AbstractImmutableEvent;
+use Joomla\CMS\Event\Result\ResultAware;
+use Joomla\CMS\Event\Result\ResultAwareInterface;
+use Joomla\CMS\Event\Result\ResultTypeArrayAware;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for CustomFields events
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class GetTypesEvent extends AbstractImmutableEvent implements ResultAwareInterface
+{
+    use ResultAware;
+    use ResultTypeArrayAware;
+}
diff --git a/libraries/src/Event/CustomFields/PrepareDomEvent.php b/libraries/src/Event/CustomFields/PrepareDomEvent.php
new file mode 100644
index 0000000000000..aeae0d7dad8de
--- /dev/null
+++ b/libraries/src/Event/CustomFields/PrepareDomEvent.php
@@ -0,0 +1,121 @@
+<?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\Event\CustomFields;
+
+use Joomla\CMS\Form\Form;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for CustomFields events
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class PrepareDomEvent extends CustomFieldsEvent
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  __DEPLOY_VERSION__
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['subject', 'fieldset', 'form'];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        parent::__construct($name, $arguments);
+
+        if (!\array_key_exists('fieldset', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'fieldset' of event {$name} is required but has not been provided");
+        }
+
+        if (!\array_key_exists('form', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'form' of event {$name} is required but has not been provided");
+        }
+    }
+
+    /**
+     * Setter for the fieldset argument.
+     *
+     * @param   \DOMElement  $value  The value to set
+     *
+     * @return  \DOMElement
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setFieldset(\DOMElement $value): \DOMElement
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the form argument.
+     *
+     * @param   Form  $value  The value to set
+     *
+     * @return  Form
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setForm(Form $value): Form
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the field.
+     *
+     * @return  object
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getField(): object
+    {
+        return $this->arguments['subject'];
+    }
+
+    /**
+     * Getter for the fieldset.
+     *
+     * @return  \DOMElement
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getFieldset(): \DOMElement
+    {
+        return $this->arguments['fieldset'];
+    }
+
+    /**
+     * Getter for the form.
+     *
+     * @return  Form
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getForm(): Form
+    {
+        return $this->arguments['form'];
+    }
+}
diff --git a/libraries/src/Event/CustomFields/PrepareFieldEvent.php b/libraries/src/Event/CustomFields/PrepareFieldEvent.php
new file mode 100644
index 0000000000000..f5ca9ad2e6f16
--- /dev/null
+++ b/libraries/src/Event/CustomFields/PrepareFieldEvent.php
@@ -0,0 +1,29 @@
+<?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\Event\CustomFields;
+
+use Joomla\CMS\Event\Result\ResultAware;
+use Joomla\CMS\Event\Result\ResultAwareInterface;
+use Joomla\CMS\Event\Result\ResultTypeMixedAware;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for CustomFields events
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class PrepareFieldEvent extends AbstractPrepareFieldEvent implements ResultAwareInterface
+{
+    use ResultAware;
+    use ResultTypeMixedAware;
+}
diff --git a/libraries/src/Event/Editor/EditorButtonsSetupEvent.php b/libraries/src/Event/Editor/EditorButtonsSetupEvent.php
new file mode 100644
index 0000000000000..c77a74a4bdffc
--- /dev/null
+++ b/libraries/src/Event/Editor/EditorButtonsSetupEvent.php
@@ -0,0 +1,204 @@
+<?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\Event\Editor;
+
+use Joomla\CMS\Editor\Button\ButtonsRegistryInterface;
+use Joomla\CMS\Event\AbstractImmutableEvent;
+
+/**
+ * Editor setup event
+ *
+ * @since   5.0.0
+ */
+final class EditorButtonsSetupEvent extends AbstractImmutableEvent
+{
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   5.0.0
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        if (!\array_key_exists('subject', $arguments)) {
+            throw new \BadMethodCallException("Argument 'subject' of event {$name} is required but has not been provided");
+        }
+
+        if (!\array_key_exists('editorType', $arguments)) {
+            throw new \BadMethodCallException("Argument 'editorType' of event {$name} is required but has not been provided");
+        }
+
+        if (!\array_key_exists('disabledButtons', $arguments)) {
+            throw new \BadMethodCallException("Argument 'disabledButtons' of event {$name} is required but has not been provided");
+        }
+
+        parent::__construct($name, $arguments);
+    }
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   ButtonsRegistryInterface  $value  The value to set
+     *
+     * @return  ButtonsRegistryInterface
+     *
+     * @since  5.0.0
+     */
+    protected function setSubject(ButtonsRegistryInterface $value): ButtonsRegistryInterface
+    {
+        return $value;
+    }
+
+    /**
+     * Returns Buttons Registry instance.
+     *
+     * @return  ButtonsRegistryInterface
+     *
+     * @since  5.0.0
+     */
+    public function getButtonsRegistry(): ButtonsRegistryInterface
+    {
+        return $this->getArgument('subject');
+    }
+
+    /**
+     * Setter for the Editor Type argument.
+     *
+     * @param   string  $value  The value to set
+     *
+     * @return  string
+     *
+     * @since  5.0.0
+     */
+    protected function setEditorType(string $value): string
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the Editor Type argument.
+     *
+     * @return  string
+     *
+     * @since  5.0.0
+     */
+    public function getEditorType(): string
+    {
+        return $this->arguments['editorType'];
+    }
+
+    /**
+     * Setter for the disabled buttons argument.
+     *
+     * @param   array  $value  The value to set
+     *
+     * @return  array
+     *
+     * @since  5.0.0
+     */
+    protected function setDisabledButtons(array $value): array
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the disabled buttons argument.
+     *
+     * @return  array
+     *
+     * @since  5.0.0
+     */
+    public function getDisabledButtons(): array
+    {
+        return $this->arguments['disabledButtons'];
+    }
+
+    /**
+     * Setter for the Editor ID argument.
+     *
+     * @param   string  $value  The value to set
+     *
+     * @return  string
+     *
+     * @since  5.0.0
+     */
+    protected function setEditorId(string $value): string
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the Editor ID argument.
+     *
+     * @return  string
+     *
+     * @since  5.0.0
+     */
+    public function getEditorId(): string
+    {
+        return $this->arguments['editorId'] ?? '';
+    }
+
+    /**
+     * Setter for the asset argument.
+     *
+     * @param   int  $value  The value to set
+     *
+     * @return  int
+     *
+     * @since  5.0.0
+     */
+    protected function setAsset(int $value): int
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the asset argument.
+     *
+     * @return  int
+     *
+     * @since  5.0.0
+     */
+    public function getAsset(): int
+    {
+        return $this->arguments['asset'] ?? 0;
+    }
+
+    /**
+     * Setter for the author argument.
+     *
+     * @param   int  $value  The value to set
+     *
+     * @return  int
+     *
+     * @since  5.0.0
+     */
+    protected function setAuthor(int $value): int
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the author argument.
+     *
+     * @return  int
+     *
+     * @since  5.0.0
+     */
+    public function getAuthor(): int
+    {
+        return $this->arguments['author'] ?? 0;
+    }
+}
diff --git a/libraries/src/Event/Editor/EditorSetupEvent.php b/libraries/src/Event/Editor/EditorSetupEvent.php
new file mode 100644
index 0000000000000..a79d721a2a63e
--- /dev/null
+++ b/libraries/src/Event/Editor/EditorSetupEvent.php
@@ -0,0 +1,66 @@
+<?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\Event\Editor;
+
+use Joomla\CMS\Editor\EditorsRegistryInterface;
+use Joomla\CMS\Event\AbstractImmutableEvent;
+
+/**
+ * Editor setup event
+ *
+ * @since   5.0.0
+ */
+final class EditorSetupEvent extends AbstractImmutableEvent
+{
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   5.0.0
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        if (!\array_key_exists('subject', $arguments)) {
+            throw new \BadMethodCallException("Argument 'subject' of event {$name} is required but has not been provided");
+        }
+
+        parent::__construct($name, $arguments);
+    }
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   EditorsRegistryInterface  $value  The value to set
+     *
+     * @return  EditorsRegistryInterface
+     *
+     * @since  5.0.0
+     */
+    protected function setSubject(EditorsRegistryInterface $value): EditorsRegistryInterface
+    {
+        return $value;
+    }
+
+    /**
+     * Returns Editors Registry instance.
+     *
+     * @return  EditorsRegistryInterface
+     *
+     * @since  5.0.0
+     */
+    public function getEditorsRegistry(): EditorsRegistryInterface
+    {
+        return $this->getArgument('subject');
+    }
+}
diff --git a/libraries/src/Event/ErrorEvent.php b/libraries/src/Event/ErrorEvent.php
index a5e4f9c094bdf..6d1956ab268ad 100644
--- a/libraries/src/Event/ErrorEvent.php
+++ b/libraries/src/Event/ErrorEvent.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event;
@@ -12,7 +12,7 @@
 use Joomla\Application\AbstractApplication;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Event/Extension/AbstractExtensionEvent.php b/libraries/src/Event/Extension/AbstractExtensionEvent.php
new file mode 100644
index 0000000000000..060ceabd0003b
--- /dev/null
+++ b/libraries/src/Event/Extension/AbstractExtensionEvent.php
@@ -0,0 +1,57 @@
+<?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\Event\Extension;
+
+use Joomla\CMS\Event\AbstractImmutableEvent;
+use Joomla\CMS\Event\ReshapeArgumentsAware;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Base class for Extension events
+ *
+ * @since  5.0.0
+ */
+abstract class AbstractExtensionEvent extends AbstractImmutableEvent
+{
+    use ReshapeArgumentsAware;
+
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = [];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   5.0.0
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        // Reshape the arguments array to preserve b/c with legacy listeners
+        if ($this->legacyArgumentsOrder) {
+            $arguments = $this->reshapeArguments($arguments, $this->legacyArgumentsOrder);
+        }
+
+        parent::__construct($name, $arguments);
+    }
+}
diff --git a/libraries/src/Event/Extension/AfterInstallEvent.php b/libraries/src/Event/Extension/AfterInstallEvent.php
new file mode 100644
index 0000000000000..d562149afb651
--- /dev/null
+++ b/libraries/src/Event/Extension/AfterInstallEvent.php
@@ -0,0 +1,109 @@
+<?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\Event\Extension;
+
+use Joomla\CMS\Installer\Installer;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Extension events
+ *
+ * @since  5.0.0
+ */
+class AfterInstallEvent extends AbstractExtensionEvent
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['installer', 'eid'];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   5.0.0
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        parent::__construct($name, $arguments);
+
+        if (!\array_key_exists('installer', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'method' of event {$name} is required but has not been provided");
+        }
+
+        if (!\array_key_exists('eid', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'eid' of event {$name} is required but has not been provided");
+        }
+    }
+
+    /**
+     * Setter for the installer argument.
+     *
+     * @param   Installer  $value  The value to set
+     *
+     * @return  Installer
+     *
+     * @since  5.0.0
+     */
+    protected function setInstaller(Installer $value): Installer
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the eid argument.
+     *
+     * @param   int|bool  $value  The value to set
+     *
+     * @return  int|bool
+     *
+     * @since  5.0.0
+     */
+    protected function setEid(int|bool $value): int|bool
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the installer.
+     *
+     * @return  Installer
+     *
+     * @since  5.0.0
+     */
+    public function getInstaller(): Installer
+    {
+        return $this->arguments['installer'];
+    }
+
+    /**
+     * Getter for the eid.
+     *
+     * @return  int|bool
+     *
+     * @since  5.0.0
+     */
+    public function getEid(): int|bool
+    {
+        return $this->arguments['eid'];
+    }
+}
diff --git a/libraries/src/Event/Extension/AfterUninstallEvent.php b/libraries/src/Event/Extension/AfterUninstallEvent.php
new file mode 100644
index 0000000000000..01943423d018a
--- /dev/null
+++ b/libraries/src/Event/Extension/AfterUninstallEvent.php
@@ -0,0 +1,139 @@
+<?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\Event\Extension;
+
+use Joomla\CMS\Installer\Installer;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Extension events
+ *
+ * @since  5.0.0
+ */
+class AfterUninstallEvent extends AbstractExtensionEvent
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['installer', 'eid', 'removed'];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   5.0.0
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        parent::__construct($name, $arguments);
+
+        if (!\array_key_exists('installer', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'method' of event {$name} is required but has not been provided");
+        }
+
+        if (!\array_key_exists('eid', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'eid' of event {$name} is required but has not been provided");
+        }
+
+        if (!\array_key_exists('removed', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'removed' of event {$name} is required but has not been provided");
+        }
+    }
+
+    /**
+     * Setter for the installer argument.
+     *
+     * @param   Installer  $value  The value to set
+     *
+     * @return  Installer
+     *
+     * @since  5.0.0
+     */
+    protected function setInstaller(Installer $value): Installer
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the eid argument.
+     *
+     * @param   integer  $value  The value to set
+     *
+     * @return  integer
+     *
+     * @since  5.0.0
+     */
+    protected function setEid(int $value): int
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the removed argument.
+     *
+     * @param   bool  $value  The value to set
+     *
+     * @return  bool
+     *
+     * @since  5.0.0
+     */
+    protected function setRemoved(bool $value): bool
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the installer.
+     *
+     * @return  Installer
+     *
+     * @since  5.0.0
+     */
+    public function getInstaller(): Installer
+    {
+        return $this->arguments['installer'];
+    }
+
+    /**
+     * Getter for the eid.
+     *
+     * @return  integer
+     *
+     * @since  5.0.0
+     */
+    public function getEid(): int
+    {
+        return $this->arguments['eid'];
+    }
+
+    /**
+     * Getter for the removed.
+     *
+     * @return  bool
+     *
+     * @since  5.0.0
+     */
+    public function getRemoved(): bool
+    {
+        return $this->arguments['removed'];
+    }
+}
diff --git a/libraries/src/Event/Extension/AfterUpdateEvent.php b/libraries/src/Event/Extension/AfterUpdateEvent.php
new file mode 100644
index 0000000000000..d07546ecc1ea7
--- /dev/null
+++ b/libraries/src/Event/Extension/AfterUpdateEvent.php
@@ -0,0 +1,109 @@
+<?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\Event\Extension;
+
+use Joomla\CMS\Installer\Installer;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Extension events
+ *
+ * @since  5.0.0
+ */
+class AfterUpdateEvent extends AbstractExtensionEvent
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['installer', 'eid'];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   5.0.0
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        parent::__construct($name, $arguments);
+
+        if (!\array_key_exists('installer', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'method' of event {$name} is required but has not been provided");
+        }
+
+        if (!\array_key_exists('eid', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'eid' of event {$name} is required but has not been provided");
+        }
+    }
+
+    /**
+     * Setter for the installer argument.
+     *
+     * @param   Installer  $value  The value to set
+     *
+     * @return  Installer
+     *
+     * @since  5.0.0
+     */
+    protected function setInstaller(Installer $value): Installer
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the eid argument.
+     *
+     * @param   int|bool  $value  The value to set
+     *
+     * @return  int|bool
+     *
+     * @since  5.0.0
+     */
+    protected function setEid(int|bool $value): int|bool
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the installer.
+     *
+     * @return  Installer
+     *
+     * @since  5.0.0
+     */
+    public function getInstaller(): Installer
+    {
+        return $this->arguments['installer'];
+    }
+
+    /**
+     * Getter for the eid.
+     *
+     * @return  int|bool
+     *
+     * @since  5.0.0
+     */
+    public function getEid(): int|bool
+    {
+        return $this->arguments['eid'];
+    }
+}
diff --git a/libraries/src/Event/Extension/BeforeInstallEvent.php b/libraries/src/Event/Extension/BeforeInstallEvent.php
new file mode 100644
index 0000000000000..5ef2a40e5168b
--- /dev/null
+++ b/libraries/src/Event/Extension/BeforeInstallEvent.php
@@ -0,0 +1,159 @@
+<?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\Event\Extension;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Extension events
+ *
+ * @since  5.0.0
+ */
+class BeforeInstallEvent extends AbstractExtensionEvent
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['method', 'type', 'manifest', 'extension'];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   5.0.0
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        parent::__construct($name, $arguments);
+
+        if (!\array_key_exists('method', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'method' of event {$name} is required but has not been provided");
+        }
+
+        if (!\array_key_exists('type', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'type' of event {$name} is required but has not been provided");
+        }
+    }
+
+    /**
+     * Setter for the method argument.
+     *
+     * @param   string  $value  The value to set
+     *
+     * @return  string
+     *
+     * @since  5.0.0
+     */
+    protected function setMethod(string $value): string
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the type argument.
+     *
+     * @param   string  $value  The value to set
+     *
+     * @return  string
+     *
+     * @since  5.0.0
+     */
+    protected function setType(string $value): string
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the manifest argument.
+     *
+     * @param   ?\SimpleXMLElement  $value  The value to set
+     *
+     * @return  ?\SimpleXMLElement
+     *
+     * @since  5.0.0
+     */
+    protected function setManifest(?\SimpleXMLElement $value): ?\SimpleXMLElement
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the extension argument.
+     *
+     * @param   integer  $value  The value to set
+     *
+     * @return  integer
+     *
+     * @since  5.0.0
+     */
+    protected function setExtension(int $value): int
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the method.
+     *
+     * @return  string
+     *
+     * @since  5.0.0
+     */
+    public function getMethod(): string
+    {
+        return $this->arguments['method'];
+    }
+
+    /**
+     * Getter for the type.
+     *
+     * @return  string
+     *
+     * @since  5.0.0
+     */
+    public function getType(): string
+    {
+        return $this->arguments['type'];
+    }
+
+    /**
+     * Getter for the manifest.
+     *
+     * @return  ?\SimpleXMLElement
+     *
+     * @since  5.0.0
+     */
+    public function getManifest(): ?\SimpleXMLElement
+    {
+        return $this->arguments['manifest'] ?? null;
+    }
+
+    /**
+     * Getter for the extension.
+     *
+     * @return  integer
+     *
+     * @since  5.0.0
+     */
+    public function getExtension(): int
+    {
+        return $this->arguments['extension'] ?? 0;
+    }
+}
diff --git a/libraries/src/Event/Extension/BeforeUninstallEvent.php b/libraries/src/Event/Extension/BeforeUninstallEvent.php
new file mode 100644
index 0000000000000..fde96656c72f0
--- /dev/null
+++ b/libraries/src/Event/Extension/BeforeUninstallEvent.php
@@ -0,0 +1,77 @@
+<?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\Event\Extension;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Extension events
+ *
+ * @since  5.0.0
+ */
+class BeforeUninstallEvent extends AbstractExtensionEvent
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['eid'];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   5.0.0
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        parent::__construct($name, $arguments);
+
+        if (!\array_key_exists('eid', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'eid' of event {$name} is required but has not been provided");
+        }
+    }
+
+    /**
+     * Setter for the eid argument.
+     *
+     * @param   integer  $value  The value to set
+     *
+     * @return  integer
+     *
+     * @since  5.0.0
+     */
+    protected function setEid(int $value): int
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the eid.
+     *
+     * @return  integer
+     *
+     * @since  5.0.0
+     */
+    public function getEid(): int
+    {
+        return $this->arguments['eid'];
+    }
+}
diff --git a/libraries/src/Event/Extension/BeforeUpdateEvent.php b/libraries/src/Event/Extension/BeforeUpdateEvent.php
new file mode 100644
index 0000000000000..b6bb2f9cfacbd
--- /dev/null
+++ b/libraries/src/Event/Extension/BeforeUpdateEvent.php
@@ -0,0 +1,107 @@
+<?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\Event\Extension;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Extension events
+ *
+ * @since  5.0.0
+ */
+class BeforeUpdateEvent extends AbstractExtensionEvent
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['type', 'manifest'];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   5.0.0
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        parent::__construct($name, $arguments);
+
+        if (!\array_key_exists('type', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'type' of event {$name} is required but has not been provided");
+        }
+
+        if (!\array_key_exists('manifest', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'manifest' of event {$name} is required but has not been provided");
+        }
+    }
+
+    /**
+     * Setter for the type argument.
+     *
+     * @param   string  $value  The value to set
+     *
+     * @return  string
+     *
+     * @since  5.0.0
+     */
+    protected function setType(string $value): string
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the manifest argument.
+     *
+     * @param   ?\SimpleXMLElement  $value  The value to set
+     *
+     * @return  ?\SimpleXMLElement
+     *
+     * @since  5.0.0
+     */
+    protected function setManifest(?\SimpleXMLElement $value): ?\SimpleXMLElement
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the type.
+     *
+     * @return  string
+     *
+     * @since  5.0.0
+     */
+    public function getType(): string
+    {
+        return $this->arguments['type'];
+    }
+
+    /**
+     * Getter for the manifest.
+     *
+     * @return  ?\SimpleXMLElement
+     *
+     * @since  5.0.0
+     */
+    public function getManifest(): ?\SimpleXMLElement
+    {
+        return $this->arguments['manifest'];
+    }
+}
diff --git a/libraries/src/Event/Finder/AbstractFinderEvent.php b/libraries/src/Event/Finder/AbstractFinderEvent.php
new file mode 100644
index 0000000000000..fb51bbdef1dc9
--- /dev/null
+++ b/libraries/src/Event/Finder/AbstractFinderEvent.php
@@ -0,0 +1,61 @@
+<?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\Event\Finder;
+
+use Joomla\CMS\Event\AbstractImmutableEvent;
+use Joomla\CMS\Event\ReshapeArgumentsAware;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Finder events
+ *
+ * @since  5.0.0
+ */
+abstract class AbstractFinderEvent extends AbstractImmutableEvent implements FinderEventInterface
+{
+    use ReshapeArgumentsAware;
+
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = [];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   5.0.0
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        // Reshape the arguments array to preserve b/c with legacy listeners
+        if ($this->legacyArgumentsOrder) {
+            $arguments = $this->reshapeArguments($arguments, $this->legacyArgumentsOrder);
+        }
+
+        parent::__construct($name, $arguments);
+
+        if (!\array_key_exists('subject', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'subject' of event {$name} is required but has not been provided");
+        }
+    }
+}
diff --git a/libraries/src/Event/Finder/AfterCategoryChangeStateEvent.php b/libraries/src/Event/Finder/AfterCategoryChangeStateEvent.php
new file mode 100644
index 0000000000000..8eba8a49db7e1
--- /dev/null
+++ b/libraries/src/Event/Finder/AfterCategoryChangeStateEvent.php
@@ -0,0 +1,25 @@
+<?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\Event\Finder;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Model event.
+ * Example:
+ *  new AfterCategoryChangeStateEvent('onEventName', ['context' => $extension, 'subject' => $primaryKeys, 'value' => $newState]);
+ *
+ * @since  5.0.0
+ */
+class AfterCategoryChangeStateEvent extends \Joomla\CMS\Event\Model\AfterCategoryChangeStateEvent implements FinderEventInterface
+{
+}
diff --git a/libraries/src/Event/Finder/AfterChangeStateEvent.php b/libraries/src/Event/Finder/AfterChangeStateEvent.php
new file mode 100644
index 0000000000000..d4f88e99f5b04
--- /dev/null
+++ b/libraries/src/Event/Finder/AfterChangeStateEvent.php
@@ -0,0 +1,27 @@
+<?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\Event\Finder;
+
+use Joomla\CMS\Event\Model\ChangeStateEvent;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Model event.
+ * Example:
+ *  new AfterChangeStateEvent('onEventName', ['context' => 'com_example.example', 'subject' => $primaryKeys, 'value' => $newState]);
+ *
+ * @since  5.0.0
+ */
+class AfterChangeStateEvent extends ChangeStateEvent implements FinderEventInterface
+{
+}
diff --git a/libraries/src/Event/Finder/AfterDeleteEvent.php b/libraries/src/Event/Finder/AfterDeleteEvent.php
new file mode 100644
index 0000000000000..8580ccf5dacd9
--- /dev/null
+++ b/libraries/src/Event/Finder/AfterDeleteEvent.php
@@ -0,0 +1,27 @@
+<?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\Event\Finder;
+
+use Joomla\CMS\Event\Model\DeleteEvent;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Model event.
+ * Example:
+ *  new AfterDeleteEvent('onEventName', ['context' => 'com_example.example', 'subject' => $itemObjectToDelete]);
+ *
+ * @since  5.0.0
+ */
+class AfterDeleteEvent extends DeleteEvent implements FinderEventInterface
+{
+}
diff --git a/libraries/src/Event/Finder/AfterSaveEvent.php b/libraries/src/Event/Finder/AfterSaveEvent.php
new file mode 100644
index 0000000000000..3c06697720ce8
--- /dev/null
+++ b/libraries/src/Event/Finder/AfterSaveEvent.php
@@ -0,0 +1,36 @@
+<?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\Event\Finder;
+
+use Joomla\CMS\Event\Model\SaveEvent;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Model event.
+ * Example:
+ *  new AfterSaveEvent('onEventName', ['context' => 'com_example.example', 'subject' => $itemObjectToSave, 'isNew' => $isNew]);
+ *
+ * @since  5.0.0
+ */
+class AfterSaveEvent extends SaveEvent implements FinderEventInterface
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['context', 'subject', 'isNew'];
+}
diff --git a/libraries/src/Event/Finder/BeforeIndexEvent.php b/libraries/src/Event/Finder/BeforeIndexEvent.php
new file mode 100644
index 0000000000000..3ae5fba4c9d9e
--- /dev/null
+++ b/libraries/src/Event/Finder/BeforeIndexEvent.php
@@ -0,0 +1,27 @@
+<?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\Event\Finder;
+
+use Joomla\CMS\Event\AbstractImmutableEvent;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Finder events.
+ * Example:
+ *  new BeforeIndexEvent('onEventName', []);
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class BeforeIndexEvent extends AbstractImmutableEvent implements FinderEventInterface
+{
+}
diff --git a/libraries/src/Event/Finder/BeforeSaveEvent.php b/libraries/src/Event/Finder/BeforeSaveEvent.php
new file mode 100644
index 0000000000000..1d7adec55df7c
--- /dev/null
+++ b/libraries/src/Event/Finder/BeforeSaveEvent.php
@@ -0,0 +1,36 @@
+<?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\Event\Finder;
+
+use Joomla\CMS\Event\Model\SaveEvent;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Model event.
+ * Example:
+ *  new BeforeSaveEvent('onEventName', ['context' => 'com_example.example', 'subject' => $itemObjectToSave, 'isNew' => $isNew);
+ *
+ * @since  5.0.0
+ */
+class BeforeSaveEvent extends SaveEvent implements FinderEventInterface
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['context', 'subject', 'isNew'];
+}
diff --git a/libraries/src/Event/Finder/BuildIndexEvent.php b/libraries/src/Event/Finder/BuildIndexEvent.php
new file mode 100644
index 0000000000000..a48e168d6fc1c
--- /dev/null
+++ b/libraries/src/Event/Finder/BuildIndexEvent.php
@@ -0,0 +1,27 @@
+<?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\Event\Finder;
+
+use Joomla\CMS\Event\AbstractImmutableEvent;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Finder events.
+ * Example:
+ *  new BuildIndexEvent('onEventName', []);
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class BuildIndexEvent extends AbstractImmutableEvent implements FinderEventInterface
+{
+}
diff --git a/libraries/src/Event/Finder/FinderEventInterface.php b/libraries/src/Event/Finder/FinderEventInterface.php
new file mode 100644
index 0000000000000..3f53cb856a785
--- /dev/null
+++ b/libraries/src/Event/Finder/FinderEventInterface.php
@@ -0,0 +1,19 @@
+<?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\Event\Finder;
+
+/**
+ * Interface class for finder events
+ *
+ * @since  5.0.0
+ */
+interface FinderEventInterface
+{
+}
diff --git a/libraries/src/Event/Finder/GarbageCollectionEvent.php b/libraries/src/Event/Finder/GarbageCollectionEvent.php
new file mode 100644
index 0000000000000..4a1b81c9df0b8
--- /dev/null
+++ b/libraries/src/Event/Finder/GarbageCollectionEvent.php
@@ -0,0 +1,27 @@
+<?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\Event\Finder;
+
+use Joomla\CMS\Event\AbstractImmutableEvent;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Finder events.
+ * Example:
+ *  new GarbageCollectionEvent('onEventName', []);
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class GarbageCollectionEvent extends AbstractImmutableEvent implements FinderEventInterface
+{
+}
diff --git a/libraries/src/Event/Finder/PrepareContentEvent.php b/libraries/src/Event/Finder/PrepareContentEvent.php
new file mode 100644
index 0000000000000..78c0fb4752062
--- /dev/null
+++ b/libraries/src/Event/Finder/PrepareContentEvent.php
@@ -0,0 +1,62 @@
+<?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\Event\Finder;
+
+use Joomla\Component\Finder\Administrator\Indexer\Result;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Finder events.
+ * Example:
+ *  new PrepareContentEvent('onEventName', ['subject' => $item]);
+ *
+ * @since  5.0.0
+ */
+class PrepareContentEvent extends AbstractFinderEvent
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['subject'];
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   Result  $value  The value to set
+     *
+     * @return  Result
+     *
+     * @since  5.0.0
+     */
+    protected function setSubject(Result $value): Result
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the item.
+     *
+     * @return  Result
+     *
+     * @since  5.0.0
+     */
+    public function getItem(): Result
+    {
+        return $this->arguments['subject'];
+    }
+}
diff --git a/libraries/src/Event/Finder/ResultEvent.php b/libraries/src/Event/Finder/ResultEvent.php
new file mode 100644
index 0000000000000..ced76ec23ea16
--- /dev/null
+++ b/libraries/src/Event/Finder/ResultEvent.php
@@ -0,0 +1,89 @@
+<?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\Event\Finder;
+
+use Joomla\Component\Finder\Administrator\Indexer\Query;
+use Joomla\Component\Finder\Administrator\Indexer\Result;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Finder events.
+ * Example:
+ *  new ResultEvent('onEventName', ['subject' => $item, 'query' => $query]);
+ *
+ * @since  5.0.0
+ */
+class ResultEvent extends AbstractFinderEvent
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['subject', 'query'];
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   Result  $value  The value to set
+     *
+     * @return  Result
+     *
+     * @since  5.0.0
+     */
+    protected function setSubject(Result $value): Result
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the query argument.
+     *
+     * @param   Query  $value  The value to set
+     *
+     * @return  Query
+     *
+     * @since  5.0.0
+     */
+    protected function setQuery(Query $value): Query
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the item.
+     *
+     * @return  Result
+     *
+     * @since  5.0.0
+     */
+    public function getItem(): Result
+    {
+        return $this->arguments['subject'];
+    }
+
+    /**
+     * Getter for the query.
+     *
+     * @return  Query
+     *
+     * @since  5.0.0
+     */
+    public function getQuery(): Query
+    {
+        return $this->arguments['query'];
+    }
+}
diff --git a/libraries/src/Event/Finder/StartIndexEvent.php b/libraries/src/Event/Finder/StartIndexEvent.php
new file mode 100644
index 0000000000000..657da9a0bddcf
--- /dev/null
+++ b/libraries/src/Event/Finder/StartIndexEvent.php
@@ -0,0 +1,27 @@
+<?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\Event\Finder;
+
+use Joomla\CMS\Event\AbstractImmutableEvent;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Finder events.
+ * Example:
+ *  new StartIndexEvent('onEventName', []);
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class StartIndexEvent extends AbstractImmutableEvent implements FinderEventInterface
+{
+}
diff --git a/libraries/src/Event/GenericEvent.php b/libraries/src/Event/GenericEvent.php
index 6417e395c472a..00f724276657d 100644
--- a/libraries/src/Event/GenericEvent.php
+++ b/libraries/src/Event/GenericEvent.php
@@ -4,13 +4,13 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Event/Installer/AddInstallationTabEvent.php b/libraries/src/Event/Installer/AddInstallationTabEvent.php
new file mode 100644
index 0000000000000..c033b14e81e85
--- /dev/null
+++ b/libraries/src/Event/Installer/AddInstallationTabEvent.php
@@ -0,0 +1,30 @@
+<?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\Event\Installer;
+
+use Joomla\CMS\Event\AbstractImmutableEvent;
+use Joomla\CMS\Event\Result\ResultAware;
+use Joomla\CMS\Event\Result\ResultAwareInterface;
+use Joomla\CMS\Event\Result\ResultTypeArrayAware;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Installer events
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class AddInstallationTabEvent extends AbstractImmutableEvent implements ResultAwareInterface
+{
+    use ResultAware;
+    use ResultTypeArrayAware;
+}
diff --git a/libraries/src/Event/Installer/AfterInstallerEvent.php b/libraries/src/Event/Installer/AfterInstallerEvent.php
new file mode 100644
index 0000000000000..fcef2d512d455
--- /dev/null
+++ b/libraries/src/Event/Installer/AfterInstallerEvent.php
@@ -0,0 +1,182 @@
+<?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\Event\Installer;
+
+use Joomla\CMS\Installer\Installer as ExtensionInstaller;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Installer events
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class AfterInstallerEvent extends InstallerEvent
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  __DEPLOY_VERSION__
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['subject', 'package', 'installer', 'installerResult', 'message'];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        parent::__construct($name, $arguments);
+
+        if (!\array_key_exists('installer', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'installer' of event {$name} is required but has not been provided");
+        }
+
+        if (!\array_key_exists('installerResult', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'installerResult' of event {$name} is required but has not been provided");
+        }
+
+        if (!\array_key_exists('message', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'message' of event {$name} is required but has not been provided");
+        }
+
+        // For backward compatibility make sure the values is referenced
+        // TODO: Remove in Joomla 6
+        // @deprecated: Passing argument by reference is deprecated, and will not work in Joomla 6
+        if (key($arguments) === 0) {
+            $this->arguments['installerResult'] = &$arguments[3];
+            $this->arguments['message']         = &$arguments[4];
+        } elseif (\array_key_exists('installerResult', $arguments)) {
+            $this->arguments['installerResult'] = &$arguments['installerResult'];
+            $this->arguments['message']         = &$arguments['message'];
+        }
+    }
+
+    /**
+     * Setter for the installer argument.
+     *
+     * @param   ExtensionInstaller  $value  The value to set
+     *
+     * @return  ExtensionInstaller
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setInstaller(ExtensionInstaller $value): ExtensionInstaller
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the installerResult argument.
+     *
+     * @param   bool  $value  The value to set
+     *
+     * @return  bool
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setInstallerResult(bool $value): bool
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the message argument.
+     *
+     * @param   string  $value  The value to set
+     *
+     * @return  string
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setMessage(string $value): string
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the installer.
+     *
+     * @return  ExtensionInstaller
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getInstaller(): ExtensionInstaller
+    {
+        return $this->arguments['installer'];
+    }
+
+    /**
+     * Getter for the installer result.
+     *
+     * @return  bool
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getInstallerResult(): bool
+    {
+        return $this->arguments['installerResult'];
+    }
+
+    /**
+     * Getter for the message.
+     *
+     * @return  string
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getMessage(): string
+    {
+        return $this->arguments['message'];
+    }
+
+    /**
+     * Update the installerResult.
+     *
+     * @param   bool  $value  The value to set
+     *
+     * @return  static
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function updateInstallerResult(bool $value): static
+    {
+        $this->arguments['installerResult'] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Update the message.
+     *
+     * @param   string  $value  The value to set
+     *
+     * @return  static
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function updateMessage(string $value): static
+    {
+        $this->arguments['message'] = $value;
+
+        return $this;
+    }
+}
diff --git a/libraries/src/Event/Installer/BeforeInstallationEvent.php b/libraries/src/Event/Installer/BeforeInstallationEvent.php
new file mode 100644
index 0000000000000..0c60014928ef0
--- /dev/null
+++ b/libraries/src/Event/Installer/BeforeInstallationEvent.php
@@ -0,0 +1,29 @@
+<?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\Event\Installer;
+
+use Joomla\CMS\Event\Result\ResultAware;
+use Joomla\CMS\Event\Result\ResultAwareInterface;
+use Joomla\CMS\Event\Result\ResultTypeBooleanAware;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Installer events
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class BeforeInstallationEvent extends InstallerEvent implements ResultAwareInterface
+{
+    use ResultAware;
+    use ResultTypeBooleanAware;
+}
diff --git a/libraries/src/Event/Installer/BeforeInstallerEvent.php b/libraries/src/Event/Installer/BeforeInstallerEvent.php
new file mode 100644
index 0000000000000..a2ed8293650b3
--- /dev/null
+++ b/libraries/src/Event/Installer/BeforeInstallerEvent.php
@@ -0,0 +1,29 @@
+<?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\Event\Installer;
+
+use Joomla\CMS\Event\Result\ResultAware;
+use Joomla\CMS\Event\Result\ResultAwareInterface;
+use Joomla\CMS\Event\Result\ResultTypeBooleanAware;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Installer events
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class BeforeInstallerEvent extends InstallerEvent implements ResultAwareInterface
+{
+    use ResultAware;
+    use ResultTypeBooleanAware;
+}
diff --git a/libraries/src/Event/Installer/BeforePackageDownloadEvent.php b/libraries/src/Event/Installer/BeforePackageDownloadEvent.php
new file mode 100644
index 0000000000000..7914abd57799e
--- /dev/null
+++ b/libraries/src/Event/Installer/BeforePackageDownloadEvent.php
@@ -0,0 +1,143 @@
+<?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\Event\Installer;
+
+use Joomla\CMS\Event\AbstractImmutableEvent;
+use Joomla\CMS\Event\ReshapeArgumentsAware;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Installer events
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class BeforePackageDownloadEvent extends AbstractImmutableEvent
+{
+    use ReshapeArgumentsAware;
+
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  __DEPLOY_VERSION__
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['url', 'headers'];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        // Reshape the arguments array to preserve b/c with legacy listeners
+        // Do not override existing $arguments in place, or it will break references!
+        if ($this->legacyArgumentsOrder) {
+            parent::__construct($name, $this->reshapeArguments($arguments, $this->legacyArgumentsOrder));
+        } else {
+            parent::__construct($name, $arguments);
+        }
+
+        if (!\array_key_exists('url', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'url' of event {$name} is required but has not been provided");
+        }
+
+        if (!\array_key_exists('headers', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'headers' of event {$name} is required but has not been provided");
+        }
+
+        // For backward compatibility make sure the value is referenced
+        // TODO: Remove in Joomla 6
+        // @deprecated: Passing argument by reference is deprecated, and will not work in Joomla 6
+        if (key($arguments) === 0) {
+            $this->arguments['url'] = &$arguments[0];
+        } elseif (\array_key_exists('url', $arguments)) {
+            $this->arguments['url'] = &$arguments['url'];
+        }
+    }
+
+    /**
+     * Setter for the url argument.
+     *
+     * @param   string  $value  The value to set
+     *
+     * @return  string
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setUrl(string $value): string
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the headers argument.
+     *
+     * @param   array|\ArrayAccess  $value  The value to set
+     *
+     * @return  array|\ArrayAccess
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setHeaders(array|\ArrayAccess $value): array|\ArrayAccess
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the url.
+     *
+     * @return  string
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getUrl(): string
+    {
+        return $this->arguments['url'];
+    }
+
+    /**
+     * Getter for the headers.
+     *
+     * @return  array|\ArrayAccess
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getHeaders(): array|\ArrayAccess
+    {
+        return $this->arguments['headers'];
+    }
+
+    /**
+     * Update the url.
+     *
+     * @param   string  $value  The value to set
+     *
+     * @return  static
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function updateUrl(string $value): static
+    {
+        $this->arguments['url'] = $value;
+
+        return $this;
+    }
+}
diff --git a/libraries/src/Event/Installer/InstallerEvent.php b/libraries/src/Event/Installer/InstallerEvent.php
new file mode 100644
index 0000000000000..7ad91e8bf7168
--- /dev/null
+++ b/libraries/src/Event/Installer/InstallerEvent.php
@@ -0,0 +1,144 @@
+<?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\Event\Installer;
+
+use Joomla\CMS\Event\AbstractImmutableEvent;
+use Joomla\CMS\Event\ReshapeArgumentsAware;
+use Joomla\CMS\MVC\Model\BaseModel;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Installer events
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+abstract class InstallerEvent extends AbstractImmutableEvent
+{
+    use ReshapeArgumentsAware;
+
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  __DEPLOY_VERSION__
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['subject', 'package'];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        // Reshape the arguments array to preserve b/c with legacy listeners
+        // Do not override existing $arguments in place, or it will break references!
+        if ($this->legacyArgumentsOrder) {
+            parent::__construct($name, $this->reshapeArguments($arguments, $this->legacyArgumentsOrder));
+        } else {
+            parent::__construct($name, $arguments);
+        }
+
+        if (!\array_key_exists('subject', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'subject' of event {$name} is required but has not been provided");
+        }
+
+        if (!\array_key_exists('package', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'package' of event {$name} is required but has not been provided");
+        }
+
+        // For backward compatibility make sure the package is referenced
+        // TODO: Remove in Joomla 6
+        // @deprecated: Passing argument by reference is deprecated, and will not work in Joomla 6
+        if (key($arguments) === 0) {
+            $this->arguments['package'] = &$arguments[1];
+        } elseif (\array_key_exists('package', $arguments)) {
+            $this->arguments['package'] = &$arguments['package'];
+        }
+    }
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   BaseModel  $value  The value to set
+     *
+     * @return  BaseModel
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setSubject(BaseModel $value): BaseModel
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the package argument.
+     *
+     * @param   array|\ArrayAccess|null  $value  The value to set
+     *
+     * @return  array|\ArrayAccess|null
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setPackage(array|\ArrayAccess|null $value): array|\ArrayAccess|null
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the model.
+     *
+     * @return  BaseModel
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getModel(): BaseModel
+    {
+        return $this->arguments['subject'];
+    }
+
+    /**
+     * Getter for the package.
+     *
+     * @return  array|\ArrayAccess|null
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getPackage(): array|\ArrayAccess|null
+    {
+        return $this->arguments['package'] ?? null;
+    }
+
+    /**
+     * Update the package.
+     *
+     * @param   array|\ArrayAccess|null  $value  The value to set
+     *
+     * @return  static
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function updatePackage(array|\ArrayAccess|null $value): static
+    {
+        $this->arguments['package'] = $value;
+
+        return $this;
+    }
+}
diff --git a/libraries/src/Event/Menu/AfterGetMenuTypeOptionsEvent.php b/libraries/src/Event/Menu/AfterGetMenuTypeOptionsEvent.php
new file mode 100644
index 0000000000000..517e77c368561
--- /dev/null
+++ b/libraries/src/Event/Menu/AfterGetMenuTypeOptionsEvent.php
@@ -0,0 +1,118 @@
+<?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\Event\Menu;
+
+use Joomla\CMS\Event\AbstractImmutableEvent;
+use Joomla\CMS\Event\ReshapeArgumentsAware;
+use Joomla\CMS\MVC\Model\BaseModel;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for menu events
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class AfterGetMenuTypeOptionsEvent extends AbstractImmutableEvent
+{
+    use ReshapeArgumentsAware;
+
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  __DEPLOY_VERSION__
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['items', 'subject'];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        // Reshape the arguments array to preserve b/c with legacy listeners
+        if ($this->legacyArgumentsOrder) {
+            $arguments = $this->reshapeArguments($arguments, $this->legacyArgumentsOrder);
+        }
+
+        parent::__construct($name, $arguments);
+
+        if (!\array_key_exists('items', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'items' of event {$name} is required but has not been provided");
+        }
+
+        if (!\array_key_exists('subject', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'subject' of event {$name} is required but has not been provided");
+        }
+    }
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   BaseModel  $value  The value to set
+     *
+     * @return  BaseModel
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setSubject(BaseModel $value): BaseModel
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the items argument.
+     *
+     * @param   array|\ArrayAccess  $value  The value to set
+     *
+     * @return  array|\ArrayAccess
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setItems(array|\ArrayAccess $value): array|\ArrayAccess
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the model.
+     *
+     * @return  BaseModel
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getModel(): BaseModel
+    {
+        return $this->arguments['subject'];
+    }
+
+    /**
+     * Getter for the items.
+     *
+     * @return  array|\ArrayAccess
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getItems(): array|\ArrayAccess
+    {
+        return $this->arguments['items'];
+    }
+}
diff --git a/libraries/src/Event/Menu/BeforeRenderMenuItemsViewEvent.php b/libraries/src/Event/Menu/BeforeRenderMenuItemsViewEvent.php
new file mode 100644
index 0000000000000..f04691a302283
--- /dev/null
+++ b/libraries/src/Event/Menu/BeforeRenderMenuItemsViewEvent.php
@@ -0,0 +1,88 @@
+<?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\Event\Menu;
+
+use Joomla\CMS\Event\AbstractImmutableEvent;
+use Joomla\CMS\Event\ReshapeArgumentsAware;
+use Joomla\CMS\MVC\View\HtmlView;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for menu events
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class BeforeRenderMenuItemsViewEvent extends AbstractImmutableEvent
+{
+    use ReshapeArgumentsAware;
+
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  __DEPLOY_VERSION__
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['subject'];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        // Reshape the arguments array to preserve b/c with legacy listeners
+        if ($this->legacyArgumentsOrder) {
+            $arguments = $this->reshapeArguments($arguments, $this->legacyArgumentsOrder);
+        }
+
+        parent::__construct($name, $arguments);
+
+        if (!\array_key_exists('subject', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'subject' of event {$name} is required but has not been provided");
+        }
+    }
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   HtmlView  $value  The value to set
+     *
+     * @return  HtmlView
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setSubject(HtmlView $value): HtmlView
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the view.
+     *
+     * @return  HtmlView
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getView(): HtmlView
+    {
+        return $this->arguments['subject'];
+    }
+}
diff --git a/libraries/src/Event/Menu/PreprocessMenuItemsEvent.php b/libraries/src/Event/Menu/PreprocessMenuItemsEvent.php
new file mode 100644
index 0000000000000..1bcf6d3525e23
--- /dev/null
+++ b/libraries/src/Event/Menu/PreprocessMenuItemsEvent.php
@@ -0,0 +1,170 @@
+<?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\Event\Menu;
+
+use Joomla\CMS\Event\AbstractImmutableEvent;
+use Joomla\CMS\Event\ReshapeArgumentsAware;
+use Joomla\Registry\Registry;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for menu events
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class PreprocessMenuItemsEvent extends AbstractImmutableEvent
+{
+    use ReshapeArgumentsAware;
+
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  __DEPLOY_VERSION__
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['context', 'subject', 'params', 'enabled'];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        // Reshape the arguments array to preserve b/c with legacy listeners
+        if ($this->legacyArgumentsOrder) {
+            $arguments = $this->reshapeArguments($arguments, $this->legacyArgumentsOrder);
+        }
+
+        parent::__construct($name, $arguments);
+
+        if (!\array_key_exists('context', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'context' of event {$name} is required but has not been provided");
+        }
+
+        if (!\array_key_exists('subject', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'subject' of event {$name} is required but has not been provided");
+        }
+    }
+
+    /**
+     * Setter for the context argument.
+     *
+     * @param   string  $value  The value to set
+     *
+     * @return  string
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setContext(string $value): string
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   array|\ArrayAccess  $value  The value to set
+     *
+     * @return  array|\ArrayAccess
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setSubject(array|\ArrayAccess $value): array|\ArrayAccess
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the registry argument.
+     *
+     * @param   ?Registry  $value  The value to set
+     *
+     * @return  ?Registry
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setParams(?Registry $value): ?Registry
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the enabled argument.
+     *
+     * @param   ?bool  $value  The value to set
+     *
+     * @return  ?bool
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setEnabled(?bool $value): ?bool
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the context.
+     *
+     * @return  string
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getContext(): string
+    {
+        return $this->arguments['context'];
+    }
+
+    /**
+     * Getter for the items.
+     *
+     * @return  array|\ArrayAccess
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getItems(): array|\ArrayAccess
+    {
+        return $this->arguments['subject'];
+    }
+
+    /**
+     * Getter for the params.
+     *
+     * @return  ?Registry
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getParams(): ?Registry
+    {
+        return $this->arguments['params'] ?? null;
+    }
+
+    /**
+     * Getter for the enabled.
+     *
+     * @return  ?bool
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getEnabled(): ?bool
+    {
+        return $this->arguments['enabled'] ?? null;
+    }
+}
diff --git a/libraries/src/Event/Model/AfterCategoryChangeStateEvent.php b/libraries/src/Event/Model/AfterCategoryChangeStateEvent.php
new file mode 100644
index 0000000000000..0bc1133fcf6a5
--- /dev/null
+++ b/libraries/src/Event/Model/AfterCategoryChangeStateEvent.php
@@ -0,0 +1,36 @@
+<?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\Event\Model;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Model event.
+ * Example:
+ *  new AfterCategoryChangeStateEvent('onEventName', ['context' => $extension, 'subject' => $primaryKeys, 'value' => $newState]);
+ *
+ * @since  5.0.0
+ */
+class AfterCategoryChangeStateEvent extends ChangeStateEvent
+{
+    /**
+     * Getter for the extension.
+     *
+     * @return  string
+     *
+     * @since  5.0.0
+     */
+    public function getExtension(): string
+    {
+        return $this->getContext();
+    }
+}
diff --git a/libraries/src/Event/Model/AfterChangeStateEvent.php b/libraries/src/Event/Model/AfterChangeStateEvent.php
new file mode 100644
index 0000000000000..8d668b0efd5b0
--- /dev/null
+++ b/libraries/src/Event/Model/AfterChangeStateEvent.php
@@ -0,0 +1,31 @@
+<?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\Event\Model;
+
+use Joomla\CMS\Event\Result\ResultAware;
+use Joomla\CMS\Event\Result\ResultAwareInterface;
+use Joomla\CMS\Event\Result\ResultTypeBooleanAware;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Model event.
+ * Example:
+ *  new AfterChangeStateEvent('onEventName', ['context' => 'com_example.example', 'subject' => $primaryKeys, 'value' => $newState]);
+ *
+ * @since  5.0.0
+ */
+class AfterChangeStateEvent extends ChangeStateEvent implements ResultAwareInterface
+{
+    use ResultAware;
+    use ResultTypeBooleanAware;
+}
diff --git a/libraries/src/Event/Model/AfterCleanCacheEvent.php b/libraries/src/Event/Model/AfterCleanCacheEvent.php
new file mode 100644
index 0000000000000..f5d693916bf46
--- /dev/null
+++ b/libraries/src/Event/Model/AfterCleanCacheEvent.php
@@ -0,0 +1,147 @@
+<?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\Event\Model;
+
+use Joomla\CMS\Event\AbstractImmutableEvent;
+use Joomla\CMS\Event\ReshapeArgumentsAware;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Clean cache events
+ *
+ * @since  5.0.0
+ */
+class AfterCleanCacheEvent extends AbstractImmutableEvent
+{
+    use ReshapeArgumentsAware;
+
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['defaultgroup', 'cachebase', 'result'];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   5.0.0
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        // Reshape the arguments array to preserve b/c with legacy listeners
+        if ($this->legacyArgumentsOrder) {
+            $arguments = $this->reshapeArguments($arguments, $this->legacyArgumentsOrder);
+        }
+
+        parent::__construct($name, $arguments);
+
+        if (!\array_key_exists('defaultgroup', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'defaultgroup' of event {$name} is required but has not been provided");
+        }
+
+        if (!\array_key_exists('cachebase', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'cachebase' of event {$name} is required but has not been provided");
+        }
+
+        if (!\array_key_exists('result', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'result' of event {$name} is required but has not been provided");
+        }
+    }
+
+    /**
+     * Setter for the defaultgroup argument.
+     *
+     * @param   string  $value  The value to set
+     *
+     * @return  string
+     *
+     * @since  5.0.0
+     */
+    protected function setDefaultgroup(string $value): string
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the cachebase argument.
+     *
+     * @param   string  $value  The value to set
+     *
+     * @return  string
+     *
+     * @since  5.0.0
+     */
+    protected function setCachebase(string $value): string
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the result argument.
+     *
+     * @param   bool  $value  The value to set
+     *
+     * @return  bool
+     *
+     * @since  5.0.0
+     */
+    protected function setResult(bool $value): bool
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the defaultgroup.
+     *
+     * @return  string
+     *
+     * @since  5.0.0
+     */
+    public function getDefaultGroup(): string
+    {
+        return $this->arguments['defaultgroup'];
+    }
+
+    /**
+     * Getter for the cachebase.
+     *
+     * @return  string
+     *
+     * @since  5.0.0
+     */
+    public function getCacheBase(): string
+    {
+        return $this->arguments['cachebase'];
+    }
+
+    /**
+     * Getter for the result.
+     *
+     * @return  bool
+     *
+     * @since  5.0.0
+     */
+    public function getResult(): bool
+    {
+        return $this->arguments['result'];
+    }
+}
diff --git a/libraries/src/Event/Model/AfterDeleteEvent.php b/libraries/src/Event/Model/AfterDeleteEvent.php
new file mode 100644
index 0000000000000..567f737a8fc02
--- /dev/null
+++ b/libraries/src/Event/Model/AfterDeleteEvent.php
@@ -0,0 +1,25 @@
+<?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\Event\Model;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Model event.
+ * Example:
+ *  new AfterDeleteEvent('onEventName', ['context' => 'com_example.example', 'subject' => $itemObjectToDelete]);
+ *
+ * @since  5.0.0
+ */
+class AfterDeleteEvent extends DeleteEvent
+{
+}
diff --git a/libraries/src/Event/Model/AfterSaveEvent.php b/libraries/src/Event/Model/AfterSaveEvent.php
new file mode 100644
index 0000000000000..e18007439484a
--- /dev/null
+++ b/libraries/src/Event/Model/AfterSaveEvent.php
@@ -0,0 +1,25 @@
+<?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\Event\Model;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Model event.
+ * Example:
+ *  new AfterSaveEvent('onEventName', ['context' => 'com_example.example', 'subject' => $itemObjectToSave, 'isNew' => $isNew, 'data' => $submittedData]);
+ *
+ * @since  5.0.0
+ */
+class AfterSaveEvent extends SaveEvent
+{
+}
diff --git a/libraries/src/Event/Model/BeforeBatchEvent.php b/libraries/src/Event/Model/BeforeBatchEvent.php
index d6257ef527350..890b814d7fdb4 100644
--- a/libraries/src/Event/Model/BeforeBatchEvent.php
+++ b/libraries/src/Event/Model/BeforeBatchEvent.php
@@ -4,16 +4,15 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Model;
 
-use BadMethodCallException;
 use Joomla\CMS\Event\AbstractImmutableEvent;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -29,18 +28,18 @@ class BeforeBatchEvent extends AbstractImmutableEvent
      * @param   string  $name       The event name.
      * @param   array   $arguments  The event arguments.
      *
-     * @throws  BadMethodCallException
+     * @throws  \BadMethodCallException
      *
      * @since   4.0.0
      */
     public function __construct($name, array $arguments = [])
     {
         if (!\array_key_exists('src', $arguments)) {
-            throw new BadMethodCallException("Argument 'src' is required for event $name");
+            throw new \BadMethodCallException("Argument 'src' is required for event $name");
         }
 
         if (!\array_key_exists('type', $arguments)) {
-            throw new BadMethodCallException("Argument 'type' is required for event $name");
+            throw new \BadMethodCallException("Argument 'type' is required for event $name");
         }
 
         parent::__construct($name, $arguments);
diff --git a/libraries/src/Event/Model/BeforeChangeStateEvent.php b/libraries/src/Event/Model/BeforeChangeStateEvent.php
new file mode 100644
index 0000000000000..e6a14f1107fb3
--- /dev/null
+++ b/libraries/src/Event/Model/BeforeChangeStateEvent.php
@@ -0,0 +1,31 @@
+<?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\Event\Model;
+
+use Joomla\CMS\Event\Result\ResultAware;
+use Joomla\CMS\Event\Result\ResultAwareInterface;
+use Joomla\CMS\Event\Result\ResultTypeBooleanAware;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Model event.
+ * Example:
+ *  new BeforeChangeStateEvent('onEventName', ['context' => 'com_example.example', 'subject' => $primaryKeys, 'value' => $newState]);
+ *
+ * @since  5.0.0
+ */
+class BeforeChangeStateEvent extends ChangeStateEvent implements ResultAwareInterface
+{
+    use ResultAware;
+    use ResultTypeBooleanAware;
+}
diff --git a/libraries/src/Event/Model/BeforeDeleteEvent.php b/libraries/src/Event/Model/BeforeDeleteEvent.php
new file mode 100644
index 0000000000000..53f1c8245aadf
--- /dev/null
+++ b/libraries/src/Event/Model/BeforeDeleteEvent.php
@@ -0,0 +1,31 @@
+<?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\Event\Model;
+
+use Joomla\CMS\Event\Result\ResultAware;
+use Joomla\CMS\Event\Result\ResultAwareInterface;
+use Joomla\CMS\Event\Result\ResultTypeBooleanAware;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Model event.
+ * Example:
+ *  new BeforeDeleteEvent('onEventName', ['context' => 'com_example.example', 'subject' => $itemObjectToDelete]);
+ *
+ * @since  5.0.0
+ */
+class BeforeDeleteEvent extends DeleteEvent implements ResultAwareInterface
+{
+    use ResultAware;
+    use ResultTypeBooleanAware;
+}
diff --git a/libraries/src/Event/Model/BeforeSaveEvent.php b/libraries/src/Event/Model/BeforeSaveEvent.php
new file mode 100644
index 0000000000000..2f2f1877683f5
--- /dev/null
+++ b/libraries/src/Event/Model/BeforeSaveEvent.php
@@ -0,0 +1,31 @@
+<?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\Event\Model;
+
+use Joomla\CMS\Event\Result\ResultAware;
+use Joomla\CMS\Event\Result\ResultAwareInterface;
+use Joomla\CMS\Event\Result\ResultTypeBooleanAware;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Model event.
+ * Example:
+ *  new BeforeSaveEvent('onEventName', ['context' => 'com_example.example', 'subject' => $itemObjectToSave, 'isNew' => $isNew, 'data' => $submittedData]);
+ *
+ * @since  5.0.0
+ */
+class BeforeSaveEvent extends SaveEvent implements ResultAwareInterface
+{
+    use ResultAware;
+    use ResultTypeBooleanAware;
+}
diff --git a/libraries/src/Event/Model/BeforeValidateDataEvent.php b/libraries/src/Event/Model/BeforeValidateDataEvent.php
new file mode 100644
index 0000000000000..cdb215fe42476
--- /dev/null
+++ b/libraries/src/Event/Model/BeforeValidateDataEvent.php
@@ -0,0 +1,25 @@
+<?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\Event\Model;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Model Form event.
+ * Example:
+ *  new BeforeValidateDataEvent('onEventName', ['subject' => $form, 'data' => $data]);
+ *
+ * @since  5.0.0
+ */
+class BeforeValidateDataEvent extends FormEvent
+{
+}
diff --git a/libraries/src/Event/Model/ChangeStateEvent.php b/libraries/src/Event/Model/ChangeStateEvent.php
new file mode 100644
index 0000000000000..5f70dfedea9cb
--- /dev/null
+++ b/libraries/src/Event/Model/ChangeStateEvent.php
@@ -0,0 +1,84 @@
+<?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\Event\Model;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Model event
+ *
+ * @since  5.0.0
+ */
+abstract class ChangeStateEvent extends ModelEvent
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['context', 'subject', 'value'];
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   array  $value  The value to set
+     *
+     * @return  array
+     *
+     * @since  5.0.0
+     */
+    protected function setSubject(array $value): array
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the value argument.
+     *
+     * @param   int  $value  The value to set
+     *
+     * @return  int
+     *
+     * @since  5.0.0
+     */
+    protected function setValue($value): int
+    {
+        return (int) $value;
+    }
+
+    /**
+     * Getter for the list of primary keys.
+     *
+     * @return  array
+     *
+     * @since  5.0.0
+     */
+    public function getPks(): array
+    {
+        return $this->arguments['subject'];
+    }
+
+    /**
+     * Getter for the value state.
+     *
+     * @return  integer
+     *
+     * @since  5.0.0
+     */
+    public function getValue(): int
+    {
+        return $this->arguments['value'];
+    }
+}
diff --git a/libraries/src/Event/Model/DeleteEvent.php b/libraries/src/Event/Model/DeleteEvent.php
new file mode 100644
index 0000000000000..06f8115214304
--- /dev/null
+++ b/libraries/src/Event/Model/DeleteEvent.php
@@ -0,0 +1,58 @@
+<?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\Event\Model;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Model event
+ *
+ * @since  5.0.0
+ */
+abstract class DeleteEvent extends ModelEvent
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['context', 'subject'];
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   object  $value  The value to set
+     *
+     * @return  object
+     *
+     * @since  5.0.0
+     */
+    protected function setSubject(object $value): object
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the item.
+     *
+     * @return  object
+     *
+     * @since  5.0.0
+     */
+    public function getItem(): object
+    {
+        return $this->arguments['subject'];
+    }
+}
diff --git a/libraries/src/Event/Model/FormEvent.php b/libraries/src/Event/Model/FormEvent.php
new file mode 100644
index 0000000000000..c0532763338d4
--- /dev/null
+++ b/libraries/src/Event/Model/FormEvent.php
@@ -0,0 +1,130 @@
+<?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\Event\Model;
+
+use Joomla\CMS\Event\AbstractImmutableEvent;
+use Joomla\CMS\Event\ReshapeArgumentsAware;
+use Joomla\CMS\Form\Form;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Model Form event
+ *
+ * @since  5.0.0
+ */
+abstract class FormEvent extends AbstractImmutableEvent
+{
+    use ReshapeArgumentsAware;
+
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['subject', 'data'];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   5.0.0
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        // Reshape the arguments array to preserve b/c with legacy listeners
+        if ($this->legacyArgumentsOrder) {
+            $arguments = $this->reshapeArguments($arguments, $this->legacyArgumentsOrder);
+        }
+
+        parent::__construct($name, $arguments);
+
+        if (!\array_key_exists('subject', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'subject' of event {$name} is required but has not been provided");
+        }
+
+        if (!\array_key_exists('data', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'data' of event {$name} is required but has not been provided");
+        }
+    }
+
+    /**
+     * Setter for the context argument.
+     *
+     * @param   string  $value  The value to set
+     *
+     * @return  string
+     *
+     * @since  5.0.0
+     */
+    protected function setContext(string $value): string
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the context argument.
+     *
+     * @return  string
+     *
+     * @since  5.0.0
+     */
+    public function getContext(): string
+    {
+        return $this->arguments['context'];
+    }
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   Form  $value  The value to set
+     *
+     * @return  Form
+     *
+     * @since  5.0.0
+     */
+    protected function setSubject(Form $value): Form
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the form.
+     *
+     * @return  Form
+     *
+     * @since  5.0.0
+     */
+    public function getForm(): Form
+    {
+        return $this->arguments['subject'];
+    }
+
+    /**
+     * Getter for the data.
+     *
+     * @return  object|array
+     *
+     * @since  5.0.0
+     */
+    public function getData()
+    {
+        return $this->arguments['data'];
+    }
+}
diff --git a/libraries/src/Event/Model/ModelEvent.php b/libraries/src/Event/Model/ModelEvent.php
new file mode 100644
index 0000000000000..baaefc7d9dc3c
--- /dev/null
+++ b/libraries/src/Event/Model/ModelEvent.php
@@ -0,0 +1,91 @@
+<?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\Event\Model;
+
+use Joomla\CMS\Event\AbstractImmutableEvent;
+use Joomla\CMS\Event\ReshapeArgumentsAware;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Base class for Model events
+ *
+ * @since  5.0.0
+ */
+abstract class ModelEvent extends AbstractImmutableEvent
+{
+    use ReshapeArgumentsAware;
+
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = [];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   5.0.0
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        // Reshape the arguments array to preserve b/c with legacy listeners
+        if ($this->legacyArgumentsOrder) {
+            $arguments = $this->reshapeArguments($arguments, $this->legacyArgumentsOrder);
+        }
+
+        parent::__construct($name, $arguments);
+
+        if (!\array_key_exists('context', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'context' of event {$name} is required but has not been provided");
+        }
+
+        if (!\array_key_exists('subject', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'subject' of event {$name} is required but has not been provided");
+        }
+    }
+
+    /**
+     * Setter for the context argument.
+     *
+     * @param   string  $value  The value to set
+     *
+     * @return  string
+     *
+     * @since  5.0.0
+     */
+    protected function setContext(string $value): string
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the context argument.
+     *
+     * @return  string
+     *
+     * @since  5.0.0
+     */
+    public function getContext(): string
+    {
+        return $this->arguments['context'];
+    }
+}
diff --git a/libraries/src/Event/Model/NormaliseRequestDataEvent.php b/libraries/src/Event/Model/NormaliseRequestDataEvent.php
new file mode 100644
index 0000000000000..ed84dac962961
--- /dev/null
+++ b/libraries/src/Event/Model/NormaliseRequestDataEvent.php
@@ -0,0 +1,34 @@
+<?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\Event\Model;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Model Form event.
+ * Example:
+ *  new NormaliseRequestDataEvent('onEventName', ['context' => 'com_example.example', 'data' => $data, 'subject' => $form]);
+ *
+ * @since  5.0.0
+ */
+class NormaliseRequestDataEvent extends BeforeValidateDataEvent
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['context', 'data', 'subject'];
+}
diff --git a/libraries/src/Event/Model/PrepareDataEvent.php b/libraries/src/Event/Model/PrepareDataEvent.php
new file mode 100644
index 0000000000000..09b9625db85d9
--- /dev/null
+++ b/libraries/src/Event/Model/PrepareDataEvent.php
@@ -0,0 +1,46 @@
+<?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\Event\Model;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Model event.
+ * Example:
+ *  new PrepareDataEvent('onEventName', ['context' => 'com_example.example', 'subject' => $data]);
+ *
+ * @since  5.0.0
+ */
+class PrepareDataEvent extends ModelEvent
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['context', 'subject'];
+
+    /**
+     * Getter for the data.
+     *
+     * @return  object
+     *
+     * @since  5.0.0
+     */
+    public function getData()
+    {
+        return $this->arguments['subject'];
+    }
+}
diff --git a/libraries/src/Event/Model/PrepareFormEvent.php b/libraries/src/Event/Model/PrepareFormEvent.php
new file mode 100644
index 0000000000000..5465db3b2d104
--- /dev/null
+++ b/libraries/src/Event/Model/PrepareFormEvent.php
@@ -0,0 +1,25 @@
+<?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\Event\Model;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Model Form event.
+ * Example:
+ *  new PrepareFormEvent('onEventName', ['subject' => $form, 'data' => $data]);
+ *
+ * @since  5.0.0
+ */
+class PrepareFormEvent extends FormEvent
+{
+}
diff --git a/libraries/src/Event/Model/SaveEvent.php b/libraries/src/Event/Model/SaveEvent.php
new file mode 100644
index 0000000000000..0376364b77a49
--- /dev/null
+++ b/libraries/src/Event/Model/SaveEvent.php
@@ -0,0 +1,96 @@
+<?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\Event\Model;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Model event
+ *
+ * @since  5.0.0
+ */
+abstract class SaveEvent extends ModelEvent
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['context', 'subject', 'isNew', 'data'];
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   object  $value  The value to set
+     *
+     * @return  object
+     *
+     * @since  5.0.0
+     */
+    protected function setSubject(object $value): object
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the isNew argument.
+     *
+     * @param   bool  $value  The value to set
+     *
+     * @return  bool
+     *
+     * @since  5.0.0
+     */
+    protected function setIsNew($value): bool
+    {
+        return (bool) $value;
+    }
+
+    /**
+     * Getter for the item.
+     *
+     * @return  object
+     *
+     * @since  5.0.0
+     */
+    public function getItem(): object
+    {
+        return $this->arguments['subject'];
+    }
+
+    /**
+     * Getter for the isNew state.
+     *
+     * @return  boolean
+     *
+     * @since  5.0.0
+     */
+    public function getIsNew(): bool
+    {
+        return $this->arguments['isNew'];
+    }
+
+    /**
+     * Getter for the data.
+     *
+     * @return  array
+     *
+     * @since  5.0.0
+     */
+    public function getData()
+    {
+        return $this->arguments['data'];
+    }
+}
diff --git a/libraries/src/Event/Module/AfterCleanModuleListEvent.php b/libraries/src/Event/Module/AfterCleanModuleListEvent.php
new file mode 100644
index 0000000000000..9e7b65f852e9f
--- /dev/null
+++ b/libraries/src/Event/Module/AfterCleanModuleListEvent.php
@@ -0,0 +1,25 @@
+<?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\Event\Module;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Module events.
+ * Example:
+ *  new AfterCleanModuleListEvent('onEventName', ['subject' => $modules]);
+ *
+ * @since  5.0.0
+ */
+class AfterCleanModuleListEvent extends ModuleListEvent
+{
+}
diff --git a/libraries/src/Event/Module/AfterModuleListEvent.php b/libraries/src/Event/Module/AfterModuleListEvent.php
new file mode 100644
index 0000000000000..c07c645e6204b
--- /dev/null
+++ b/libraries/src/Event/Module/AfterModuleListEvent.php
@@ -0,0 +1,25 @@
+<?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\Event\Module;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Module events.
+ * Example:
+ *  new AfterModuleListEvent('onEventName', ['subject' => $modules]);
+ *
+ * @since  5.0.0
+ */
+class AfterModuleListEvent extends ModuleListEvent
+{
+}
diff --git a/libraries/src/Event/Module/AfterRenderModuleEvent.php b/libraries/src/Event/Module/AfterRenderModuleEvent.php
new file mode 100644
index 0000000000000..adcd92502501f
--- /dev/null
+++ b/libraries/src/Event/Module/AfterRenderModuleEvent.php
@@ -0,0 +1,25 @@
+<?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\Event\Module;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Module events.
+ * Example:
+ *  new AfterRenderModuleEvent('onEventName', ['subject' => $module, 'attributes' => $attrs]);
+ *
+ * @since  5.0.0
+ */
+class AfterRenderModuleEvent extends RenderModuleEvent
+{
+}
diff --git a/libraries/src/Event/Module/AfterRenderModulesEvent.php b/libraries/src/Event/Module/AfterRenderModulesEvent.php
new file mode 100644
index 0000000000000..f7b1c2388d633
--- /dev/null
+++ b/libraries/src/Event/Module/AfterRenderModulesEvent.php
@@ -0,0 +1,130 @@
+<?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\Event\Module;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Module events.
+ * Example:
+ *  new AfterRenderModulesEvent('onEventName', ['subject' => $content, 'attributes' => $attrs]);
+ *
+ * @since  5.0.0
+ */
+class AfterRenderModulesEvent extends ModuleEvent
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['subject', 'attributes'];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   5.0.0
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        parent::__construct($name, $arguments);
+
+        if (!\array_key_exists('attributes', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'attributes' of event {$name} is required but has not been provided");
+        }
+
+        // For backward compatibility make sure the content is referenced
+        // TODO: Remove in Joomla 6
+        // @deprecated: Passing argument by reference is deprecated, and will not work in Joomla 6
+        if (key($arguments) === 0) {
+            $this->arguments['subject'] = &$arguments[0];
+        } elseif (\array_key_exists('subject', $arguments)) {
+            $this->arguments['subject'] = &$arguments['subject'];
+        }
+    }
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   string  $value  The value to set
+     *
+     * @return  object
+     *
+     * @since  5.0.0
+     */
+    protected function setSubject(string $value): string
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the attributes argument.
+     *
+     * @param   array|\ArrayAccess  $value  The value to set
+     *
+     * @return  array|\ArrayAccess
+     *
+     * @since  5.0.0
+     */
+    protected function setAttributes(array|\ArrayAccess $value): array|\ArrayAccess
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the content.
+     *
+     * @return  object
+     *
+     * @since  5.0.0
+     */
+    public function getContent(): string
+    {
+        return $this->arguments['subject'];
+    }
+
+    /**
+     * Setter for the content.
+     *
+     * @param   string  $value  The value to set
+     *
+     * @return  static
+     *
+     * @since  5.0.0
+     */
+    public function updateContent(string $value): static
+    {
+        $this->arguments['subject'] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Getter for the attributes argument.
+     *
+     * @return  array|\ArrayAccess
+     *
+     * @since  5.0.0
+     */
+    public function getAttributes(): array|\ArrayAccess
+    {
+        return $this->arguments['attributes'];
+    }
+}
diff --git a/libraries/src/Event/Module/BeforeRenderModuleEvent.php b/libraries/src/Event/Module/BeforeRenderModuleEvent.php
new file mode 100644
index 0000000000000..5726ab8e8b2da
--- /dev/null
+++ b/libraries/src/Event/Module/BeforeRenderModuleEvent.php
@@ -0,0 +1,25 @@
+<?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\Event\Module;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Module events.
+ * Example:
+ *  new BeforeRenderModuleEvent('onEventName', ['subject' => $module, 'attributes' => $attrs]);
+ *
+ * @since  5.0.0
+ */
+class BeforeRenderModuleEvent extends RenderModuleEvent
+{
+}
diff --git a/libraries/src/Event/Module/ModuleEvent.php b/libraries/src/Event/Module/ModuleEvent.php
new file mode 100644
index 0000000000000..4c027e1d60d91
--- /dev/null
+++ b/libraries/src/Event/Module/ModuleEvent.php
@@ -0,0 +1,61 @@
+<?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\Event\Module;
+
+use Joomla\CMS\Event\AbstractImmutableEvent;
+use Joomla\CMS\Event\ReshapeArgumentsAware;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Base class for Module events
+ *
+ * @since  5.0.0
+ */
+abstract class ModuleEvent extends AbstractImmutableEvent
+{
+    use ReshapeArgumentsAware;
+
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = [];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   5.0.0
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        // Reshape the arguments array to preserve b/c with legacy listeners
+        if ($this->legacyArgumentsOrder) {
+            $arguments = $this->reshapeArguments($arguments, $this->legacyArgumentsOrder);
+        }
+
+        parent::__construct($name, $arguments);
+
+        if (!\array_key_exists('subject', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'subject' of event {$name} is required but has not been provided");
+        }
+    }
+}
diff --git a/libraries/src/Event/Module/ModuleListEvent.php b/libraries/src/Event/Module/ModuleListEvent.php
new file mode 100644
index 0000000000000..b90ab15c38f5e
--- /dev/null
+++ b/libraries/src/Event/Module/ModuleListEvent.php
@@ -0,0 +1,58 @@
+<?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\Event\Module;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Module events
+ *
+ * @since  5.0.0
+ */
+abstract class ModuleListEvent extends ModuleEvent
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['subject'];
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   array|\ArrayAccess  $value  The value to set
+     *
+     * @return  array|\ArrayAccess
+     *
+     * @since  5.0.0
+     */
+    protected function setSubject(array|\ArrayAccess $value): array|\ArrayAccess
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the subject argument.
+     *
+     * @return  array|\ArrayAccess
+     *
+     * @since  5.0.0
+     */
+    public function getModules(): array|\ArrayAccess
+    {
+        return $this->arguments['subject'];
+    }
+}
diff --git a/libraries/src/Event/Module/PrepareModuleListEvent.php b/libraries/src/Event/Module/PrepareModuleListEvent.php
new file mode 100644
index 0000000000000..7fd89ca452ec6
--- /dev/null
+++ b/libraries/src/Event/Module/PrepareModuleListEvent.php
@@ -0,0 +1,25 @@
+<?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\Event\Module;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Module events.
+ * Example:
+ *  new AfterModuleListEvent('onEventName', ['subject' => $modules]);
+ *
+ * @since  5.0.0
+ */
+class PrepareModuleListEvent extends ModuleListEvent
+{
+}
diff --git a/libraries/src/Event/Module/RenderModuleEvent.php b/libraries/src/Event/Module/RenderModuleEvent.php
new file mode 100644
index 0000000000000..283cd7143b4a6
--- /dev/null
+++ b/libraries/src/Event/Module/RenderModuleEvent.php
@@ -0,0 +1,103 @@
+<?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\Event\Module;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Module events
+ *
+ * @since  5.0.0
+ */
+abstract class RenderModuleEvent extends ModuleEvent
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['subject', 'attributes'];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   5.0.0
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        parent::__construct($name, $arguments);
+
+        if (!\array_key_exists('attributes', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'attributes' of event {$name} is required but has not been provided");
+        }
+    }
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   object  $value  The value to set
+     *
+     * @return  object
+     *
+     * @since  5.0.0
+     */
+    protected function setSubject(object $value): object
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the attributes argument.
+     *
+     * @param   array|\ArrayAccess  $value  The value to set
+     *
+     * @return  array|\ArrayAccess
+     *
+     * @since  5.0.0
+     */
+    protected function setAttributes(array|\ArrayAccess $value): array|\ArrayAccess
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the subject argument.
+     *
+     * @return  object
+     *
+     * @since  5.0.0
+     */
+    public function getModule(): object
+    {
+        return $this->arguments['subject'];
+    }
+
+    /**
+     * Getter for the attributes argument.
+     *
+     * @return  array|\ArrayAccess
+     *
+     * @since  5.0.0
+     */
+    public function getAttributes(): array|\ArrayAccess
+    {
+        return $this->arguments['attributes'];
+    }
+}
diff --git a/libraries/src/Event/MultiFactor/BeforeDisplayMethods.php b/libraries/src/Event/MultiFactor/BeforeDisplayMethods.php
index 3fc1baee00b1e..74b1a431722de 100644
--- a/libraries/src/Event/MultiFactor/BeforeDisplayMethods.php
+++ b/libraries/src/Event/MultiFactor/BeforeDisplayMethods.php
@@ -4,18 +4,17 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\MultiFactor;
 
-use DomainException;
 use Joomla\CMS\Event\AbstractImmutableEvent;
 use Joomla\CMS\Event\Result\ResultAware;
 use Joomla\CMS\User\User;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -50,7 +49,7 @@ public function __construct(User $user)
     public function setUser(User $value): User
     {
         if (empty($value) || ($value->id <= 0) || ($value->guest == 1)) {
-            throw new DomainException(sprintf('Argument \'user\' of event %s must be a non-guest User object.', $this->name));
+            throw new \DomainException(sprintf('Argument \'user\' of event %s must be a non-guest User object.', $this->name));
         }
 
         return $value;
diff --git a/libraries/src/Event/MultiFactor/Callback.php b/libraries/src/Event/MultiFactor/Callback.php
index dd953022f458d..6b7ffc4cfff8c 100644
--- a/libraries/src/Event/MultiFactor/Callback.php
+++ b/libraries/src/Event/MultiFactor/Callback.php
@@ -4,16 +4,15 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\MultiFactor;
 
-use DomainException;
 use Joomla\CMS\Event\AbstractImmutableEvent;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -41,13 +40,13 @@ public function __construct(string $method)
      * @param   string|null  $value  The value to validate
      *
      * @return  string
-     * @throws  DomainException
+     * @throws  \DomainException
      * @since   4.2.0
      */
     public function setMethod(string $value): string
     {
         if (empty($value)) {
-            throw new DomainException(sprintf("Argument 'method' of event %s must be a non-empty string.", $this->name));
+            throw new \DomainException(sprintf("Argument 'method' of event %s must be a non-empty string.", $this->name));
         }
 
         return $value;
diff --git a/libraries/src/Event/MultiFactor/Captive.php b/libraries/src/Event/MultiFactor/Captive.php
index 1d21b9b0e2428..36b186e392e19 100644
--- a/libraries/src/Event/MultiFactor/Captive.php
+++ b/libraries/src/Event/MultiFactor/Captive.php
@@ -4,12 +4,11 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\MultiFactor;
 
-use DomainException;
 use Joomla\CMS\Event\AbstractImmutableEvent;
 use Joomla\CMS\Event\Result\ResultAware;
 use Joomla\CMS\Event\Result\ResultAwareInterface;
@@ -18,7 +17,7 @@
 use Joomla\Component\Users\Administrator\Table\MfaTable;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -59,7 +58,7 @@ public function __construct(MfaTable $record)
     public function setRecord(MfaTable $value): MfaTable
     {
         if (empty($value)) {
-            throw new DomainException(sprintf('Argument \'record\' of event %s must be a MfaTable object.', $this->name));
+            throw new \DomainException(sprintf('Argument \'record\' of event %s must be a MfaTable object.', $this->name));
         }
 
         return $value;
diff --git a/libraries/src/Event/MultiFactor/GetMethod.php b/libraries/src/Event/MultiFactor/GetMethod.php
index 5f376c990315f..18fb7261becf1 100644
--- a/libraries/src/Event/MultiFactor/GetMethod.php
+++ b/libraries/src/Event/MultiFactor/GetMethod.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\MultiFactor;
@@ -16,7 +16,7 @@
 use Joomla\Component\Users\Administrator\DataShape\MethodDescriptor;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Event/MultiFactor/GetSetup.php b/libraries/src/Event/MultiFactor/GetSetup.php
index 53369bfda6a46..e820c721f2d3f 100644
--- a/libraries/src/Event/MultiFactor/GetSetup.php
+++ b/libraries/src/Event/MultiFactor/GetSetup.php
@@ -4,12 +4,11 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\MultiFactor;
 
-use DomainException;
 use Joomla\CMS\Event\AbstractImmutableEvent;
 use Joomla\CMS\Event\Result\ResultAware;
 use Joomla\CMS\Event\Result\ResultAwareInterface;
@@ -18,7 +17,7 @@
 use Joomla\Component\Users\Administrator\Table\MfaTable;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -59,7 +58,7 @@ public function __construct(MfaTable $record)
     public function setRecord(MfaTable $value): MfaTable
     {
         if (empty($value)) {
-            throw new DomainException(sprintf('Argument \'record\' of event %s must be a MfaTable object.', $this->name));
+            throw new \DomainException(sprintf('Argument \'record\' of event %s must be a MfaTable object.', $this->name));
         }
 
         return $value;
diff --git a/libraries/src/Event/MultiFactor/NotifyActionLog.php b/libraries/src/Event/MultiFactor/NotifyActionLog.php
index aca5b13e9d475..dbdb28c7b08b7 100644
--- a/libraries/src/Event/MultiFactor/NotifyActionLog.php
+++ b/libraries/src/Event/MultiFactor/NotifyActionLog.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\MultiFactor;
@@ -12,7 +12,7 @@
 use Joomla\CMS\Event\AbstractImmutableEvent;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -30,6 +30,7 @@ class NotifyActionLog extends AbstractImmutableEvent
         'onComUsersCaptiveShowSelect',
         'onComUsersCaptiveValidateFailed',
         'onComUsersCaptiveValidateInvalidMethod',
+        'onComUsersCaptiveValidateTryLimitReached',
         'onComUsersCaptiveValidateSuccess',
         'onComUsersControllerMethodAfterRegenerateBackupCodes',
         'onComUsersControllerMethodBeforeAdd',
diff --git a/libraries/src/Event/MultiFactor/SaveSetup.php b/libraries/src/Event/MultiFactor/SaveSetup.php
index 4586c59899555..564ff144b9072 100644
--- a/libraries/src/Event/MultiFactor/SaveSetup.php
+++ b/libraries/src/Event/MultiFactor/SaveSetup.php
@@ -4,12 +4,11 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\MultiFactor;
 
-use DomainException;
 use Joomla\CMS\Event\AbstractImmutableEvent;
 use Joomla\CMS\Event\Result\ResultAware;
 use Joomla\CMS\Event\Result\ResultAwareInterface;
@@ -18,7 +17,7 @@
 use Joomla\Input\Input;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -63,7 +62,7 @@ public function __construct(MfaTable $record, Input $input)
     public function setRecord(MfaTable $value): MfaTable
     {
         if (empty($value)) {
-            throw new DomainException(sprintf('Argument \'record\' of event %s must be a MfaTable object.', $this->name));
+            throw new \DomainException(sprintf('Argument \'record\' of event %s must be a MfaTable object.', $this->name));
         }
 
         return $value;
@@ -80,7 +79,7 @@ public function setRecord(MfaTable $value): MfaTable
     public function setInput(Input $value): Input
     {
         if (empty($value)) {
-            throw new DomainException(sprintf('Argument \'input\' of event %s must be an Input object.', $this->name));
+            throw new \DomainException(sprintf('Argument \'input\' of event %s must be an Input object.', $this->name));
         }
 
         return $value;
diff --git a/libraries/src/Event/MultiFactor/Validate.php b/libraries/src/Event/MultiFactor/Validate.php
index a558e78db9143..3fc7cd6712c78 100644
--- a/libraries/src/Event/MultiFactor/Validate.php
+++ b/libraries/src/Event/MultiFactor/Validate.php
@@ -4,12 +4,11 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\MultiFactor;
 
-use DomainException;
 use Joomla\CMS\Event\AbstractImmutableEvent;
 use Joomla\CMS\Event\Result\ResultAware;
 use Joomla\CMS\Event\Result\ResultAwareInterface;
@@ -18,7 +17,7 @@
 use Joomla\Component\Users\Administrator\Table\MfaTable;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -63,7 +62,7 @@ public function __construct(MfaTable $record, User $user, string $code)
     public function setRecord(MfaTable $value): MfaTable
     {
         if (empty($value)) {
-            throw new DomainException(sprintf('Argument \'record\' of event %s must be a MfaTable object.', $this->name));
+            throw new \DomainException(sprintf('Argument \'record\' of event %s must be a MfaTable object.', $this->name));
         }
 
         return $value;
@@ -80,7 +79,7 @@ public function setRecord(MfaTable $value): MfaTable
     public function setUser(User $value): User
     {
         if (empty($value) || ($value->id <= 0) || ($value->guest == 1)) {
-            throw new DomainException(sprintf('Argument \'user\' of event %s must be a non-guest User object.', $this->name));
+            throw new \DomainException(sprintf('Argument \'user\' of event %s must be a non-guest User object.', $this->name));
         }
 
         return $value;
diff --git a/libraries/src/Event/Plugin/AjaxEvent.php b/libraries/src/Event/Plugin/AjaxEvent.php
new file mode 100644
index 0000000000000..74804344e7666
--- /dev/null
+++ b/libraries/src/Event/Plugin/AjaxEvent.php
@@ -0,0 +1,121 @@
+<?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\Event\Plugin;
+
+use Joomla\Application\AbstractApplication;
+use Joomla\CMS\Event\AbstractImmutableEvent;
+use Joomla\CMS\Event\Result\ResultAwareInterface;
+use Joomla\CMS\Event\Result\ResultTypeMixedAware;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for onAjax... events
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class AjaxEvent extends AbstractImmutableEvent implements ResultAwareInterface
+{
+    use ResultTypeMixedAware;
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        parent::__construct($name, $arguments);
+
+        if (!\array_key_exists('subject', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'subject' of event {$name} is required but has not been provided");
+        }
+    }
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   AbstractApplication  $value  The value to set
+     *
+     * @return  AbstractApplication
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setSubject(AbstractApplication $value): AbstractApplication
+    {
+        return $value;
+    }
+
+    /**
+     * Get the event's application object
+     *
+     * @return  AbstractApplication
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getApplication(): AbstractApplication
+    {
+        return $this->arguments['subject'];
+    }
+
+    /**
+     * Appends data to the result of the event.
+     *
+     * @param   mixed  $data  What to add to the result.
+     *
+     * @return  void
+     * @since   __DEPLOY_VERSION__
+     */
+    public function addResult($data): void
+    {
+        $this->arguments['result'] = $this->arguments['result'] ?? [];
+
+        if (\is_array($this->arguments['result'])) {
+            $this->arguments['result'][] = $data;
+        } elseif (\is_scalar($this->arguments['result']) && \is_scalar($data)) {
+            $this->arguments['result'] .= $data;
+        } else {
+            throw new \UnexpectedValueException('Mixed data in the result for the event ' . $this->getName());
+        }
+    }
+
+    /**
+     * Update the result of the event.
+     *
+     * @param   mixed  $data  What to add to the result.
+     *
+     * @return  static
+     * @since   __DEPLOY_VERSION__
+     */
+    public function updateEventResult($data): static
+    {
+        $this->arguments['result'] = $data;
+
+        return $this;
+    }
+
+    /**
+     * Get the event result.
+     *
+     * @return  mixed
+     * @since   __DEPLOY_VERSION__
+     */
+    public function getEventResult(): mixed
+    {
+        return $this->arguments['result'] ?? null;
+    }
+}
diff --git a/libraries/src/Event/Plugin/System/Schemaorg/BeforeCompileHeadEvent.php b/libraries/src/Event/Plugin/System/Schemaorg/BeforeCompileHeadEvent.php
new file mode 100644
index 0000000000000..57c3349e94956
--- /dev/null
+++ b/libraries/src/Event/Plugin/System/Schemaorg/BeforeCompileHeadEvent.php
@@ -0,0 +1,102 @@
+<?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\Event\Plugin\System\Schemaorg;
+
+use Joomla\CMS\Event\AbstractImmutableEvent;
+use Joomla\Registry\Registry;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for SchemaBeforeCompileHeadEvent event
+ * Example:
+ *  new BeforeCompileHeadEvent('onSchemaBeforeCompileHead', ['subject' => $schema, 'context' => 'com_example.example']);
+ *
+ * @since  5.0.0
+ */
+class BeforeCompileHeadEvent extends AbstractImmutableEvent
+{
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   5.0.0
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        if (!\array_key_exists('subject', $arguments)) {
+            throw new \BadMethodCallException("Argument 'subject' of event {$name} is required but has not been provided");
+        }
+
+        if (!\array_key_exists('context', $arguments)) {
+            throw new \BadMethodCallException("Argument 'context' of event {$name} is required but has not been provided");
+        }
+
+        parent::__construct($name, $arguments);
+    }
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   Registry  $value  The value to set
+     *
+     * @return  Registry
+     *
+     * @since   5.0.0
+     */
+    protected function setSubject(Registry $value): Registry
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the context argument.
+     *
+     * @param   string  $value  The value to set
+     *
+     * @return  string
+     *
+     * @since   5.0.0
+     */
+    protected function setContext(string $value): string
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the schema argument.
+     *
+     * @return  Registry
+     *
+     * @since   5.0.0
+     */
+    public function getSchema(): Registry
+    {
+        return $this->arguments['subject'];
+    }
+
+    /**
+     * Getter for the context argument.
+     *
+     * @return  string
+     *
+     * @since   5.0.0
+     */
+    public function getContext(): string
+    {
+        return $this->arguments['context'];
+    }
+}
diff --git a/libraries/src/Event/Plugin/System/Schemaorg/PrepareDataEvent.php b/libraries/src/Event/Plugin/System/Schemaorg/PrepareDataEvent.php
new file mode 100644
index 0000000000000..0e1e94a86dd25
--- /dev/null
+++ b/libraries/src/Event/Plugin/System/Schemaorg/PrepareDataEvent.php
@@ -0,0 +1,101 @@
+<?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\Event\Plugin\System\Schemaorg;
+
+use Joomla\CMS\Event\AbstractImmutableEvent;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for SchemaPrepareDataEvent event
+ * Example:
+ *  new PrepareDataEvent('onSchemaPrepareData', ['subject' => $data, 'context' => 'com_example.example']);
+ *
+ * @since  5.0.0
+ */
+class PrepareDataEvent extends AbstractImmutableEvent
+{
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   5.0.0
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        if (!\array_key_exists('subject', $arguments)) {
+            throw new \BadMethodCallException("Argument 'subject' of event {$name} is required but has not been provided");
+        }
+
+        if (!\array_key_exists('context', $arguments)) {
+            throw new \BadMethodCallException("Argument 'context' of event {$name} is required but has not been provided");
+        }
+
+        parent::__construct($name, $arguments);
+    }
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   object  $value  The value to set
+     *
+     * @return  object
+     *
+     * @since   5.0.0
+     */
+    protected function setSubject(object $value): object
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the context argument.
+     *
+     * @param   string  $value  The value to set
+     *
+     * @return  string
+     *
+     * @since   5.0.0
+     */
+    protected function setContext(string $value): string
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the data argument.
+     *
+     * @return  object
+     *
+     * @since   5.0.0
+     */
+    public function getData(): object
+    {
+        return $this->arguments['subject'];
+    }
+
+    /**
+     * Getter for the context argument.
+     *
+     * @return  string
+     *
+     * @since   5.0.0
+     */
+    public function getContext(): string
+    {
+        return $this->arguments['context'];
+    }
+}
diff --git a/libraries/src/Event/Plugin/System/Schemaorg/PrepareFormEvent.php b/libraries/src/Event/Plugin/System/Schemaorg/PrepareFormEvent.php
new file mode 100644
index 0000000000000..ea77f3870ba2f
--- /dev/null
+++ b/libraries/src/Event/Plugin/System/Schemaorg/PrepareFormEvent.php
@@ -0,0 +1,72 @@
+<?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\Event\Plugin\System\Schemaorg;
+
+use Joomla\CMS\Event\AbstractImmutableEvent;
+use Joomla\CMS\Form\Form;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for SchemaPrepareFormEvent event
+ * Example:
+ *  new PrepareFormEvent('onSchemaPrepareForm', ['subject' => $form]);
+ *
+ * @since  5.0.0
+ */
+class PrepareFormEvent extends AbstractImmutableEvent
+{
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   5.0.0
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        if (!\array_key_exists('subject', $arguments)) {
+            throw new \BadMethodCallException("Argument 'subject' of event {$name} is required but has not been provided");
+        }
+
+        parent::__construct($name, $arguments);
+    }
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   Form  $value  The value to set
+     *
+     * @return  Form
+     *
+     * @since   5.0.0
+     */
+    protected function setSubject(Form $value): Form
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the form argument.
+     *
+     * @return  Form
+     *
+     * @since   5.0.0
+     */
+    public function getForm(): Form
+    {
+        return $this->arguments['subject'];
+    }
+}
diff --git a/libraries/src/Event/Plugin/System/Schemaorg/PrepareSaveEvent.php b/libraries/src/Event/Plugin/System/Schemaorg/PrepareSaveEvent.php
new file mode 100644
index 0000000000000..9e5ff2f675daa
--- /dev/null
+++ b/libraries/src/Event/Plugin/System/Schemaorg/PrepareSaveEvent.php
@@ -0,0 +1,192 @@
+<?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\Event\Plugin\System\Schemaorg;
+
+use Joomla\CMS\Event\AbstractImmutableEvent;
+use Joomla\CMS\Table\TableInterface;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for SchemaPrepareSaveEvent event
+ * Example:
+ *  new PrepareFormEvent('onSchemaPrepareForm', ['subject' => $subject, 'context' => $context, 'item' => $table, 'isNew' => $isNew, 'schema' => $schema]);
+ *
+ * @since  5.0.0
+ */
+class PrepareSaveEvent extends AbstractImmutableEvent
+{
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   5.0.0
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        if (!\array_key_exists('subject', $arguments)) {
+            throw new \BadMethodCallException("Argument 'subject' of event {$name} is required but has not been provided");
+        }
+
+        if (!\array_key_exists('context', $arguments)) {
+            throw new \BadMethodCallException("Argument 'context' of event {$name} is required but has not been provided");
+        }
+
+        if (!\array_key_exists('item', $arguments)) {
+            throw new \BadMethodCallException("Argument 'item' of event {$name} is required but has not been provided");
+        }
+
+        if (!\array_key_exists('isNew', $arguments)) {
+            throw new \BadMethodCallException("Argument 'isNew' of event {$name} is required but has not been provided");
+        }
+
+        if (!\array_key_exists('schema', $arguments)) {
+            throw new \BadMethodCallException("Argument 'schema' of event {$name} is required but has not been provided");
+        }
+
+        parent::__construct($name, $arguments);
+    }
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   object  $value  The value to set
+     *
+     * @return  object
+     *
+     * @since   5.0.0
+     */
+    protected function setSubject(object $value): object
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the context argument.
+     *
+     * @param   string  $value  The value to set
+     *
+     * @return  string
+     *
+     * @since   5.0.0
+     */
+    protected function setContext(string $value): string
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the item argument.
+     *
+     * @param   TableInterface  $value  The value to set
+     *
+     * @return  TableInterface
+     *
+     * @since   5.0.0
+     */
+    protected function setItem(TableInterface $value): TableInterface
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the isNew argument.
+     *
+     * @param   boolean  $value  The value to set
+     *
+     * @return  boolean
+     *
+     * @since   5.0.0
+     */
+    protected function setIsNew(bool $value): bool
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the schema argument.
+     *
+     * @param   array  $value  The value to set
+     *
+     * @return  array
+     *
+     * @since   5.0.0
+     */
+    protected function setSchema(array $value): array
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the data argument.
+     *
+     * @return  object
+     *
+     * @since   5.0.0
+     */
+    public function getData(): object
+    {
+        return $this->arguments['subject'];
+    }
+
+    /**
+     * Getter for the context argument.
+     *
+     * @return  string
+     *
+     * @since   5.0.0
+     */
+    public function getContext(): string
+    {
+        return $this->arguments['context'];
+    }
+
+    /**
+     * Getter for the item argument.
+     *
+     * @return  TableInterface
+     *
+     * @since   5.0.0
+     */
+    public function getItem(): TableInterface
+    {
+        return $this->arguments['item'];
+    }
+
+    /**
+     * Getter for the isNew argument.
+     *
+     * @return  boolean
+     *
+     * @since   5.0.0
+     */
+    public function getIsNew(): bool
+    {
+        return $this->arguments['isNew'];
+    }
+
+    /**
+     * Getter for the schema argument.
+     *
+     * @return  array
+     *
+     * @since   5.0.0
+     */
+    public function getSchema(): array
+    {
+        return $this->arguments['schema'];
+    }
+}
diff --git a/libraries/src/Event/Plugin/System/Webauthn/Ajax.php b/libraries/src/Event/Plugin/System/Webauthn/Ajax.php
index a6dfa67638452..5e4cd6fccbf4e 100644
--- a/libraries/src/Event/Plugin/System/Webauthn/Ajax.php
+++ b/libraries/src/Event/Plugin/System/Webauthn/Ajax.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Plugin\System\Webauthn;
diff --git a/libraries/src/Event/Plugin/System/Webauthn/AjaxChallenge.php b/libraries/src/Event/Plugin/System/Webauthn/AjaxChallenge.php
index fe120f6fd073f..bcdc578c151ce 100644
--- a/libraries/src/Event/Plugin/System/Webauthn/AjaxChallenge.php
+++ b/libraries/src/Event/Plugin/System/Webauthn/AjaxChallenge.php
@@ -4,12 +4,11 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Plugin\System\Webauthn;
 
-use InvalidArgumentException;
 use Joomla\CMS\Event\AbstractImmutableEvent;
 use Joomla\CMS\Event\Result\ResultAware;
 use Joomla\CMS\Event\Result\ResultAwareInterface;
@@ -42,7 +41,7 @@ public function typeCheckResult($data): void
         }
 
         if (!is_string($data) || @json_decode($data) === null) {
-            throw new InvalidArgumentException(sprintf('Event %s only accepts JSON results.', $this->getName()));
+            throw new \InvalidArgumentException(sprintf('Event %s only accepts JSON results.', $this->getName()));
         }
     }
 }
diff --git a/libraries/src/Event/Plugin/System/Webauthn/AjaxCreate.php b/libraries/src/Event/Plugin/System/Webauthn/AjaxCreate.php
index f72ab77233f7c..08a17f491d6eb 100644
--- a/libraries/src/Event/Plugin/System/Webauthn/AjaxCreate.php
+++ b/libraries/src/Event/Plugin/System/Webauthn/AjaxCreate.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Plugin\System\Webauthn;
diff --git a/libraries/src/Event/Plugin/System/Webauthn/AjaxDelete.php b/libraries/src/Event/Plugin/System/Webauthn/AjaxDelete.php
index 1d2137ba764af..dc6d30fb40872 100644
--- a/libraries/src/Event/Plugin/System/Webauthn/AjaxDelete.php
+++ b/libraries/src/Event/Plugin/System/Webauthn/AjaxDelete.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Plugin\System\Webauthn;
diff --git a/libraries/src/Event/Plugin/System/Webauthn/AjaxInitCreate.php b/libraries/src/Event/Plugin/System/Webauthn/AjaxInitCreate.php
index c8354c1396a69..78ffb4e0847d8 100644
--- a/libraries/src/Event/Plugin/System/Webauthn/AjaxInitCreate.php
+++ b/libraries/src/Event/Plugin/System/Webauthn/AjaxInitCreate.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Plugin\System\Webauthn;
diff --git a/libraries/src/Event/Plugin/System/Webauthn/AjaxLogin.php b/libraries/src/Event/Plugin/System/Webauthn/AjaxLogin.php
index ec6cc70d988f5..f8c4958739f8a 100644
--- a/libraries/src/Event/Plugin/System/Webauthn/AjaxLogin.php
+++ b/libraries/src/Event/Plugin/System/Webauthn/AjaxLogin.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Plugin\System\Webauthn;
diff --git a/libraries/src/Event/Plugin/System/Webauthn/AjaxSaveLabel.php b/libraries/src/Event/Plugin/System/Webauthn/AjaxSaveLabel.php
index e0231c3e04ddc..4afef9f425634 100644
--- a/libraries/src/Event/Plugin/System/Webauthn/AjaxSaveLabel.php
+++ b/libraries/src/Event/Plugin/System/Webauthn/AjaxSaveLabel.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Plugin\System\Webauthn;
diff --git a/libraries/src/Event/Privacy/CanRemoveDataEvent.php b/libraries/src/Event/Privacy/CanRemoveDataEvent.php
new file mode 100644
index 0000000000000..3af54a25a0133
--- /dev/null
+++ b/libraries/src/Event/Privacy/CanRemoveDataEvent.php
@@ -0,0 +1,135 @@
+<?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\Event\Privacy;
+
+use Joomla\CMS\Event\Result\ResultAware;
+use Joomla\CMS\Event\Result\ResultAwareInterface;
+use Joomla\CMS\User\User;
+use Joomla\Component\Privacy\Administrator\Removal\Status;
+use Joomla\Component\Privacy\Administrator\Table\RequestTable;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Privacy events.
+ * Example:
+ *     new CanRemoveDataEvent('onEventName', ['subject' => $requestTable, 'user' => $user]);
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class CanRemoveDataEvent extends PrivacyEvent implements ResultAwareInterface
+{
+    use ResultAware;
+
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  __DEPLOY_VERSION__
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['subject', 'user'];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        parent::__construct($name, $arguments);
+
+        if (!\array_key_exists('subject', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'subject' of event {$name} is required but has not been provided");
+        }
+
+        if (!\array_key_exists('user', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'user' of event {$name} is required but has not been provided");
+        }
+    }
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   RequestTable  $value  The value to set
+     *
+     * @return  RequestTable
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setSubject(RequestTable $value): RequestTable
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the user argument.
+     *
+     * @param   ?User  $value  The value to set
+     *
+     * @return  ?User
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setUser(?User $value): ?User
+    {
+        return $value;
+    }
+
+    /**
+     * Checks the type of the data being appended to the result argument.
+     *
+     * @param   mixed  $data  The data to type check
+     *
+     * @return  void
+     * @throws  \InvalidArgumentException
+     *
+     * @internal
+     * @since   __DEPLOY_VERSION__
+     */
+    public function typeCheckResult($data): void
+    {
+        if (!$data instanceof Status) {
+            throw new \InvalidArgumentException(sprintf('Event %s only accepts Joomla\Component\Privacy\Administrator\Removal\Status results.', \get_class($this)));
+        }
+    }
+
+    /**
+     * Getter for the request.
+     *
+     * @return  RequestTable
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getRequest(): RequestTable
+    {
+        return $this->arguments['subject'];
+    }
+
+    /**
+     * Getter for the user.
+     *
+     * @return  ?User
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getUser(): ?User
+    {
+        return $this->arguments['user'];
+    }
+}
diff --git a/libraries/src/Event/Privacy/CheckPrivacyPolicyPublishedEvent.php b/libraries/src/Event/Privacy/CheckPrivacyPolicyPublishedEvent.php
new file mode 100644
index 0000000000000..982e132510108
--- /dev/null
+++ b/libraries/src/Event/Privacy/CheckPrivacyPolicyPublishedEvent.php
@@ -0,0 +1,79 @@
+<?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\Event\Privacy;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Privacy events.
+ * Example:
+ *     new CheckPrivacyPolicyPublishedEvent('onEventName', ['subject' => $policyInfo]);
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class CheckPrivacyPolicyPublishedEvent extends PrivacyEvent
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  __DEPLOY_VERSION__
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['subject'];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        parent::__construct($name, $arguments);
+
+        if (!\array_key_exists('subject', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'subject' of event {$name} is required but has not been provided");
+        }
+    }
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   array|\ArrayAccess  $value  The value to set
+     *
+     * @return  array|\ArrayAccess
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setSubject(array|\ArrayAccess $value): array|\ArrayAccess
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the policy check.
+     *
+     * @return  array|\ArrayAccess
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getPolicyInfo(): array|\ArrayAccess
+    {
+        return $this->arguments['subject'];
+    }
+}
diff --git a/libraries/src/Event/Privacy/CollectCapabilitiesEvent.php b/libraries/src/Event/Privacy/CollectCapabilitiesEvent.php
new file mode 100644
index 0000000000000..4421ea6788356
--- /dev/null
+++ b/libraries/src/Event/Privacy/CollectCapabilitiesEvent.php
@@ -0,0 +1,31 @@
+<?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\Event\Privacy;
+
+use Joomla\CMS\Event\Result\ResultAware;
+use Joomla\CMS\Event\Result\ResultAwareInterface;
+use Joomla\CMS\Event\Result\ResultTypeArrayAware;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Privacy events.
+ * Example:
+ *   new CollectCapabilitiesEvent('onEventName');
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class CollectCapabilitiesEvent extends PrivacyEvent implements ResultAwareInterface
+{
+    use ResultAware;
+    use ResultTypeArrayAware;
+}
diff --git a/libraries/src/Event/Privacy/ExportRequestEvent.php b/libraries/src/Event/Privacy/ExportRequestEvent.php
new file mode 100644
index 0000000000000..88887a1aeddae
--- /dev/null
+++ b/libraries/src/Event/Privacy/ExportRequestEvent.php
@@ -0,0 +1,147 @@
+<?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\Event\Privacy;
+
+use Joomla\CMS\Event\Result\ResultAware;
+use Joomla\CMS\Event\Result\ResultAwareInterface;
+use Joomla\CMS\User\User;
+use Joomla\Component\Privacy\Administrator\Export\Domain;
+use Joomla\Component\Privacy\Administrator\Table\RequestTable;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Privacy events.
+ * Example:
+ *     new ExportRequestEvent('onEventName', ['subject' => $requestTable, 'user' => $user]);
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class ExportRequestEvent extends PrivacyEvent implements ResultAwareInterface
+{
+    use ResultAware;
+
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  __DEPLOY_VERSION__
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['subject', 'user'];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        parent::__construct($name, $arguments);
+
+        if (!\array_key_exists('subject', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'subject' of event {$name} is required but has not been provided");
+        }
+
+        if (!\array_key_exists('user', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'user' of event {$name} is required but has not been provided");
+        }
+    }
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   RequestTable  $value  The value to set
+     *
+     * @return  RequestTable
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setSubject(RequestTable $value): RequestTable
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the user argument.
+     *
+     * @param   ?User  $value  The value to set
+     *
+     * @return  ?User
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setUser(?User $value): ?User
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the request.
+     *
+     * @return  RequestTable
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getRequest(): RequestTable
+    {
+        return $this->arguments['subject'];
+    }
+
+    /**
+     * Getter for the user.
+     *
+     * @return  ?User
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getUser(): ?User
+    {
+        return $this->arguments['user'];
+    }
+
+    /**
+     * Checks the type of the data being appended to the result argument.
+     *
+     * @param   mixed  $data  The data to type check
+     *
+     * @return  void
+     * @throws  \InvalidArgumentException
+     *
+     * @internal
+     * @since   __DEPLOY_VERSION__
+     */
+    public function typeCheckResult($data): void
+    {
+        if (!is_array($data)) {
+            throw new \InvalidArgumentException(sprintf('Event %s only accepts Array results.', \get_class($this)));
+        }
+
+        // Validate items in array
+        foreach ($data as $item) {
+            if (!$item instanceof Domain) {
+                throw new \InvalidArgumentException(
+                    sprintf(
+                        'Event %s only accepts Joomla\Component\Privacy\Administrator\Export\Domain in result array.',
+                        \get_class($this)
+                    )
+                );
+            }
+        }
+    }
+}
diff --git a/libraries/src/Event/Privacy/PrivacyEvent.php b/libraries/src/Event/Privacy/PrivacyEvent.php
new file mode 100644
index 0000000000000..ffef84b775aee
--- /dev/null
+++ b/libraries/src/Event/Privacy/PrivacyEvent.php
@@ -0,0 +1,57 @@
+<?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\Event\Privacy;
+
+use Joomla\CMS\Event\AbstractImmutableEvent;
+use Joomla\CMS\Event\ReshapeArgumentsAware;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Base class for Privacy events
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+abstract class PrivacyEvent extends AbstractImmutableEvent
+{
+    use ReshapeArgumentsAware;
+
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  __DEPLOY_VERSION__
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = [];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        // Reshape the arguments array to preserve b/c with legacy listeners
+        if ($this->legacyArgumentsOrder) {
+            $arguments = $this->reshapeArguments($arguments, $this->legacyArgumentsOrder);
+        }
+
+        parent::__construct($name, $arguments);
+    }
+}
diff --git a/libraries/src/Event/Privacy/RemoveDataEvent.php b/libraries/src/Event/Privacy/RemoveDataEvent.php
new file mode 100644
index 0000000000000..9476f9e905bec
--- /dev/null
+++ b/libraries/src/Event/Privacy/RemoveDataEvent.php
@@ -0,0 +1,112 @@
+<?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\Event\Privacy;
+
+use Joomla\CMS\User\User;
+use Joomla\Component\Privacy\Administrator\Table\RequestTable;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Privacy events.
+ * Example:
+ *    new RemoveDataEvent('onEventName', ['subject' => $requestTable, 'user' => $user]);
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class RemoveDataEvent extends PrivacyEvent
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  __DEPLOY_VERSION__
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['subject', 'user'];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        parent::__construct($name, $arguments);
+
+        if (!\array_key_exists('subject', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'subject' of event {$name} is required but has not been provided");
+        }
+
+        if (!\array_key_exists('user', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'user' of event {$name} is required but has not been provided");
+        }
+    }
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   RequestTable  $value  The value to set
+     *
+     * @return  RequestTable
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setSubject(RequestTable $value): RequestTable
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the user argument.
+     *
+     * @param   ?User  $value  The value to set
+     *
+     * @return  ?User
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setUser(?User $value): ?User
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the request.
+     *
+     * @return  RequestTable
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getRequest(): RequestTable
+    {
+        return $this->arguments['subject'];
+    }
+
+    /**
+     * Getter for the user.
+     *
+     * @return  ?User
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getUser(): ?User
+    {
+        return $this->arguments['user'];
+    }
+}
diff --git a/libraries/src/Event/QuickIcon/GetIconEvent.php b/libraries/src/Event/QuickIcon/GetIconEvent.php
index 08c102bb01370..f994fbf944131 100644
--- a/libraries/src/Event/QuickIcon/GetIconEvent.php
+++ b/libraries/src/Event/QuickIcon/GetIconEvent.php
@@ -4,13 +4,11 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
- * @license        GNU General Public License version 2 or later; see LICENSE
+ * @license        GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\QuickIcon;
 
-use BadMethodCallException;
-use DomainException;
 use Joomla\CMS\Event\AbstractImmutableEvent;
 use Joomla\CMS\Event\ReshapeArgumentsAware;
 use Joomla\CMS\Event\Result\ResultAware;
@@ -18,7 +16,7 @@
 use Joomla\CMS\Event\Result\ResultTypeArrayAware;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -39,7 +37,7 @@ class GetIconEvent extends AbstractImmutableEvent implements ResultAwareInterfac
      * @param   array   $arguments  The event arguments.
      *
      * @since   4.2.0
-     * @throws  BadMethodCallException
+     * @throws  \BadMethodCallException
      */
     public function __construct(string $name, array $arguments = [])
     {
@@ -60,7 +58,7 @@ public function __construct(string $name, array $arguments = [])
     public function setContext(string $value)
     {
         if (empty($value)) {
-            throw new DomainException(sprintf("Argument 'context' of event %s must be a non-empty string.", $this->name));
+            throw new \DomainException(sprintf("Argument 'context' of event %s must be a non-empty string.", $this->name));
         }
     }
 }
diff --git a/libraries/src/Event/ReshapeArgumentsAware.php b/libraries/src/Event/ReshapeArgumentsAware.php
index 9290cb90232a4..de3b42c1b0cc9 100644
--- a/libraries/src/Event/ReshapeArgumentsAware.php
+++ b/libraries/src/Event/ReshapeArgumentsAware.php
@@ -4,15 +4,13 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
- * @license        GNU General Public License version 2 or later; see LICENSE
+ * @license        GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event;
 
-use DomainException;
-
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -48,7 +46,7 @@
  * All this is achieved by the reshapeArguments() method in this trait which has to be called in the
  * constructor of the concrete event class.
  *
- * This trait is marked as deprecated with a removal target of 5.0 because in Joomla 5 we will only
+ * This trait is marked as deprecated with a removal target of 6.0 because in Joomla 6 we will only
  * be using concrete event classes with named arguments, removing legacy listeners and their
  * positional arguments headaches.
  *
@@ -72,26 +70,21 @@ trait ReshapeArgumentsAware
      */
     protected function reshapeArguments(array $arguments, array $argumentNames, array $defaults = [])
     {
-        $mandatoryKeys = array_diff($argumentNames, array_keys($defaults));
-        $currentKeys   = array_keys($arguments);
-        $missingKeys   = array_diff($mandatoryKeys, $currentKeys);
-        $extraKeys     = array_diff($currentKeys, $argumentNames);
+        $reconstructed = [];
 
-        // Am I missing any mandatory arguments?
-        if ($missingKeys) {
-            throw new DomainException(sprintf('Missing arguments for ‘%s’ event: %s', $this->getName(), implode(', ', $missingKeys)));
-        }
+        // Check when the source is non-associative, example [$context, $item, $isNew, $data]
+        if (key($arguments) === 0) {
+            foreach ($argumentNames as $i => $name) {
+                $reconstructed[$name] = $arguments[$i] ?? $defaults[$name] ?? null;
+            }
 
-        // Do I have unknown arguments?
-        if ($extraKeys) {
-            throw new DomainException(sprintf('Unknown arguments for ‘%s’ event: %s', $this->getName(), implode(', ', $missingKeys)));
+            // Return the reconstructed arguments array
+            return $reconstructed;
         }
 
-        // Reconstruct the arguments in the order specified in $argumentTypes
-        $reconstructed = [];
-
+        // Reconstruct the arguments in the order specified in $argumentNames
         foreach ($argumentNames as $key) {
-            $reconstructed[$key] = $arguments[$key] ?? $defaults[$key];
+            $reconstructed[$key] = $arguments[$key] ?? $defaults[$key] ?? null;
         }
 
         // Return the reconstructed arguments array
diff --git a/libraries/src/Event/Result/ResultAware.php b/libraries/src/Event/Result/ResultAware.php
index b543e5ac14f82..50ca140a2cb7b 100644
--- a/libraries/src/Event/Result/ResultAware.php
+++ b/libraries/src/Event/Result/ResultAware.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
- * @license        GNU General Public License version 2 or later; see LICENSE
+ * @license        GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Result;
@@ -13,7 +13,7 @@
 use Joomla\Event\Event as BaseEvent;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -90,7 +90,7 @@ public function addResult($data): void
     protected function setResult(array $value)
     {
         if ($this->preventSetArgumentResult) {
-            throw new BadMethodCallException('You are not allowed to set the result argument directly. Use addResult() instead.');
+            throw new \BadMethodCallException('You are not allowed to set the result argument directly. Use addResult() instead.');
         }
 
         // Always assume that the last element of the array is the result the handler is trying to append.
diff --git a/libraries/src/Event/Result/ResultAwareInterface.php b/libraries/src/Event/Result/ResultAwareInterface.php
index 92fe283007fa1..576966dacc08d 100644
--- a/libraries/src/Event/Result/ResultAwareInterface.php
+++ b/libraries/src/Event/Result/ResultAwareInterface.php
@@ -4,15 +4,13 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Result;
 
-use InvalidArgumentException;
-
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -46,7 +44,7 @@ public function addResult($data): void;
      * @param   mixed  $data  The data to type check
      *
      * @return  void
-     * @throws  InvalidArgumentException
+     * @throws  \InvalidArgumentException
      *
      * @internal
      * @since   4.2.0
diff --git a/libraries/src/Event/Result/ResultTypeArrayAware.php b/libraries/src/Event/Result/ResultTypeArrayAware.php
index 827f5dd0f90c0..8879ac17e8519 100644
--- a/libraries/src/Event/Result/ResultTypeArrayAware.php
+++ b/libraries/src/Event/Result/ResultTypeArrayAware.php
@@ -4,15 +4,13 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
- * @license        GNU General Public License version 2 or later; see LICENSE
+ * @license        GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Result;
 
-use InvalidArgumentException;
-
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -50,7 +48,7 @@ trait ResultTypeArrayAware
      * @param   mixed  $data  The data to type check
      *
      * @return  void
-     * @throws  InvalidArgumentException
+     * @throws  \InvalidArgumentException
      *
      * @internal
      * @since   4.2.0
@@ -66,7 +64,7 @@ public function typeCheckResult($data): void
         }
 
         if (!is_array($data)) {
-            throw new InvalidArgumentException(sprintf('Event %s only accepts Array results.', $this->getName()));
+            throw new \InvalidArgumentException(sprintf('Event %s only accepts Array results.', $this->getName()));
         }
     }
 }
diff --git a/libraries/src/Event/Result/ResultTypeBooleanAware.php b/libraries/src/Event/Result/ResultTypeBooleanAware.php
index 99a7b7a2ace75..a6d2f9319dd86 100644
--- a/libraries/src/Event/Result/ResultTypeBooleanAware.php
+++ b/libraries/src/Event/Result/ResultTypeBooleanAware.php
@@ -4,15 +4,13 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
- * @license        GNU General Public License version 2 or later; see LICENSE
+ * @license        GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Result;
 
-use InvalidArgumentException;
-
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -39,7 +37,7 @@ trait ResultTypeBooleanAware
      * @param   mixed  $data  The data to type check
      *
      * @return  void
-     * @throws  InvalidArgumentException
+     * @throws  \InvalidArgumentException
      *
      * @internal
      * @since   4.2.0
@@ -51,7 +49,7 @@ public function typeCheckResult($data): void
         }
 
         if (!is_bool($data)) {
-            throw new InvalidArgumentException(sprintf('Event %s only accepts Boolean results.', $this->getName()));
+            throw new \InvalidArgumentException(sprintf('Event %s only accepts Boolean results.', $this->getName()));
         }
     }
 }
diff --git a/libraries/src/Event/Result/ResultTypeFloatAware.php b/libraries/src/Event/Result/ResultTypeFloatAware.php
index d1534467680d0..b6547a31ca7c0 100644
--- a/libraries/src/Event/Result/ResultTypeFloatAware.php
+++ b/libraries/src/Event/Result/ResultTypeFloatAware.php
@@ -4,15 +4,13 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
- * @license        GNU General Public License version 2 or later; see LICENSE
+ * @license        GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Result;
 
-use InvalidArgumentException;
-
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -50,7 +48,7 @@ trait ResultTypeFloatAware
      * @param   mixed  $data  The data to type check
      *
      * @return  void
-     * @throws  InvalidArgumentException
+     * @throws  \InvalidArgumentException
      *
      * @internal
      * @since   4.2.0
@@ -66,7 +64,7 @@ public function typeCheckResult($data): void
         }
 
         if (!is_float($data)) {
-            throw new InvalidArgumentException(sprintf('Event %s only accepts Float results.', $this->getName()));
+            throw new \InvalidArgumentException(sprintf('Event %s only accepts Float results.', $this->getName()));
         }
     }
 }
diff --git a/libraries/src/Event/Result/ResultTypeIntegerAware.php b/libraries/src/Event/Result/ResultTypeIntegerAware.php
index b0c850a537776..99c8ab68c43b3 100644
--- a/libraries/src/Event/Result/ResultTypeIntegerAware.php
+++ b/libraries/src/Event/Result/ResultTypeIntegerAware.php
@@ -4,15 +4,13 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
- * @license        GNU General Public License version 2 or later; see LICENSE
+ * @license        GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Result;
 
-use InvalidArgumentException;
-
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -50,7 +48,7 @@ trait ResultTypeIntegerAware
      * @param   mixed  $data  The data to type check
      *
      * @return  void
-     * @throws  InvalidArgumentException
+     * @throws  \InvalidArgumentException
      *
      * @internal
      * @since   4.2.0
@@ -66,7 +64,7 @@ public function typeCheckResult($data): void
         }
 
         if (!is_int($data)) {
-            throw new InvalidArgumentException(sprintf('Event %s only accepts Integer results.', $this->getName()));
+            throw new \InvalidArgumentException(sprintf('Event %s only accepts Integer results.', $this->getName()));
         }
     }
 }
diff --git a/libraries/src/Event/Result/ResultTypeMixedAware.php b/libraries/src/Event/Result/ResultTypeMixedAware.php
index 54d945d3044b2..87276bc8aed7a 100644
--- a/libraries/src/Event/Result/ResultTypeMixedAware.php
+++ b/libraries/src/Event/Result/ResultTypeMixedAware.php
@@ -4,15 +4,13 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
- * @license        GNU General Public License version 2 or later; see LICENSE
+ * @license        GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Result;
 
-use InvalidArgumentException;
-
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -32,7 +30,7 @@ trait ResultTypeMixedAware
      * @param   mixed  $data  The data to type check
      *
      * @return  void
-     * @throws  InvalidArgumentException
+     * @throws  \InvalidArgumentException
      *
      * @internal
      * @since   4.2.0
diff --git a/libraries/src/Event/Result/ResultTypeNumericAware.php b/libraries/src/Event/Result/ResultTypeNumericAware.php
index 378cc483fb9a0..a5304dfb0ae1d 100644
--- a/libraries/src/Event/Result/ResultTypeNumericAware.php
+++ b/libraries/src/Event/Result/ResultTypeNumericAware.php
@@ -4,15 +4,13 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
- * @license        GNU General Public License version 2 or later; see LICENSE
+ * @license        GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Result;
 
-use InvalidArgumentException;
-
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -50,7 +48,7 @@ trait ResultTypeNumericAware
      * @param   mixed  $data  The data to type check
      *
      * @return  void
-     * @throws  InvalidArgumentException
+     * @throws  \InvalidArgumentException
      *
      * @internal
      * @since   4.2.0
@@ -66,7 +64,7 @@ public function typeCheckResult($data): void
         }
 
         if (!is_numeric($data)) {
-            throw new InvalidArgumentException(sprintf('Event %s only accepts Numeric results.', $this->getName()));
+            throw new \InvalidArgumentException(sprintf('Event %s only accepts Numeric results.', $this->getName()));
         }
     }
 }
diff --git a/libraries/src/Event/Result/ResultTypeObjectAware.php b/libraries/src/Event/Result/ResultTypeObjectAware.php
index 2578969d11ede..43cf161e04317 100644
--- a/libraries/src/Event/Result/ResultTypeObjectAware.php
+++ b/libraries/src/Event/Result/ResultTypeObjectAware.php
@@ -4,15 +4,13 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
- * @license        GNU General Public License version 2 or later; see LICENSE
+ * @license        GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Result;
 
-use InvalidArgumentException;
-
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -60,7 +58,7 @@ trait ResultTypeObjectAware
      * @param   mixed  $data  The data to type check
      *
      * @return  void
-     * @throws  InvalidArgumentException
+     * @throws  \InvalidArgumentException
      *
      * @internal
      * @since   4.2.0
@@ -76,7 +74,7 @@ public function typeCheckResult($data): void
         }
 
         if (!is_object($data)) {
-            throw new InvalidArgumentException(sprintf('Event %s only accepts object results.', $this->getName()));
+            throw new \InvalidArgumentException(sprintf('Event %s only accepts object results.', $this->getName()));
         }
 
         if (empty($this->resultAcceptableClasses)) {
@@ -91,6 +89,6 @@ public function typeCheckResult($data): void
 
         $acceptableTypes = implode(', ', $this->resultAcceptableClasses);
         $messageTemplate = 'Event %s only accepts object results which are instances of one of %s.';
-        throw new InvalidArgumentException(sprintf($messageTemplate, $this->getName(), $acceptableTypes));
+        throw new \InvalidArgumentException(sprintf($messageTemplate, $this->getName(), $acceptableTypes));
     }
 }
diff --git a/libraries/src/Event/Result/ResultTypeStringAware.php b/libraries/src/Event/Result/ResultTypeStringAware.php
index a1a50cf205923..08469f93e679a 100644
--- a/libraries/src/Event/Result/ResultTypeStringAware.php
+++ b/libraries/src/Event/Result/ResultTypeStringAware.php
@@ -4,15 +4,13 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
- * @license        GNU General Public License version 2 or later; see LICENSE
+ * @license        GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Result;
 
-use InvalidArgumentException;
-
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -50,7 +48,7 @@ trait ResultTypeStringAware
      * @param   mixed  $data  The data to type check
      *
      * @return  void
-     * @throws  InvalidArgumentException
+     * @throws  \InvalidArgumentException
      *
      * @internal
      * @since   4.2.0
@@ -66,7 +64,7 @@ public function typeCheckResult($data): void
         }
 
         if (!is_string($data)) {
-            throw new InvalidArgumentException(sprintf('Event %s only accepts String results.', $this->getName()));
+            throw new \InvalidArgumentException(sprintf('Event %s only accepts String results.', $this->getName()));
         }
     }
 }
diff --git a/libraries/src/Event/Table/AbstractEvent.php b/libraries/src/Event/Table/AbstractEvent.php
index 0845789d7476f..f9fd2c998a299 100644
--- a/libraries/src/Event/Table/AbstractEvent.php
+++ b/libraries/src/Event/Table/AbstractEvent.php
@@ -4,17 +4,16 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Table;
 
-use BadMethodCallException;
 use Joomla\CMS\Event\AbstractImmutableEvent;
 use Joomla\CMS\Table\TableInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -28,14 +27,14 @@ abstract class AbstractEvent extends AbstractImmutableEvent
      * @param   string  $name       The event name.
      * @param   array   $arguments  The event arguments.
      *
-     * @throws  BadMethodCallException
+     * @throws  \BadMethodCallException
      *
      * @since   1.0
      */
     public function __construct($name, array $arguments = [])
     {
         if (!\array_key_exists('subject', $arguments)) {
-            throw new BadMethodCallException("Argument 'subject' of event {$this->name} is required but has not been provided");
+            throw new \BadMethodCallException("Argument 'subject' of event {$this->name} is required but has not been provided");
         }
 
         parent::__construct($name, $arguments);
@@ -48,12 +47,12 @@ public function __construct($name, array $arguments = [])
      *
      * @return  TableInterface
      *
-     * @throws  BadMethodCallException  If the argument is not of the expected type.
+     * @throws  \BadMethodCallException  If the argument is not of the expected type.
      */
     protected function setSubject($value)
     {
         if (!\is_object($value) || !($value instanceof TableInterface)) {
-            throw new BadMethodCallException("Argument 'subject' of event {$this->name} is not of the expected type");
+            throw new \BadMethodCallException("Argument 'subject' of event {$this->name} is not of the expected type");
         }
 
         return $value;
diff --git a/libraries/src/Event/Table/AfterBindEvent.php b/libraries/src/Event/Table/AfterBindEvent.php
index 74fda472e4aa9..59fad64ec6a8e 100644
--- a/libraries/src/Event/Table/AfterBindEvent.php
+++ b/libraries/src/Event/Table/AfterBindEvent.php
@@ -4,17 +4,17 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Table;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Event class for JTable's onAfterBind event
+ * Event class for \Joomla\CMS\Table\Table onAfterBind event
  *
  * @since  4.0.0
  */
diff --git a/libraries/src/Event/Table/AfterCheckinEvent.php b/libraries/src/Event/Table/AfterCheckinEvent.php
index a840b15d17602..650d4e7f3b5b1 100644
--- a/libraries/src/Event/Table/AfterCheckinEvent.php
+++ b/libraries/src/Event/Table/AfterCheckinEvent.php
@@ -4,17 +4,17 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Table;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Event class for JTable's onAfterCheckin event
+ * Event class for \Joomla\CMS\Table\Table onAfterCheckin event
  *
  * @since  4.0.0
  */
diff --git a/libraries/src/Event/Table/AfterCheckoutEvent.php b/libraries/src/Event/Table/AfterCheckoutEvent.php
index a06dc09e47af5..bdb7975f8b900 100644
--- a/libraries/src/Event/Table/AfterCheckoutEvent.php
+++ b/libraries/src/Event/Table/AfterCheckoutEvent.php
@@ -4,17 +4,17 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Table;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Event class for JTable's onAfterCheckout event
+ * Event class for \Joomla\CMS\Table\Table onAfterCheckout event
  *
  * @since  4.0.0
  */
diff --git a/libraries/src/Event/Table/AfterDeleteEvent.php b/libraries/src/Event/Table/AfterDeleteEvent.php
index daec4c99d15bd..c1d3a7ad424da 100644
--- a/libraries/src/Event/Table/AfterDeleteEvent.php
+++ b/libraries/src/Event/Table/AfterDeleteEvent.php
@@ -4,19 +4,17 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Table;
 
-use BadMethodCallException;
-
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Event class for JTable's onAfterDelete event
+ * Event class for \Joomla\CMS\Table\Table onAfterDelete event
  *
  * @since  4.0.0
  */
@@ -26,18 +24,18 @@ class AfterDeleteEvent extends AbstractEvent
      * Constructor.
      *
      * Mandatory arguments:
-     * subject      JTableInterface The table we are operating on
+     * subject      \Joomla\CMS\Table\TableInterface The table we are operating on
      * pk           The optional primary key value we deleted.
      *
      * @param   string  $name       The event name.
      * @param   array   $arguments  The event arguments.
      *
-     * @throws  BadMethodCallException
+     * @throws  \BadMethodCallException
      */
     public function __construct($name, array $arguments = [])
     {
         if (!\array_key_exists('pk', $arguments)) {
-            throw new BadMethodCallException("Argument 'pk' is required for event $name");
+            throw new \BadMethodCallException("Argument 'pk' is required for event $name");
         }
 
         parent::__construct($name, $arguments);
diff --git a/libraries/src/Event/Table/AfterHitEvent.php b/libraries/src/Event/Table/AfterHitEvent.php
index bfb3cd342d978..ba6cc57fb55be 100644
--- a/libraries/src/Event/Table/AfterHitEvent.php
+++ b/libraries/src/Event/Table/AfterHitEvent.php
@@ -4,17 +4,17 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Table;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Event class for JTable's onAfterHit event
+ * Event class for \Joomla\CMS\Table\Table onAfterHit event
  *
  * @since  4.0.0
  */
diff --git a/libraries/src/Event/Table/AfterLoadEvent.php b/libraries/src/Event/Table/AfterLoadEvent.php
index 02b8c2ee1d027..4d3ad5cfaa667 100644
--- a/libraries/src/Event/Table/AfterLoadEvent.php
+++ b/libraries/src/Event/Table/AfterLoadEvent.php
@@ -4,19 +4,17 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Table;
 
-use BadMethodCallException;
-
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Event class for JTable's onAfterLoad event
+ * Event class for \Joomla\CMS\Table\Table onAfterLoad event
  *
  * @since  4.0.0
  */
@@ -26,23 +24,23 @@ class AfterLoadEvent extends AbstractEvent
      * Constructor.
      *
      * Mandatory arguments:
-     * subject  JTableInterface The table we are operating on
-     * result   boolean         Did the table record load succeed?
-     * row      null|array      The values loaded from the database, null if it failed
+     * subject  \Joomla\CMS\Table\TableInterface The table we are operating on
+     * result   boolean                          Did the table record load succeed?
+     * row      null|array                       The values loaded from the database, null if it failed
      *
      * @param   string  $name       The event name.
      * @param   array   $arguments  The event arguments.
      *
-     * @throws  BadMethodCallException
+     * @throws  \BadMethodCallException
      */
     public function __construct($name, array $arguments = [])
     {
         if (!\array_key_exists('result', $arguments)) {
-            throw new BadMethodCallException("Argument 'result' is required for event $name");
+            throw new \BadMethodCallException("Argument 'result' is required for event $name");
         }
 
         if (!\array_key_exists('row', $arguments)) {
-            throw new BadMethodCallException("Argument 'row' is required for event $name");
+            throw new \BadMethodCallException("Argument 'row' is required for event $name");
         }
 
         parent::__construct($name, $arguments);
@@ -55,7 +53,7 @@ public function __construct($name, array $arguments = [])
      *
      * @return  boolean
      *
-     * @throws  BadMethodCallException  if the argument is not of the expected type
+     * @throws  \BadMethodCallException  if the argument is not of the expected type
      */
     protected function setResult($value)
     {
@@ -69,12 +67,12 @@ protected function setResult($value)
      *
      * @return  array|null
      *
-     * @throws  BadMethodCallException  if the argument is not of the expected type
+     * @throws  \BadMethodCallException  if the argument is not of the expected type
      */
     protected function setRow($value)
     {
         if (!\is_null($value) && !\is_array($value)) {
-            throw new BadMethodCallException("Argument 'row' of event {$this->name} is not of the expected type");
+            throw new \BadMethodCallException("Argument 'row' of event {$this->name} is not of the expected type");
         }
 
         return $value;
diff --git a/libraries/src/Event/Table/AfterMoveEvent.php b/libraries/src/Event/Table/AfterMoveEvent.php
index 5071454d7a659..bb62160b8e3cc 100644
--- a/libraries/src/Event/Table/AfterMoveEvent.php
+++ b/libraries/src/Event/Table/AfterMoveEvent.php
@@ -4,20 +4,19 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Table;
 
-use BadMethodCallException;
 use stdClass;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Event class for JTable's onAfterMove event
+ * Event class for \Joomla\CMS\Table\Table onAfterMove event
  *
  * @since  4.0.0
  */
@@ -27,28 +26,28 @@ class AfterMoveEvent extends AbstractEvent
      * Constructor.
      *
      * Mandatory arguments:
-     * subject      JTableInterface The table we are operating on
-     * row          stdClass|null   The primary keys and ordering value for the selection.
-     * delta        int             The direction and magnitude to move the row in the ordering sequence.
-     * where        string          WHERE clause which was used for limiting the selection of rows to compact the ordering values.
+     * subject      \Joomla\CMS\Table\TableInterface The table we are operating on
+     * row          stdClass|null                    The primary keys and ordering value for the selection.
+     * delta        int                              The direction and magnitude to move the row in the ordering sequence.
+     * where        string                           WHERE clause which was used for limiting the selection of rows to compact the ordering values.
      *
      * @param   string  $name       The event name.
      * @param   array   $arguments  The event arguments.
      *
-     * @throws  BadMethodCallException
+     * @throws  \BadMethodCallException
      */
     public function __construct($name, array $arguments = [])
     {
         if (!\array_key_exists('row', $arguments)) {
-            throw new BadMethodCallException("Argument 'row' is required for event $name");
+            throw new \BadMethodCallException("Argument 'row' is required for event $name");
         }
 
         if (!\array_key_exists('delta', $arguments)) {
-            throw new BadMethodCallException("Argument 'delta' is required for event $name");
+            throw new \BadMethodCallException("Argument 'delta' is required for event $name");
         }
 
         if (!\array_key_exists('where', $arguments)) {
-            throw new BadMethodCallException("Argument 'ignore' is required for event $name");
+            throw new \BadMethodCallException("Argument 'ignore' is required for event $name");
         }
 
         parent::__construct($name, $arguments);
@@ -57,16 +56,16 @@ public function __construct($name, array $arguments = [])
     /**
      * Setter for the rows argument
      *
-     * @param   stdClass|null  $value  The value to set
+     * @param   \stdClass|null  $value  The value to set
      *
      * @return  mixed
      *
-     * @throws  BadMethodCallException  if the argument is not of the expected type
+     * @throws  \BadMethodCallException  if the argument is not of the expected type
      */
     protected function setRow($value)
     {
-        if (!($value instanceof stdClass) && !empty($value)) {
-            throw new BadMethodCallException("Argument 'row' of event {$this->name} must be an stdClass object or null");
+        if (!($value instanceof \stdClass) && !empty($value)) {
+            throw new \BadMethodCallException("Argument 'row' of event {$this->name} must be an stdClass object or null");
         }
 
         return $value;
@@ -79,12 +78,12 @@ protected function setRow($value)
      *
      * @return  integer
      *
-     * @throws  BadMethodCallException  if the argument is not of the expected type
+     * @throws  \BadMethodCallException  if the argument is not of the expected type
      */
     protected function setDelta($value)
     {
         if (!is_numeric($value)) {
-            throw new BadMethodCallException("Argument 'delta' of event {$this->name} must be an integer");
+            throw new \BadMethodCallException("Argument 'delta' of event {$this->name} must be an integer");
         }
 
         return (int) $value;
@@ -97,12 +96,12 @@ protected function setDelta($value)
      *
      * @return  mixed
      *
-     * @throws  BadMethodCallException  if the argument is not of the expected type
+     * @throws  \BadMethodCallException  if the argument is not of the expected type
      */
     protected function setWhere($value)
     {
         if (!empty($value) && !\is_string($value)) {
-            throw new BadMethodCallException("Argument 'where' of event {$this->name} must be empty or string");
+            throw new \BadMethodCallException("Argument 'where' of event {$this->name} must be empty or string");
         }
 
         return $value;
diff --git a/libraries/src/Event/Table/AfterPublishEvent.php b/libraries/src/Event/Table/AfterPublishEvent.php
index 34bf4d7f05016..e50cc6eaaeb5a 100644
--- a/libraries/src/Event/Table/AfterPublishEvent.php
+++ b/libraries/src/Event/Table/AfterPublishEvent.php
@@ -4,17 +4,17 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Table;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Event class for JTable's onAfterPublish event
+ * Event class for \Joomla\CMS\Table\Table onAfterPublish event
  *
  * @since  4.0.0
  */
diff --git a/libraries/src/Event/Table/AfterReorderEvent.php b/libraries/src/Event/Table/AfterReorderEvent.php
index 32ccf8319fb8d..93fffa4ffb487 100644
--- a/libraries/src/Event/Table/AfterReorderEvent.php
+++ b/libraries/src/Event/Table/AfterReorderEvent.php
@@ -4,19 +4,17 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Table;
 
-use BadMethodCallException;
-
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Event class for JTable's onAfterReorder event
+ * Event class for \Joomla\CMS\Table\Table onAfterReorder event
  *
  * @since  4.0.0
  */
@@ -26,19 +24,19 @@ class AfterReorderEvent extends AbstractEvent
      * Constructor.
      *
      * Mandatory arguments:
-     * subject      JTableInterface The table we are operating on
-     * rows         stdClass[]|null The primary keys and ordering values for the selection.
-     * where        string          WHERE clause which was used for limiting the selection of rows to compact the ordering values.
+     * subject      \Joomla\CMS\Table\TableInterface The table we are operating on
+     * rows         ?stdClass[]                      The primary keys and ordering values for the selection.
+     * where        string                           WHERE clause which was used for limiting the selection of rows to compact the ordering values.
      *
      * @param   string  $name       The event name.
      * @param   array   $arguments  The event arguments.
      *
-     * @throws  BadMethodCallException
+     * @throws  \BadMethodCallException
      */
     public function __construct($name, array $arguments = [])
     {
         if (!\array_key_exists('where', $arguments)) {
-            throw new BadMethodCallException("Argument 'ignore' is required for event $name");
+            throw new \BadMethodCallException("Argument 'ignore' is required for event $name");
         }
 
         parent::__construct($name, $arguments);
@@ -51,12 +49,12 @@ public function __construct($name, array $arguments = [])
      *
      * @return  mixed
      *
-     * @throws  BadMethodCallException  if the argument is not of the expected type
+     * @throws  \BadMethodCallException  if the argument is not of the expected type
      */
     protected function setWhere($value)
     {
         if (!empty($value) && !\is_string($value) && !\is_array($value)) {
-            throw new BadMethodCallException("Argument 'where' of event {$this->name} must be empty or string or array of strings");
+            throw new \BadMethodCallException("Argument 'where' of event {$this->name} must be empty or string or array of strings");
         }
 
         return $value;
diff --git a/libraries/src/Event/Table/AfterResetEvent.php b/libraries/src/Event/Table/AfterResetEvent.php
index 37a9fc9ed48be..9d847e0fa7b9d 100644
--- a/libraries/src/Event/Table/AfterResetEvent.php
+++ b/libraries/src/Event/Table/AfterResetEvent.php
@@ -4,17 +4,17 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Table;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Event class for JTable's onAfterReset event
+ * Event class for \Joomla\CMS\Table\Table onAfterReset event
  *
  * @since  4.0.0
  */
diff --git a/libraries/src/Event/Table/AfterStoreEvent.php b/libraries/src/Event/Table/AfterStoreEvent.php
index dda37844573d1..3dcc348123678 100644
--- a/libraries/src/Event/Table/AfterStoreEvent.php
+++ b/libraries/src/Event/Table/AfterStoreEvent.php
@@ -4,19 +4,17 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Table;
 
-use BadMethodCallException;
-
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Event class for JTable's onAfterStore event
+ * Event class for \Joomla\CMS\Table\Table onAfterStore event
  *
  * @since  4.0.0
  */
@@ -26,18 +24,18 @@ class AfterStoreEvent extends AbstractEvent
      * Constructor.
      *
      * Mandatory arguments:
-     * subject      JTableInterface The table we are operating on
-     * result       boolean         Did the save succeed?
+     * subject      \Joomla\CMS\Table\TableInterface The table we are operating on
+     * result       boolean                          Did the save succeed?
      *
      * @param   string  $name       The event name.
      * @param   array   $arguments  The event arguments.
      *
-     * @throws  BadMethodCallException
+     * @throws  \BadMethodCallException
      */
     public function __construct($name, array $arguments = [])
     {
         if (!\array_key_exists('result', $arguments)) {
-            throw new BadMethodCallException("Argument 'result' is required for event $name");
+            throw new \BadMethodCallException("Argument 'result' is required for event $name");
         }
 
         parent::__construct($name, $arguments);
@@ -50,7 +48,7 @@ public function __construct($name, array $arguments = [])
      *
      * @return  boolean
      *
-     * @throws  BadMethodCallException  if the argument is not of the expected type
+     * @throws  \BadMethodCallException  if the argument is not of the expected type
      */
     protected function setResult($value)
     {
diff --git a/libraries/src/Event/Table/BeforeBindEvent.php b/libraries/src/Event/Table/BeforeBindEvent.php
index 679a0785e91cd..44f9e888d9d35 100644
--- a/libraries/src/Event/Table/BeforeBindEvent.php
+++ b/libraries/src/Event/Table/BeforeBindEvent.php
@@ -4,19 +4,17 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Table;
 
-use BadMethodCallException;
-
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Event class for JTable's onBeforeBind event
+ * Event class for Table onBeforeBind event
  *
  * @since  4.0.0
  */
@@ -26,23 +24,23 @@ class BeforeBindEvent extends AbstractEvent
      * Constructor.
      *
      * Mandatory arguments:
-     * subject      JTableInterface The table we are operating on
-     * src          mixed           An associative array or object to bind to the JTable instance.
+     * subject      TableInterface The table we are operating on
+     * src          mixed           An associative array or object to bind to the Table instance.
      * ignore       mixed           An optional array or space separated list of properties to ignore while binding.
      *
      * @param   string  $name       The event name.
      * @param   array   $arguments  The event arguments.
      *
-     * @throws  BadMethodCallException
+     * @throws  \BadMethodCallException
      */
     public function __construct($name, array $arguments = [])
     {
         if (!\array_key_exists('src', $arguments)) {
-            throw new BadMethodCallException("Argument 'src' is required for event $name");
+            throw new \BadMethodCallException("Argument 'src' is required for event $name");
         }
 
         if (!\array_key_exists('ignore', $arguments)) {
-            throw new BadMethodCallException("Argument 'ignore' is required for event $name");
+            throw new \BadMethodCallException("Argument 'ignore' is required for event $name");
         }
 
         parent::__construct($name, $arguments);
@@ -55,12 +53,12 @@ public function __construct($name, array $arguments = [])
      *
      * @return  mixed
      *
-     * @throws  BadMethodCallException  if the argument is not of the expected type
+     * @throws  \BadMethodCallException  if the argument is not of the expected type
      */
     protected function setSrc($value)
     {
         if (!empty($value) && !\is_object($value) && !\is_array($value)) {
-            throw new BadMethodCallException("Argument 'src' of event {$this->name} must be empty, object or array");
+            throw new \BadMethodCallException("Argument 'src' of event {$this->name} must be empty, object or array");
         }
 
         return $value;
@@ -73,12 +71,12 @@ protected function setSrc($value)
      *
      * @return  mixed
      *
-     * @throws  BadMethodCallException  if the argument is not of the expected type
+     * @throws  \BadMethodCallException  if the argument is not of the expected type
      */
     protected function setIgnore($value)
     {
         if (!empty($value) && !\is_array($value)) {
-            throw new BadMethodCallException("Argument 'ignore' of event {$this->name} must be empty or array");
+            throw new \BadMethodCallException("Argument 'ignore' of event {$this->name} must be empty or array");
         }
 
         return $value;
diff --git a/libraries/src/Event/Table/BeforeCheckinEvent.php b/libraries/src/Event/Table/BeforeCheckinEvent.php
index fede118dc28aa..7500964a26fc2 100644
--- a/libraries/src/Event/Table/BeforeCheckinEvent.php
+++ b/libraries/src/Event/Table/BeforeCheckinEvent.php
@@ -4,19 +4,17 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Table;
 
-use BadMethodCallException;
-
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Event class for JTable's onBeforeCheckin event
+ * Event class for \Joomla\CMS\Table\Table onBeforeCheckin event
  *
  * @since  4.0.0
  */
@@ -26,18 +24,18 @@ class BeforeCheckinEvent extends AbstractEvent
      * Constructor.
      *
      * Mandatory arguments:
-     * subject      JTableInterface The table we are operating on
-     * pk           mixed           An optional primary key value to check out.
+     * subject      \Joomla\CMS\Table\TableInterface The table we are operating on
+     * pk           mixed                            An optional primary key value to check out.
      *
      * @param   string  $name       The event name.
      * @param   array   $arguments  The event arguments.
      *
-     * @throws  BadMethodCallException
+     * @throws  \BadMethodCallException
      */
     public function __construct($name, array $arguments = [])
     {
         if (!\array_key_exists('pk', $arguments)) {
-            throw new BadMethodCallException("Argument 'pk' is required for event $name");
+            throw new \BadMethodCallException("Argument 'pk' is required for event $name");
         }
 
         parent::__construct($name, $arguments);
diff --git a/libraries/src/Event/Table/BeforeCheckoutEvent.php b/libraries/src/Event/Table/BeforeCheckoutEvent.php
index 8446bf94424c6..e35f524accf94 100644
--- a/libraries/src/Event/Table/BeforeCheckoutEvent.php
+++ b/libraries/src/Event/Table/BeforeCheckoutEvent.php
@@ -4,19 +4,17 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Table;
 
-use BadMethodCallException;
-
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Event class for JTable's onBeforeCheckout event
+ * Event class for \Joomla\CMS\Table\Table onBeforeCheckout event
  *
  * @since  4.0.0
  */
@@ -26,23 +24,23 @@ class BeforeCheckoutEvent extends AbstractEvent
      * Constructor.
      *
      * Mandatory arguments:
-     * subject      JTableInterface The table we are operating on
-     * userId       integer         The Id of the user checking out the row.
-     * pk           mixed           An optional primary key value to check out.
+     * subject      \Joomla\CMS\Table\TableInterface The table we are operating on
+     * userId       integer                          The Id of the user checking out the row.
+     * pk           mixed                            An optional primary key value to check out.
      *
      * @param   string  $name       The event name.
      * @param   array   $arguments  The event arguments.
      *
-     * @throws  BadMethodCallException
+     * @throws  \BadMethodCallException
      */
     public function __construct($name, array $arguments = [])
     {
         if (!\array_key_exists('userId', $arguments)) {
-            throw new BadMethodCallException("Argument 'userId' is required for event $name");
+            throw new \BadMethodCallException("Argument 'userId' is required for event $name");
         }
 
         if (!\array_key_exists('pk', $arguments)) {
-            throw new BadMethodCallException("Argument 'pk' is required for event $name");
+            throw new \BadMethodCallException("Argument 'pk' is required for event $name");
         }
 
         parent::__construct($name, $arguments);
@@ -55,12 +53,12 @@ public function __construct($name, array $arguments = [])
      *
      * @return  mixed
      *
-     * @throws  BadMethodCallException  if the argument is not of the expected type
+     * @throws  \BadMethodCallException  if the argument is not of the expected type
      */
     protected function setUserId($value)
     {
         if (!is_numeric($value) || empty($value)) {
-            throw new BadMethodCallException("Argument 'userId' of event {$this->name} must be an integer");
+            throw new \BadMethodCallException("Argument 'userId' of event {$this->name} must be an integer");
         }
 
         return (int) $value;
diff --git a/libraries/src/Event/Table/BeforeDeleteEvent.php b/libraries/src/Event/Table/BeforeDeleteEvent.php
index b965d9dca85b9..af62e85aa72b8 100644
--- a/libraries/src/Event/Table/BeforeDeleteEvent.php
+++ b/libraries/src/Event/Table/BeforeDeleteEvent.php
@@ -4,19 +4,17 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Table;
 
-use BadMethodCallException;
-
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Event class for JTable's onBeforeDelete event
+ * Event class for \Joomla\CMS\Table\Table onBeforeDelete event
  *
  * @since  4.0.0
  */
@@ -26,18 +24,18 @@ class BeforeDeleteEvent extends AbstractEvent
      * Constructor.
      *
      * Mandatory arguments:
-     * subject      JTableInterface The table we are operating on
+     * subject      \Joomla\CMS\Table\TableInterface The table we are operating on
      * pk           An optional primary key value to delete.
      *
      * @param   string  $name       The event name.
      * @param   array   $arguments  The event arguments.
      *
-     * @throws  BadMethodCallException
+     * @throws  \BadMethodCallException
      */
     public function __construct($name, array $arguments = [])
     {
         if (!\array_key_exists('pk', $arguments)) {
-            throw new BadMethodCallException("Argument 'pk' is required for event $name");
+            throw new \BadMethodCallException("Argument 'pk' is required for event $name");
         }
 
         parent::__construct($name, $arguments);
diff --git a/libraries/src/Event/Table/BeforeHitEvent.php b/libraries/src/Event/Table/BeforeHitEvent.php
index 8d4ce576210e2..727336ff70058 100644
--- a/libraries/src/Event/Table/BeforeHitEvent.php
+++ b/libraries/src/Event/Table/BeforeHitEvent.php
@@ -4,17 +4,17 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Table;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Event class for JTable's onBeforeHit event
+ * Event class for \Joomla\CMS\Table\Table onBeforeHit event
  *
  * @since  4.0.0
  */
diff --git a/libraries/src/Event/Table/BeforeLoadEvent.php b/libraries/src/Event/Table/BeforeLoadEvent.php
index 87d40fa1d967a..a79c1739d6ade 100644
--- a/libraries/src/Event/Table/BeforeLoadEvent.php
+++ b/libraries/src/Event/Table/BeforeLoadEvent.php
@@ -4,19 +4,17 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Table;
 
-use BadMethodCallException;
-
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Event class for JTable's onBeforeLoad event
+ * Event class for \Joomla\CMS\Table\Table onBeforeLoad event
  *
  * @since  4.0.0
  */
@@ -26,23 +24,23 @@ class BeforeLoadEvent extends AbstractEvent
      * Constructor.
      *
      * Mandatory arguments:
-     * subject  JTableInterface The table we are operating on
-     * keys     mixed           The optional primary key value to load the row by, or an array of fields to match.
-     * reset    boolean         True to reset the default values before loading the new row.
+     * subject  \Joomla\CMS\Table\TableInterface The table we are operating on
+     * keys     mixed                            The optional primary key value to load the row by, or an array of fields to match.
+     * reset    boolean                          True to reset the default values before loading the new row.
      *
      * @param   string  $name       The event name.
      * @param   array   $arguments  The event arguments.
      *
-     * @throws  BadMethodCallException
+     * @throws  \BadMethodCallException
      */
     public function __construct($name, array $arguments = [])
     {
         if (!\array_key_exists('keys', $arguments)) {
-            throw new BadMethodCallException("Argument 'keys' is required for event $name");
+            throw new \BadMethodCallException("Argument 'keys' is required for event $name");
         }
 
         if (!\array_key_exists('reset', $arguments)) {
-            throw new BadMethodCallException("Argument 'reset' is required for event $name");
+            throw new \BadMethodCallException("Argument 'reset' is required for event $name");
         }
 
         parent::__construct($name, $arguments);
diff --git a/libraries/src/Event/Table/BeforeMoveEvent.php b/libraries/src/Event/Table/BeforeMoveEvent.php
index eff0066dc60d2..648bfc48cb6f0 100644
--- a/libraries/src/Event/Table/BeforeMoveEvent.php
+++ b/libraries/src/Event/Table/BeforeMoveEvent.php
@@ -4,20 +4,19 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Table;
 
-use BadMethodCallException;
 use Joomla\Database\DatabaseQuery;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Event class for JTable's onBeforeMove event
+ * Event class for \Joomla\CMS\Table\Table onBeforeMove event
  *
  * @since  4.0.0
  */
@@ -27,28 +26,28 @@ class BeforeMoveEvent extends AbstractEvent
      * Constructor.
      *
      * Mandatory arguments:
-     * subject      JTableInterface The table we are operating on
-     * query        DatabaseQuery   The query to get the primary keys and ordering values for the selection.
-     * delta        int             The direction and magnitude to move the row in the ordering sequence.
-     * where        string          WHERE clause to use for limiting the selection of rows to compact the ordering values.
+     * subject      \Joomla\CMS\Table\TableInterface The table we are operating on
+     * query        DatabaseQuery                    The query to get the primary keys and ordering values for the selection.
+     * delta        int                              The direction and magnitude to move the row in the ordering sequence.
+     * where        string                           WHERE clause to use for limiting the selection of rows to compact the ordering values.
      *
      * @param   string  $name       The event name.
      * @param   array   $arguments  The event arguments.
      *
-     * @throws  BadMethodCallException
+     * @throws  \BadMethodCallException
      */
     public function __construct($name, array $arguments = [])
     {
         if (!\array_key_exists('query', $arguments)) {
-            throw new BadMethodCallException("Argument 'query' is required for event $name");
+            throw new \BadMethodCallException("Argument 'query' is required for event $name");
         }
 
         if (!\array_key_exists('delta', $arguments)) {
-            throw new BadMethodCallException("Argument 'delta' is required for event $name");
+            throw new \BadMethodCallException("Argument 'delta' is required for event $name");
         }
 
         if (!\array_key_exists('where', $arguments)) {
-            throw new BadMethodCallException("Argument 'where' is required for event $name");
+            throw new \BadMethodCallException("Argument 'where' is required for event $name");
         }
 
         parent::__construct($name, $arguments);
@@ -61,12 +60,12 @@ public function __construct($name, array $arguments = [])
      *
      * @return  mixed
      *
-     * @throws  BadMethodCallException  if the argument is not of the expected type
+     * @throws  \BadMethodCallException  if the argument is not of the expected type
      */
     protected function setQuery($value)
     {
         if (!($value instanceof DatabaseQuery)) {
-            throw new BadMethodCallException("Argument 'query' of event {$this->name} must be of DatabaseQuery type");
+            throw new \BadMethodCallException("Argument 'query' of event {$this->name} must be of DatabaseQuery type");
         }
 
         return $value;
@@ -79,12 +78,12 @@ protected function setQuery($value)
      *
      * @return  integer
      *
-     * @throws  BadMethodCallException  if the argument is not of the expected type
+     * @throws  \BadMethodCallException  if the argument is not of the expected type
      */
     protected function setDelta($value)
     {
         if (!is_numeric($value)) {
-            throw new BadMethodCallException("Argument 'delta' of event {$this->name} must be an integer");
+            throw new \BadMethodCallException("Argument 'delta' of event {$this->name} must be an integer");
         }
 
         return (int) $value;
@@ -97,12 +96,12 @@ protected function setDelta($value)
      *
      * @return  mixed
      *
-     * @throws  BadMethodCallException  if the argument is not of the expected type
+     * @throws  \BadMethodCallException  if the argument is not of the expected type
      */
     protected function setWhere($value)
     {
         if (!empty($value) && !\is_string($value)) {
-            throw new BadMethodCallException("Argument 'where' of event {$this->name} must be empty or string");
+            throw new \BadMethodCallException("Argument 'where' of event {$this->name} must be empty or string");
         }
 
         return $value;
diff --git a/libraries/src/Event/Table/BeforePublishEvent.php b/libraries/src/Event/Table/BeforePublishEvent.php
index d2f330ce3d5ee..a1d066cfce3a4 100644
--- a/libraries/src/Event/Table/BeforePublishEvent.php
+++ b/libraries/src/Event/Table/BeforePublishEvent.php
@@ -4,19 +4,17 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Table;
 
-use BadMethodCallException;
-
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Event class for JTable's onBeforePublish event
+ * Event class for \Joomla\CMS\Table\Table onBeforePublish event
  *
  * @since  4.0.0
  */
@@ -26,28 +24,28 @@ class BeforePublishEvent extends AbstractEvent
      * Constructor.
      *
      * Mandatory arguments:
-     * subject      JTableInterface The table we are operating on
-     * pks          mixed           An optional array of primary key values to update.
-     * state        int             The publishing state. eg. [0 = unpublished, 1 = published]
-     * userId       int             The user id of the user performing the operation.
+     * subject      \Joomla\CMS\Table\TableInterface The table we are operating on
+     * pks          mixed                            An optional array of primary key values to update.
+     * state        int                              The publishing state. eg. [0 = unpublished, 1 = published]
+     * userId       int                              The user id of the user performing the operation.
      *
      * @param   string  $name       The event name.
      * @param   array   $arguments  The event arguments.
      *
-     * @throws  BadMethodCallException
+     * @throws  \BadMethodCallException
      */
     public function __construct($name, array $arguments = [])
     {
         if (!\array_key_exists('pks', $arguments)) {
-            throw new BadMethodCallException("Argument 'pks' is required for event $name");
+            throw new \BadMethodCallException("Argument 'pks' is required for event $name");
         }
 
         if (!\array_key_exists('state', $arguments)) {
-            throw new BadMethodCallException("Argument 'state' is required for event $name");
+            throw new \BadMethodCallException("Argument 'state' is required for event $name");
         }
 
         if (!\array_key_exists('userId', $arguments)) {
-            throw new BadMethodCallException("Argument 'userId' is required for event $name");
+            throw new \BadMethodCallException("Argument 'userId' is required for event $name");
         }
 
         parent::__construct($name, $arguments);
@@ -60,12 +58,12 @@ public function __construct($name, array $arguments = [])
      *
      * @return  mixed
      *
-     * @throws  BadMethodCallException  if the argument is not of the expected type
+     * @throws  \BadMethodCallException  if the argument is not of the expected type
      */
     protected function setQuery($value)
     {
         if (!empty($value) && !\is_array($value)) {
-            throw new BadMethodCallException("Argument 'pks' of event {$this->name} must be empty or an array");
+            throw new \BadMethodCallException("Argument 'pks' of event {$this->name} must be empty or an array");
         }
 
         return $value;
@@ -78,12 +76,12 @@ protected function setQuery($value)
      *
      * @return  integer
      *
-     * @throws  BadMethodCallException  if the argument is not of the expected type
+     * @throws  \BadMethodCallException  if the argument is not of the expected type
      */
     protected function setState($value)
     {
         if (!is_numeric($value)) {
-            throw new BadMethodCallException("Argument 'state' of event {$this->name} must be an integer");
+            throw new \BadMethodCallException("Argument 'state' of event {$this->name} must be an integer");
         }
 
         return (int) $value;
@@ -96,12 +94,12 @@ protected function setState($value)
      *
      * @return  integer
      *
-     * @throws  BadMethodCallException  if the argument is not of the expected type
+     * @throws  \BadMethodCallException  if the argument is not of the expected type
      */
     protected function setUserId($value)
     {
         if (!is_numeric($value)) {
-            throw new BadMethodCallException("Argument 'userId' of event {$this->name} must be an integer");
+            throw new \BadMethodCallException("Argument 'userId' of event {$this->name} must be an integer");
         }
 
         return (int) $value;
diff --git a/libraries/src/Event/Table/BeforeReorderEvent.php b/libraries/src/Event/Table/BeforeReorderEvent.php
index 765e2d58dd709..736bfbd97d626 100644
--- a/libraries/src/Event/Table/BeforeReorderEvent.php
+++ b/libraries/src/Event/Table/BeforeReorderEvent.php
@@ -4,20 +4,19 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Table;
 
-use BadMethodCallException;
 use Joomla\Database\DatabaseQuery;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Event class for JTable's onBeforeReorder event
+ * Event class for \Joomla\CMS\Table\Table onBeforeReorder event
  *
  * @since  4.0.0
  */
@@ -27,23 +26,23 @@ class BeforeReorderEvent extends AbstractEvent
      * Constructor.
      *
      * Mandatory arguments:
-     * subject      JTableInterface The table we are operating on
-     * query        DatabaseQuery   The query to get the primary keys and ordering values for the selection.
-     * where        string          WHERE clause to use for limiting the selection of rows to compact the ordering values.
+     * subject      \Joomla\CMS\Table\TableInterface The table we are operating on
+     * query        DatabaseQuery                    The query to get the primary keys and ordering values for the selection.
+     * where        string                           WHERE clause to use for limiting the selection of rows to compact the ordering values.
      *
      * @param   string  $name       The event name.
      * @param   array   $arguments  The event arguments.
      *
-     * @throws  BadMethodCallException
+     * @throws  \BadMethodCallException
      */
     public function __construct($name, array $arguments = [])
     {
         if (!\array_key_exists('query', $arguments)) {
-            throw new BadMethodCallException("Argument 'query' is required for event $name");
+            throw new \BadMethodCallException("Argument 'query' is required for event $name");
         }
 
         if (!\array_key_exists('where', $arguments)) {
-            throw new BadMethodCallException("Argument 'where' is required for event $name");
+            throw new \BadMethodCallException("Argument 'where' is required for event $name");
         }
 
         parent::__construct($name, $arguments);
@@ -56,12 +55,12 @@ public function __construct($name, array $arguments = [])
      *
      * @return  mixed
      *
-     * @throws  BadMethodCallException  if the argument is not of the expected type
+     * @throws  \BadMethodCallException  if the argument is not of the expected type
      */
     protected function setQuery($value)
     {
         if (!($value instanceof DatabaseQuery)) {
-            throw new BadMethodCallException("Argument 'query' of event {$this->name} must be of DatabaseQuery type");
+            throw new \BadMethodCallException("Argument 'query' of event {$this->name} must be of DatabaseQuery type");
         }
 
         return $value;
@@ -74,12 +73,12 @@ protected function setQuery($value)
      *
      * @return  mixed
      *
-     * @throws  BadMethodCallException  if the argument is not of the expected type
+     * @throws  \BadMethodCallException  if the argument is not of the expected type
      */
     protected function setWhere($value)
     {
         if (!empty($value) && !\is_string($value) && !\is_array($value)) {
-            throw new BadMethodCallException("Argument 'where' of event {$this->name} must be empty or string or array of strings");
+            throw new \BadMethodCallException("Argument 'where' of event {$this->name} must be empty or string or array of strings");
         }
 
         return $value;
diff --git a/libraries/src/Event/Table/BeforeResetEvent.php b/libraries/src/Event/Table/BeforeResetEvent.php
index f9b3f835c5e71..fb6bd34f5ab1c 100644
--- a/libraries/src/Event/Table/BeforeResetEvent.php
+++ b/libraries/src/Event/Table/BeforeResetEvent.php
@@ -4,17 +4,17 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Table;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Event class for JTable's onBeforeReset event
+ * Event class for \Joomla\CMS\Table\Table onBeforeReset event
  *
  * @since  4.0.0
  */
diff --git a/libraries/src/Event/Table/BeforeStoreEvent.php b/libraries/src/Event/Table/BeforeStoreEvent.php
index 0ff2e945196de..f58c54c226d89 100644
--- a/libraries/src/Event/Table/BeforeStoreEvent.php
+++ b/libraries/src/Event/Table/BeforeStoreEvent.php
@@ -4,19 +4,17 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Table;
 
-use BadMethodCallException;
-
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Event class for JTable's onBeforeStore event
+ * Event class for \Joomla\CMS\Table\Table onBeforeStore event
  *
  * @since  4.0.0
  */
@@ -26,23 +24,23 @@ class BeforeStoreEvent extends AbstractEvent
      * Constructor.
      *
      * Mandatory arguments:
-     * subject      JTableInterface The table we are operating on
-     * updateNulls  boolean         True to update fields even if they are null.
-     * k            mixed           Name of the primary key fields in the table (string or array of strings).
+     * subject      \Joomla\CMS\Table\TableInterface The table we are operating on
+     * updateNulls  boolean                          True to update fields even if they are null.
+     * k            mixed                            Name of the primary key fields in the table (string or array of strings).
      *
      * @param   string  $name       The event name.
      * @param   array   $arguments  The event arguments.
      *
-     * @throws  BadMethodCallException
+     * @throws  \BadMethodCallException
      */
     public function __construct($name, array $arguments = [])
     {
         if (!\array_key_exists('updateNulls', $arguments)) {
-            throw new BadMethodCallException("Argument 'updateNulls' is required for event $name");
+            throw new \BadMethodCallException("Argument 'updateNulls' is required for event $name");
         }
 
         if (!\array_key_exists('k', $arguments)) {
-            throw new BadMethodCallException("Argument 'k' is required for event $name");
+            throw new \BadMethodCallException("Argument 'k' is required for event $name");
         }
 
         parent::__construct($name, $arguments);
diff --git a/libraries/src/Event/Table/CheckEvent.php b/libraries/src/Event/Table/CheckEvent.php
index 8d958fac0415c..ed8d96fcef70b 100644
--- a/libraries/src/Event/Table/CheckEvent.php
+++ b/libraries/src/Event/Table/CheckEvent.php
@@ -4,17 +4,17 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Table;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Event class for JTable's onCheck event
+ * Event class for \Joomla\CMS\Table\Table onCheck event
  *
  * @since  4.0.0
  */
diff --git a/libraries/src/Event/Table/ObjectCreateEvent.php b/libraries/src/Event/Table/ObjectCreateEvent.php
index a90c1d1869538..754152d50160a 100644
--- a/libraries/src/Event/Table/ObjectCreateEvent.php
+++ b/libraries/src/Event/Table/ObjectCreateEvent.php
@@ -4,17 +4,17 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Table;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Event class for JTable's onObjectCreate event
+ * Event class for \Joomla\CMS\Table\Table onObjectCreate event
  *
  * @since  4.0.0
  */
diff --git a/libraries/src/Event/Table/SetNewTagsEvent.php b/libraries/src/Event/Table/SetNewTagsEvent.php
index 214f23ef52be2..b2a9e20943a21 100644
--- a/libraries/src/Event/Table/SetNewTagsEvent.php
+++ b/libraries/src/Event/Table/SetNewTagsEvent.php
@@ -4,22 +4,21 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Table;
 
-use BadMethodCallException;
-
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Event class for JTable's onSetNewTags event
+ * Event class for \Joomla\CMS\Table\Table onSetNewTags event
  *
  * @since  4.0.0
- * @todo   Only used in JModelAdmin::batchTag since we can't use JTable::save as we don't want the data to be saved. Maybe trigger onBeforeStore?
+ * @todo   Only used in JModelAdmin::batchTag since we can't use
+ *         \Joomla\CMS\Table\Table::save as we don't want the data to be saved. Maybe trigger onBeforeStore?
  */
 class SetNewTagsEvent extends AbstractEvent
 {
@@ -27,23 +26,23 @@ class SetNewTagsEvent extends AbstractEvent
      * Constructor.
      *
      * Mandatory arguments:
-     * subject      JTableInterface The table we are operating on
-     * newTags      int[]           New tags to be added to or replace current tags for an item
-     * replaceTags  bool            Replace tags (true) or add them (false)
+     * subject      \Joomla\CMS\Table\TableInterface The table we are operating on
+     * newTags      int[]                            New tags to be added to or replace current tags for an item
+     * replaceTags  bool                             Replace tags (true) or add them (false)
      *
      * @param   string  $name       The event name.
      * @param   array   $arguments  The event arguments.
      *
-     * @throws  BadMethodCallException
+     * @throws  \BadMethodCallException
      */
     public function __construct($name, array $arguments = [])
     {
         if (!\array_key_exists('newTags', $arguments)) {
-            throw new BadMethodCallException("Argument 'newTags' is required for event $name");
+            throw new \BadMethodCallException("Argument 'newTags' is required for event $name");
         }
 
         if (!\array_key_exists('replaceTags', $arguments)) {
-            throw new BadMethodCallException("Argument 'replaceTags' is required for event $name");
+            throw new \BadMethodCallException("Argument 'replaceTags' is required for event $name");
         }
 
         parent::__construct($name, $arguments);
diff --git a/libraries/src/Event/User/AbstractDeleteEvent.php b/libraries/src/Event/User/AbstractDeleteEvent.php
new file mode 100644
index 0000000000000..f3c5f1d1caf67
--- /dev/null
+++ b/libraries/src/Event/User/AbstractDeleteEvent.php
@@ -0,0 +1,58 @@
+<?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\Event\User;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Base class for User delete event
+ *
+ * @since  5.0.0
+ */
+abstract class AbstractDeleteEvent extends UserEvent
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['subject'];
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   array  $value  The value to set
+     *
+     * @return  array
+     *
+     * @since  5.0.0
+     */
+    protected function setSubject(array $value): array
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the user.
+     *
+     * @return  array
+     *
+     * @since  5.0.0
+     */
+    public function getUser(): array
+    {
+        return $this->arguments['subject'];
+    }
+}
diff --git a/libraries/src/Event/User/AbstractLoginEvent.php b/libraries/src/Event/User/AbstractLoginEvent.php
new file mode 100644
index 0000000000000..f8d30699325df
--- /dev/null
+++ b/libraries/src/Event/User/AbstractLoginEvent.php
@@ -0,0 +1,84 @@
+<?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\Event\User;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Base class for User login event
+ *
+ * @since  5.0.0
+ */
+abstract class AbstractLoginEvent extends UserEvent
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['subject', 'options'];
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   array  $value  The value to set
+     *
+     * @return  array
+     *
+     * @since  5.0.0
+     */
+    protected function setSubject(array $value): array
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the options argument.
+     *
+     * @param   array  $value  The value to set
+     *
+     * @return  array
+     *
+     * @since  5.0.0
+     */
+    protected function setOptions(array $value): array
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the response.
+     *
+     * @return  array
+     *
+     * @since  5.0.0
+     */
+    public function getAuthenticationResponse(): array
+    {
+        return $this->arguments['subject'];
+    }
+
+    /**
+     * Getter for the options.
+     *
+     * @return  array
+     *
+     * @since  5.0.0
+     */
+    public function getOptions(): array
+    {
+        return $this->arguments['options'] ?? [];
+    }
+}
diff --git a/libraries/src/Event/User/AbstractLogoutEvent.php b/libraries/src/Event/User/AbstractLogoutEvent.php
new file mode 100644
index 0000000000000..591bae0d54ee1
--- /dev/null
+++ b/libraries/src/Event/User/AbstractLogoutEvent.php
@@ -0,0 +1,84 @@
+<?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\Event\User;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Base class for User logout event
+ *
+ * @since  5.0.0
+ */
+abstract class AbstractLogoutEvent extends UserEvent
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['subject', 'options'];
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   array  $value  The value to set
+     *
+     * @return  array
+     *
+     * @since  5.0.0
+     */
+    protected function setSubject(array $value): array
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the options argument.
+     *
+     * @param   array  $value  The value to set
+     *
+     * @return  array
+     *
+     * @since  5.0.0
+     */
+    protected function setOptions(array $value): array
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the parameters.
+     *
+     * @return  array
+     *
+     * @since  5.0.0
+     */
+    public function getParameters(): array
+    {
+        return $this->arguments['subject'];
+    }
+
+    /**
+     * Getter for the options.
+     *
+     * @return  array
+     *
+     * @since  5.0.0
+     */
+    public function getOptions(): array
+    {
+        return $this->arguments['options'] ?? [];
+    }
+}
diff --git a/libraries/src/Event/User/AbstractSaveEvent.php b/libraries/src/Event/User/AbstractSaveEvent.php
new file mode 100644
index 0000000000000..f7c37bd761cc5
--- /dev/null
+++ b/libraries/src/Event/User/AbstractSaveEvent.php
@@ -0,0 +1,103 @@
+<?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\Event\User;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Base class for User save event
+ *
+ * @since  5.0.0
+ */
+abstract class AbstractSaveEvent extends UserEvent
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['subject', 'isNew'];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        parent::__construct($name, $arguments);
+
+        if (!\array_key_exists('isNew', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'isNew' of event {$name} is required but has not been provided");
+        }
+    }
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   array  $value  The value to set
+     *
+     * @return  array
+     *
+     * @since  5.0.0
+     */
+    protected function setSubject(array $value): array
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the isNew argument.
+     *
+     * @param   bool  $value  The value to set
+     *
+     * @return  bool
+     *
+     * @since  5.0.0
+     */
+    protected function setIsNew($value): bool
+    {
+        return (bool) $value;
+    }
+
+    /**
+     * Getter for the user.
+     *
+     * @return  array
+     *
+     * @since  5.0.0
+     */
+    public function getUser(): array
+    {
+        return $this->arguments['subject'];
+    }
+
+    /**
+     * Getter for the isNew state.
+     *
+     * @return  boolean
+     *
+     * @since  5.0.0
+     */
+    public function getIsNew(): bool
+    {
+        return $this->arguments['isNew'];
+    }
+}
diff --git a/libraries/src/Event/User/AfterDeleteEvent.php b/libraries/src/Event/User/AfterDeleteEvent.php
new file mode 100644
index 0000000000000..88e378c5d584a
--- /dev/null
+++ b/libraries/src/Event/User/AfterDeleteEvent.php
@@ -0,0 +1,105 @@
+<?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\Event\User;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for User delete event.
+ * Example:
+ *  new AfterDeleteEvent('onEventName', ['subject' => $userArray, 'deletingResult' => $result, 'errorMessage' => $errorStr]);
+ *
+ * @since  5.0.0
+ */
+class AfterDeleteEvent extends AbstractDeleteEvent
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['subject', 'deletingResult', 'errorMessage'];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        parent::__construct($name, $arguments);
+
+        if (!\array_key_exists('deletingResult', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'deletingResult' of event {$name} is required but has not been provided");
+        }
+    }
+
+    /**
+     * Setter for the deletingResult argument.
+     *
+     * @param   bool  $value  The value to set
+     *
+     * @return  bool
+     *
+     * @since  5.0.0
+     */
+    protected function setDeletingResult(bool $value): bool
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the errorMessage argument.
+     *
+     * @param   ?string  $value  The value to set
+     *
+     * @return  ?string
+     *
+     * @since  5.0.0
+     */
+    protected function setErrorMessage(?string $value): ?string
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the deleting result.
+     *
+     * @return  bool
+     *
+     * @since  5.0.0
+     */
+    public function getDeletingResult(): bool
+    {
+        return $this->arguments['deletingResult'];
+    }
+
+    /**
+     * Getter for the error message.
+     *
+     * @return  string
+     *
+     * @since  5.0.0
+     */
+    public function getErrorMessage(): string
+    {
+        return $this->arguments['errorMessage'] ?? '';
+    }
+}
diff --git a/libraries/src/Event/User/AfterLoginEvent.php b/libraries/src/Event/User/AfterLoginEvent.php
new file mode 100644
index 0000000000000..ce95978f75179
--- /dev/null
+++ b/libraries/src/Event/User/AfterLoginEvent.php
@@ -0,0 +1,34 @@
+<?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\Event\User;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for User event.
+ * Example:
+ *  new AfterLoginEvent('onEventName', ['subject' => $authenticationResponseArray, 'options' => $options]);
+ *
+ * @since  5.0.0
+ */
+class AfterLoginEvent extends AbstractLoginEvent
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['options', 'subject'];
+}
diff --git a/libraries/src/Event/User/AfterLogoutEvent.php b/libraries/src/Event/User/AfterLogoutEvent.php
new file mode 100644
index 0000000000000..3dbb0037cea3b
--- /dev/null
+++ b/libraries/src/Event/User/AfterLogoutEvent.php
@@ -0,0 +1,34 @@
+<?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\Event\User;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for User event.
+ * Example:
+ *  new AfterLogoutEvent('onEventName', ['subject' => $parameters, 'options' => $options]);
+ *
+ * @since  5.0.0
+ */
+class AfterLogoutEvent extends AbstractLogoutEvent
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['options', 'subject'];
+}
diff --git a/libraries/src/Event/User/AfterRemindEvent.php b/libraries/src/Event/User/AfterRemindEvent.php
new file mode 100644
index 0000000000000..2dac44c6ee44d
--- /dev/null
+++ b/libraries/src/Event/User/AfterRemindEvent.php
@@ -0,0 +1,60 @@
+<?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\Event\User;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for User event.
+ * Example:
+ *  new AfterRemindEvent('onEventName', ['subject' => $user]);
+ *
+ * @since  5.0.0
+ */
+class AfterRemindEvent extends UserEvent
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['subject'];
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   object  $value  The value to set
+     *
+     * @return  object
+     *
+     * @since  5.0.0
+     */
+    protected function setSubject(object $value): object
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the user.
+     *
+     * @return  object
+     *
+     * @since  5.0.0
+     */
+    public function getUser(): object
+    {
+        return $this->arguments['subject'];
+    }
+}
diff --git a/libraries/src/Event/User/AfterSaveEvent.php b/libraries/src/Event/User/AfterSaveEvent.php
new file mode 100644
index 0000000000000..b4b9dcc1dcbfd
--- /dev/null
+++ b/libraries/src/Event/User/AfterSaveEvent.php
@@ -0,0 +1,105 @@
+<?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\Event\User;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for User save event.
+ * Example:
+ *  new AfterSaveEvent('onEventName', ['subject' => $userArray, 'isNew' => $isNew, 'savingResult' => $result, 'errorMessage' => $errorStr]);
+ *
+ * @since  5.0.0
+ */
+class AfterSaveEvent extends AbstractSaveEvent
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['subject', 'isNew', 'savingResult', 'errorMessage'];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        parent::__construct($name, $arguments);
+
+        if (!\array_key_exists('savingResult', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'savingResult' of event {$name} is required but has not been provided");
+        }
+    }
+
+    /**
+     * Setter for the savingResult argument.
+     *
+     * @param   bool  $value  The value to set
+     *
+     * @return  bool
+     *
+     * @since  5.0.0
+     */
+    protected function setSavingResult(bool $value): bool
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the errorMessage argument.
+     *
+     * @param   ?string  $value  The value to set
+     *
+     * @return  ?string
+     *
+     * @since  5.0.0
+     */
+    protected function setErrorMessage(?string $value): ?string
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the saving result.
+     *
+     * @return  bool
+     *
+     * @since  5.0.0
+     */
+    public function getSavingResult(): bool
+    {
+        return $this->arguments['savingResult'];
+    }
+
+    /**
+     * Getter for the error message.
+     *
+     * @return  string
+     *
+     * @since  5.0.0
+     */
+    public function getErrorMessage(): string
+    {
+        return $this->arguments['errorMessage'] ?? '';
+    }
+}
diff --git a/libraries/src/Event/User/AuthenticationEvent.php b/libraries/src/Event/User/AuthenticationEvent.php
new file mode 100644
index 0000000000000..307add7f7837a
--- /dev/null
+++ b/libraries/src/Event/User/AuthenticationEvent.php
@@ -0,0 +1,157 @@
+<?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\Event\User;
+
+use Joomla\CMS\Authentication\Authentication;
+use Joomla\CMS\Authentication\AuthenticationResponse;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for User event.
+ * Example:
+ *  new AuthenticationEvent('onEventName', ['credentials' => $credentials, 'options' => $options, 'subject' => $authenticationResponse]);
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class AuthenticationEvent extends UserEvent
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  __DEPLOY_VERSION__
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['credentials', 'options', 'subject'];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        parent::__construct($name, $arguments);
+
+        if (!\array_key_exists('credentials', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'credentials' of event {$name} is required but has not been provided");
+        }
+    }
+
+    /**
+     * Tell if the event propagation is stopped.
+     * Also, the event considered "stopped" when AuthenticationResponse has STATUS_SUCCESS.
+     *
+     * @return  boolean  True if stopped, false otherwise.
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function isStopped()
+    {
+        if (parent::isStopped()) {
+            return true;
+        }
+
+        // Check Response status
+        $response = $this->getAuthenticationResponse();
+        if ($response->status === Authentication::STATUS_SUCCESS) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   AuthenticationResponse  $value  The value to set
+     *
+     * @return  AuthenticationResponse
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setSubject(AuthenticationResponse $value): AuthenticationResponse
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the credentials argument.
+     *
+     * @param   array  $value  The value to set
+     *
+     * @return  array
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setCredentials(array $value): array
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the options argument.
+     *
+     * @param   array  $value  The value to set
+     *
+     * @return  array
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function setOptions(array $value): array
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the response.
+     *
+     * @return  AuthenticationResponse
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getAuthenticationResponse(): AuthenticationResponse
+    {
+        return $this->arguments['subject'];
+    }
+
+    /**
+     * Getter for the credentials.
+     *
+     * @return  array
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getCredentials(): array
+    {
+        return $this->arguments['credentials'];
+    }
+
+    /**
+     * Getter for the options.
+     *
+     * @return  array
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function getOptions(): array
+    {
+        return $this->arguments['options'] ?? [];
+    }
+}
diff --git a/libraries/src/Event/User/AuthorisationEvent.php b/libraries/src/Event/User/AuthorisationEvent.php
new file mode 100644
index 0000000000000..234e974f86dca
--- /dev/null
+++ b/libraries/src/Event/User/AuthorisationEvent.php
@@ -0,0 +1,110 @@
+<?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\Event\User;
+
+use Joomla\CMS\Authentication\AuthenticationResponse;
+use Joomla\CMS\Event\Result\ResultAware;
+use Joomla\CMS\Event\Result\ResultAwareInterface;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for User event.
+ * Example:
+ *  new AuthorisationEvent('onEventName', ['subject' => $authenticationResponse, 'options' => $options]);
+ *
+ * @since  5.0.0
+ */
+class AuthorisationEvent extends UserEvent implements ResultAwareInterface
+{
+    use ResultAware;
+
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['subject', 'options'];
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   AuthenticationResponse  $value  The value to set
+     *
+     * @return  AuthenticationResponse
+     *
+     * @since  5.0.0
+     */
+    protected function setSubject(AuthenticationResponse $value): AuthenticationResponse
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the options argument.
+     *
+     * @param   array  $value  The value to set
+     *
+     * @return  array
+     *
+     * @since  5.0.0
+     */
+    protected function setOptions(array $value): array
+    {
+        return $value;
+    }
+
+    /**
+     * Checks the type of the data being appended to the result argument.
+     *
+     * @param   mixed  $data  The data to type check
+     *
+     * @return  void
+     * @throws  \InvalidArgumentException
+     *
+     * @internal
+     * @since   5.0.0
+     */
+    public function typeCheckResult($data): void
+    {
+        if (!$data instanceof AuthenticationResponse) {
+            throw new \InvalidArgumentException(sprintf('Event %s only accepts AuthenticationResponse results.', $this->getName()));
+        }
+    }
+
+    /**
+     * Getter for the response.
+     *
+     * @return  AuthenticationResponse
+     *
+     * @since  5.0.0
+     */
+    public function getAuthenticationResponse(): AuthenticationResponse
+    {
+        return $this->arguments['subject'];
+    }
+
+    /**
+     * Getter for the options.
+     *
+     * @return  array
+     *
+     * @since  5.0.0
+     */
+    public function getOptions(): array
+    {
+        return $this->arguments['options'] ?? [];
+    }
+}
diff --git a/libraries/src/Event/User/AuthorisationFailureEvent.php b/libraries/src/Event/User/AuthorisationFailureEvent.php
new file mode 100644
index 0000000000000..9bdeac35c4538
--- /dev/null
+++ b/libraries/src/Event/User/AuthorisationFailureEvent.php
@@ -0,0 +1,86 @@
+<?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\Event\User;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for User event.
+ * Example:
+ *  new AuthorisationFailureEvent('onEventName', ['subject' => $authenticationResponseArray, 'options' => $options]);
+ *
+ * @since  5.0.0
+ */
+class AuthorisationFailureEvent extends UserEvent
+{
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['subject', 'options'];
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   array  $value  The value to set
+     *
+     * @return  array
+     *
+     * @since  5.0.0
+     */
+    protected function setSubject(array $value): array
+    {
+        return $value;
+    }
+
+    /**
+     * Setter for the options argument.
+     *
+     * @param   array  $value  The value to set
+     *
+     * @return  array
+     *
+     * @since  5.0.0
+     */
+    protected function setOptions(array $value): array
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the response.
+     *
+     * @return  array
+     *
+     * @since  5.0.0
+     */
+    public function getAuthenticationResponse(): array
+    {
+        return $this->arguments['subject'];
+    }
+
+    /**
+     * Getter for the options.
+     *
+     * @return  array
+     *
+     * @since  5.0.0
+     */
+    public function getOptions(): array
+    {
+        return $this->arguments['options'] ?? [];
+    }
+}
diff --git a/libraries/src/Event/User/BeforeDeleteEvent.php b/libraries/src/Event/User/BeforeDeleteEvent.php
new file mode 100644
index 0000000000000..5e258186ae2e1
--- /dev/null
+++ b/libraries/src/Event/User/BeforeDeleteEvent.php
@@ -0,0 +1,25 @@
+<?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\Event\User;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for User delete event.
+ * Example:
+ *  new BeforeDeleteEvent('onEventName', ['subject' => $userArray]);
+ *
+ * @since  5.0.0
+ */
+class BeforeDeleteEvent extends AbstractDeleteEvent
+{
+}
diff --git a/libraries/src/Event/User/BeforeSaveEvent.php b/libraries/src/Event/User/BeforeSaveEvent.php
new file mode 100644
index 0000000000000..07a3c5402cf05
--- /dev/null
+++ b/libraries/src/Event/User/BeforeSaveEvent.php
@@ -0,0 +1,67 @@
+<?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\Event\User;
+
+use Joomla\CMS\Event\Result\ResultAware;
+use Joomla\CMS\Event\Result\ResultAwareInterface;
+use Joomla\CMS\Event\Result\ResultTypeBooleanAware;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for User save event.
+ * Example:
+ *  new BeforeSaveEvent('onEventName', ['subject' => $oldUserArray, 'isNew' => $isNew, 'data' => $data]);
+ *
+ * @since  5.0.0
+ */
+class BeforeSaveEvent extends AbstractSaveEvent implements ResultAwareInterface
+{
+    use ResultAware;
+    use ResultTypeBooleanAware;
+
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['subject', 'isNew', 'data'];
+
+    /**
+     * Setter for the data argument.
+     *
+     * @param   array  $value  The value to set
+     *
+     * @return  array
+     *
+     * @since  5.0.0
+     */
+    protected function setData(array $value): array
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the data.
+     *
+     * @return  array
+     *
+     * @since  5.0.0
+     */
+    public function getData(): array
+    {
+        return $this->arguments['data'] ?? [];
+    }
+}
diff --git a/libraries/src/Event/User/LoginButtonsEvent.php b/libraries/src/Event/User/LoginButtonsEvent.php
new file mode 100644
index 0000000000000..728d20c7ae808
--- /dev/null
+++ b/libraries/src/Event/User/LoginButtonsEvent.php
@@ -0,0 +1,67 @@
+<?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\Event\User;
+
+use Joomla\CMS\Event\Result\ResultAware;
+use Joomla\CMS\Event\Result\ResultAwareInterface;
+use Joomla\CMS\Event\Result\ResultTypeArrayAware;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for User event.
+ * Example:
+ *  new LoginButtonsEvent('onEventName', ['subject' => $formId]);
+ *
+ * @since  5.0.0
+ */
+class LoginButtonsEvent extends UserEvent implements ResultAwareInterface
+{
+    use ResultAware;
+    use ResultTypeArrayAware;
+
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = ['subject'];
+
+    /**
+     * Setter for the subject argument.
+     *
+     * @param   string  $value  The value to set
+     *
+     * @return  string
+     *
+     * @since  5.0.0
+     */
+    protected function setSubject(string $value): string
+    {
+        return $value;
+    }
+
+    /**
+     * Getter for the formId.
+     *
+     * @return  string
+     *
+     * @since  5.0.0
+     */
+    public function getFormId(): string
+    {
+        return $this->arguments['subject'];
+    }
+}
diff --git a/libraries/src/Event/User/LoginEvent.php b/libraries/src/Event/User/LoginEvent.php
new file mode 100644
index 0000000000000..77ae6c80e7024
--- /dev/null
+++ b/libraries/src/Event/User/LoginEvent.php
@@ -0,0 +1,31 @@
+<?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\Event\User;
+
+use Joomla\CMS\Event\Result\ResultAware;
+use Joomla\CMS\Event\Result\ResultAwareInterface;
+use Joomla\CMS\Event\Result\ResultTypeBooleanAware;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for User event.
+ * Example:
+ *  new LoginEvent('onEventName', ['subject' => $authenticationResponseArray, 'options' => $options]);
+ *
+ * @since  5.0.0
+ */
+class LoginEvent extends AbstractLoginEvent implements ResultAwareInterface
+{
+    use ResultAware;
+    use ResultTypeBooleanAware;
+}
diff --git a/libraries/src/Event/User/LoginFailureEvent.php b/libraries/src/Event/User/LoginFailureEvent.php
new file mode 100644
index 0000000000000..853ae098182ce
--- /dev/null
+++ b/libraries/src/Event/User/LoginFailureEvent.php
@@ -0,0 +1,25 @@
+<?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\Event\User;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for User event.
+ * Example:
+ *  new LoginFailureEvent('onEventName', ['subject' => $authenticationResponseArray, 'options' => $options]);
+ *
+ * @since  5.0.0
+ */
+class LoginFailureEvent extends AbstractLoginEvent
+{
+}
diff --git a/libraries/src/Event/User/LogoutEvent.php b/libraries/src/Event/User/LogoutEvent.php
new file mode 100644
index 0000000000000..5238f4a471982
--- /dev/null
+++ b/libraries/src/Event/User/LogoutEvent.php
@@ -0,0 +1,31 @@
+<?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\Event\User;
+
+use Joomla\CMS\Event\Result\ResultAware;
+use Joomla\CMS\Event\Result\ResultAwareInterface;
+use Joomla\CMS\Event\Result\ResultTypeBooleanAware;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for User event.
+ * Example:
+ *  new LogoutEvent('onEventName', ['subject' => $parameters, 'options' => $options]);
+ *
+ * @since  5.0.0
+ */
+class LogoutEvent extends AbstractLogoutEvent implements ResultAwareInterface
+{
+    use ResultAware;
+    use ResultTypeBooleanAware;
+}
diff --git a/libraries/src/Event/User/LogoutFailureEvent.php b/libraries/src/Event/User/LogoutFailureEvent.php
new file mode 100644
index 0000000000000..fef2d680cff38
--- /dev/null
+++ b/libraries/src/Event/User/LogoutFailureEvent.php
@@ -0,0 +1,25 @@
+<?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\Event\User;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for User event.
+ * Example:
+ *  new LogoutFailureEvent('onEventName', ['subject' => $parameters, 'options' => $options]);
+ *
+ * @since  5.0.0
+ */
+class LogoutFailureEvent extends AbstractLogoutEvent
+{
+}
diff --git a/libraries/src/Event/User/UserEvent.php b/libraries/src/Event/User/UserEvent.php
new file mode 100644
index 0000000000000..1863217c8800a
--- /dev/null
+++ b/libraries/src/Event/User/UserEvent.php
@@ -0,0 +1,61 @@
+<?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\Event\User;
+
+use Joomla\CMS\Event\AbstractImmutableEvent;
+use Joomla\CMS\Event\ReshapeArgumentsAware;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Base class for User events
+ *
+ * @since  5.0.0
+ */
+abstract class UserEvent extends AbstractImmutableEvent
+{
+    use ReshapeArgumentsAware;
+
+    /**
+     * The argument names, in order expected by legacy plugins.
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     * @deprecated 5.0 will be removed in 6.0
+     */
+    protected $legacyArgumentsOrder = [];
+
+    /**
+     * Constructor.
+     *
+     * @param   string  $name       The event name.
+     * @param   array   $arguments  The event arguments.
+     *
+     * @throws  \BadMethodCallException
+     *
+     * @since   5.0.0
+     */
+    public function __construct($name, array $arguments = [])
+    {
+        // Reshape the arguments array to preserve b/c with legacy listeners
+        if ($this->legacyArgumentsOrder) {
+            $arguments = $this->reshapeArguments($arguments, $this->legacyArgumentsOrder);
+        }
+
+        parent::__construct($name, $arguments);
+
+        if (!\array_key_exists('subject', $this->arguments)) {
+            throw new \BadMethodCallException("Argument 'subject' of event {$name} is required but has not been provided");
+        }
+    }
+}
diff --git a/libraries/src/Event/View/DisplayEvent.php b/libraries/src/Event/View/DisplayEvent.php
index 7a5822689f77b..60a0d5a8a3816 100644
--- a/libraries/src/Event/View/DisplayEvent.php
+++ b/libraries/src/Event/View/DisplayEvent.php
@@ -4,17 +4,16 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\View;
 
-use BadMethodCallException;
 use Joomla\CMS\Event\AbstractImmutableEvent;
 use Joomla\CMS\MVC\View\ViewInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -30,30 +29,30 @@ class DisplayEvent extends AbstractImmutableEvent
      * @param   string  $name       The event name.
      * @param   array   $arguments  The event arguments.
      *
-     * @throws  BadMethodCallException
+     * @throws  \BadMethodCallException
      *
      * @since   4.0.0
      */
     public function __construct($name, array $arguments = [])
     {
         if (!isset($arguments['subject'])) {
-            throw new BadMethodCallException("Argument 'subject' of event {$this->name} is required but has not been provided");
+            throw new \BadMethodCallException("Argument 'subject' of event {$this->name} is required but has not been provided");
         }
 
         if (!($arguments['subject'] instanceof ViewInterface)) {
-            throw new BadMethodCallException("Argument 'subject' of event {$this->name} is not of type 'ViewInterface'");
+            throw new \BadMethodCallException("Argument 'subject' of event {$this->name} is not of type 'ViewInterface'");
         }
 
         if (!isset($arguments['extension'])) {
-            throw new BadMethodCallException("Argument 'extension' of event {$this->name} is required but has not been provided");
+            throw new \BadMethodCallException("Argument 'extension' of event {$this->name} is required but has not been provided");
         }
 
         if (!isset($arguments['extension']) || !is_string($arguments['extension'])) {
-            throw new BadMethodCallException("Argument 'extension' of event {$this->name} is not of type 'string'");
+            throw new \BadMethodCallException("Argument 'extension' of event {$this->name} is not of type 'string'");
         }
 
         if (strpos($arguments['extension'], '.') === false) {
-            throw new BadMethodCallException("Argument 'extension' of event {$this->name} has wrong format. Valid format: 'component.section'");
+            throw new \BadMethodCallException("Argument 'extension' of event {$this->name} has wrong format. Valid format: 'component.section'");
         }
 
         if (!\array_key_exists('extensionName', $arguments) || !\array_key_exists('section', $arguments)) {
diff --git a/libraries/src/Event/WebAsset/AbstractEvent.php b/libraries/src/Event/WebAsset/AbstractEvent.php
index 802c685d1f201..8b92c208431ea 100644
--- a/libraries/src/Event/WebAsset/AbstractEvent.php
+++ b/libraries/src/Event/WebAsset/AbstractEvent.php
@@ -4,16 +4,15 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\WebAsset;
 
-use BadMethodCallException;
 use Joomla\CMS\Event\AbstractImmutableEvent;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -29,14 +28,14 @@ abstract class AbstractEvent extends AbstractImmutableEvent
      * @param   string  $name       The event name.
      * @param   array   $arguments  The event arguments.
      *
-     * @throws  BadMethodCallException
+     * @throws  \BadMethodCallException
      *
      * @since   4.0.0
      */
     public function __construct($name, array $arguments = [])
     {
         if (!\array_key_exists('subject', $arguments)) {
-            throw new BadMethodCallException("Argument 'subject' of event {$this->name} is required but has not been provided");
+            throw new \BadMethodCallException("Argument 'subject' of event {$this->name} is required but has not been provided");
         }
 
         parent::__construct($name, $arguments);
diff --git a/libraries/src/Event/WebAsset/WebAssetRegistryAssetChanged.php b/libraries/src/Event/WebAsset/WebAssetRegistryAssetChanged.php
index 77a9249e568d6..332034a5449f8 100644
--- a/libraries/src/Event/WebAsset/WebAssetRegistryAssetChanged.php
+++ b/libraries/src/Event/WebAsset/WebAssetRegistryAssetChanged.php
@@ -9,12 +9,11 @@
 
 namespace Joomla\CMS\Event\WebAsset;
 
-use BadMethodCallException;
 use Joomla\CMS\WebAsset\WebAssetItemInterface;
 use Joomla\CMS\WebAsset\WebAssetRegistryInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -30,7 +29,7 @@ class WebAssetRegistryAssetChanged extends AbstractEvent
      * @param   string  $name       The event name.
      * @param   array   $arguments  The event arguments.
      *
-     * @throws  BadMethodCallException
+     * @throws  \BadMethodCallException
      *
      * @since  4.0.0
      */
@@ -40,15 +39,15 @@ public function __construct($name, array $arguments = [])
 
         // Check for required arguments
         if (!\array_key_exists('asset', $arguments) || !($arguments['asset'] instanceof WebAssetItemInterface)) {
-            throw new BadMethodCallException("Argument 'asset' of event $name is not of the expected type");
+            throw new \BadMethodCallException("Argument 'asset' of event $name is not of the expected type");
         }
 
         if (!\array_key_exists('assetType', $arguments) || !is_string($arguments['assetType'])) {
-            throw new BadMethodCallException("Argument 'assetType' of event $name is not of the expected type");
+            throw new \BadMethodCallException("Argument 'assetType' of event $name is not of the expected type");
         }
 
         if (!\array_key_exists('change', $arguments) || !is_string($arguments['change'])) {
-            throw new BadMethodCallException("Argument 'change' of event $name is not of the expected type");
+            throw new \BadMethodCallException("Argument 'change' of event $name is not of the expected type");
         }
     }
 
@@ -59,14 +58,14 @@ public function __construct($name, array $arguments = [])
      *
      * @return  WebAssetRegistryInterface
      *
-     * @throws  BadMethodCallException  if the argument is not of the expected type
+     * @throws  \BadMethodCallException  if the argument is not of the expected type
      *
      * @since  4.0.0
      */
     protected function setSubject($value)
     {
         if (!$value || !($value instanceof WebAssetRegistryInterface)) {
-            throw new BadMethodCallException("Argument 'subject' of event {$this->name} is not of the expected type");
+            throw new \BadMethodCallException("Argument 'subject' of event {$this->name} is not of the expected type");
         }
 
         return $value;
diff --git a/libraries/src/Event/Workflow/AbstractEvent.php b/libraries/src/Event/Workflow/AbstractEvent.php
index fca4545ed7531..0e3b1adc4a00e 100644
--- a/libraries/src/Event/Workflow/AbstractEvent.php
+++ b/libraries/src/Event/Workflow/AbstractEvent.php
@@ -4,18 +4,15 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Workflow;
 
-use BadMethodCallException;
 use Joomla\CMS\Event\AbstractImmutableEvent;
 
-use function explode;
-
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -31,26 +28,26 @@ abstract class AbstractEvent extends AbstractImmutableEvent
      * @param   string  $name       The event name.
      * @param   array   $arguments  The event arguments.
      *
-     * @throws  BadMethodCallException
+     * @throws  \BadMethodCallException
      *
      * @since   4.0.0
      */
     public function __construct($name, array $arguments = [])
     {
         if (!\array_key_exists('subject', $arguments)) {
-            throw new BadMethodCallException("Argument 'subject' of event {$this->name} is required but has not been provided");
+            throw new \BadMethodCallException("Argument 'subject' of event {$this->name} is required but has not been provided");
         }
 
         if (!\array_key_exists('extension', $arguments)) {
-            throw new BadMethodCallException("Argument 'extension' of event {$this->name} is required but has not been provided");
+            throw new \BadMethodCallException("Argument 'extension' of event {$this->name} is required but has not been provided");
         }
 
         if (strpos($arguments['extension'], '.') === false) {
-            throw new BadMethodCallException("Argument 'extension' of event {$this->name} has wrong format. Valid format: 'component.section'");
+            throw new \BadMethodCallException("Argument 'extension' of event {$this->name} has wrong format. Valid format: 'component.section'");
         }
 
         if (!\array_key_exists('extensionName', $arguments) || !\array_key_exists('section', $arguments)) {
-            $parts = explode('.', $arguments['extension']);
+            $parts = \explode('.', $arguments['extension']);
 
             $arguments['extensionName'] = $arguments['extensionName'] ?? $parts[0];
             $arguments['section']       = $arguments['section'] ?? $parts[1];
diff --git a/libraries/src/Event/Workflow/WorkflowFunctionalityUsedEvent.php b/libraries/src/Event/Workflow/WorkflowFunctionalityUsedEvent.php
index fa4a3ae1fa1a9..7e5b6f5dac3bc 100644
--- a/libraries/src/Event/Workflow/WorkflowFunctionalityUsedEvent.php
+++ b/libraries/src/Event/Workflow/WorkflowFunctionalityUsedEvent.php
@@ -4,15 +4,13 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Workflow;
 
-use BadMethodCallException;
-
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -28,7 +26,7 @@ class WorkflowFunctionalityUsedEvent extends AbstractEvent
      * @param   string  $name       The event name.
      * @param   array   $arguments  The event arguments.
      *
-     * @throws  BadMethodCallException
+     * @throws  \BadMethodCallException
      *
      * @since   4.0.0
      */
diff --git a/libraries/src/Event/Workflow/WorkflowTransitionEvent.php b/libraries/src/Event/Workflow/WorkflowTransitionEvent.php
index f6c3e77ea424d..b1f37a105c88a 100644
--- a/libraries/src/Event/Workflow/WorkflowTransitionEvent.php
+++ b/libraries/src/Event/Workflow/WorkflowTransitionEvent.php
@@ -4,15 +4,13 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Event\Workflow;
 
-use BadMethodCallException;
-
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -28,7 +26,7 @@ class WorkflowTransitionEvent extends AbstractEvent
      * @param   string  $name       The event name.
      * @param   array   $arguments  The event arguments.
      *
-     * @throws  BadMethodCallException
+     * @throws  \BadMethodCallException
      *
      * @since   4.0.0
      */
diff --git a/libraries/src/Exception/ExceptionHandler.php b/libraries/src/Exception/ExceptionHandler.php
index 039528158d08f..f3e09e99514f2 100644
--- a/libraries/src/Exception/ExceptionHandler.php
+++ b/libraries/src/Exception/ExceptionHandler.php
@@ -11,11 +11,12 @@
 
 use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Error\AbstractRenderer;
+use Joomla\CMS\Event\Application\AfterInitialiseDocumentEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Log\Log;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -94,6 +95,11 @@ public static function render(\Throwable $error)
                 $app->redirect('index.php');
             }
 
+            // Clear all opened Output buffers to prevent misrendering
+            for ($i = 0, $l = ob_get_level(); $i < $l; $i++) {
+                ob_end_clean();
+            }
+
             /*
              * Try and determine the format to render the error page in
              *
@@ -118,6 +124,15 @@ public static function render(\Throwable $error)
             Factory::$document = $renderer->getDocument();
             Factory::getApplication()->loadDocument(Factory::$document);
 
+            // Trigger the onAfterInitialiseDocument event.
+            $app->getDispatcher()->dispatch(
+                'onAfterInitialiseDocument',
+                new AfterInitialiseDocumentEvent('onAfterInitialiseDocument', [
+                    'subject'  => $app,
+                    'document' => $renderer->getDocument(),
+                ])
+            );
+
             $data = $renderer->render($error);
 
             // If nothing was rendered, just use the message from the Exception
diff --git a/libraries/src/Extension/BootableExtensionInterface.php b/libraries/src/Extension/BootableExtensionInterface.php
index 3f8efd8e51c24..fc7c36c30c00d 100644
--- a/libraries/src/Extension/BootableExtensionInterface.php
+++ b/libraries/src/Extension/BootableExtensionInterface.php
@@ -12,7 +12,7 @@
 use Psr\Container\ContainerInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Extension/Component.php b/libraries/src/Extension/Component.php
index b5b5ca5849c5b..d0630421f1962 100644
--- a/libraries/src/Extension/Component.php
+++ b/libraries/src/Extension/Component.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Dispatcher\DispatcherInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Extension/ComponentInterface.php b/libraries/src/Extension/ComponentInterface.php
index 1ffe0e6d3f0d8..9b9c1723320cc 100644
--- a/libraries/src/Extension/ComponentInterface.php
+++ b/libraries/src/Extension/ComponentInterface.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Dispatcher\DispatcherInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Extension/DummyPlugin.php b/libraries/src/Extension/DummyPlugin.php
index 21b26eee9e1b6..926241ccbde30 100644
--- a/libraries/src/Extension/DummyPlugin.php
+++ b/libraries/src/Extension/DummyPlugin.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Plugin\CMSPlugin;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Extension/ExtensionHelper.php b/libraries/src/Extension/ExtensionHelper.php
index aec5e4eb2c349..1e2929863263c 100644
--- a/libraries/src/Extension/ExtensionHelper.php
+++ b/libraries/src/Extension/ExtensionHelper.php
@@ -13,7 +13,7 @@
 use Joomla\Database\ParameterType;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -172,6 +172,7 @@ class ExtensionHelper
         ['plugin', 'ldap', 'authentication', 0],
 
         // Core plugin extensions - behaviour
+        ['plugin', 'compat', 'behaviour', 0],
         ['plugin', 'taggable', 'behaviour', 0],
         ['plugin', 'versionable', 'behaviour', 0],
 
@@ -273,11 +274,21 @@ class ExtensionHelper
         ['plugin', 'overridecheck', 'quickicon', 0],
         ['plugin', 'phpversioncheck', 'quickicon', 0],
         ['plugin', 'privacycheck', 'quickicon', 0],
+        ['plugin', 'eos', 'quickicon', 0],
 
         // Core plugin extensions - sample data
         ['plugin', 'blog', 'sampledata', 0],
         ['plugin', 'multilang', 'sampledata', 0],
 
+        // Core plugin extensions - schemaorg
+        ['plugin', 'blogposting', 'schemaorg', 0],
+        ['plugin', 'book', 'schemaorg', 0],
+        ['plugin', 'event', 'schemaorg', 0],
+        ['plugin', 'jobposting', 'schemaorg', 0],
+        ['plugin', 'organization', 'schemaorg', 0],
+        ['plugin', 'person', 'schemaorg', 0],
+        ['plugin', 'recipe', 'schemaorg', 0],
+
         // Core plugin extensions - system
         ['plugin', 'accessibility', 'system', 0],
         ['plugin', 'actionlogs', 'system', 0],
@@ -292,25 +303,28 @@ class ExtensionHelper
         ['plugin', 'languagefilter', 'system', 0],
         ['plugin', 'log', 'system', 0],
         ['plugin', 'logout', 'system', 0],
-        ['plugin', 'logrotation', 'system', 0],
         ['plugin', 'privacyconsent', 'system', 0],
         ['plugin', 'redirect', 'system', 0],
         ['plugin', 'remember', 'system', 0],
         ['plugin', 'schedulerunner', 'system', 0],
+        ['plugin', 'schemaorg', 'system', 0],
         ['plugin', 'sef', 'system', 0],
         ['plugin', 'sessiongc', 'system', 0],
         ['plugin', 'shortcut', 'system', 0],
         ['plugin', 'skipto', 'system', 0],
         ['plugin', 'stats', 'system', 0],
         ['plugin', 'tasknotification', 'system', 0],
-        ['plugin', 'updatenotification', 'system', 0],
         ['plugin', 'webauthn', 'system', 0],
 
         // Core plugin extensions - task scheduler
         ['plugin', 'checkfiles', 'task', 0],
-        ['plugin', 'demotasks', 'task', 0],
+        ['plugin', 'deleteactionlogs', 'task', 0],
+        ['plugin', 'globalcheckin', 'task', 0],
+        ['plugin', 'privacyconsent', 'task', 0],
         ['plugin', 'requests', 'task', 0],
+        ['plugin', 'rotatelogs', 'task', 0],
         ['plugin', 'sitestatus', 'task', 0],
+        ['plugin', 'updatenotification', 'task', 0],
 
         // Core plugin extensions - user
         ['plugin', 'contactcreator', 'user', 0],
diff --git a/libraries/src/Extension/ExtensionManagerInterface.php b/libraries/src/Extension/ExtensionManagerInterface.php
index e38b270ca8fbf..8766ae6702fbd 100644
--- a/libraries/src/Extension/ExtensionManagerInterface.php
+++ b/libraries/src/Extension/ExtensionManagerInterface.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Extension;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Extension/ExtensionManagerTrait.php b/libraries/src/Extension/ExtensionManagerTrait.php
index 9800fbe701709..fe2acdcdd20e0 100644
--- a/libraries/src/Extension/ExtensionManagerTrait.php
+++ b/libraries/src/Extension/ExtensionManagerTrait.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Extension;
@@ -20,7 +20,7 @@
 use Joomla\Event\DispatcherInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Extension/LegacyComponent.php b/libraries/src/Extension/LegacyComponent.php
index 3f05a9243a3e3..ce37c1f2112b0 100644
--- a/libraries/src/Extension/LegacyComponent.php
+++ b/libraries/src/Extension/LegacyComponent.php
@@ -20,16 +20,16 @@
 use Joomla\CMS\Dispatcher\DispatcherInterface;
 use Joomla\CMS\Dispatcher\LegacyComponentDispatcher;
 use Joomla\CMS\Fields\FieldsServiceInterface;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Menu\AbstractMenu;
 use Joomla\CMS\MVC\Factory\LegacyFactory;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Factory\MVCFactoryServiceInterface;
 use Joomla\CMS\Tag\TagServiceInterface;
 use Joomla\CMS\Tag\TagServiceTrait;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Extension/MVCComponent.php b/libraries/src/Extension/MVCComponent.php
index d4605a5d67f71..90f92ef65dfb5 100644
--- a/libraries/src/Extension/MVCComponent.php
+++ b/libraries/src/Extension/MVCComponent.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\MVC\Factory\MVCFactoryServiceTrait;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Extension/Module.php b/libraries/src/Extension/Module.php
index de2db49bd5530..ca9a87f230509 100644
--- a/libraries/src/Extension/Module.php
+++ b/libraries/src/Extension/Module.php
@@ -17,7 +17,7 @@
 use Joomla\Input\Input;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Extension/ModuleInterface.php b/libraries/src/Extension/ModuleInterface.php
index 9fb0adf09ce21..f4ca106440972 100644
--- a/libraries/src/Extension/ModuleInterface.php
+++ b/libraries/src/Extension/ModuleInterface.php
@@ -14,7 +14,7 @@
 use Joomla\Input\Input;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Extension/PluginInterface.php b/libraries/src/Extension/PluginInterface.php
index 256bdddd87067..55baeb78188ed 100644
--- a/libraries/src/Extension/PluginInterface.php
+++ b/libraries/src/Extension/PluginInterface.php
@@ -12,7 +12,7 @@
 use Joomla\Event\DispatcherAwareInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Extension/Service/Provider/CategoryFactory.php b/libraries/src/Extension/Service/Provider/CategoryFactory.php
index e14745afefe5d..9556703ea1f96 100644
--- a/libraries/src/Extension/Service/Provider/CategoryFactory.php
+++ b/libraries/src/Extension/Service/Provider/CategoryFactory.php
@@ -15,7 +15,7 @@
 use Joomla\DI\ServiceProviderInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Extension/Service/Provider/ComponentDispatcherFactory.php b/libraries/src/Extension/Service/Provider/ComponentDispatcherFactory.php
index e01d2ce71ba6d..4d105dae72e24 100644
--- a/libraries/src/Extension/Service/Provider/ComponentDispatcherFactory.php
+++ b/libraries/src/Extension/Service/Provider/ComponentDispatcherFactory.php
@@ -15,7 +15,7 @@
 use Joomla\DI\ServiceProviderInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Extension/Service/Provider/HelperFactory.php b/libraries/src/Extension/Service/Provider/HelperFactory.php
index 253b70a52e91c..16199130b5598 100644
--- a/libraries/src/Extension/Service/Provider/HelperFactory.php
+++ b/libraries/src/Extension/Service/Provider/HelperFactory.php
@@ -15,7 +15,7 @@
 use Joomla\DI\ServiceProviderInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Extension/Service/Provider/MVCFactory.php b/libraries/src/Extension/Service/Provider/MVCFactory.php
index 0c7b27a4fcf7c..7eb07ef7b8f03 100644
--- a/libraries/src/Extension/Service/Provider/MVCFactory.php
+++ b/libraries/src/Extension/Service/Provider/MVCFactory.php
@@ -11,17 +11,19 @@
 
 use Joomla\CMS\Cache\CacheControllerFactoryInterface;
 use Joomla\CMS\Form\FormFactoryInterface;
+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\User\UserFactoryInterface;
 use Joomla\Database\DatabaseInterface;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
 use Joomla\Event\DispatcherInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
-// phpcs:enable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:e_JEXECes.SideEffects
 
 /**
  * Service provider for the service MVC factory.
@@ -76,6 +78,8 @@ function (Container $container) {
                 $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));
 
                 return $factory;
             }
diff --git a/libraries/src/Extension/Service/Provider/Module.php b/libraries/src/Extension/Service/Provider/Module.php
index 5a4cfeefc9ee5..8f90f50a624c6 100644
--- a/libraries/src/Extension/Service/Provider/Module.php
+++ b/libraries/src/Extension/Service/Provider/Module.php
@@ -16,7 +16,7 @@
 use Joomla\DI\ServiceProviderInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Extension/Service/Provider/ModuleDispatcherFactory.php b/libraries/src/Extension/Service/Provider/ModuleDispatcherFactory.php
index e5b8884a9cb16..8b4e5e2713680 100644
--- a/libraries/src/Extension/Service/Provider/ModuleDispatcherFactory.php
+++ b/libraries/src/Extension/Service/Provider/ModuleDispatcherFactory.php
@@ -14,7 +14,7 @@
 use Joomla\DI\ServiceProviderInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Extension/Service/Provider/RouterFactory.php b/libraries/src/Extension/Service/Provider/RouterFactory.php
index f52881ebe1d7d..7f3b7da8a1f5a 100644
--- a/libraries/src/Extension/Service/Provider/RouterFactory.php
+++ b/libraries/src/Extension/Service/Provider/RouterFactory.php
@@ -16,7 +16,7 @@
 use Joomla\DI\ServiceProviderInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Factory.php b/libraries/src/Factory.php
index d49886c6904e1..fba5557f9d0de 100644
--- a/libraries/src/Factory.php
+++ b/libraries/src/Factory.php
@@ -19,19 +19,17 @@
 use Joomla\CMS\Filesystem\Stream;
 use Joomla\CMS\Language\Language;
 use Joomla\CMS\Language\LanguageFactoryInterface;
-use Joomla\CMS\Log\Log;
 use Joomla\CMS\Mail\Mail;
-use Joomla\CMS\Mail\MailHelper;
+use Joomla\CMS\Mail\MailerFactoryInterface;
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\User\User;
 use Joomla\Database\DatabaseDriver;
 use Joomla\Database\DatabaseInterface;
 use Joomla\DI\Container;
 use Joomla\Registry\Registry;
-use PHPMailer\PHPMailer\Exception as phpmailerException;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -230,8 +228,8 @@ public static function getConfig($file = null, $type = 'PHP', $namespace = '')
      *   notify developers of changes needed in their code
      *
      * This method is not suggested for use as a one-for-one replacement of static calls, such as
-     * replacing calls to `Factory::getDbo()` with calls to `Factory::getContainer()->get('db')`, code
-     * should be refactored to support dependency injection instead of making this change.
+     * replacing calls to `Factory::getDbo()` with calls to `Factory::getContainer()->get(DatabaseInterface::class)`,
+     * code should be refactored to support dependency injection instead of making this change.
      *
      * @return  Container
      *
@@ -461,8 +459,8 @@ public static function getDbo()
         );
 
         if (!self::$database) {
-            if (self::getContainer()->has('DatabaseDriver')) {
-                self::$database = self::getContainer()->get('DatabaseDriver');
+            if (self::getContainer()->has(DatabaseInterface::class)) {
+                self::$database = self::getContainer()->get(DatabaseInterface::class);
             } else {
                 self::$database = self::createDbo();
             }
@@ -480,6 +478,11 @@ public static function getDbo()
      *
      * @see     Mail
      * @since   1.7.0
+     *
+     * @deprecated  4.4.0 will be removed in 6.0
+     *              Use the mailer service in the DI container and create a mailer from there
+     *              Example:
+     *              Factory::getContainer()->get(MailerFactoryInterface::class)->createMailer();
      */
     public static function getMailer()
     {
@@ -603,14 +606,18 @@ protected static function createContainer(): Container
             ->registerServiceProvider(new \Joomla\CMS\Service\Provider\Application())
             ->registerServiceProvider(new \Joomla\CMS\Service\Provider\Authentication())
             ->registerServiceProvider(new \Joomla\CMS\Service\Provider\CacheController())
+            ->registerServiceProvider(new \Joomla\CMS\Service\Provider\CaptchaRegistry())
             ->registerServiceProvider(new \Joomla\CMS\Service\Provider\Config())
             ->registerServiceProvider(new \Joomla\CMS\Service\Provider\Console())
+            ->registerServiceProvider(new \Joomla\CMS\Service\Provider\EditorsRegistry())
             ->registerServiceProvider(new \Joomla\CMS\Service\Provider\Database())
             ->registerServiceProvider(new \Joomla\CMS\Service\Provider\Dispatcher())
             ->registerServiceProvider(new \Joomla\CMS\Service\Provider\Document())
             ->registerServiceProvider(new \Joomla\CMS\Service\Provider\Form())
+            ->registerServiceProvider(new \Joomla\CMS\Service\Provider\Input())
             ->registerServiceProvider(new \Joomla\CMS\Service\Provider\Logger())
             ->registerServiceProvider(new \Joomla\CMS\Service\Provider\Language())
+            ->registerServiceProvider(new \Joomla\CMS\Service\Provider\Mailer())
             ->registerServiceProvider(new \Joomla\CMS\Service\Provider\Menu())
             ->registerServiceProvider(new \Joomla\CMS\Service\Provider\Pathway())
             ->registerServiceProvider(new \Joomla\CMS\Service\Provider\HTMLRegistry())
@@ -693,56 +700,20 @@ protected static function createDbo()
      *
      * @see     Mail
      * @since   1.7.0
+     *
+     * @deprecated  4.4.0 will be removed in 6.0
+     *              Use the mailer service in the DI container and create a mailer from there
+     *              Example:
+     *              Factory::getContainer()->get(MailerFactoryInterface::class)->createMailer();
      */
     protected static function createMailer()
     {
-        $conf = self::getConfig();
-
-        $smtpauth   = ($conf->get('smtpauth') == 0) ? null : 1;
-        $smtpuser   = $conf->get('smtpuser');
-        $smtppass   = $conf->get('smtppass');
-        $smtphost   = $conf->get('smtphost');
-        $smtpsecure = $conf->get('smtpsecure');
-        $smtpport   = $conf->get('smtpport');
-        $mailfrom   = $conf->get('mailfrom');
-        $fromname   = $conf->get('fromname');
-        $mailer     = $conf->get('mailer');
-
-        // Create a Mail object
-        $mail = Mail::getInstance();
-
-        // Clean the email address
-        $mailfrom = MailHelper::cleanLine($mailfrom);
-
-        // Set default sender without Reply-to if the mailfrom is a valid address
-        if (MailHelper::isEmailAddress($mailfrom)) {
-            // Wrap in try/catch to catch phpmailerExceptions if it is throwing them
-            try {
-                // Check for a false return value if exception throwing is disabled
-                if ($mail->setFrom($mailfrom, MailHelper::cleanLine($fromname), false) === false) {
-                    Log::add(__METHOD__ . '() could not set the sender data.', Log::WARNING, 'mail');
-                }
-            } catch (phpmailerException $e) {
-                Log::add(__METHOD__ . '() could not set the sender data.', Log::WARNING, 'mail');
-            }
-        }
+        $mailer = self::getContainer()->get(MailerFactoryInterface::class)->createMailer(self::getConfig());
 
-        // Default mailer is to use PHP's mail function
-        switch ($mailer) {
-            case 'smtp':
-                $mail->useSmtp($smtpauth, $smtphost, $smtpuser, $smtppass, $smtpsecure, $smtpport);
-                break;
-
-            case 'sendmail':
-                $mail->isSendmail();
-                break;
-
-            default:
-                $mail->isMail();
-                break;
-        }
+        // This needs to be set here for backwards compatibility
+        Mail::$instances['Joomla'] = $mailer;
 
-        return $mail;
+        return $mailer;
     }
 
     /**
diff --git a/libraries/src/Feed/Feed.php b/libraries/src/Feed/Feed.php
index a57853ac75129..c3726d7b7c8eb 100644
--- a/libraries/src/Feed/Feed.php
+++ b/libraries/src/Feed/Feed.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Date\Date;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Feed/FeedEntry.php b/libraries/src/Feed/FeedEntry.php
index b948129a1d928..dac25ae4279fb 100644
--- a/libraries/src/Feed/FeedEntry.php
+++ b/libraries/src/Feed/FeedEntry.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Date\Date;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Feed/FeedFactory.php b/libraries/src/Feed/FeedFactory.php
index 3f9d63f27f62a..f1f91cd3ddb8c 100644
--- a/libraries/src/Feed/FeedFactory.php
+++ b/libraries/src/Feed/FeedFactory.php
@@ -13,7 +13,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Feed/FeedLink.php b/libraries/src/Feed/FeedLink.php
index 5a8c93ea99669..e219754991139 100644
--- a/libraries/src/Feed/FeedLink.php
+++ b/libraries/src/Feed/FeedLink.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Feed;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -68,6 +68,38 @@ class FeedLink
      */
     public $length;
 
+    /**
+     * The link of the image.
+     *
+     * @var    integer
+     * @since  4.4.0
+     */
+    public $link;
+
+    /**
+     * The description of the image.
+     *
+     * @var    integer
+     * @since  4.4.0
+     */
+    public $description;
+
+    /**
+     * The height of the image.
+     *
+     * @var    integer
+     * @since  4.4.0
+     */
+    public $height;
+
+    /**
+     * The width of the image.
+     *
+     * @var    integer
+     * @since  4.4.0
+     */
+    public $width;
+
     /**
      * Constructor.
      *
diff --git a/libraries/src/Feed/FeedParser.php b/libraries/src/Feed/FeedParser.php
index 2076fe287f5e5..67e4a32ccde78 100644
--- a/libraries/src/Feed/FeedParser.php
+++ b/libraries/src/Feed/FeedParser.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Filter\InputFilter;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Feed/FeedPerson.php b/libraries/src/Feed/FeedPerson.php
index 9adc21c9814e2..a8e6a1ad0ebbe 100644
--- a/libraries/src/Feed/FeedPerson.php
+++ b/libraries/src/Feed/FeedPerson.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Feed;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Feed/Parser/AtomParser.php b/libraries/src/Feed/Parser/AtomParser.php
index 3b002b3db1572..4cdf4a09880e9 100644
--- a/libraries/src/Feed/Parser/AtomParser.php
+++ b/libraries/src/Feed/Parser/AtomParser.php
@@ -15,7 +15,7 @@
 use Joomla\CMS\Feed\FeedParser;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Feed/Parser/NamespaceParserInterface.php b/libraries/src/Feed/Parser/NamespaceParserInterface.php
index 52cd253df4451..704805eae9012 100644
--- a/libraries/src/Feed/Parser/NamespaceParserInterface.php
+++ b/libraries/src/Feed/Parser/NamespaceParserInterface.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Feed\FeedEntry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Feed/Parser/Rss/ItunesRssParser.php b/libraries/src/Feed/Parser/Rss/ItunesRssParser.php
index 0aeaf8a45ff47..3140930385f75 100644
--- a/libraries/src/Feed/Parser/Rss/ItunesRssParser.php
+++ b/libraries/src/Feed/Parser/Rss/ItunesRssParser.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Feed\Parser\NamespaceParserInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Feed/Parser/Rss/MediaRssParser.php b/libraries/src/Feed/Parser/Rss/MediaRssParser.php
index fb5b8a6186adb..068e1b8da6999 100644
--- a/libraries/src/Feed/Parser/Rss/MediaRssParser.php
+++ b/libraries/src/Feed/Parser/Rss/MediaRssParser.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Feed\Parser\NamespaceParserInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Feed/Parser/RssParser.php b/libraries/src/Feed/Parser/RssParser.php
index f3badf13c80e6..c3cd85beb68ac 100644
--- a/libraries/src/Feed/Parser/RssParser.php
+++ b/libraries/src/Feed/Parser/RssParser.php
@@ -16,7 +16,7 @@
 use Joomla\CMS\Feed\FeedPerson;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Fields/FieldsServiceInterface.php b/libraries/src/Fields/FieldsServiceInterface.php
index f8fc09cefdec7..4d564ebdf186b 100644
--- a/libraries/src/Fields/FieldsServiceInterface.php
+++ b/libraries/src/Fields/FieldsServiceInterface.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Fields;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Filesystem/File.php b/libraries/src/Filesystem/File.php
index 435ead9ba9c3a..d72f56901d04f 100644
--- a/libraries/src/Filesystem/File.php
+++ b/libraries/src/Filesystem/File.php
@@ -17,7 +17,7 @@
 use Joomla\CMS\Log\Log;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -287,8 +287,8 @@ public static function delete($file)
 
             /**
              * Invalidate the OPCache for the file before actually deleting it
-             * @see https://github.com/joomla/joomla-cms/pull/32915#issuecomment-812865635
-             * @see https://www.php.net/manual/en/function.opcache-invalidate.php#116372
+             * @link https://github.com/joomla/joomla-cms/pull/32915#issuecomment-812865635
+             * @link https://www.php.net/manual/en/function.opcache-invalidate.php#116372
              */
             self::invalidateFileCache($file);
 
diff --git a/libraries/src/Filesystem/FilesystemHelper.php b/libraries/src/Filesystem/FilesystemHelper.php
index a87e02b7adfa9..032c8cd64cd10 100644
--- a/libraries/src/Filesystem/FilesystemHelper.php
+++ b/libraries/src/Filesystem/FilesystemHelper.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Filesystem;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Filesystem/Folder.php b/libraries/src/Filesystem/Folder.php
index cef115745c236..82a8105685c4e 100644
--- a/libraries/src/Filesystem/Folder.php
+++ b/libraries/src/Filesystem/Folder.php
@@ -16,7 +16,7 @@
 use Joomla\CMS\Log\Log;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Filesystem/Patcher.php b/libraries/src/Filesystem/Patcher.php
index 3d5f5505e9f77..566b173b91617 100644
--- a/libraries/src/Filesystem/Patcher.php
+++ b/libraries/src/Filesystem/Patcher.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Language\Text;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Filesystem/Path.php b/libraries/src/Filesystem/Path.php
index faf981503763a..744dd87b49735 100644
--- a/libraries/src/Filesystem/Path.php
+++ b/libraries/src/Filesystem/Path.php
@@ -9,9 +9,9 @@
 
 namespace Joomla\CMS\Filesystem;
 
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 
-use Joomla\CMS\Crypt\Crypt;
+use Joomla\Filesystem\Path as FilesystemPath;
 
 if (!\defined('JPATH_ROOT')) {
     // Define a string constant for the root directory of the file system in native format
@@ -25,126 +25,8 @@
  * @deprecated  4.4 will be removed in 6.0
  *              Use Joomla\Filesystem\Path instead.
  */
-class Path
+class Path extends FilesystemPath
 {
-    /**
-     * Checks if a path's permissions can be changed.
-     *
-     * @param   string  $path  Path to check.
-     *
-     * @return  boolean  True if path can have mode changed.
-     *
-     * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
-     *              Use Joomla\Filesystem\Path::canChmod() instead.
-     */
-    public static function canChmod($path)
-    {
-        $perms = fileperms($path);
-
-        if ($perms !== false) {
-            if (@chmod($path, $perms ^ 0001)) {
-                @chmod($path, $perms);
-
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Chmods files and directories recursively to given permissions.
-     *
-     * @param   string  $path        Root path to begin changing mode [without trailing slash].
-     * @param   string  $filemode    Octal representation of the value to change file mode to [null = no change].
-     * @param   string  $foldermode  Octal representation of the value to change folder mode to [null = no change].
-     *
-     * @return  boolean  True if successful [one fail means the whole operation failed].
-     *
-     * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
-     *              Use Joomla\Filesystem\Path::setPermissions() instead.
-     */
-    public static function setPermissions($path, $filemode = '0644', $foldermode = '0755')
-    {
-        // Initialise return value
-        $ret = true;
-
-        if (is_dir($path)) {
-            $dh = opendir($path);
-
-            while ($file = readdir($dh)) {
-                if ($file != '.' && $file != '..') {
-                    $fullpath = $path . '/' . $file;
-
-                    if (is_dir($fullpath)) {
-                        if (!self::setPermissions($fullpath, $filemode, $foldermode)) {
-                            $ret = false;
-                        }
-                    } else {
-                        if (isset($filemode)) {
-                            if (!@ chmod($fullpath, octdec($filemode))) {
-                                $ret = false;
-                            }
-                        }
-                    }
-                }
-            }
-
-            closedir($dh);
-
-            if (isset($foldermode)) {
-                if (!@ chmod($path, octdec($foldermode))) {
-                    $ret = false;
-                }
-            }
-        } else {
-            if (isset($filemode)) {
-                $ret = @ chmod($path, octdec($filemode));
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Get the permissions of the file/folder at a given path.
-     *
-     * @param   string  $path  The path of a file/folder.
-     *
-     * @return  string  Filesystem permissions.
-     *
-     * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
-     *              Use Joomla\Filesystem\Path::getPermissions() instead.
-     *              The framework class throws Exceptions in case of error which you have to catch.
-     */
-    public static function getPermissions($path)
-    {
-        $path = self::clean($path);
-        $mode = @ decoct(@ fileperms($path) & 0777);
-
-        if (\strlen($mode) < 3) {
-            return '---------';
-        }
-
-        $parsed_mode = '';
-
-        for ($i = 0; $i < 3; $i++) {
-            // Read
-            $parsed_mode .= ($mode[$i] & 04) ? 'r' : '-';
-
-            // Write
-            $parsed_mode .= ($mode[$i] & 02) ? 'w' : '-';
-
-            // Execute
-            $parsed_mode .= ($mode[$i] & 01) ? 'x' : '-';
-        }
-
-        return $parsed_mode;
-    }
-
     /**
      * Checks for snooping outside of the file system root.
      *
@@ -157,81 +39,13 @@ public static function getPermissions($path)
      * @deprecated  4.4 will be removed in 6.0
      *              Use Joomla\Filesystem\Path::check() instead.
      */
-    public static function check($path)
+    public static function check($path, $basePath = '')
     {
-        if (strpos($path, '..') !== false) {
-            // Don't translate
-            throw new \Exception(
-                sprintf(
-                    '%s() - Use of relative paths not permitted',
-                    __METHOD__
-                )
-            );
+        if ($basePath == '') {
+            $basePath = JPATH_ROOT;
         }
 
-        $path = self::clean($path);
-
-        if ((JPATH_ROOT != '') && strpos($path, self::clean(JPATH_ROOT)) !== 0) {
-            throw new \Exception(
-                sprintf(
-                    '%1$s() - Snooping out of bounds @ %2$s',
-                    __METHOD__,
-                    self::removeRoot($path)
-                )
-            );
-        }
-
-        return $path;
-    }
-
-    /**
-     * Function to strip additional / or \ in a path name.
-     *
-     * @param   string  $path  The path to clean.
-     * @param   string  $ds    Directory separator (optional).
-     *
-     * @return  string  The cleaned path.
-     *
-     * @throws  \UnexpectedValueException
-     * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
-     *              Use Joomla\Filesystem\Path::clean() instead.
-     */
-    public static function clean($path, $ds = DIRECTORY_SEPARATOR)
-    {
-        if (!\is_string($path) && !empty($path)) {
-            throw new \UnexpectedValueException(
-                sprintf(
-                    '%s() - $path is not a string',
-                    __METHOD__
-                )
-            );
-        }
-
-        if ($path === null) {
-            @trigger_error(
-                sprintf(
-                    'Path can not be null, in 6.0 it will throw an exception',
-                    __METHOD__
-                ),
-                E_USER_DEPRECATED
-            );
-            $path = '';
-        }
-
-        $path = trim($path);
-
-        if (empty($path)) {
-            $path = JPATH_ROOT;
-        } elseif (($ds === '\\') && substr($path, 0, 2) === '\\\\') {
-            // Remove double slashes and backslashes and convert all slashes and backslashes to DIRECTORY_SEPARATOR
-            // If dealing with a UNC path don't forget to prepend the path with a backslash.
-            $path = "\\" . preg_replace('#[/\\\\]+#', $ds, $path);
-        } else {
-            $path = preg_replace('#[/\\\\]+#', $ds, $path);
-        }
-
-        return $path;
+        return parent::check($path, $basePath);
     }
 
     /**
@@ -247,7 +61,7 @@ public static function clean($path, $ds = DIRECTORY_SEPARATOR)
      */
     public static function isOwner($path)
     {
-        $tmp = md5(Crypt::genRandomBytes());
+        $tmp = md5(random_bytes(16));
         $ssp = ini_get('session.save_path');
         $jtp = JPATH_SITE . '/tmp';
 
@@ -280,127 +94,4 @@ public static function isOwner($path)
 
         return false;
     }
-
-    /**
-     * Searches the directory paths for a given file.
-     *
-     * @param   mixed   $paths  A path string or array of path strings to search in
-     * @param   string  $file   The file name to look for.
-     *
-     * @return  mixed   The full path and file name for the target file, or boolean false if the file is not found in any of the paths.
-     *
-     * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
-     *              Use Joomla\Filesystem\Path::find() instead.
-     */
-    public static function find($paths, $file)
-    {
-        // Force to array
-        if (!\is_array($paths) && !($paths instanceof \Iterator)) {
-            settype($paths, 'array');
-        }
-
-        // Start looping through the path set
-        foreach ($paths as $path) {
-            // Get the path to the file
-            $fullname = $path . '/' . $file;
-
-            // Is the path based on a stream?
-            if (strpos($path, '://') === false) {
-                // Not a stream, so do a realpath() to avoid directory
-                // traversal attempts on the local file system.
-
-                // Needed for substr() later
-                $path     = realpath($path);
-                $fullname = realpath($fullname);
-            }
-
-            /*
-             * The substr() check added to make sure that the realpath()
-             * results in a directory registered so that
-             * non-registered directories are not accessible via directory
-             * traversal attempts.
-             */
-            if (file_exists($fullname) && substr($fullname, 0, \strlen($path)) === $path) {
-                return $fullname;
-            }
-        }
-
-        // Could not find the file in the set of paths
-        return false;
-    }
-
-    /**
-     * Resolves /./, /../ and multiple / in a string and returns the resulting absolute path, inspired by Flysystem
-     * Removes trailing slashes
-     *
-     * @param   string  $path  A path to resolve
-     *
-     * @return  string  The resolved path
-     *
-     * @since   3.9.25
-     * @deprecated  4.4 will be removed in 6.0
-     *              Use Joomla\Filesystem\Path::resolve() instead.
-     */
-    public static function resolve($path)
-    {
-        $path = static::clean($path);
-
-        // Save start character for absolute path
-        $startCharacter = ($path[0] === DIRECTORY_SEPARATOR) ? DIRECTORY_SEPARATOR : '';
-
-        $parts = [];
-
-        foreach (explode(DIRECTORY_SEPARATOR, $path) as $part) {
-            switch ($part) {
-                case '':
-                case '.':
-                    break;
-
-                case '..':
-                    if (empty($parts)) {
-                        throw new \Exception('Path is outside of the defined root');
-                    }
-
-                    array_pop($parts);
-                    break;
-
-                default:
-                    $parts[] = $part;
-                    break;
-            }
-        }
-
-        return $startCharacter . implode(DIRECTORY_SEPARATOR, $parts);
-    }
-
-    /**
-     * Remove all references to root directory path and the system tmp path from a message
-     *
-     * @param   string  $message        The message to be cleaned
-     * @param   string  $rootDirectory  Optional root directory, defaults to JPATH_ROOT
-     *
-     * @return  string
-     *
-     * @since   3.10.7
-     * @deprecated  4.4 will be removed in 6.0
-     *              Use Joomla\Filesystem\Path::removeRoot() instead.
-     */
-    public static function removeRoot($message, $rootDirectory = null)
-    {
-        if (empty($rootDirectory)) {
-            $rootDirectory = JPATH_ROOT;
-        }
-
-        $makePattern = static function ($dir) {
-            return '~' . str_replace('~', '\\~', preg_replace('~[/\\\\]+~', '[/\\\\\\\\]+', $dir)) . '~';
-        };
-
-        $replacements = [
-            $makePattern(static::clean($rootDirectory)) => '[ROOT]',
-            $makePattern(sys_get_temp_dir())            => '[TMP]',
-        ];
-
-        return preg_replace(array_keys($replacements), array_values($replacements), $message);
-    }
 }
diff --git a/libraries/src/Filesystem/Stream.php b/libraries/src/Filesystem/Stream.php
index 89dac30c898dc..907423d2ae6a0 100644
--- a/libraries/src/Filesystem/Stream.php
+++ b/libraries/src/Filesystem/Stream.php
@@ -10,10 +10,11 @@
 namespace Joomla\CMS\Filesystem;
 
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Object\CMSObject;
+use Joomla\CMS\Object\LegacyErrorHandlingTrait;
+use Joomla\CMS\Object\LegacyPropertyManagementTrait;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -33,8 +34,11 @@
  * @deprecated  4.4 will be removed in 6.0
  *              Use Joomla\Filesystem\Stream instead.
  */
-class Stream extends CMSObject
+class Stream
 {
+    use LegacyErrorHandlingTrait;
+    use LegacyPropertyManagementTrait;
+
     /**
      * File Mode
      *
diff --git a/libraries/src/Filesystem/Streams/StreamString.php b/libraries/src/Filesystem/Streams/StreamString.php
index fa718e331ec49..cf611329151a5 100644
--- a/libraries/src/Filesystem/Streams/StreamString.php
+++ b/libraries/src/Filesystem/Streams/StreamString.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\CMS\Filesystem\Streams;
 
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 
 use Joomla\CMS\Filesystem\Support\StringController;
 
diff --git a/libraries/src/Filesystem/Support/StringController.php b/libraries/src/Filesystem/Support/StringController.php
index f718eae838391..5e70cc2d1948f 100644
--- a/libraries/src/Filesystem/Support/StringController.php
+++ b/libraries/src/Filesystem/Support/StringController.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Filesystem\Support;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Filter/InputFilter.php b/libraries/src/Filter/InputFilter.php
index 262240977908d..a5f9e483dbe8d 100644
--- a/libraries/src/Filter/InputFilter.php
+++ b/libraries/src/Filter/InputFilter.php
@@ -13,7 +13,7 @@
 use Joomla\Filter\InputFilter as BaseInputFilter;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -428,9 +428,9 @@ protected static function decodeFileData(array $data)
      */
     protected function decode($source)
     {
-        static $ttr;
+        static $ttr = [];
 
-        if (!\is_array($ttr)) {
+        if (!\count($ttr)) {
             // Entity decode
             $trans_tbl = get_html_translation_table(HTML_ENTITIES, ENT_COMPAT, 'ISO-8859-1');
 
diff --git a/libraries/src/Filter/OutputFilter.php b/libraries/src/Filter/OutputFilter.php
index a6ce6a6f342fe..6f3f07a7e4b48 100644
--- a/libraries/src/Filter/OutputFilter.php
+++ b/libraries/src/Filter/OutputFilter.php
@@ -15,7 +15,7 @@
 use Joomla\String\StringHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Form/Field/AccessiblemediaField.php b/libraries/src/Form/Field/AccessiblemediaField.php
index 2ab1b18d489a4..356935eff6101 100644
--- a/libraries/src/Form/Field/AccessiblemediaField.php
+++ b/libraries/src/Form/Field/AccessiblemediaField.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Form\Field;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Form/Field/AccesslevelField.php b/libraries/src/Form/Field/AccesslevelField.php
index 6072238391669..a2c9a14303c8b 100644
--- a/libraries/src/Form/Field/AccesslevelField.php
+++ b/libraries/src/Form/Field/AccesslevelField.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\HTML\HTMLHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -36,7 +36,7 @@ class AccesslevelField extends ListField
     /**
      * Method to get the field options.
      *
-     * @return  array  The field option objects.
+     * @return  object[]  The field option objects.
      *
      * @since   4.0.0
      */
diff --git a/libraries/src/Form/Field/AliastagField.php b/libraries/src/Form/Field/AliastagField.php
index 5e54647cddbf0..83b39d18f2eec 100644
--- a/libraries/src/Form/Field/AliastagField.php
+++ b/libraries/src/Form/Field/AliastagField.php
@@ -10,11 +10,11 @@
 namespace Joomla\CMS\Form\Field;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Language\Text;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -35,7 +35,7 @@ class AliastagField extends ListField
     /**
      * Method to get a list of options for a list input.
      *
-     * @return  array  An array of JHtml options.
+     * @return  object[]  An array of JHtml options.
      *
      * @since   3.6
      */
diff --git a/libraries/src/Form/Field/AuthorField.php b/libraries/src/Form/Field/AuthorField.php
index 8fcb99cdcf449..fe957458b8539 100644
--- a/libraries/src/Form/Field/AuthorField.php
+++ b/libraries/src/Form/Field/AuthorField.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Form\Field;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -31,7 +31,7 @@ class AuthorField extends ListField
     /**
      * Cached array of the category items.
      *
-     * @var    array
+     * @var    array[]
      * @since  3.2
      */
     protected static $options = [];
@@ -39,7 +39,7 @@ class AuthorField extends ListField
     /**
      * Method to get the options to populate list
      *
-     * @return  array  The field option objects.
+     * @return  object[]  The field option objects.
      *
      * @since   3.2
      */
diff --git a/libraries/src/Form/Field/CachehandlerField.php b/libraries/src/Form/Field/CachehandlerField.php
index be1c21f1abfed..2aa50f747677e 100644
--- a/libraries/src/Form/Field/CachehandlerField.php
+++ b/libraries/src/Form/Field/CachehandlerField.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Language\Text;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -37,7 +37,7 @@ class CachehandlerField extends ListField
     /**
      * Method to get the field options.
      *
-     * @return  array  The field option objects.
+     * @return  object[]  The field option objects.
      *
      * @since   1.7.0
      */
diff --git a/libraries/src/Form/Field/CalendarField.php b/libraries/src/Form/Field/CalendarField.php
index 5bf5abeb54703..c1a839ab225b6 100644
--- a/libraries/src/Form/Field/CalendarField.php
+++ b/libraries/src/Form/Field/CalendarField.php
@@ -16,7 +16,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -64,7 +64,7 @@ class CalendarField extends FormField
     /**
      * The filter.
      *
-     * @var    integer
+     * @var    string
      * @since  3.2
      */
     protected $filter;
@@ -193,6 +193,8 @@ public function __set($name, $value)
     {
         switch ($name) {
             case 'maxlength':
+            case 'maxyear':
+            case 'minyear':
             case 'timeformat':
                 $this->$name = (int) $value;
                 break;
@@ -204,8 +206,6 @@ public function __set($name, $value)
             case 'format':
             case 'filterFormat':
             case 'filter':
-            case 'minyear':
-            case 'maxyear':
                 $this->$name = (string) $value;
                 break;
 
@@ -243,8 +243,8 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
             $this->filltable    = (string) $this->element['filltable'] ? (string) $this->element['filltable'] : 'true';
             $this->timeformat   = (int) $this->element['timeformat'] ? (int) $this->element['timeformat'] : 24;
             $this->singleheader = (string) $this->element['singleheader'] ? (string) $this->element['singleheader'] : 'false';
-            $this->minyear      = \strlen((string) $this->element['minyear']) ? (string) $this->element['minyear'] : null;
-            $this->maxyear      = \strlen((string) $this->element['maxyear']) ? (string) $this->element['maxyear'] : null;
+            $this->minyear      = \strlen((string) $this->element['minyear']) ? (int) $this->element['minyear'] : null;
+            $this->maxyear      = \strlen((string) $this->element['maxyear']) ? (int) $this->element['maxyear'] : null;
 
             if ($this->maxyear < 0 || $this->minyear > 0) {
                 $this->todaybutton = 'false';
@@ -377,10 +377,10 @@ protected function getLayoutData()
     /**
      * 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.
+     * @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.
      *
@@ -398,7 +398,7 @@ public function filter($value, $group = null, Registry $input = null)
         }
 
         if ($this->filterFormat) {
-            $value = DateTime::createFromFormat($this->filterFormat, $value)->format('Y-m-d H:i:s');
+            $value = \DateTime::createFromFormat($this->filterFormat, $value)->format('Y-m-d H:i:s');
         }
 
         $app = Factory::getApplication();
diff --git a/libraries/src/Form/Field/CaptchaField.php b/libraries/src/Form/Field/CaptchaField.php
index 67ac4fe201c89..7fd906964cb40 100644
--- a/libraries/src/Form/Field/CaptchaField.php
+++ b/libraries/src/Form/Field/CaptchaField.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Form\FormField;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -51,7 +51,7 @@ class CaptchaField extends FormField
     /**
      * The captcha base instance of our type.
      *
-     * @var Captcha
+     * @var ?Captcha
      */
     protected $_captcha;
 
diff --git a/libraries/src/Form/Field/CategoryField.php b/libraries/src/Form/Field/CategoryField.php
index a7ab3d330ade6..42eb999bbbf1a 100644
--- a/libraries/src/Form/Field/CategoryField.php
+++ b/libraries/src/Form/Field/CategoryField.php
@@ -9,13 +9,12 @@
 
 namespace Joomla\CMS\Form\Field;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -40,7 +39,7 @@ class CategoryField extends ListField
      * which categories should be displayed.
      * Use the show_root attribute to specify whether to show the global category root in the list.
      *
-     * @return  array    The field option objects.
+     * @return  object[]    The field option objects.
      *
      * @since   1.6
      */
@@ -74,7 +73,7 @@ protected function getOptions()
             // Verify permissions.  If the action attribute is set, then we scan the options.
             if ((string) $this->element['action']) {
                 // Get the current user object.
-                $user = Factory::getUser();
+                $user = $this->getCurrentUser();
 
                 foreach ($options as $i => $option) {
                     /*
diff --git a/libraries/src/Form/Field/CheckboxField.php b/libraries/src/Form/Field/CheckboxField.php
index cf3cca0ea944c..7681e9c3306e1 100644
--- a/libraries/src/Form/Field/CheckboxField.php
+++ b/libraries/src/Form/Field/CheckboxField.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Form\FormField;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Form/Field/CheckboxesField.php b/libraries/src/Form/Field/CheckboxesField.php
index 955a3c8ac2b85..34af4fbd2a528 100644
--- a/libraries/src/Form/Field/CheckboxesField.php
+++ b/libraries/src/Form/Field/CheckboxesField.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Form\Field;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Form/Field/ChromestyleField.php b/libraries/src/Form/Field/ChromestyleField.php
index 004233bdbd5e9..8a874191fd61b 100644
--- a/libraries/src/Form/Field/ChromestyleField.php
+++ b/libraries/src/Form/Field/ChromestyleField.php
@@ -17,7 +17,7 @@
 use Joomla\Database\ParameterType;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -129,7 +129,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
      * Method to get the list of template chrome style options
      * grouped by template.
      *
-     * @return  array  The field option objects as a nested array in groups.
+     * @return  array[]  The field option objects as a nested array in groups.
      *
      * @since   3.0
      */
@@ -162,7 +162,7 @@ protected function getGroups()
     /**
      * Method to get the templates module styles.
      *
-     * @return  array  The array of styles, grouped by templates.
+     * @return  string[]  The array of styles, grouped by templates.
      *
      * @since   3.0
      */
@@ -210,7 +210,7 @@ protected function getTemplateModuleStyles()
     /**
      * Return a list of templates
      *
-     * @return  array  List of templates
+     * @return  object[]  List of templates
      *
      * @since   3.2.1
      */
diff --git a/libraries/src/Form/Field/ColorField.php b/libraries/src/Form/Field/ColorField.php
index a73788f61c0bf..2448cf35e5eae 100644
--- a/libraries/src/Form/Field/ColorField.php
+++ b/libraries/src/Form/Field/ColorField.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Form\FormField;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -137,7 +137,6 @@ public function __get($name)
             case 'control':
             case 'default':
             case 'display':
-            case 'exclude':
             case 'format':
             case 'keywords':
             case 'preview':
@@ -166,7 +165,6 @@ public function __set($name, $value)
             case 'control':
             case 'default':
             case 'display':
-            case 'exclude':
             case 'format':
             case 'keywords':
             case 'saveFormat':
diff --git a/libraries/src/Form/Field/ComboField.php b/libraries/src/Form/Field/ComboField.php
index 4532f89a0c5bc..38e7c38a3b912 100644
--- a/libraries/src/Form/Field/ComboField.php
+++ b/libraries/src/Form/Field/ComboField.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Form\Field;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Form/Field/ComponentlayoutField.php b/libraries/src/Form/Field/ComponentlayoutField.php
index fd08a11e27305..ff14a8c0f06c3 100644
--- a/libraries/src/Form/Field/ComponentlayoutField.php
+++ b/libraries/src/Form/Field/ComponentlayoutField.php
@@ -11,16 +11,16 @@
 
 use Joomla\CMS\Application\ApplicationHelper;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Folder;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Form\FormField;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\Database\ParameterType;
+use Joomla\Filesystem\Folder;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Form/Field/ComponentsField.php b/libraries/src/Form/Field/ComponentsField.php
index 25d32a69d0e5d..f1fea01e44a48 100644
--- a/libraries/src/Form/Field/ComponentsField.php
+++ b/libraries/src/Form/Field/ComponentsField.php
@@ -14,7 +14,7 @@
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -35,7 +35,7 @@ class ComponentsField extends ListField
     /**
      * Method to get a list of options for a list input.
      *
-     * @return  array  An array of JHtml options.
+     * @return  object[]  An array of JHtml options.
      *
      * @since   2.5.0
      */
diff --git a/libraries/src/Form/Field/ContenthistoryField.php b/libraries/src/Form/Field/ContenthistoryField.php
index 59a41f708357d..68a9476ec8bcd 100644
--- a/libraries/src/Form/Field/ContenthistoryField.php
+++ b/libraries/src/Form/Field/ContenthistoryField.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Session\Session;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Form/Field/ContentlanguageField.php b/libraries/src/Form/Field/ContentlanguageField.php
index 59ff91934d80a..b8af47a269fb6 100644
--- a/libraries/src/Form/Field/ContentlanguageField.php
+++ b/libraries/src/Form/Field/ContentlanguageField.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\HTML\HTMLHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -34,7 +34,7 @@ class ContentlanguageField extends ListField
     /**
      * Method to get the field options for content languages.
      *
-     * @return  array  The options the field is going to show.
+     * @return  object[]  The options the field is going to show.
      *
      * @since   1.6
      */
diff --git a/libraries/src/Form/Field/ContenttypeField.php b/libraries/src/Form/Field/ContenttypeField.php
index 229d34a5fa35d..5477f799a33a8 100644
--- a/libraries/src/Form/Field/ContenttypeField.php
+++ b/libraries/src/Form/Field/ContenttypeField.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Language\Text;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -56,7 +56,7 @@ protected function getInput()
     /**
      * Method to get a list of content types
      *
-     * @return  array  The field option objects.
+     * @return  object[]  The field option objects.
      *
      * @since   3.1
      */
diff --git a/libraries/src/Form/Field/DatabaseconnectionField.php b/libraries/src/Form/Field/DatabaseconnectionField.php
index 6beea5447a7be..103b802e35049 100644
--- a/libraries/src/Form/Field/DatabaseconnectionField.php
+++ b/libraries/src/Form/Field/DatabaseconnectionField.php
@@ -13,7 +13,7 @@
 use Joomla\Database\DatabaseDriver;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Form/Field/EditorField.php b/libraries/src/Form/Field/EditorField.php
index 45cc9000226e2..647ad1de252a5 100644
--- a/libraries/src/Form/Field/EditorField.php
+++ b/libraries/src/Form/Field/EditorField.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Factory;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -91,7 +91,7 @@ class EditorField extends TextareaField
     /**
      * The hide of the editor.
      *
-     * @var    array
+     * @var    string[]
      * @since  3.2
      */
     protected $hide;
@@ -99,7 +99,7 @@ class EditorField extends TextareaField
     /**
      * The editorType of the editor.
      *
-     * @var    array
+     * @var    string[]
      * @since  3.2
      */
     protected $editorType;
diff --git a/libraries/src/Form/Field/EmailField.php b/libraries/src/Form/Field/EmailField.php
index 785d775979e8b..318690ba2c86e 100644
--- a/libraries/src/Form/Field/EmailField.php
+++ b/libraries/src/Form/Field/EmailField.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Form\Field;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Form/Field/FileField.php b/libraries/src/Form/Field/FileField.php
index 2300b1b47115b..c9e6ee7f93b50 100644
--- a/libraries/src/Form/Field/FileField.php
+++ b/libraries/src/Form/Field/FileField.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Form\FormField;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Form/Field/FilelistField.php b/libraries/src/Form/Field/FilelistField.php
index bc947226ea148..7492de195095e 100644
--- a/libraries/src/Form/Field/FilelistField.php
+++ b/libraries/src/Form/Field/FilelistField.php
@@ -16,7 +16,7 @@
 use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -181,7 +181,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
      * Attributes allow an exclude mask and stripping of extensions from file name.
      * Default attribute may optionally be set to null (no file) or -1 (use a default).
      *
-     * @return  array  The field option objects.
+     * @return  object[]  The field option objects.
      *
      * @since   1.7.0
      */
diff --git a/libraries/src/Form/Field/FolderlistField.php b/libraries/src/Form/Field/FolderlistField.php
index e56b1ae6d0e1c..4806cf81f0cf0 100644
--- a/libraries/src/Form/Field/FolderlistField.php
+++ b/libraries/src/Form/Field/FolderlistField.php
@@ -15,7 +15,7 @@
 use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -52,7 +52,7 @@ class FolderlistField extends ListField
     /**
      * The recursive.
      *
-     * @var    string
+     * @var    bool
      * @since  3.6
      */
     protected $recursive;
@@ -177,7 +177,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
     /**
      * Method to get the field options.
      *
-     * @return  array  The field option objects.
+     * @return  object[]  The field option objects.
      *
      * @since   1.7.0
      */
diff --git a/libraries/src/Form/Field/FrontendlanguageField.php b/libraries/src/Form/Field/FrontendlanguageField.php
index 5a0f0352e9ec7..28a8b2c456cdb 100644
--- a/libraries/src/Form/Field/FrontendlanguageField.php
+++ b/libraries/src/Form/Field/FrontendlanguageField.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Factory;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -34,7 +34,7 @@ class FrontendlanguageField extends ListField
     /**
      * Method to get the field options for frontend published content languages with homes.
      *
-     * @return  array  The options the field is going to show.
+     * @return  object[]  The options the field is going to show.
      *
      * @since   3.5
      */
@@ -64,7 +64,7 @@ protected function getOptions()
         } catch (\RuntimeException $e) {
             $languages = [];
 
-            if (Factory::getUser()->authorise('core.admin')) {
+            if ($this->getCurrentUser()->authorise('core.admin')) {
                 Factory::getApplication()->enqueueMessage($e->getMessage(), 'error');
             }
         }
diff --git a/libraries/src/Form/Field/GroupedlistField.php b/libraries/src/Form/Field/GroupedlistField.php
index e56667c217ca1..a56ea8568a29f 100644
--- a/libraries/src/Form/Field/GroupedlistField.php
+++ b/libraries/src/Form/Field/GroupedlistField.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Language\Text;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -44,7 +44,7 @@ class GroupedlistField extends FormField
     /**
      * Method to get the field option groups.
      *
-     * @return  array  The field option objects as a nested array in groups.
+     * @return  array[]  The field option objects as a nested array in groups.
      *
      * @since   1.7.0
      * @throws  \UnexpectedValueException
@@ -145,7 +145,7 @@ protected function getGroups()
     }
 
     /**
-     * Method to get the field input markup fora grouped list.
+     * Method to get the field input markup for a grouped list.
      * Multiselect is enabled by using the multiple attribute.
      *
      * @return  string  The field input markup.
diff --git a/libraries/src/Form/Field/HeadertagField.php b/libraries/src/Form/Field/HeadertagField.php
index 554e242a467a7..ec3107cd6db3b 100644
--- a/libraries/src/Form/Field/HeadertagField.php
+++ b/libraries/src/Form/Field/HeadertagField.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\HTML\HTMLHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -33,7 +33,7 @@ class HeadertagField extends ListField
     /**
      * Method to get the field options.
      *
-     * @return  array  The field option objects.
+     * @return  object[]  The field option objects.
      *
      * @since   3.0
      */
diff --git a/libraries/src/Form/Field/HiddenField.php b/libraries/src/Form/Field/HiddenField.php
index 6bab9cc474ee9..21beb3b705ca6 100644
--- a/libraries/src/Form/Field/HiddenField.php
+++ b/libraries/src/Form/Field/HiddenField.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Form\FormField;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Form/Field/ImagelistField.php b/libraries/src/Form/Field/ImagelistField.php
index 04f4dfd39483b..f5c5894254d8b 100644
--- a/libraries/src/Form/Field/ImagelistField.php
+++ b/libraries/src/Form/Field/ImagelistField.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Form\Field;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -32,7 +32,7 @@ class ImagelistField extends FilelistField
      * Method to get the list of images field options.
      * Use the filter attribute to specify allowable file extensions.
      *
-     * @return  array  The field option objects.
+     * @return  object[]  The field option objects.
      *
      * @since   1.7.0
      */
diff --git a/libraries/src/Form/Field/IntegerField.php b/libraries/src/Form/Field/IntegerField.php
index f48f6f27f2501..43bfe6cd53210 100644
--- a/libraries/src/Form/Field/IntegerField.php
+++ b/libraries/src/Form/Field/IntegerField.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\HTML\HTMLHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -34,7 +34,7 @@ class IntegerField extends ListField
     /**
      * Method to get the field options.
      *
-     * @return  array  The field option objects.
+     * @return  object[]  The field option objects.
      *
      * @since   1.7.0
      */
diff --git a/libraries/src/Form/Field/LanguageField.php b/libraries/src/Form/Field/LanguageField.php
index 1b25dd8b13561..3c28e8c7c0d2b 100644
--- a/libraries/src/Form/Field/LanguageField.php
+++ b/libraries/src/Form/Field/LanguageField.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Language\LanguageHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -37,7 +37,7 @@ class LanguageField extends ListField
     /**
      * Method to get the field options.
      *
-     * @return  array  The field option objects.
+     * @return  object[]  The field option objects.
      *
      * @since   1.7.0
      */
@@ -69,27 +69,27 @@ function ($a, $b) {
         );
 
         // Set the default value active language
-        if ($langParams = ComponentHelper::getParams('com_languages')) {
-            switch ((string) $this->value) {
-                case 'site':
-                case 'frontend':
-                case '0':
-                    $this->value = $langParams->get('site', 'en-GB');
-                    break;
-                case 'admin':
-                case 'administrator':
-                case 'backend':
-                case '1':
-                    $this->value = $langParams->get('administrator', 'en-GB');
-                    break;
-                case 'active':
-                case 'auto':
-                    $lang        = Factory::getLanguage();
-                    $this->value = $lang->getTag();
-                    break;
-                default:
-                    break;
-            }
+        $langParams = ComponentHelper::getParams('com_languages');
+
+        switch ((string) $this->value) {
+            case 'site':
+            case 'frontend':
+            case '0':
+                $this->value = $langParams->get('site', 'en-GB');
+                break;
+            case 'admin':
+            case 'administrator':
+            case 'backend':
+            case '1':
+                $this->value = $langParams->get('administrator', 'en-GB');
+                break;
+            case 'active':
+            case 'auto':
+                $lang        = Factory::getLanguage();
+                $this->value = $lang->getTag();
+                break;
+            default:
+                break;
         }
 
         return $options;
diff --git a/libraries/src/Form/Field/LastvisitdaterangeField.php b/libraries/src/Form/Field/LastvisitdaterangeField.php
index 4213ea95637d4..0fcc190d2de7c 100644
--- a/libraries/src/Form/Field/LastvisitdaterangeField.php
+++ b/libraries/src/Form/Field/LastvisitdaterangeField.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Form\Form;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Form/Field/LimitboxField.php b/libraries/src/Form/Field/LimitboxField.php
index 1e66fd6ef914b..55bb1f31da853 100644
--- a/libraries/src/Form/Field/LimitboxField.php
+++ b/libraries/src/Form/Field/LimitboxField.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Language\Text;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -33,7 +33,7 @@ class LimitboxField extends ListField
     /**
      * Cached array of the category items.
      *
-     * @var    array
+     * @var    array[]
      * @since  3.2
      */
     protected static $options = [];
@@ -41,14 +41,14 @@ class LimitboxField extends ListField
     /**
      * Default options
      *
-     * @var  array
+     * @var  int[]
      */
     protected $defaultLimits = [5, 10, 15, 20, 25, 30, 50, 100, 200, 500];
 
     /**
      * Method to get the options to populate to populate list
      *
-     * @return  array  The field option objects.
+     * @return  object[]  The field option objects.
      *
      * @since   3.2
      */
diff --git a/libraries/src/Form/Field/ListField.php b/libraries/src/Form/Field/ListField.php
index 19982d6fec2a5..d437c6f6d34aa 100644
--- a/libraries/src/Form/Field/ListField.php
+++ b/libraries/src/Form/Field/ListField.php
@@ -21,7 +21,7 @@
 use Joomla\CMS\Uri\Uri;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -68,7 +68,7 @@ protected function getInput()
     /**
      * Method to get the field options.
      *
-     * @return  array  The field option objects.
+     * @return  object[]  The field option objects.
      *
      * @since   3.7.0
      */
@@ -79,31 +79,31 @@ protected function getOptions()
 
         foreach ($this->element->xpath('option') as $option) {
             // Filter requirements
-            if ($requires = explode(',', (string) $option['requires'])) {
-                // Requires multilanguage
-                if (\in_array('multilanguage', $requires) && !Multilanguage::isEnabled()) {
-                    continue;
-                }
+            $requires = explode(',', (string) $option['requires']);
 
-                // Requires associations
-                if (\in_array('associations', $requires) && !Associations::isEnabled()) {
-                    continue;
-                }
+            // Requires multilanguage
+            if (\in_array('multilanguage', $requires) && !Multilanguage::isEnabled()) {
+                continue;
+            }
 
-                // Requires adminlanguage
-                if (\in_array('adminlanguage', $requires) && !ModuleHelper::isAdminMultilang()) {
-                    continue;
-                }
+            // Requires associations
+            if (\in_array('associations', $requires) && !Associations::isEnabled()) {
+                continue;
+            }
 
-                // Requires vote plugin
-                if (\in_array('vote', $requires) && !PluginHelper::isEnabled('content', 'vote')) {
-                    continue;
-                }
+            // Requires adminlanguage
+            if (\in_array('adminlanguage', $requires) && !ModuleHelper::isAdminMultilang()) {
+                continue;
+            }
 
-                // Requires record hits
-                if (\in_array('hits', $requires) && !ComponentHelper::getParams('com_content')->get('record_hits', 1)) {
-                    continue;
-                }
+            // Requires vote plugin
+            if (\in_array('vote', $requires) && !PluginHelper::isEnabled('content', 'vote')) {
+                continue;
+            }
+
+            // Requires record hits
+            if (\in_array('hits', $requires) && !ComponentHelper::getParams('com_content')->get('record_hits', 1)) {
+                continue;
             }
 
             $value = (string) $option['value'];
@@ -195,8 +195,8 @@ protected function getOptions()
     /**
      * Method to add an option to the list field.
      *
-     * @param   string  $text        Text/Language variable of the option.
-     * @param   array   $attributes  Array of attributes ('name' => 'value' format)
+     * @param   string    $text        Text/Language variable of the option.
+     * @param   string[]  $attributes  Array of attributes ('name' => 'value') format
      *
      * @return  ListField  For chaining.
      *
diff --git a/libraries/src/Form/Field/MediaField.php b/libraries/src/Form/Field/MediaField.php
index 96998b0ad1305..948ed3982a51c 100644
--- a/libraries/src/Form/Field/MediaField.php
+++ b/libraries/src/Form/Field/MediaField.php
@@ -11,13 +11,13 @@
 
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Form\FormField;
 use Joomla\CMS\Helper\MediaHelper;
 use Joomla\CMS\Uri\Uri;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -185,8 +185,6 @@ public function __set($name, $value)
             case 'authorField':
             case 'asset':
             case 'link':
-            case 'width':
-            case 'height':
             case 'preview':
             case 'directory':
             case 'folder':
@@ -194,8 +192,10 @@ public function __set($name, $value)
                 $this->$name = (string) $value;
                 break;
 
+            case 'height':
             case 'previewWidth':
             case 'previewHeight':
+            case 'width':
                 $this->$name = (int) $value;
                 break;
 
@@ -293,9 +293,9 @@ public function getLayoutData()
             $this->folder = $adapter . ':' . $path;
         } elseif ($this->value && is_file(JPATH_ROOT . '/' . $this->value)) {
             /**
-             * Local image, for example images/sampledata/cassiopeia/nasa2-640.jpg . We need to validate and make sure
-             * the top level folder is one of the directory configured in filesystem local plugin to avoid error message
-             * displayed in manage when users click on Select button to select a new image
+             * Local image, for example images/sampledata/cassiopeia/nasa2-640.jpg. We need to validate and make sure
+             * the top level folder is one of the directories configured in the filesystem local plugin to avoid an error
+             * message being displayed when users click on Select button to select a new image.
              */
             $paths = explode('/', Path::clean($this->value, '/'));
 
@@ -310,8 +310,8 @@ public function getLayoutData()
             /**
              * This is the case where a folder is configured in directory attribute of the form field. The directory needs
              * to be a relative folder of the folder configured in Path to Images Folder config option of Media component.
-             * Same with a already stored local image above, we need to validate and make sure top level folder is one of the directory
-             * configured in filesystem local plugin
+             * Same with an already stored local image above, we need to validate and make sure the top level folder is one of the
+             * directories configured in the filesystem local plugin.
              */
             $path  = ComponentHelper::getParams('com_media')->get('image_path', 'images') . '/' . $this->directory;
             $paths = explode('/', Path::clean($path, '/'));
diff --git a/libraries/src/Form/Field/MenuField.php b/libraries/src/Form/Field/MenuField.php
index 3506e3567c565..b0610c48b5019 100644
--- a/libraries/src/Form/Field/MenuField.php
+++ b/libraries/src/Form/Field/MenuField.php
@@ -9,12 +9,11 @@
 
 namespace Joomla\CMS\Form\Field;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\Database\ParameterType;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -35,7 +34,7 @@ class MenuField extends GroupedlistField
     /**
      * Method to get the field option groups.
      *
-     * @return  array  The field option objects as a nested array in groups.
+     * @return  array[]  The field option objects as a nested array in groups.
      *
      * @since   1.7.0
      * @throws  \UnexpectedValueException
@@ -73,7 +72,7 @@ protected function getGroups()
         $menus = $db->setQuery($query)->loadObjectList();
 
         if ($accessType) {
-            $user = Factory::getUser();
+            $user = $this->getCurrentUser();
 
             foreach ($menus as $key => $menu) {
                 switch ($accessType) {
diff --git a/libraries/src/Form/Field/MenuitemField.php b/libraries/src/Form/Field/MenuitemField.php
index 07a192046b581..424a772955b53 100644
--- a/libraries/src/Form/Field/MenuitemField.php
+++ b/libraries/src/Form/Field/MenuitemField.php
@@ -13,7 +13,7 @@
 use Joomla\Component\Menus\Administrator\Helper\MenusHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -42,7 +42,7 @@ class MenuitemField extends GroupedlistField
     /**
      * The client id.
      *
-     * @var    string
+     * @var    int
      * @since  3.2
      */
     protected $clientId;
@@ -50,7 +50,7 @@ class MenuitemField extends GroupedlistField
     /**
      * The language.
      *
-     * @var    array
+     * @var    string[]
      * @since  3.2
      */
     protected $language;
@@ -58,7 +58,7 @@ class MenuitemField extends GroupedlistField
     /**
      * The published status.
      *
-     * @var    array
+     * @var    string[]
      * @since  3.2
      */
     protected $published;
@@ -66,7 +66,7 @@ class MenuitemField extends GroupedlistField
     /**
      * The disabled status.
      *
-     * @var    array
+     * @var    string[]
      * @since  3.2
      */
     protected $disable;
@@ -159,7 +159,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
     /**
      * Method to get the field option groups.
      *
-     * @return  array  The field option objects as a nested array in groups.
+     * @return  array[]  The field option objects as a nested array in groups.
      *
      * @since   1.6
      */
diff --git a/libraries/src/Form/Field/MeterField.php b/libraries/src/Form/Field/MeterField.php
index 93d1b5267d999..c928d8b9f019d 100644
--- a/libraries/src/Form/Field/MeterField.php
+++ b/libraries/src/Form/Field/MeterField.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Form\FormField;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -48,14 +48,38 @@ class MeterField extends FormField
      */
     protected $animated = true;
 
+    /**
+     * The min value of the progress bar
+     *
+     * @var    int
+     * @since  4.4.0
+     */
+    protected $min = 0;
+
     /**
      * The max value of the progress bar
      *
-     * @var    boolean
+     * @var    int
      * @since  4.0.0
      */
     protected $max = 100;
 
+    /**
+     * The width of the progress bar
+     *
+     * @var    string
+     * @since  4.4.0
+     */
+    protected $width;
+
+    /**
+     * The color of the progress bar
+     *
+     * @var    string
+     * @since  4.4.0
+     */
+    protected $color;
+
     /**
      * The striped class for the progress bar
      *
@@ -107,6 +131,11 @@ public function __get($name)
     public function __set($name, $value)
     {
         switch ($name) {
+            case 'max':
+            case 'min':
+                $this->$name = (int) $value;
+                break;
+
             case 'width':
             case 'color':
                 $this->$name = (string) $value;
diff --git a/libraries/src/Form/Field/ModalSelectField.php b/libraries/src/Form/Field/ModalSelectField.php
new file mode 100644
index 0000000000000..9398efa5ec21b
--- /dev/null
+++ b/libraries/src/Form/Field/ModalSelectField.php
@@ -0,0 +1,239 @@
+<?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;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('JPATH_PLATFORM') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+use Joomla\CMS\Form\FormField;
+
+/**
+ * Provides a modal content selection
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class ModalSelectField extends FormField
+{
+    /**
+     * The form field type.
+     *
+     * @var    string
+     * @since  __DEPLOY_VERSION__
+     */
+    protected $type = 'ModalSelect';
+
+    /**
+     * Layout to render
+     *
+     * @var    string
+     * @since  __DEPLOY_VERSION__
+     */
+    protected $layout = 'joomla.form.field.modal-select';
+
+    /**
+     * Enabled actions: select, clear, edit, new
+     *
+     * @var    boolean[]
+     * @since  __DEPLOY_VERSION__
+     */
+    protected $canDo = [];
+
+    /**
+     * Urls for modal: select, edit, new
+     *
+     * @var    string[]
+     * @since  __DEPLOY_VERSION__
+     */
+    protected $urls = [];
+
+    /**
+     * List of titles for each modal type: select, edit, new
+     *
+     * @var    string[]
+     * @since  __DEPLOY_VERSION__
+     */
+    protected $modalTitles = [];
+
+    /**
+     * 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.
+     *
+     * @return  boolean  True on success.
+     *
+     * @see     FormField::setup()
+     * @since   __DEPLOY_VERSION__
+     */
+    public function setup(\SimpleXMLElement $element, $value, $group = null)
+    {
+        $result = parent::setup($element, $value, $group);
+
+        if (!$result) {
+            return $result;
+        }
+
+        // Prepare enabled actions
+        $this->__set('select', (string) $this->element['select'] != 'false');
+        $this->__set('new', (string) $this->element['new'] == 'true');
+        $this->__set('edit', (string) $this->element['edit'] == 'true');
+        $this->__set('clear', (string) $this->element['clear'] != 'false');
+
+        // Prepare Urls and titles
+        foreach (['urlSelect', 'urlNew', 'urlEdit', 'urlCheckin', 'titleSelect', 'titleNew', 'titleEdit'] as $attr) {
+            $this->__set($attr, (string) $this->element[$attr]);
+        }
+
+        return $result;
+    }
+
+    /**
+     * 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   __DEPLOY_VERSION__
+     */
+    public function __get($name)
+    {
+        switch ($name) {
+            case 'select':
+                return $this->canDo['select'] ?? true;
+            case 'new':
+                return $this->canDo['new'] ?? false;
+            case 'edit':
+                return $this->canDo['edit'] ?? false;
+            case 'clear':
+                return $this->canDo['clear'] ?? true;
+            case 'urlSelect':
+                return $this->urls['select'] ?? '';
+            case 'urlNew':
+                return $this->urls['new'] ?? '';
+            case 'urlEdit':
+                return $this->urls['edit'] ?? '';
+            case 'urlCheckin':
+                return $this->urls['checkin'] ?? '';
+            case 'titleSelect':
+                return $this->modalTitles['select'] ?? '';
+            case 'titleNew':
+                return $this->modalTitles['new'] ?? '';
+            case 'titleEdit':
+                return $this->modalTitles['edit'] ?? '';
+            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   __DEPLOY_VERSION__
+     */
+    public function __set($name, $value)
+    {
+        switch ($name) {
+            case 'select':
+                $this->canDo['select'] = (bool) $value;
+                break;
+            case 'new':
+                $this->canDo['new'] = (bool) $value;
+                break;
+            case 'edit':
+                $this->canDo['edit'] = (bool) $value;
+                break;
+            case 'clear':
+                $this->canDo['clear'] = (bool) $value;
+                break;
+            case 'urlSelect':
+                $this->urls['select'] = (string) $value;
+                break;
+            case 'urlNew':
+                $this->urls['new'] = (string) $value;
+                break;
+            case 'urlEdit':
+                $this->urls['edit'] = (string) $value;
+                break;
+            case 'urlCheckin':
+                $this->urls['checkin'] = (string) $value;
+                break;
+            case 'titleSelect':
+                $this->modalTitles['select'] = (string) $value;
+                break;
+            case 'titleNew':
+                $this->modalTitles['new'] = (string) $value;
+                break;
+            case 'titleEdit':
+                $this->modalTitles['edit'] = (string) $value;
+                break;
+            default:
+                parent::__set($name, $value);
+        }
+    }
+
+    /**
+     * Method to get the field input markup.
+     *
+     * @return  string  The field input markup.
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    protected function getInput()
+    {
+        if (empty($this->layout)) {
+            throw new \UnexpectedValueException(sprintf('%s has no layout assigned.', $this->name));
+        }
+
+        // Get the layout data
+        $data = $this->getLayoutData();
+
+        // Load the content title here to avoid a double DB Query
+        $data['valueTitle'] = $this->getValueTitle();
+
+        return $this->getRenderer($this->layout)->render($data);
+    }
+
+    /**
+     * Method to retrieve the title of selected item.
+     *
+     * @return string
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    protected function getValueTitle()
+    {
+        return $this->value;
+    }
+
+    /**
+     * Method to get the data to be passed to the layout for rendering.
+     *
+     * @return  array
+     *
+     * @since __DEPLOY_VERSION__
+     */
+    protected function getLayoutData()
+    {
+        $data                = parent::getLayoutData();
+        $data['canDo']       = $this->canDo;
+        $data['urls']        = $this->urls;
+        $data['modalTitles'] = $this->modalTitles;
+
+        return $data;
+    }
+}
diff --git a/libraries/src/Form/Field/ModulelayoutField.php b/libraries/src/Form/Field/ModulelayoutField.php
index 8e98cbd20dfc9..c0a7059f7a585 100644
--- a/libraries/src/Form/Field/ModulelayoutField.php
+++ b/libraries/src/Form/Field/ModulelayoutField.php
@@ -11,16 +11,16 @@
 
 use Joomla\CMS\Application\ApplicationHelper;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Folder;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Form\FormField;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\Database\ParameterType;
+use Joomla\Filesystem\Folder;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Form/Field/ModuleorderField.php b/libraries/src/Form/Field/ModuleorderField.php
index 4b12ec6c2a989..13581dd07f400 100644
--- a/libraries/src/Form/Field/ModuleorderField.php
+++ b/libraries/src/Form/Field/ModuleorderField.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Session\Session;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Form/Field/ModulepositionField.php b/libraries/src/Form/Field/ModulepositionField.php
index ee3cd15eff246..fc391eca8dc63 100644
--- a/libraries/src/Form/Field/ModulepositionField.php
+++ b/libraries/src/Form/Field/ModulepositionField.php
@@ -16,7 +16,7 @@
 use Joomla\CMS\Language\Text;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -74,7 +74,7 @@ public function __set($name, $value)
     {
         switch ($name) {
             case 'clientId':
-                $this->clientId = (string) $value;
+                $this->clientId = (int) $value;
                 break;
 
             default:
diff --git a/libraries/src/Form/Field/ModuletagField.php b/libraries/src/Form/Field/ModuletagField.php
index c9eb91daecf03..9257d6a620d4c 100644
--- a/libraries/src/Form/Field/ModuletagField.php
+++ b/libraries/src/Form/Field/ModuletagField.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\HTML\HTMLHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -33,7 +33,7 @@ class ModuletagField extends ListField
     /**
      * Method to get the field options.
      *
-     * @return  array  The field option objects.
+     * @return  object[]  The field option objects.
      *
      * @since   3.0
      */
diff --git a/libraries/src/Form/Field/NoteField.php b/libraries/src/Form/Field/NoteField.php
index eda7cbdd0b094..a4d2233df5b07 100644
--- a/libraries/src/Form/Field/NoteField.php
+++ b/libraries/src/Form/Field/NoteField.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Language\Text;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Form/Field/NumberField.php b/libraries/src/Form/Field/NumberField.php
index 305ededc7464a..adb44b3cde6dd 100644
--- a/libraries/src/Form/Field/NumberField.php
+++ b/libraries/src/Form/Field/NumberField.php
@@ -16,7 +16,7 @@
 use Joomla\CMS\Uri\Uri;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Form/Field/OrderingField.php b/libraries/src/Form/Field/OrderingField.php
index 02493b8f43864..10acb670a318b 100644
--- a/libraries/src/Form/Field/OrderingField.php
+++ b/libraries/src/Form/Field/OrderingField.php
@@ -12,11 +12,11 @@
 use Joomla\CMS\Form\FormField;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\UCM\UCMType;
-use Joomla\Database\DatabaseQuery;
 use Joomla\Database\ParameterType;
+use Joomla\Database\QueryInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -146,7 +146,7 @@ protected function getInput()
     /**
      * Builds the query for the ordering list.
      *
-     * @return  DatabaseQuery  The query for the ordering form field
+     * @return  QueryInterface  The query for the ordering form field
      *
      * @since   3.2
      */
diff --git a/libraries/src/Form/Field/PasswordField.php b/libraries/src/Form/Field/PasswordField.php
index eec68ecb65f65..4eda026666097 100644
--- a/libraries/src/Form/Field/PasswordField.php
+++ b/libraries/src/Form/Field/PasswordField.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Form\FormField;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -167,12 +167,10 @@ public function __get($name)
      */
     public function __set($name, $value)
     {
-        $value = (string) $value;
-
         switch ($name) {
             case 'maxLength':
             case 'threshold':
-                $this->$name = $value;
+                $this->$name = (int) $value;
                 break;
 
             case 'lock':
diff --git a/libraries/src/Form/Field/PluginsField.php b/libraries/src/Form/Field/PluginsField.php
index a08adc3aa647c..9d7091c3b16da 100644
--- a/libraries/src/Form/Field/PluginsField.php
+++ b/libraries/src/Form/Field/PluginsField.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Log\Log;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -108,7 +108,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
     /**
      * Method to get a list of options for a list input.
      *
-     * @return  array  An array of JHtml options.
+     * @return  object[]  An array of JHtml options.
      *
      * @since   2.5.0
      */
@@ -117,57 +117,59 @@ protected function getOptions()
         $folder        = $this->folder;
         $parentOptions = parent::getOptions();
 
-        if (!empty($folder)) {
-            // Get list of plugins
-            $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
-                ->select(
-                    [
-                        $db->quoteName('element', 'value'),
-                        $db->quoteName('name', 'text'),
-                    ]
-                )
-                ->from($db->quoteName('#__extensions'))
-                ->where(
-                    [
-                        $db->quoteName('folder') . ' = :folder',
-                        $db->quoteName('enabled') . ' = 1',
-                    ]
-                )
-                ->bind(':folder', $folder)
-                ->order(
-                    [
-                        $db->quoteName('ordering'),
-                        $db->quoteName('name'),
-                    ]
-                );
-
-            if ((string) $this->element['useaccess'] === 'true') {
-                $query->whereIn($db->quoteName('access'), Factory::getUser()->getAuthorisedViewLevels());
-            }
+        if (empty($folder)) {
+            Log::add(Text::_('JFRAMEWORK_FORM_FIELDS_PLUGINS_ERROR_FOLDER_EMPTY'), Log::WARNING, 'jerror');
 
-            $options   = $db->setQuery($query)->loadObjectList();
-            $lang      = Factory::getLanguage();
-            $useGlobal = $this->element['useglobal'];
+            return $parentOptions;
+        }
 
-            if ($useGlobal) {
-                $globalValue = Factory::getApplication()->get($this->fieldname);
-            }
+        // Get list of plugins
+        $db    = $this->getDatabase();
+        $query = $db->getQuery(true)
+            ->select(
+                [
+                    $db->quoteName('element', 'value'),
+                    $db->quoteName('name', 'text'),
+                ]
+            )
+            ->from($db->quoteName('#__extensions'))
+            ->where(
+                [
+                    $db->quoteName('folder') . ' = :folder',
+                    $db->quoteName('enabled') . ' = 1',
+                ]
+            )
+            ->bind(':folder', $folder)
+            ->order(
+                [
+                    $db->quoteName('ordering'),
+                    $db->quoteName('name'),
+                ]
+            );
+
+        if ((string) $this->element['useaccess'] === 'true') {
+            $query->whereIn($db->quoteName('access'), $this->getCurrentUser()->getAuthorisedViewLevels());
+        }
 
-            foreach ($options as $i => $item) {
-                $source    = JPATH_PLUGINS . '/' . $folder . '/' . $item->value;
-                $extension = 'plg_' . $folder . '_' . $item->value;
-                $lang->load($extension . '.sys', JPATH_ADMINISTRATOR) || $lang->load($extension . '.sys', $source);
-                $options[$i]->text = Text::_($item->text);
-
-                // If we are using useglobal update the use global value text with the plugin text.
-                if ($useGlobal && isset($parentOptions[0]) && $item->value === $globalValue) {
-                    $text                   = Text::_($extension);
-                    $parentOptions[0]->text = Text::sprintf('JGLOBAL_USE_GLOBAL_VALUE', ($text === '' || $text === $extension ? $item->value : $text));
-                }
+        $options   = $db->setQuery($query)->loadObjectList();
+        $lang      = Factory::getLanguage();
+        $useGlobal = $this->element['useglobal'];
+
+        if ($useGlobal) {
+            $globalValue = Factory::getApplication()->get($this->fieldname);
+        }
+
+        foreach ($options as $i => $item) {
+            $source    = JPATH_PLUGINS . '/' . $folder . '/' . $item->value;
+            $extension = 'plg_' . $folder . '_' . $item->value;
+            $lang->load($extension . '.sys', JPATH_ADMINISTRATOR) || $lang->load($extension . '.sys', $source);
+            $item->text = Text::_($item->text);
+
+            // If we are using useglobal update the use global value text with the plugin text.
+            if ($useGlobal && isset($parentOptions[0]) && $item->value === $globalValue) {
+                $text                   = Text::_($extension);
+                $parentOptions[0]->text = Text::sprintf('JGLOBAL_USE_GLOBAL_VALUE', ($text === '' || $text === $extension ? $item->value : $text));
             }
-        } else {
-            Log::add(Text::_('JFRAMEWORK_FORM_FIELDS_PLUGINS_ERROR_FOLDER_EMPTY'), Log::WARNING, 'jerror');
         }
 
         return array_merge($parentOptions, $options);
diff --git a/libraries/src/Form/Field/PluginstatusField.php b/libraries/src/Form/Field/PluginstatusField.php
index 3a5416932730f..70b1821f2874b 100644
--- a/libraries/src/Form/Field/PluginstatusField.php
+++ b/libraries/src/Form/Field/PluginstatusField.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Form\Field;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -31,7 +31,7 @@ class PluginstatusField extends PredefinedlistField
     /**
      * Available statuses
      *
-     * @var  array
+     * @var  string[]
      * @since  3.5
      */
     protected $predefinedOptions = [
diff --git a/libraries/src/Form/Field/PredefinedlistField.php b/libraries/src/Form/Field/PredefinedlistField.php
index 1d7b0e6cb983d..67e8dbc4122a3 100644
--- a/libraries/src/Form/Field/PredefinedlistField.php
+++ b/libraries/src/Form/Field/PredefinedlistField.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Language\Text;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -33,7 +33,7 @@ abstract class PredefinedlistField extends ListField
     /**
      * Cached array of the category items.
      *
-     * @var    array
+     * @var    array[]
      * @since  3.2
      */
     protected static $options = [];
@@ -41,7 +41,7 @@ abstract class PredefinedlistField extends ListField
     /**
      * Available predefined options
      *
-     * @var  array
+     * @var  string[]
      * @since  3.2
      */
     protected $predefinedOptions = [];
@@ -57,7 +57,7 @@ abstract class PredefinedlistField extends ListField
     /**
      * Allows to use only specific values of the predefined list
      *
-     * @var  array
+     * @var  string[]
      * @since  4.0.0
      */
     protected $optionsFilter = [];
@@ -91,7 +91,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
     /**
      * Method to get the options to populate list
      *
-     * @return  array  The field option objects.
+     * @return  object[]  The field option objects.
      *
      * @since   3.2
      */
diff --git a/libraries/src/Form/Field/RadioField.php b/libraries/src/Form/Field/RadioField.php
index 9096126f5f490..f5079e328df8c 100644
--- a/libraries/src/Form/Field/RadioField.php
+++ b/libraries/src/Form/Field/RadioField.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Form\Field;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Form/Field/RadiobasicField.php b/libraries/src/Form/Field/RadiobasicField.php
index e575e0387658a..5fbc09ee55dda 100644
--- a/libraries/src/Form/Field/RadiobasicField.php
+++ b/libraries/src/Form/Field/RadiobasicField.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Form\Field;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Form/Field/RangeField.php b/libraries/src/Form/Field/RangeField.php
index 4937bb347afd7..d3d3c0bc7fb5a 100644
--- a/libraries/src/Form/Field/RangeField.php
+++ b/libraries/src/Form/Field/RangeField.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Form\Field;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Form/Field/RedirectStatusField.php b/libraries/src/Form/Field/RedirectStatusField.php
index 4db7f769e54b7..8b86851704a5e 100644
--- a/libraries/src/Form/Field/RedirectStatusField.php
+++ b/libraries/src/Form/Field/RedirectStatusField.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Form\Field;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -26,12 +26,12 @@ class RedirectStatusField extends PredefinedlistField
      * @var    string
      * @since  3.8.0
      */
-    public $type = 'Redirect_Status';
+    public $type = 'RedirectStatus';
 
     /**
      * Available statuses
      *
-     * @var  array
+     * @var  string[]
      * @since  3.8.0
      */
     protected $predefinedOptions = [
diff --git a/libraries/src/Form/Field/RegistrationdaterangeField.php b/libraries/src/Form/Field/RegistrationdaterangeField.php
index 5a0c1f951b412..b8c2fe4024985 100644
--- a/libraries/src/Form/Field/RegistrationdaterangeField.php
+++ b/libraries/src/Form/Field/RegistrationdaterangeField.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Form\Form;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -34,7 +34,7 @@ class RegistrationdaterangeField extends PredefinedlistField
     /**
      * Available options
      *
-     * @var  array
+     * @var  string[]
      * @since  3.2
      */
     protected $predefinedOptions = [
diff --git a/libraries/src/Form/Field/RulesField.php b/libraries/src/Form/Field/RulesField.php
index c3bc1a74af7db..2253708efb9f9 100644
--- a/libraries/src/Form/Field/RulesField.php
+++ b/libraries/src/Form/Field/RulesField.php
@@ -10,12 +10,13 @@
 namespace Joomla\CMS\Form\Field;
 
 use Joomla\CMS\Access\Access;
+use Joomla\CMS\Access\Rules;
 use Joomla\CMS\Form\FormField;
 use Joomla\CMS\Helper\UserGroupsHelper;
 use Joomla\Database\ParameterType;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -78,7 +79,7 @@ class RulesField extends FormField
     /**
      * The asset rules
      *
-     * @var    array
+     * @var    Rules
      * @since  4.3.0
      */
     protected $assetRules;
@@ -86,7 +87,7 @@ class RulesField extends FormField
     /**
      * The actions
      *
-     * @var    array
+     * @var    object[]
      * @since  4.3.0
      */
     protected $actions;
@@ -94,7 +95,7 @@ class RulesField extends FormField
     /**
      * The groups
      *
-     * @var    array
+     * @var    object[]
      * @since  4.3.0
      */
     protected $groups;
@@ -325,7 +326,7 @@ protected function getLayoutData()
     /**
      * Get a list of the user groups.
      *
-     * @return  array
+     * @return  object[]
      *
      * @since   1.7.0
      */
diff --git a/libraries/src/Form/Field/SchemaorgComponentSectionsField.php b/libraries/src/Form/Field/SchemaorgComponentSectionsField.php
new file mode 100755
index 0000000000000..7f191d3d8a2b5
--- /dev/null
+++ b/libraries/src/Form/Field/SchemaorgComponentSectionsField.php
@@ -0,0 +1,65 @@
+<?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\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Schemaorg\SchemaorgServiceInterface;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Form Field class for the Joomla Framework.
+ *
+     * @since  5.0.0
+ */
+class SchemaorgComponentSectionsField extends ComponentsField
+{
+    /**
+     * The form field type.
+     *
+     * @var   string
+     * @since  5.0.0
+     */
+    protected $type = 'SchemaorgComponentSections';
+    /**
+         * Method to get a list of options for a list input.
+         *
+         * @return  array  An array of JHtml options.
+         *
+         * @since   5.0.0
+         */
+    protected function getOptions()
+    {
+        $app       = Factory::getApplication();
+        $items     = parent::getOptions();
+        $options   = [];
+        $options[] = HTMLHelper::_('select.option', ' ', Text::_('JNONE'));
+        foreach ($items as $item) {
+            if (substr($item->value, 0, 4) !== 'com_') {
+                continue;
+            }
+
+            $component = $app->bootComponent($item->value);
+            if (!($component instanceof SchemaorgServiceInterface)) {
+                continue;
+            }
+
+            foreach ($component->getSchemaorgContexts() as $extension => $text) {
+                $options[] = HTMLHelper::_('select.option', $extension, Text::sprintf('JSCHEMAORG_FIELD_COMPONENT_SECTIONS_TEXT', $item->text, $text));
+            }
+        }
+
+        return $options;
+    }
+}
diff --git a/libraries/src/Form/Field/SessionhandlerField.php b/libraries/src/Form/Field/SessionhandlerField.php
index 32b2201918026..46421cce076a1 100644
--- a/libraries/src/Form/Field/SessionhandlerField.php
+++ b/libraries/src/Form/Field/SessionhandlerField.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Session\Session;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -36,7 +36,7 @@ class SessionhandlerField extends ListField
     /**
      * Method to get the session handler field options.
      *
-     * @return  array  The field option objects.
+     * @return  object[]  The field option objects.
      *
      * @since   1.7.0
      */
diff --git a/libraries/src/Form/Field/SpacerField.php b/libraries/src/Form/Field/SpacerField.php
index 96511a9a9b851..d686ec7c3aaba 100644
--- a/libraries/src/Form/Field/SpacerField.php
+++ b/libraries/src/Form/Field/SpacerField.php
@@ -15,7 +15,7 @@
 use Joomla\CMS\Language\Text;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Form/Field/SqlField.php b/libraries/src/Form/Field/SqlField.php
index 65ccc234e273c..caf156ee57958 100644
--- a/libraries/src/Form/Field/SqlField.php
+++ b/libraries/src/Form/Field/SqlField.php
@@ -12,11 +12,11 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
-use Joomla\Database\DatabaseQuery;
 use Joomla\Database\Exception\ExecutionFailureException;
+use Joomla\Database\QueryInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -110,9 +110,12 @@ public function __get($name)
     public function __set($name, $value)
     {
         switch ($name) {
+            case 'translate':
+                $this->$name = (bool) $value;
+                break;
+
             case 'keyField':
             case 'valueField':
-            case 'translate':
             case 'header':
             case 'query':
                 $this->$name = (string) $value;
@@ -162,17 +165,15 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
                     $query['order']  = (string) $this->element['sql_order'];
 
                     // Get the filters
-                    $filters = isset($this->element['sql_filter']) ? explode(',', $this->element['sql_filter']) : '';
+                    $filters = isset($this->element['sql_filter']) ? explode(',', $this->element['sql_filter']) : [];
 
                     // Get the default value for query if empty
-                    if (\is_array($filters)) {
-                        foreach ($filters as $filter) {
-                            $name   = "sql_default_{$filter}";
-                            $attrib = (string) $this->element[$name];
-
-                            if (!empty($attrib)) {
-                                $defaults[$filter] = $attrib;
-                            }
+                    foreach ($filters as $filter) {
+                        $name   = "sql_default_{$filter}";
+                        $attrib = (string) $this->element[$name];
+
+                        if (!empty($attrib)) {
+                            $defaults[$filter] = $attrib;
                         }
                     }
 
@@ -193,11 +194,11 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
     /**
      * Method to process the query from form.
      *
-     * @param   array   $conditions  The conditions from the form.
-     * @param   string  $filters     The columns to filter.
-     * @param   array   $defaults    The defaults value to set if condition is empty.
+     * @param   string[]  $conditions  The conditions from the form.
+     * @param   string[]  $filters     The columns to filter.
+     * @param   string[]  $defaults    The defaults value to set if condition is empty.
      *
-     * @return  DatabaseQuery  The query object.
+     * @return  QueryInterface  The query object.
      *
      * @since   3.5
      */
@@ -259,7 +260,7 @@ protected function processQuery($conditions, $filters, $defaults)
      * Method to get the custom field options.
      * Use the query attribute to supply a query to generate the list.
      *
-     * @return  array  The field option objects.
+     * @return  object[]  The field option objects.
      *
      * @since   1.7.0
      */
diff --git a/libraries/src/Form/Field/StatusField.php b/libraries/src/Form/Field/StatusField.php
index 389eafe0e828a..ce8080d550b31 100644
--- a/libraries/src/Form/Field/StatusField.php
+++ b/libraries/src/Form/Field/StatusField.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Form\Field;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -31,7 +31,7 @@ class StatusField extends PredefinedlistField
     /**
      * Available statuses
      *
-     * @var  array
+     * @var  string[]
      * @since  3.2
      */
     protected $predefinedOptions = [
diff --git a/libraries/src/Form/Field/SubformField.php b/libraries/src/Form/Field/SubformField.php
index db0dc248c03a8..54cbd96142b06 100644
--- a/libraries/src/Form/Field/SubformField.php
+++ b/libraries/src/Form/Field/SubformField.php
@@ -9,13 +9,13 @@
 
 namespace Joomla\CMS\Form\Field;
 
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Form\FormField;
+use Joomla\Filesystem\Path;
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -69,7 +69,7 @@ class SubformField extends FormField
 
     /**
      * Which buttons to show in multiple mode
-     * @var array $buttons
+     * @var boolean[] $buttons
      */
     protected $buttons = ['add' => true, 'remove' => true, 'move' => true];
 
@@ -397,9 +397,9 @@ protected function loadSubFormData(Form $subForm)
     /**
      * 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
+     * @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.
diff --git a/libraries/src/Form/Field/TagField.php b/libraries/src/Form/Field/TagField.php
index c535891b356ed..05f771803bb02 100644
--- a/libraries/src/Form/Field/TagField.php
+++ b/libraries/src/Form/Field/TagField.php
@@ -17,7 +17,7 @@
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -117,7 +117,7 @@ protected function getInput()
     /**
      * Method to get a list of tags
      *
-     * @return  array  The field option objects.
+     * @return  object[]  The field option objects.
      *
      * @since   3.1
      */
@@ -239,7 +239,7 @@ protected function getOptions()
 
         // Block the possibility to set a tag as it own parent
         if ($this->form->getName() === 'com_tags.tag') {
-            $id   = (int) $this->form->getValue('id', 0);
+            $id   = (int) $this->form->getValue('id', null, 0);
 
             foreach ($options as $option) {
                 if ($option->value == $id) {
@@ -264,9 +264,9 @@ protected function getOptions()
     /**
      * Add "-" before nested tags, depending on level
      *
-     * @param   array  &$options  Array of tags
+     * @param   object[]  &$options  Array of tags
      *
-     * @return  array  The field option objects.
+     * @return  object[]  The field option objects.
      *
      * @since   3.1
      */
@@ -315,7 +315,7 @@ public function allowCustom()
             return false;
         }
 
-        return Factory::getUser()->authorise('core.create', 'com_tags');
+        return $this->getCurrentUser()->authorise('core.create', 'com_tags');
     }
 
     /**
diff --git a/libraries/src/Form/Field/TelephoneField.php b/libraries/src/Form/Field/TelephoneField.php
index da055da8dac08..42911ff563a51 100644
--- a/libraries/src/Form/Field/TelephoneField.php
+++ b/libraries/src/Form/Field/TelephoneField.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Form\Field;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Form/Field/TemplatestyleField.php b/libraries/src/Form/Field/TemplatestyleField.php
index 0dedae2c09bb0..8a88b3214c26c 100644
--- a/libraries/src/Form/Field/TemplatestyleField.php
+++ b/libraries/src/Form/Field/TemplatestyleField.php
@@ -16,7 +16,7 @@
 use Joomla\Database\ParameterType;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -125,7 +125,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
      * Use the client attribute to specify a specific client.
      * Use the template attribute to specify a specific template
      *
-     * @return  array  The field option objects as a nested array in groups.
+     * @return  array[]  The field option objects as a nested array in groups.
      *
      * @since   1.6
      */
diff --git a/libraries/src/Form/Field/TextField.php b/libraries/src/Form/Field/TextField.php
index 9010447b24368..27eee0af817cb 100644
--- a/libraries/src/Form/Field/TextField.php
+++ b/libraries/src/Form/Field/TextField.php
@@ -17,7 +17,7 @@
 use Joomla\CMS\Uri\Uri;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -186,16 +186,14 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
             $inputmode       = preg_replace('/\s+/', ' ', trim($inputmode));
             $inputmode       = explode(' ', $inputmode);
 
-            if (!empty($inputmode)) {
-                $defaultInputmode = \in_array('default', $inputmode) ? Text::_('JLIB_FORM_INPUTMODE') . ' ' : '';
+            $defaultInputmode = \in_array('default', $inputmode) ? Text::_('JLIB_FORM_INPUTMODE') . ' ' : '';
 
-                foreach (array_keys($inputmode, 'default') as $key) {
-                    unset($inputmode[$key]);
-                }
-
-                $this->inputmode = $defaultInputmode . implode(' ', $inputmode);
+            foreach (array_keys($inputmode, 'default') as $key) {
+                unset($inputmode[$key]);
             }
 
+            $this->inputmode = $defaultInputmode . implode(' ', $inputmode);
+
             // Set the dirname.
             $dirname       = ($dirname === 'dirname' || $dirname === 'true' || $dirname === '1');
             $this->dirname = $dirname ? $this->getName($this->fieldname . '_dir') : false;
@@ -255,7 +253,7 @@ protected function getInput()
     /**
      * Method to get the field options.
      *
-     * @return  array  The field option objects.
+     * @return  object[]  The field option objects.
      *
      * @since   3.4
      */
diff --git a/libraries/src/Form/Field/TextareaField.php b/libraries/src/Form/Field/TextareaField.php
index 58d768a842531..93c18a4ea9c01 100644
--- a/libraries/src/Form/Field/TextareaField.php
+++ b/libraries/src/Form/Field/TextareaField.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Form\FormField;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Form/Field/TimeField.php b/libraries/src/Form/Field/TimeField.php
index cbccd89f0b1d3..bbce52c9bc2e5 100644
--- a/libraries/src/Form/Field/TimeField.php
+++ b/libraries/src/Form/Field/TimeField.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Form\FormField;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -76,16 +76,10 @@ class TimeField extends FormField
     public function __set($name, $value)
     {
         switch ($name) {
-            case 'min':
-                $this->min = (string) $value;
-                break;
-
             case 'max':
-                $this->max = (string) $value;
-                break;
-
+            case 'min':
             case 'step':
-                $this->step = (string) $value;
+                $this->$name = (int) $value;
                 break;
 
             default:
@@ -113,9 +107,9 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
 
         if ($return) {
             // It is better not to force any default limits if none is specified
-            $this->max  = isset($this->element['max']) ? (string) $this->element['max'] : null;
-            $this->min  = isset($this->element['min']) ? (string) $this->element['min'] : null;
-            $this->step = isset($this->element['step']) ? (float) $this->element['step'] : 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;
         }
 
         return $return;
diff --git a/libraries/src/Form/Field/TimezoneField.php b/libraries/src/Form/Field/TimezoneField.php
index 3bf215f49d515..c7decb31f7204 100644
--- a/libraries/src/Form/Field/TimezoneField.php
+++ b/libraries/src/Form/Field/TimezoneField.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\HTML\HTMLHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -33,7 +33,7 @@ class TimezoneField extends GroupedlistField
     /**
      * The list of available timezone groups to use.
      *
-     * @var    array
+     * @var    string[]
      * @since  1.7.0
      */
     protected static $zones = ['Africa', 'America', 'Antarctica', 'Arctic', 'Asia', 'Atlantic', 'Australia', 'Europe', 'Indian', 'Pacific'];
@@ -114,7 +114,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
     /**
      * Method to get the time zone field option groups.
      *
-     * @return  array  The field option objects as a nested array in groups.
+     * @return  array[]  The field option objects as a nested array in groups.
      *
      * @since   1.7.0
      */
diff --git a/libraries/src/Form/Field/TransitionField.php b/libraries/src/Form/Field/TransitionField.php
index 5166d208d5d8a..3a064d6df550a 100644
--- a/libraries/src/Form/Field/TransitionField.php
+++ b/libraries/src/Form/Field/TransitionField.php
@@ -87,15 +87,12 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
     /**
      * Method to get a list of options for a list input.
      *
-     * @return  array  An array of HTMLHelper options.
+     * @return  array[]  An array of HTMLHelper options.
      *
      * @since  4.0.0
      */
     protected function getGroups()
     {
-        // Let's get the id for the current item, either category or content item.
-        $jinput = Factory::getApplication()->getInput();
-
         // Initialise variable.
         $db            = $this->getDatabase();
         $extension     = $this->extension;
@@ -138,7 +135,7 @@ protected function getGroups()
         $component = reset($parts);
 
         if (\count($items)) {
-            $user = Factory::getUser();
+            $user = $this->getCurrentUser();
 
             $items = array_filter(
                 $items,
diff --git a/libraries/src/Form/Field/UrlField.php b/libraries/src/Form/Field/UrlField.php
index f10fa3b96d226..df9178615d0bd 100644
--- a/libraries/src/Form/Field/UrlField.php
+++ b/libraries/src/Form/Field/UrlField.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Form\Field;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Form/Field/UserField.php b/libraries/src/Form/Field/UserField.php
index 2e7822e6be80a..fea44f32fabcf 100644
--- a/libraries/src/Form/Field/UserField.php
+++ b/libraries/src/Form/Field/UserField.php
@@ -9,13 +9,12 @@
 
 namespace Joomla\CMS\Form\Field;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Form\FormField;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\User\User;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -38,6 +37,7 @@ class UserField extends FormField
      *
      * @var   array
      * @since 3.5
+     * @deprecated  4.4 will be removed in 6.0 without replacement
      */
     protected $groups = null;
 
@@ -46,6 +46,7 @@ class UserField extends FormField
      *
      * @var   array
      * @since 3.5
+     * @deprecated  4.4 will be removed in 6.0 without replacement
      */
     protected $excluded = null;
 
@@ -78,7 +79,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
 
         // If user can't access com_users the field should be readonly.
         if ($return && !$this->readonly) {
-            $this->readonly = !Factory::getUser()->authorise('core.manage', 'com_users');
+            $this->readonly = !$this->getCurrentUser()->authorise('core.manage', 'com_users');
         }
 
         return $return;
@@ -120,7 +121,7 @@ public function getLayoutData()
         } elseif (strtoupper($this->value) === 'CURRENT') {
             // Handle the special case for "current".
             // 'CURRENT' is not a reasonable value to be placed in the html
-            $current = Factory::getUser();
+            $current = $this->getCurrentUser();
 
             $this->value = $current->id;
 
@@ -146,7 +147,7 @@ public function getLayoutData()
     /**
      * Method to get the filtering groups (null means no filtering)
      *
-     * @return  mixed  Array of filtering groups or null.
+     * @return  string[]  Array of filtering groups or null.
      *
      * @since   1.6
      */
@@ -155,12 +156,14 @@ protected function getGroups()
         if (isset($this->element['groups'])) {
             return explode(',', $this->element['groups']);
         }
+
+        return [];
     }
 
     /**
      * Method to get the users to exclude from the list of users
      *
-     * @return  mixed  Array of users to exclude or null to to not exclude them
+     * @return  string[]  Array of users to exclude or null to to not exclude them
      *
      * @since   1.6
      */
@@ -169,5 +172,7 @@ protected function getExcluded()
         if (isset($this->element['exclude'])) {
             return explode(',', $this->element['exclude']);
         }
+
+        return [];
     }
 }
diff --git a/libraries/src/Form/Field/UseractiveField.php b/libraries/src/Form/Field/UseractiveField.php
index 85066b96b0b20..8d874d5bfbb35 100644
--- a/libraries/src/Form/Field/UseractiveField.php
+++ b/libraries/src/Form/Field/UseractiveField.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Form\Form;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -34,7 +34,7 @@ class UseractiveField extends PredefinedlistField
     /**
      * Available statuses
      *
-     * @var  array
+     * @var  string[]
      * @since  3.2
      */
     protected $predefinedOptions = [
diff --git a/libraries/src/Form/Field/UsergrouplistField.php b/libraries/src/Form/Field/UsergrouplistField.php
index d30f175c398fe..7899fb48957b8 100644
--- a/libraries/src/Form/Field/UsergrouplistField.php
+++ b/libraries/src/Form/Field/UsergrouplistField.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Helper\UserGroupsHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -34,7 +34,7 @@ class UsergrouplistField extends ListField
     /**
      * Cached array of the category items.
      *
-     * @var    array
+     * @var    array[]
      * @since  3.2
      */
     protected static $options = [];
@@ -64,7 +64,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
     /**
      * Method to get the options to populate list
      *
-     * @return  array  The field option objects.
+     * @return  object[]  The field option objects.
      *
      * @since   3.2
      */
diff --git a/libraries/src/Form/Field/UserstateField.php b/libraries/src/Form/Field/UserstateField.php
index 0a93351d1fe7d..c6a95017984ab 100644
--- a/libraries/src/Form/Field/UserstateField.php
+++ b/libraries/src/Form/Field/UserstateField.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Form\Field;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -31,7 +31,7 @@ class UserstateField extends PredefinedlistField
     /**
      * Available statuses
      *
-     * @var  array
+     * @var  string[]
      * @since  3.2
      */
     protected $predefinedOptions = [
diff --git a/libraries/src/Form/Field/WorkflowComponentSectionsField.php b/libraries/src/Form/Field/WorkflowComponentSectionsField.php
index 58da09a422f76..27d078cf1e18d 100644
--- a/libraries/src/Form/Field/WorkflowComponentSectionsField.php
+++ b/libraries/src/Form/Field/WorkflowComponentSectionsField.php
@@ -15,7 +15,7 @@
 use Joomla\CMS\Workflow\WorkflowServiceInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -36,7 +36,7 @@ class WorkflowComponentSectionsField extends ComponentsField
     /**
      * Method to get a list of options for a list input.
      *
-     * @return  array  An array of JHtml options.
+     * @return  object[]  An array of JHtml options.
      *
      * @since   4.0.0
      */
diff --git a/libraries/src/Form/Field/WorkflowconditionField.php b/libraries/src/Form/Field/WorkflowconditionField.php
index bb2866c477d3f..55a07674afe8a 100644
--- a/libraries/src/Form/Field/WorkflowconditionField.php
+++ b/libraries/src/Form/Field/WorkflowconditionField.php
@@ -83,7 +83,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
     /**
      * Method to get the field options.
      *
-     * @return  array  The field option objects.
+     * @return  object[]  The field option objects.
      *
      * @since   4.0.0
      */
diff --git a/libraries/src/Form/Field/WorkflowstageField.php b/libraries/src/Form/Field/WorkflowstageField.php
index 97625c3b88cea..0651d32416848 100644
--- a/libraries/src/Form/Field/WorkflowstageField.php
+++ b/libraries/src/Form/Field/WorkflowstageField.php
@@ -83,7 +83,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
     /**
      * Method to get the field option groups.
      *
-     * @return  array  The field option objects as a nested array in groups.
+     * @return  array[]  The field option objects as a nested array in groups.
      *
      * @since  4.0.0
      * @throws  \UnexpectedValueException
diff --git a/libraries/src/Form/Filter/IntarrayFilter.php b/libraries/src/Form/Filter/IntarrayFilter.php
index 554dfff9d0c4c..5c2664089bd92 100644
--- a/libraries/src/Form/Filter/IntarrayFilter.php
+++ b/libraries/src/Form/Filter/IntarrayFilter.php
@@ -15,7 +15,7 @@
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Form/Filter/RawFilter.php b/libraries/src/Form/Filter/RawFilter.php
index 98489afd3c748..1cd9b23418710 100644
--- a/libraries/src/Form/Filter/RawFilter.php
+++ b/libraries/src/Form/Filter/RawFilter.php
@@ -14,7 +14,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Form/Filter/RulesFilter.php b/libraries/src/Form/Filter/RulesFilter.php
index 1b91907714597..bee3a3aede315 100644
--- a/libraries/src/Form/Filter/RulesFilter.php
+++ b/libraries/src/Form/Filter/RulesFilter.php
@@ -14,7 +14,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Form/Filter/SafehtmlFilter.php b/libraries/src/Form/Filter/SafehtmlFilter.php
index dfb0620ac3a6f..318cc4f922a77 100644
--- a/libraries/src/Form/Filter/SafehtmlFilter.php
+++ b/libraries/src/Form/Filter/SafehtmlFilter.php
@@ -15,7 +15,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Form/Filter/TelFilter.php b/libraries/src/Form/Filter/TelFilter.php
index f08fbd6a8bd7f..44439be358429 100644
--- a/libraries/src/Form/Filter/TelFilter.php
+++ b/libraries/src/Form/Filter/TelFilter.php
@@ -14,7 +14,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Form/Filter/UnsetFilter.php b/libraries/src/Form/Filter/UnsetFilter.php
index ff9571602f131..bb74f437d4807 100644
--- a/libraries/src/Form/Filter/UnsetFilter.php
+++ b/libraries/src/Form/Filter/UnsetFilter.php
@@ -14,7 +14,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Form/Filter/UrlFilter.php b/libraries/src/Form/Filter/UrlFilter.php
index 2ec5e789b42e0..c74ef0ed56617 100644
--- a/libraries/src/Form/Filter/UrlFilter.php
+++ b/libraries/src/Form/Filter/UrlFilter.php
@@ -17,7 +17,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Form/Form.php b/libraries/src/Form/Form.php
index 6be0517096733..1bfd56ab2faa5 100644
--- a/libraries/src/Form/Form.php
+++ b/libraries/src/Form/Form.php
@@ -10,18 +10,20 @@
 namespace Joomla\CMS\Form;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Object\CMSObject;
+use Joomla\CMS\User\CurrentUserInterface;
+use Joomla\CMS\User\CurrentUserTrait;
 use Joomla\Database\DatabaseAwareInterface;
 use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Database\DatabaseInterface;
 use Joomla\Database\Exception\DatabaseNotFoundException;
+use Joomla\Filesystem\Path;
 use Joomla\Registry\Registry;
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -35,9 +37,10 @@
  * @link   https://html.spec.whatwg.org/multipage/forms.html
  * @since  1.7.0
  */
-class Form
+class Form implements CurrentUserInterface
 {
     use DatabaseAwareTrait;
+    use CurrentUserTrait;
 
     /**
      * The Registry data store for form fields during display.
@@ -50,7 +53,7 @@ class Form
     /**
      * The form object errors array.
      *
-     * @var    array
+     * @var    \Exception[]
      * @since  1.7.0
      */
     protected $errors = [];
@@ -153,7 +156,7 @@ public function bind($data)
      */
     protected function bindLevel($group, $data)
     {
-        // Ensure the input data is an array.
+        // Check the input data for specific types.
         if (\is_object($data)) {
             if ($data instanceof Registry) {
                 // Handle a Registry.
@@ -161,9 +164,6 @@ protected function bindLevel($group, $data)
             } elseif ($data instanceof CMSObject) {
                 // Handle a CMSObject.
                 $data = $data->getProperties();
-            } else {
-                // Handle other types of objects.
-                $data = (array) $data;
             }
         }
 
@@ -184,7 +184,7 @@ protected function bindLevel($group, $data)
     /**
      * Return all errors, if any.
      *
-     * @return  array  Array of error messages or RuntimeException objects.
+     * @return  \Exception[]  Array of error messages or RuntimeException objects.
      *
      * @since   1.7.0
      */
@@ -303,7 +303,7 @@ public function getFieldset($set = null)
      *
      * @param   string  $group  The dot-separated form group path on which to filter the fieldsets.
      *
-     * @return  array  The array of fieldset objects.
+     * @return  object[]  The array of fieldset objects.
      *
      * @since   1.7.0
      */
@@ -570,10 +570,10 @@ public function renderFieldset($name, $options = [])
      * field being loaded.  If it is false, then the new field being loaded will be ignored and the
      * method will move on to the next field to load.
      *
-     * @param   string   $data     The name of an XML string or object.
-     * @param   boolean  $replace  Flag to toggle whether form fields should be replaced if a field
-     *                             already exists with the same group/name.
-     * @param   string   $xpath    An optional xpath to search for the fields.
+     * @param   string|\SimpleXMLElement   $data     The name of an XML string or object.
+     * @param   boolean                    $replace  Flag to toggle whether form fields should be replaced if a field
+     *                                               already exists with the same group/name.
+     * @param   string                     $xpath    An optional xpath to search for the fields.
      *
      * @return  boolean  True on success, false otherwise.
      *
@@ -582,7 +582,7 @@ public function renderFieldset($name, $options = [])
     public function load($data, $replace = true, $xpath = null)
     {
         // If the data to load isn't already an XML element or string return false.
-        if ((!($data instanceof \SimpleXMLElement)) && (!\is_string($data))) {
+        if (!($data instanceof \SimpleXMLElement) && !\is_string($data)) {
             return false;
         }
 
@@ -908,10 +908,10 @@ public function setFieldAttribute($name, $attribute, $value, $group = null)
      * the fields will be set whether they already exists or not.  If it isn't set, then the fields
      * will not be replaced if they already exist.
      *
-     * @param   array    &$elements  The array of XML element object representations of the form fields.
-     * @param   string   $group      The optional dot-separated form group path on which to set the fields.
-     * @param   boolean  $replace    True to replace existing fields if they already exist.
-     * @param   string   $fieldset   The name of the fieldset we are adding the field to.
+     * @param   \SimpleXMLElement[]    &$elements  The array of XML element object representations of the form fields.
+     * @param   string                 $group      The optional dot-separated form group path on which to set the fields.
+     * @param   boolean                $replace    True to replace existing fields if they already exist.
+     * @param   string                 $fieldset   The name of the fieldset we are adding the field to.
      *
      * @return  boolean  True on success.
      *
@@ -1130,7 +1130,7 @@ public function validate($data, $group = null)
                     $this->errors[] = $valid;
                     $return         = false;
                 }
-            } elseif (!$fieldObj && $input->exists($key)) {
+            } elseif ($input->exists($key)) {
                 // The field returned false from setup and shouldn't be included in the page body - yet we received
                 // a value for it. This is probably some sort of injection attack and should be rejected
                 $this->errors[] = new \RuntimeException(Text::sprintf('JLIB_FORM_VALIDATE_FIELD_INVALID', $key));
@@ -1377,7 +1377,7 @@ protected function &findGroup($group)
         // Make sure there is actually a group to find.
         $group = explode('.', $group);
 
-        if (!empty($group)) {
+        if (count($group)) {
             // Get any fields elements with the correct group name.
             $elements = $this->xml->xpath('//fields[@name="' . (string) $group[0] . '" and not(ancestor::field/form/*)]');
 
@@ -1429,9 +1429,9 @@ protected function &findGroup($group)
     /**
      * Method to load, setup and return a FormField object based on field data.
      *
-     * @param   string  $element  The XML element object representation of the form field.
-     * @param   string  $group    The optional dot-separated form group path on which to find the field.
-     * @param   mixed   $value    The optional value to use as the default for the field.
+     * @param   string|\SimpleXMLElement  $element  The XML element object representation of the form field.
+     * @param   string                    $group    The optional dot-separated form group path on which to find the field.
+     * @param   mixed                     $value    The optional value to use as the default for the field.
      *
      * @return  FormField|boolean  The FormField object for the field or boolean false on error.
      *
@@ -1459,6 +1459,10 @@ protected function loadField($element, $group = null, $value = null)
             }
         }
 
+        if ($field instanceof CurrentUserInterface) {
+            $field->setCurrentUser($this->getCurrentUser());
+        }
+
         // If the object could not be loaded, get a text field object.
         if ($field === false) {
             $field = FormHelper::loadFieldType('text');
@@ -1595,9 +1599,9 @@ protected function syncPaths()
     /**
      * Proxy for {@link FormHelper::addFieldPath()}.
      *
-     * @param   mixed  $new  A path or array of paths to add.
+     * @param   string|string[]  $new  A path or array of paths to add.
      *
-     * @return  array  The list of paths that have been added.
+     * @return  string[]  The list of paths that have been added.
      *
      * @since   1.7.0
      */
@@ -1609,9 +1613,9 @@ public static function addFieldPath($new = null)
     /**
      * Proxy for FormHelper::addFormPath().
      *
-     * @param   mixed  $new  A path or array of paths to add.
+     * @param   string|string[]  $new  A path or array of paths to add.
      *
-     * @return  array  The list of paths that have been added.
+     * @return  string[]  The list of paths that have been added.
      *
      * @see     FormHelper::addFormPath()
      * @since   1.7.0
@@ -1624,9 +1628,9 @@ public static function addFormPath($new = null)
     /**
      * Proxy for FormHelper::addRulePath().
      *
-     * @param   mixed  $new  A path or array of paths to add.
+     * @param   string|string[]  $new  A path or array of paths to add.
      *
-     * @return  array  The list of paths that have been added.
+     * @return  string[]  The list of paths that have been added.
      *
      * @see     FormHelper::addRulePath()
      * @since   1.7.0
@@ -1639,9 +1643,9 @@ public static function addRulePath($new = null)
     /**
      * Proxy for FormHelper::addFilterPath().
      *
-     * @param   mixed  $new  A path or array of paths to add.
+     * @param   string|string[]  $new  A path or array of paths to add.
      *
-     * @return  array  The list of paths that have been added.
+     * @return  string[]  The list of paths that have been added.
      *
      * @see     FormHelper::addFilterPath()
      * @since   4.0.0
diff --git a/libraries/src/Form/FormFactoryAwareTrait.php b/libraries/src/Form/FormFactoryAwareTrait.php
index f6e16ac40a396..b4fd3aedff608 100644
--- a/libraries/src/Form/FormFactoryAwareTrait.php
+++ b/libraries/src/Form/FormFactoryAwareTrait.php
@@ -48,7 +48,7 @@ public function getFormFactory(): FormFactoryInterface
     /**
      * Set the form factory to use.
      *
-     * @param   FormFactoryInterface  $formFactory  The form factory to use.
+     * @param   ?FormFactoryInterface  $formFactory  The form factory to use.
      *
      * @return  $this
      *
diff --git a/libraries/src/Form/FormField.php b/libraries/src/Form/FormField.php
index 5b6c0c84c3965..3d43a38e5e632 100644
--- a/libraries/src/Form/FormField.php
+++ b/libraries/src/Form/FormField.php
@@ -15,6 +15,8 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\FileLayout;
 use Joomla\CMS\Log\Log;
+use Joomla\CMS\User\CurrentUserInterface;
+use Joomla\CMS\User\CurrentUserTrait;
 use Joomla\Database\DatabaseAwareInterface;
 use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Database\DatabaseInterface;
@@ -24,7 +26,7 @@
 use Joomla\String\StringHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -32,9 +34,10 @@
  *
  * @since  1.7.0
  */
-abstract class FormField implements DatabaseAwareInterface
+abstract class FormField implements DatabaseAwareInterface, CurrentUserInterface
 {
     use DatabaseAwareTrait;
+    use CurrentUserTrait;
 
     /**
      * The description text for the form field. Usually used in tooltips.
@@ -806,7 +809,7 @@ protected function getLabel()
         $data = $this->getLayoutData();
 
         // Forcing the Alias field to display the tip below
-        $position = $this->element['name'] === 'alias' ? ' data-bs-placement="bottom" ' : '';
+        $position = ((string) $this->element['name']) === 'alias' ? ' data-bs-placement="bottom" ' : '';
 
         // Here mainly for B/C with old layouts. This can be done in the layouts directly
         $extraData = [
@@ -1015,7 +1018,7 @@ public function renderField($options = [])
             }
         }
 
-        $options['inlineHelp'] = isset($this->form->getXml()->config->inlinehelp['button'])
+        $options['inlineHelp'] = isset($this->form, $this->form->getXml()->config->inlinehelp['button'])
             ? ((string) $this->form->getXml()->config->inlinehelp['button'] == 'show' ?: false)
             : false;
 
@@ -1039,10 +1042,10 @@ public function renderField($options = [])
     /**
      * 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.
+     * @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.
      *
@@ -1067,8 +1070,24 @@ public function filter($value, $group = null, Registry $input = null)
             }
 
             // Check for a callback filter
-            if (strpos($filter, '::') !== false && \is_callable(explode('::', $filter))) {
-                return \call_user_func(explode('::', $filter), $value);
+            if (strpos($filter, '::') !== false) {
+                if (\is_callable(explode('::', $filter))) {
+                    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*/
+                [$class, $method] = explode('::', $filter);
+                if ($class === 'JComponentHelper') {
+                    throw new \UnexpectedValueException(
+                        sprintf(
+                            '%s::filter field `%s` calls a deprecated filter class %s, the class needs to be namespaced use %s instead or activate the backward compatible plugin.',
+                            \get_class($this),
+                            $this->element['name'],
+                            $class,
+                            '\\Joomla\\CMS\\Component\\ComponentHelper'
+                        )
+                    );
+                }
             }
 
             // Load the FormRule object for the field. FormRule objects take precedence over PHP functions
@@ -1118,10 +1137,10 @@ public function filter($value, $group = null, Registry $input = null)
     /**
      * Method to validate a FormField object based on field data.
      *
-     * @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 validate
-     *                            against the entire form.
+     * @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 validate
+     *                             against the entire form.
      *
      * @return  boolean|\Exception  Boolean true if field value is valid, Exception on failure.
      *
@@ -1180,6 +1199,10 @@ public function validate($value, $group = null, Registry $input = null)
                 }
             }
 
+            if ($rule instanceof CurrentUserInterface) {
+                $rule->setCurrentUser($this->getCurrentUser());
+            }
+
             try {
                 // Run the field validation rule test.
                 $valid = $rule->test($this->element, $value, $group, $input, $this->form);
@@ -1201,6 +1224,10 @@ public function validate($value, $group = null, Registry $input = null)
                 }
             }
 
+            if ($rule instanceof CurrentUserInterface) {
+                $rule->setCurrentUser($this->getCurrentUser());
+            }
+
             try {
                 // Run the field validation rule test.
                 $valid = $rule->test($this->element, $value, $group, $input, $this->form);
@@ -1229,10 +1256,10 @@ public function validate($value, $group = null, Registry $input = null)
     /**
      * Method to post-process 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.
+     * @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 processed value.
      *
diff --git a/libraries/src/Form/FormFilterInterface.php b/libraries/src/Form/FormFilterInterface.php
index 12c39fb48e480..dc7387aac9b75 100644
--- a/libraries/src/Form/FormFilterInterface.php
+++ b/libraries/src/Form/FormFilterInterface.php
@@ -30,8 +30,8 @@ interface FormFilterInterface
      * @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]".
-     * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
-     * @param   Form               $form     The form object for which the field is being tested.
+     * @param   ?Registry          $input    An optional Registry object with the entire data set to validate against the entire form.
+     * @param   ?Form              $form     The form object for which the field is being tested.
      *
      * @return  mixed   The filtered value.
      *
diff --git a/libraries/src/Form/FormHelper.php b/libraries/src/Form/FormHelper.php
index 934f51f30a575..26ed8fddaf990 100644
--- a/libraries/src/Form/FormHelper.php
+++ b/libraries/src/Form/FormHelper.php
@@ -9,12 +9,12 @@
 
 namespace Joomla\CMS\Form;
 
-use Joomla\CMS\Filesystem\Path;
+use Joomla\Filesystem\Path;
 use Joomla\String\Normalise;
 use Joomla\String\StringHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -36,7 +36,7 @@ class FormHelper
      * - /path/1
      * - /path/2
      *
-     * @var    array
+     * @var    array[]
      * @since  1.7.0
      */
     protected static $paths;
@@ -44,7 +44,7 @@ class FormHelper
     /**
      * The class namespaces.
      *
-     * @var   string
+     * @var   array[]
      * @since 3.8.0
      */
     protected static $prefixes = ['field' => [], 'form' => [], 'rule' => [], 'filter' => []];
@@ -58,7 +58,7 @@ class FormHelper
      * {ENTITY_NAME}:
      * {KEY}: {OBJECT}
      *
-     * @var    array
+     * @var    array[]
      * @since  1.7.0
      */
     protected static $entities = ['field' => [], 'form' => [], 'rule' => [], 'filter' => []];
@@ -282,9 +282,9 @@ protected static function loadClass($entity, $type)
     /**
      * Method to add a path to the list of field include paths.
      *
-     * @param   mixed  $new  A path or array of paths to add.
+     * @param   string|string[]  $new  A path or array of paths to add.
      *
-     * @return  array  The list of paths that have been added.
+     * @return  string[]  The list of paths that have been added.
      *
      * @since   1.7.0
      */
@@ -296,9 +296,9 @@ public static function addFieldPath($new = null)
     /**
      * Method to add a path to the list of form include paths.
      *
-     * @param   mixed  $new  A path or array of paths to add.
+     * @param   string|string[]  $new  A path or array of paths to add.
      *
-     * @return  array  The list of paths that have been added.
+     * @return  string[]  The list of paths that have been added.
      *
      * @since   1.7.0
      */
@@ -310,9 +310,9 @@ public static function addFormPath($new = null)
     /**
      * Method to add a path to the list of rule include paths.
      *
-     * @param   mixed  $new  A path or array of paths to add.
+     * @param   string|string[]  $new  A path or array of paths to add.
      *
-     * @return  array  The list of paths that have been added.
+     * @return  string[]  The list of paths that have been added.
      *
      * @since   1.7.0
      */
@@ -324,9 +324,9 @@ public static function addRulePath($new = null)
     /**
      * Method to add a path to the list of filter include paths.
      *
-     * @param   mixed  $new  A path or array of paths to add.
+     * @param   string|string[]  $new  A path or array of paths to add.
      *
-     * @return  array  The list of paths that have been added.
+     * @return  string[]  The list of paths that have been added.
      *
      * @since   4.0.0
      */
@@ -339,10 +339,10 @@ public static function addFilterPath($new = null)
      * Method to add a path to the list of include paths for one of the form's entities.
      * Currently supported entities: field, rule and form. You are free to support your own in a subclass.
      *
-     * @param   string  $entity  Form's entity name for which paths will be added.
-     * @param   mixed   $new     A path or array of paths to add.
+     * @param   string            $entity  Form's entity name for which paths will be added.
+     * @param   string|string[]   $new     A path or array of paths to add.
      *
-     * @return  array  The list of paths that have been added.
+     * @return  string[]  The list of paths that have been added.
      *
      * @since   1.7.0
      */
@@ -373,9 +373,9 @@ protected static function addPath($entity, $new = null)
     /**
      * Method to add a namespace prefix to the list of field lookups.
      *
-     * @param   mixed  $new  A namespaces or array of namespaces to add.
+     * @param   string|string[]  $new  A namespaces or array of namespaces to add.
      *
-     * @return  array  The list of namespaces that have been added.
+     * @return  string[]  The list of namespaces that have been added.
      *
      * @since   3.8.0
      */
@@ -387,9 +387,9 @@ public static function addFieldPrefix($new = null)
     /**
      * Method to add a namespace to the list of form lookups.
      *
-     * @param   mixed  $new  A namespace or array of namespaces to add.
+     * @param   string|string[]  $new  A namespace or array of namespaces to add.
      *
-     * @return  array  The list of namespaces that have been added.
+     * @return  string[]  The list of namespaces that have been added.
      *
      * @since   3.8.0
      */
@@ -401,9 +401,9 @@ public static function addFormPrefix($new = null)
     /**
      * Method to add a namespace to the list of rule lookups.
      *
-     * @param   mixed  $new  A namespace or array of namespaces to add.
+     * @param   string|string[]  $new  A namespace or array of namespaces to add.
      *
-     * @return  array  The list of namespaces that have been added.
+     * @return  string[]  The list of namespaces that have been added.
      *
      * @since   3.8.0
      */
@@ -415,9 +415,9 @@ public static function addRulePrefix($new = null)
     /**
      * Method to add a namespace to the list of filter lookups.
      *
-     * @param   mixed  $new  A namespace or array of namespaces to add.
+     * @param   string|string[]  $new  A namespace or array of namespaces to add.
      *
-     * @return  array  The list of namespaces that have been added.
+     * @return  string[]  The list of namespaces that have been added.
      *
      * @since   4.0.0
      */
@@ -430,10 +430,10 @@ public static function addFilterPrefix($new = null)
      * Method to add a namespace to the list of namespaces for one of the form's entities.
      * Currently supported entities: field, rule and form. You are free to support your own in a subclass.
      *
-     * @param   string  $entity  Form's entity name for which paths will be added.
-     * @param   mixed   $new     A namespace or array of namespaces to add.
+     * @param   string           $entity  Form's entity name for which paths will be added.
+     * @param   string|string[]  $new     A namespace or array of namespaces to add.
      *
-     * @return  array  The list of namespaces that have been added.
+     * @return  string[]  The list of namespaces that have been added.
      *
      * @since   3.8.0
      */
@@ -471,7 +471,7 @@ protected static function addPrefix($entity, $new = null)
      * @param   string  $formControl  Form name.
      * @param   string  $group        The dot-separated form group path.
      *
-     * @return  array   Array with show on conditions.
+     * @return  array[]   Array with show on conditions.
      *
      * @since   3.7.0
      */
diff --git a/libraries/src/Form/FormRule.php b/libraries/src/Form/FormRule.php
index 970b6c159f729..1e1ad6de501fb 100644
--- a/libraries/src/Form/FormRule.php
+++ b/libraries/src/Form/FormRule.php
@@ -12,7 +12,7 @@
 
 namespace Joomla\CMS\Form;
 
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 
 use Joomla\Registry\Registry;
 
@@ -21,7 +21,7 @@
     /**
      * Flag indicating UTF-8 and PCRE support is present
      *
-     * @var    boolean
+     * @const  boolean
      * @since  1.6
      *
      * @deprecated  4.0 will be removed in 6.0
@@ -61,8 +61,8 @@ class FormRule
      * @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]".
-     * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
-     * @param   Form               $form     The form object for which the field is being tested.
+     * @param   ?Registry          $input    An optional Registry object with the entire data set to validate against the entire form.
+     * @param   ?Form              $form     The form object for which the field is being tested.
      *
      * @return  boolean  True if the value is valid, false otherwise.
      *
diff --git a/libraries/src/Form/Rule/BooleanRule.php b/libraries/src/Form/Rule/BooleanRule.php
index 82ac72d2e1aae..302c36c641509 100644
--- a/libraries/src/Form/Rule/BooleanRule.php
+++ b/libraries/src/Form/Rule/BooleanRule.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Form\FormRule;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Form/Rule/CalendarRule.php b/libraries/src/Form/Rule/CalendarRule.php
index cb78e077f72ab..61125e1760294 100644
--- a/libraries/src/Form/Rule/CalendarRule.php
+++ b/libraries/src/Form/Rule/CalendarRule.php
@@ -16,7 +16,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -34,8 +34,8 @@ class CalendarRule extends FormRule
      * @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]".
-     * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
-     * @param   Form               $form     The form object for which the field is being tested.
+     * @param   ?Registry          $input    An optional Registry object with the entire data set to validate against the entire form.
+     * @param   ?Form              $form     The form object for which the field is being tested.
      *
      * @return  boolean  True if the value is valid, false otherwise.
      *
diff --git a/libraries/src/Form/Rule/CaptchaRule.php b/libraries/src/Form/Rule/CaptchaRule.php
index 173ea8b86be42..c0f42945423b1 100644
--- a/libraries/src/Form/Rule/CaptchaRule.php
+++ b/libraries/src/Form/Rule/CaptchaRule.php
@@ -16,7 +16,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -34,8 +34,8 @@ class CaptchaRule extends FormRule
      * @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]".
-     * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
-     * @param   Form               $form     The form object for which the field is being tested.
+     * @param   ?Registry          $input    An optional Registry object with the entire data set to validate against the entire form.
+     * @param   ?Form              $form     The form object for which the field is being tested.
      *
      * @return  boolean  True if the value is valid, false otherwise.
      *
diff --git a/libraries/src/Form/Rule/ColorRule.php b/libraries/src/Form/Rule/ColorRule.php
index 21d67c76c9761..908ed374bc8fe 100644
--- a/libraries/src/Form/Rule/ColorRule.php
+++ b/libraries/src/Form/Rule/ColorRule.php
@@ -14,7 +14,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -32,8 +32,8 @@ class ColorRule extends FormRule
      * @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]".
-     * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
-     * @param   Form               $form     The form object for which the field is being tested.
+     * @param   ?Registry          $input    An optional Registry object with the entire data set to validate against the entire form.
+     * @param   ?Form              $form     The form object for which the field is being tested.
      *
      * @return  boolean  True if the value is valid, false otherwise.
      *
diff --git a/libraries/src/Form/Rule/CssIdentifierRule.php b/libraries/src/Form/Rule/CssIdentifierRule.php
index a3a13f4449517..d0da9d5128734 100644
--- a/libraries/src/Form/Rule/CssIdentifierRule.php
+++ b/libraries/src/Form/Rule/CssIdentifierRule.php
@@ -14,7 +14,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -32,8 +32,8 @@ class CssIdentifierRule extends FormRule
      * @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]".
-     * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
-     * @param   Form               $form     The form object for which the field is being tested.
+     * @param   ?Registry          $input    An optional Registry object with the entire data set to validate against the entire form.
+     * @param   ?Form              $form     The form object for which the field is being tested.
      *
      * @return  boolean  True if the value is valid, false otherwise.
      *
@@ -56,7 +56,7 @@ public function test(\SimpleXMLElement $element, $value, $group = null, Registry
              * The following regex rules are based on the Html::cleanCssIdentifier method from Drupal
              * https://github.com/drupal/drupal/blob/8.8.5/core/lib/Drupal/Component/Utility/Html.php#L116-L130
              *
-             * with the addition for Joomla that we allow the colon (U+003A).
+             * with the addition for Joomla that we allow the colon (U+003A) and the @ (U+0040).
              */
 
             /**
@@ -66,10 +66,11 @@ public function test(\SimpleXMLElement $element, $value, $group = null, Registry
              * - A-Z (U+0041 - U+005A)
              * - the underscore (U+005F)
              * - the colon (U+003A)
+             * - the @-sign (U+0040)
              * - 0-9 (U+0061 - U+007A)
              * - ISO 10646 characters U+00A1 and higher
              */
-            if (preg_match('/[^\\x{002D}\\x{0030}-\\x{0039}\\x{0041}-\\x{005A}\\x{005F}\\x{003A}\\x{0061}-\\x{007A}\\x{00A1}-\\x{FFFF}]/u', $identifier)) {
+            if (preg_match('/[^\\x{002D}\\x{0030}-\\x{0039}\\x{0040}-\\x{005A}\\x{005F}\\x{003A}\\x{0061}-\\x{007A}\\x{00A1}-\\x{FFFF}]/u', $identifier)) {
                 return false;
             }
 
diff --git a/libraries/src/Form/Rule/CssIdentifierSubstringRule.php b/libraries/src/Form/Rule/CssIdentifierSubstringRule.php
index 579b80b70bd35..8d8f6362f59f0 100644
--- a/libraries/src/Form/Rule/CssIdentifierSubstringRule.php
+++ b/libraries/src/Form/Rule/CssIdentifierSubstringRule.php
@@ -14,7 +14,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -32,8 +32,8 @@ class CssIdentifierSubstringRule extends FormRule
      * @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]".
-     * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
-     * @param   Form               $form     The form object for which the field is being tested.
+     * @param   ?Registry          $input    An optional Registry object with the entire data set to validate against the entire form.
+     * @param   ?Form              $form     The form object for which the field is being tested.
      *
      * @return  boolean  True if the value is valid, false otherwise.
      *
@@ -52,7 +52,7 @@ public function test(\SimpleXMLElement $element, $value, $group = null, Registry
          * The following regex rules are based on the Html::cleanCssIdentifier method from Drupal
          * https://github.com/drupal/drupal/blob/8.8.5/core/lib/Drupal/Component/Utility/Html.php#L116-L130
          *
-         * with the addition for Joomla that we allow the colon (U+003A).
+         * with the addition for Joomla that we allow the colon (U+003A) and the @ (U+0040).
          */
 
         /**
@@ -62,6 +62,7 @@ public function test(\SimpleXMLElement $element, $value, $group = null, Registry
          * - A-Z (U+0041 - U+005A)
          * - the underscore (U+005F)
          * - the colon (U+003A)
+         * - the @ sign (U+0040)
          * - 0-9 (U+0061 - U+007A)
          * - ISO 10646 characters U+00A1 and higher
          */
@@ -69,7 +70,7 @@ public function test(\SimpleXMLElement $element, $value, $group = null, Registry
         $cssIdentifiers = explode(' ', $value);
 
         foreach ($cssIdentifiers as $identifier) {
-            if (preg_match('/[^\\x{002D}\\x{0030}-\\x{0039}\\x{0041}-\\x{005A}\\x{005F}\\x{003A}\\x{0061}-\\x{007A}\\x{00A1}-\\x{FFFF}]/u', $identifier)) {
+            if (preg_match('/[^\\x{002D}\\x{0030}-\\x{0039}\\x{0040}-\\x{005A}\\x{005F}\\x{003A}\\x{0061}-\\x{007A}\\x{00A1}-\\x{FFFF}]/u', $identifier)) {
                 return false;
             }
         }
diff --git a/libraries/src/Form/Rule/EmailRule.php b/libraries/src/Form/Rule/EmailRule.php
index e42d186bd697f..9665451ff91d6 100644
--- a/libraries/src/Form/Rule/EmailRule.php
+++ b/libraries/src/Form/Rule/EmailRule.php
@@ -20,7 +20,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -50,8 +50,8 @@ class EmailRule extends FormRule implements DatabaseAwareInterface
      * @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]".
-     * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
-     * @param   Form               $form     The form object for which the field is being tested.
+     * @param   ?Registry          $input    An optional Registry object with the entire data set to validate against the entire form.
+     * @param   ?Form              $form     The form object for which the field is being tested.
      *
      * @return  mixed  Boolean true if field value is valid.
      *
diff --git a/libraries/src/Form/Rule/EqualsRule.php b/libraries/src/Form/Rule/EqualsRule.php
index a830883f9f5ad..ed160c3cdccba 100644
--- a/libraries/src/Form/Rule/EqualsRule.php
+++ b/libraries/src/Form/Rule/EqualsRule.php
@@ -14,7 +14,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -34,8 +34,8 @@ class EqualsRule extends FormRule
      * @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]".
-     * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
-     * @param   Form               $form     The form object for which the field is being tested.
+     * @param   ?Registry          $input    An optional Registry object with the entire data set to validate against the entire form.
+     * @param   ?Form              $form     The form object for which the field is being tested.
      *
      * @return  boolean  True if the value is valid, false otherwise.
      *
diff --git a/libraries/src/Form/Rule/ExistsRule.php b/libraries/src/Form/Rule/ExistsRule.php
index c03340a68694d..8fa57f8952af8 100644
--- a/libraries/src/Form/Rule/ExistsRule.php
+++ b/libraries/src/Form/Rule/ExistsRule.php
@@ -16,7 +16,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -36,8 +36,8 @@ class ExistsRule extends FormRule implements DatabaseAwareInterface
      * @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]".
-     * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
-     * @param   Form               $form     The form object for which the field is being tested.
+     * @param   ?Registry          $input    An optional Registry object with the entire data set to validate against the entire form.
+     * @param   ?Form              $form     The form object for which the field is being tested.
      *
      * @return  boolean  True if the value is valid, false otherwise.
      *
diff --git a/libraries/src/Form/Rule/FilePathRule.php b/libraries/src/Form/Rule/FilePathRule.php
index 6a25e5a4109ea..ad3fa953e46f8 100644
--- a/libraries/src/Form/Rule/FilePathRule.php
+++ b/libraries/src/Form/Rule/FilePathRule.php
@@ -9,13 +9,13 @@
 
 namespace Joomla\CMS\Form\Rule;
 
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Form\FormRule;
+use Joomla\Filesystem\Path;
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -33,8 +33,8 @@ class FilePathRule extends FormRule
      * @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]".
-     * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
-     * @param   Form               $form     The form object for which the field is being tested.
+     * @param   ?Registry          $input    An optional Registry object with the entire data set to validate against the entire form.
+     * @param   ?Form              $form     The form object for which the field is being tested.
      *
      * @return  boolean  True if the value is valid, false otherwise.
      *
diff --git a/libraries/src/Form/Rule/FolderPathExistsRule.php b/libraries/src/Form/Rule/FolderPathExistsRule.php
index 9b74453ff06a8..9418439971757 100644
--- a/libraries/src/Form/Rule/FolderPathExistsRule.php
+++ b/libraries/src/Form/Rule/FolderPathExistsRule.php
@@ -10,12 +10,12 @@
 namespace Joomla\CMS\Form\Rule;
 
 use Joomla\CMS\Filesystem\Folder;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Form\Form;
+use Joomla\Filesystem\Path;
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -33,8 +33,8 @@ class FolderPathExistsRule extends FilePathRule
      * @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]".
-     * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
-     * @param   Form               $form     The form object for which the field is being tested.
+     * @param   ?Registry          $input    An optional Registry object with the entire data set to validate against the entire form.
+     * @param   ?Form              $form     The form object for which the field is being tested.
      *
      * @return  boolean  True if the value is valid and points to an existing folder below the Joomla root, false otherwise.
      *
diff --git a/libraries/src/Form/Rule/ModuleLayoutRule.php b/libraries/src/Form/Rule/ModuleLayoutRule.php
index fd6d5da58693b..32f64c153025e 100644
--- a/libraries/src/Form/Rule/ModuleLayoutRule.php
+++ b/libraries/src/Form/Rule/ModuleLayoutRule.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Form\FormRule;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Form/Rule/NotequalsRule.php b/libraries/src/Form/Rule/NotequalsRule.php
index 38c2a50f15b38..977eb5869427a 100644
--- a/libraries/src/Form/Rule/NotequalsRule.php
+++ b/libraries/src/Form/Rule/NotequalsRule.php
@@ -14,7 +14,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -34,8 +34,8 @@ class NotequalsRule extends FormRule
      * @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]".
-     * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
-     * @param   Form               $form     The form object for which the field is being tested.
+     * @param   ?Registry          $input    An optional Registry object with the entire data set to validate against the entire form.
+     * @param   ?Form              $form     The form object for which the field is being tested.
      *
      * @return  boolean  True if the value is valid, false otherwise.
      *
diff --git a/libraries/src/Form/Rule/NumberRule.php b/libraries/src/Form/Rule/NumberRule.php
index 7782691dd24c6..2f3f75263c846 100644
--- a/libraries/src/Form/Rule/NumberRule.php
+++ b/libraries/src/Form/Rule/NumberRule.php
@@ -14,7 +14,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -32,8 +32,8 @@ class NumberRule extends FormRule
      * @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]".
-     * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
-     * @param   Form               $form     The form object for which the field is being tested.
+     * @param   ?Registry          $input    An optional Registry object with the entire data set to validate against the entire form.
+     * @param   ?Form              $form     The form object for which the field is being tested.
      *
      * @return  boolean  True if the value is valid, false otherwise.
      *
diff --git a/libraries/src/Form/Rule/OptionsRule.php b/libraries/src/Form/Rule/OptionsRule.php
index 4a4d796ea6ccf..644c21cea6fb8 100644
--- a/libraries/src/Form/Rule/OptionsRule.php
+++ b/libraries/src/Form/Rule/OptionsRule.php
@@ -14,7 +14,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -33,8 +33,8 @@ class OptionsRule extends FormRule
      * @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]".
-     * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
-     * @param   Form               $form     The form object for which the field is being tested.
+     * @param   ?Registry          $input    An optional Registry object with the entire data set to validate against the entire form.
+     * @param   ?Form              $form     The form object for which the field is being tested.
      *
      * @return  boolean  True if the value is valid, false otherwise.
      *
diff --git a/libraries/src/Form/Rule/PasswordRule.php b/libraries/src/Form/Rule/PasswordRule.php
index 1f0743d094401..27c516bfaa67d 100644
--- a/libraries/src/Form/Rule/PasswordRule.php
+++ b/libraries/src/Form/Rule/PasswordRule.php
@@ -17,7 +17,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -37,8 +37,8 @@ class PasswordRule extends FormRule
      * @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]".
-     * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
-     * @param   Form               $form     The form object for which the field is being tested.
+     * @param   ?Registry          $input    An optional Registry object with the entire data set to validate against the entire form.
+     * @param   ?Form              $form     The form object for which the field is being tested.
      *
      * @return  boolean  True if the value is valid, false otherwise.
      *
diff --git a/libraries/src/Form/Rule/RulesRule.php b/libraries/src/Form/Rule/RulesRule.php
index 5f1c356264fda..01d483999c0b1 100644
--- a/libraries/src/Form/Rule/RulesRule.php
+++ b/libraries/src/Form/Rule/RulesRule.php
@@ -15,7 +15,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -33,8 +33,8 @@ class RulesRule extends FormRule
      * @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]".
-     * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
-     * @param   Form               $form     The form object for which the field is being tested.
+     * @param   ?Registry          $input    An optional Registry object with the entire data set to validate against the entire form.
+     * @param   ?Form              $form     The form object for which the field is being tested.
      *
      * @return  boolean  True if the value is valid, false otherwise.
      *
@@ -61,7 +61,7 @@ public function test(\SimpleXMLElement $element, $value, $group = null, Registry
      *
      * @param   mixed  $value  The form field value to validate.
      *
-     * @return  array  A list of permission action names from the form field value.
+     * @return  string[]  A list of permission action names from the form field value.
      *
      * @since   1.7.0
      */
@@ -82,7 +82,7 @@ protected function getValueActions($value)
      *
      * @param   \SimpleXMLElement  $element  The \SimpleXMLElement object representing the `<field>` tag for the form field object.
      *
-     * @return  array  A list of permission action names from the form field element definition.
+     * @return  string[]  A list of permission action names from the form field element definition.
      *
      * @since   1.7.0
      */
diff --git a/libraries/src/Form/Rule/ShowOnRule.php b/libraries/src/Form/Rule/ShowOnRule.php
new file mode 100644
index 0000000000000..17af6c4884d62
--- /dev/null
+++ b/libraries/src/Form/Rule/ShowOnRule.php
@@ -0,0 +1,87 @@
+<?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\Rule;
+
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Form\FormRule;
+use Joomla\Registry\Registry;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Form Rule class for the Joomla Platform.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+
+class ShowOnRule extends FormRule
+{
+    /**
+     * The regular expression to use in testing a form field value.
+     *
+     * @var    string
+     * @since  __DEPLOY_VERSION__
+     */
+    protected $regex = '[A-Za-z0-9]+!?:[A-Za-z0-9]+';
+
+    /**
+     * The regular expression modifiers to use when testing a form field value.
+     *
+     * @var    string
+     * @since  __DEPLOY_VERSION__
+     */
+    protected $modifiers = 'i';
+
+    /**
+     * Method to test the value.
+     *
+     * @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]".
+     * @param   ?Registry $input An optional Registry object with the entire data set to validate against the entire form.
+     * @param   ?Form $form The form object for which the field is being tested.
+     *
+     * @return  boolean  True if the value is valid, false otherwise.
+     *
+     * @throws  \UnexpectedValueException if rule is invalid.
+     * @since   __DEPLOY_VERSION__
+     */
+    public function test(\SimpleXMLElement $element, $value, $group = null, Registry $input = null, Form $form = null)
+    {
+        // If the field is empty and not required, the field is valid.
+        $required = ((string)$element['required'] === 'true' || (string)$element['required'] === 'required');
+
+        if (!$required && empty($value) && $value !== '0') {
+            return true;
+        }
+
+        // Make sure we allow multiple showon rules to be added
+        $rules    = [];
+        $andRules = explode('&', $value);
+        foreach ($andRules as $andRule) {
+            $orRules = explode('|', $andRule);
+            foreach ($orRules as $orRule) {
+                $rules[] = $orRule;
+            }
+        }
+
+        foreach ($rules as $i => $rule) {
+            if (!parent::test($element, $rule, $group, $input, $form)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}
diff --git a/libraries/src/Form/Rule/SubformRule.php b/libraries/src/Form/Rule/SubformRule.php
index e25a78c369e92..6a822763a0c89 100644
--- a/libraries/src/Form/Rule/SubformRule.php
+++ b/libraries/src/Form/Rule/SubformRule.php
@@ -15,7 +15,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -33,8 +33,8 @@ class SubformRule extends FormRule
      * @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]".
-     * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
-     * @param   Form               $form     The form object for which the field is being tested.
+     * @param   ?Registry          $input    An optional Registry object with the entire data set to validate against the entire form.
+     * @param   ?Form              $form     The form object for which the field is being tested.
      *
      * @return  boolean  True if the value is valid, false otherwise.
      *
diff --git a/libraries/src/Form/Rule/TelRule.php b/libraries/src/Form/Rule/TelRule.php
index f301cd6d53986..0ae268503d25a 100644
--- a/libraries/src/Form/Rule/TelRule.php
+++ b/libraries/src/Form/Rule/TelRule.php
@@ -14,7 +14,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -32,8 +32,8 @@ class TelRule extends FormRule
      * @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]".
-     * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
-     * @param   Form               $form     The form object for which the field is being tested.
+     * @param   ?Registry          $input    An optional Registry object with the entire data set to validate against the entire form.
+     * @param   ?Form              $form     The form object for which the field is being tested.
      *
      * @return  boolean  True if the value is valid, false otherwise.
      *
diff --git a/libraries/src/Form/Rule/TimeRule.php b/libraries/src/Form/Rule/TimeRule.php
index 273c687b8792d..686afe9e23f1b 100644
--- a/libraries/src/Form/Rule/TimeRule.php
+++ b/libraries/src/Form/Rule/TimeRule.php
@@ -16,7 +16,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -34,8 +34,8 @@ class TimeRule extends FormRule
      * @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]".
-     * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
-     * @param   Form               $form     The form object for which the field is being tested.
+     * @param   ?Registry          $input    An optional Registry object with the entire data set to validate against the entire form.
+     * @param   ?Form              $form     The form object for which the field is being tested.
      *
      * @return  boolean  True if the value is valid, false otherwise.
      *
diff --git a/libraries/src/Form/Rule/UrlRule.php b/libraries/src/Form/Rule/UrlRule.php
index b89244804cdfe..a02b348b46154 100644
--- a/libraries/src/Form/Rule/UrlRule.php
+++ b/libraries/src/Form/Rule/UrlRule.php
@@ -17,7 +17,7 @@
 use Joomla\Uri\UriHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -35,8 +35,8 @@ class UrlRule extends FormRule
      * @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]".
-     * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
-     * @param   Form               $form     The form object for which the field is being tested.
+     * @param   ?Registry          $input    An optional Registry object with the entire data set to validate against the entire form.
+     * @param   ?Form              $form     The form object for which the field is being tested.
      *
      * @return  boolean  True if the value is valid, false otherwise.
      *
@@ -111,7 +111,7 @@ public function test(\SimpleXMLElement $element, $value, $group = null, Registry
             return false;
         }
 
-        if (\array_key_exists('port', $urlParts) && !\is_int((int) $urlParts['port'])) {
+        if (\array_key_exists('port', $urlParts) && 0 === (int) $urlParts['port']) {
             return false;
         }
 
diff --git a/libraries/src/Form/Rule/UserIdRule.php b/libraries/src/Form/Rule/UserIdRule.php
index 867b55b7d1fd8..5a50c499d404b 100644
--- a/libraries/src/Form/Rule/UserIdRule.php
+++ b/libraries/src/Form/Rule/UserIdRule.php
@@ -17,7 +17,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Form/Rule/UsernameRule.php b/libraries/src/Form/Rule/UsernameRule.php
index 17b9b2d4aa33f..a58c4e51ef6e3 100644
--- a/libraries/src/Form/Rule/UsernameRule.php
+++ b/libraries/src/Form/Rule/UsernameRule.php
@@ -17,7 +17,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -37,8 +37,8 @@ class UsernameRule extends FormRule implements DatabaseAwareInterface
      * @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]".
-     * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
-     * @param   Form               $form     The form object for which the field is being tested.
+     * @param   ?Registry          $input    An optional Registry object with the entire data set to validate against the entire form.
+     * @param   ?Form              $form     The form object for which the field is being tested.
      *
      * @return  boolean  True if the value is valid, false otherwise.
      *
diff --git a/libraries/src/HTML/HTMLHelper.php b/libraries/src/HTML/HTMLHelper.php
index 2635e014747c0..e0fef0f86cee8 100644
--- a/libraries/src/HTML/HTMLHelper.php
+++ b/libraries/src/HTML/HTMLHelper.php
@@ -12,14 +12,14 @@
 use Joomla\CMS\Environment\Browser;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filesystem\File;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Uri\Uri;
+use Joomla\Filesystem\Path;
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -95,10 +95,14 @@ protected static function extract($key)
             );
         }
 
-        $prefix = \count($parts) === 3 ? array_shift($parts) : 'JHtml';
+        $prefix = \count($parts) === 3 ? array_shift($parts) : 'Joomla\\CMS\\HTML\\HTMLHelper';
         $file   = \count($parts) === 2 ? array_shift($parts) : '';
         $func   = array_shift($parts);
 
+        if (strtolower($prefix) === 'jhtml') {
+            $prefix = 'Joomla\\CMS\\HTML\\HTMLHelper';
+        }
+
         return [strtolower($prefix . '.' . $file . '.' . $func), $prefix, $file, $func];
     }
 
@@ -132,7 +136,7 @@ final public static function _(string $key, ...$methodArgs)
          * Support fetching services from the registry if a custom class prefix was not given (a three segment key),
          * the service comes from a class other than this one, and a service has been registered for the file.
          */
-        if ($prefix === 'JHtml' && $file !== '' && static::getServiceRegistry()->hasService($file)) {
+        if ($prefix === 'Joomla\\CMS\\HTML\\HTMLHelper' && $file !== '' && static::getServiceRegistry()->hasService($file)) {
             $service = static::getServiceRegistry()->getService($file);
 
             $toCall = [$service, $func];
@@ -401,7 +405,7 @@ protected static function includeRelativeFiles($folder, $file, $relative, $detec
 
                 if ($template->inheritable || !empty($template->parent)) {
                     $client     = $app->isClient('administrator') === true ? 'administrator' : 'site';
-                    $templaPath = JPATH_ROOT . "/media/templates/$client";
+                    $templaPath = JPATH_PUBLIC . "/media/templates/$client";
                 }
 
                 // For each potential files
@@ -441,7 +445,7 @@ protected static function includeRelativeFiles($folder, $file, $relative, $detec
                                     list($element, $file) = explode('/', $file, 2);
 
                                     // Try to deal with plugins group in the media folder
-                                    $found = static::addFileToBuffer(JPATH_ROOT . "/media/$extension/$element/$folder/$file", $ext, $debugMode);
+                                    $found = static::addFileToBuffer(JPATH_PUBLIC . "/media/$extension/$element/$folder/$file", $ext, $debugMode);
 
                                     if (!empty($found)) {
                                         $includes[] = $found;
@@ -450,7 +454,7 @@ protected static function includeRelativeFiles($folder, $file, $relative, $detec
                                     }
 
                                     // Try to deal with classical file in a media subfolder called element
-                                    $found = static::addFileToBuffer(JPATH_ROOT . "/media/$extension/$folder/$element/$file", $ext, $debugMode);
+                                    $found = static::addFileToBuffer(JPATH_PUBLIC . "/media/$extension/$folder/$element/$file", $ext, $debugMode);
 
                                     if (!empty($found)) {
                                         $includes[] = $found;
@@ -477,7 +481,7 @@ protected static function includeRelativeFiles($folder, $file, $relative, $detec
                                         }
                                     } else {
                                         // Try to deal with system files in the media folder
-                                        $found = static::addFileToBuffer(JPATH_ROOT . "/media/system/$folder/$element/$file", $ext, $debugMode);
+                                        $found = static::addFileToBuffer(JPATH_PUBLIC . "/media/system/$folder/$element/$file", $ext, $debugMode);
 
                                         if (!empty($found)) {
                                             $includes[] = $found;
@@ -487,7 +491,7 @@ protected static function includeRelativeFiles($folder, $file, $relative, $detec
                                     }
                                 } else {
                                     // Try to deal with files in the extension's media folder
-                                    $found = static::addFileToBuffer(JPATH_ROOT . "/media/$extension/$folder/$file", $ext, $debugMode);
+                                    $found = static::addFileToBuffer(JPATH_PUBLIC . "/media/$extension/$folder/$file", $ext, $debugMode);
 
                                     if (!empty($found)) {
                                         $includes[] = $found;
@@ -524,7 +528,7 @@ protected static function includeRelativeFiles($folder, $file, $relative, $detec
                                     }
 
                                     // Try to deal with system files in the media folder
-                                    $found = static::addFileToBuffer(JPATH_ROOT . "/media/system/$folder/$file", $ext, $debugMode);
+                                    $found = static::addFileToBuffer(JPATH_PUBLIC . "/media/system/$folder/$file", $ext, $debugMode);
 
                                     if (!empty($found)) {
                                         $includes[] = $found;
@@ -534,7 +538,7 @@ protected static function includeRelativeFiles($folder, $file, $relative, $detec
                                 }
                             } else {
                                 // Try to deal with system files in the media folder
-                                $found = static::addFileToBuffer(JPATH_ROOT . "/media/system/$folder/$file", $ext, $debugMode);
+                                $found = static::addFileToBuffer(JPATH_PUBLIC . "/media/system/$folder/$file", $ext, $debugMode);
 
                                 if (!empty($found)) {
                                     $includes[] = $found;
@@ -558,7 +562,7 @@ protected static function includeRelativeFiles($folder, $file, $relative, $detec
                      * This MD5SUM file must represent the signature of the folder content
                      */
                     foreach ($files as $file) {
-                        $path = JPATH_ROOT . "/$file";
+                        $path = JPATH_PUBLIC . '/' . $file;
 
                         $found = static::addFileToBuffer($path, $ext, $debugMode);
 
@@ -1209,7 +1213,7 @@ protected static function addFileToBuffer($path = '', $ext = '', $debugMode = fa
      */
     protected static function convertToRelativePath($path)
     {
-        $relativeFilePath = Uri::root(true) . str_replace(JPATH_ROOT, '', $path);
+        $relativeFilePath = Uri::root(true) . str_replace(JPATH_PUBLIC, '', $path);
 
         // On windows devices we need to replace "\" with "/" otherwise some browsers will not load the asset
         return str_replace(DIRECTORY_SEPARATOR, '/', $relativeFilePath);
diff --git a/libraries/src/HTML/Helpers/Access.php b/libraries/src/HTML/Helpers/Access.php
index 46d629054f73f..d878f3067a250 100644
--- a/libraries/src/HTML/Helpers/Access.php
+++ b/libraries/src/HTML/Helpers/Access.php
@@ -17,7 +17,7 @@
 use Joomla\CMS\Layout\LayoutHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -157,8 +157,8 @@ public static function usergroups($name, $selected, $checkSuperAdmin = false)
 
             // If checkSuperAdmin is true, only add item if the user is superadmin or the group is not super admin
             if ((!$checkSuperAdmin) || $isSuperAdmin || (!AccessCheck::checkGroup($item->id, 'core.admin'))) {
-                // Setup  the variable attributes.
-                $eid = $count . 'group_' . $item->id;
+                // Set up the variable attributes. ID may not start with a number (CSS)
+                $eid = 'group_' . $item->id . '_' . $count;
 
                 // Don't call in_array unless something is selected
                 $checked = '';
@@ -167,7 +167,7 @@ public static function usergroups($name, $selected, $checkSuperAdmin = false)
                     $checked = in_array($item->id, $selected) ? ' checked="checked"' : '';
                 }
 
-                $rel = ($item->parent_id > 0) ? ' rel="' . $count . 'group_' . $item->parent_id . '"' : '';
+                $rel = ($item->parent_id > 0) ? ' rel="group_' . $item->parent_id . '_' . $count . '"' : '';
 
                 // Build the HTML for the item.
                 $html[] = '	<div class="control-group">';
diff --git a/libraries/src/HTML/Helpers/ActionsDropdown.php b/libraries/src/HTML/Helpers/ActionsDropdown.php
index 079a8b81ff637..2442a3b66a25f 100644
--- a/libraries/src/HTML/Helpers/ActionsDropdown.php
+++ b/libraries/src/HTML/Helpers/ActionsDropdown.php
@@ -15,7 +15,7 @@
 use Joomla\CMS\Layout\LayoutHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/HTML/Helpers/AdminLanguage.php b/libraries/src/HTML/Helpers/AdminLanguage.php
index 79bbba4470de8..1101a825bcbfb 100644
--- a/libraries/src/HTML/Helpers/AdminLanguage.php
+++ b/libraries/src/HTML/Helpers/AdminLanguage.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Object\CMSObject;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/HTML/Helpers/Behavior.php b/libraries/src/HTML/Helpers/Behavior.php
index a690ae570ed8d..3799531a1551d 100644
--- a/libraries/src/HTML/Helpers/Behavior.php
+++ b/libraries/src/HTML/Helpers/Behavior.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Language\Text;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/HTML/Helpers/Bootstrap.php b/libraries/src/HTML/Helpers/Bootstrap.php
index bcf0d5a7db5be..93529e257c165 100644
--- a/libraries/src/HTML/Helpers/Bootstrap.php
+++ b/libraries/src/HTML/Helpers/Bootstrap.php
@@ -15,7 +15,7 @@
 use Joomla\CMS\Layout\LayoutHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/HTML/Helpers/Category.php b/libraries/src/HTML/Helpers/Category.php
index c16960f0d8067..eabf47577c964 100644
--- a/libraries/src/HTML/Helpers/Category.php
+++ b/libraries/src/HTML/Helpers/Category.php
@@ -16,7 +16,7 @@
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -53,7 +53,6 @@ public static function options($extension, $config = ['filter.published' => [0,
             $config = (array) $config;
             $db     = Factory::getDbo();
             $user   = Factory::getUser();
-            $groups = $user->getAuthorisedViewLevels();
 
             $query = $db->getQuery(true)
                 ->select(
@@ -72,7 +71,9 @@ public static function options($extension, $config = ['filter.published' => [0,
                 ->bind(':extension', $extension);
 
             // Filter on user access level
-            $query->whereIn($db->quoteName('a.access'), $groups);
+            if (!$user->authorise('core.admin')) {
+                $query->whereIn($db->quoteName('a.access'), $user->getAuthorisedViewLevels());
+            }
 
             // Filter on the published state
             if (isset($config['filter.published'])) {
@@ -165,8 +166,9 @@ public static function categories($extension, $config = ['filter.published' => [
                 ->bind(':extension', $extension);
 
             // Filter on user level.
-            $groups = $user->getAuthorisedViewLevels();
-            $query->whereIn($db->quoteName('a.access'), $groups);
+            if (!$user->authorise('core.admin')) {
+                $query->whereIn($db->quoteName('a.access'), $user->getAuthorisedViewLevels());
+            }
 
             // Filter on the published state
             if (isset($config['filter.published'])) {
diff --git a/libraries/src/HTML/Helpers/Content.php b/libraries/src/HTML/Helpers/Content.php
index 6e68336b758af..48bdd19991263 100644
--- a/libraries/src/HTML/Helpers/Content.php
+++ b/libraries/src/HTML/Helpers/Content.php
@@ -10,14 +10,15 @@
 namespace Joomla\CMS\HTML\Helpers;
 
 use Joomla\CMS\Date\Date;
+use Joomla\CMS\Event\Content\ContentPrepareEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\Event\DispatcherInterface;
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -40,14 +41,22 @@ abstract class Content
      */
     public static function prepare($text, $params = null, $context = 'text')
     {
-        if ($params === null) {
-            $params = new CMSObject();
+        if (!$params instanceof Registry) {
+            $params = new Registry($params);
         }
 
         $article       = new \stdClass();
         $article->text = $text;
-        PluginHelper::importPlugin('content');
-        Factory::getApplication()->triggerEvent('onContentPrepare', [$context, &$article, &$params, 0]);
+
+        $dispatcher = Factory::getContainer()->get(DispatcherInterface::class);
+
+        PluginHelper::importPlugin('content', null, true, $dispatcher);
+        $dispatcher->dispatch('onContentPrepare', new ContentPrepareEvent('onContentPrepare', [
+            'context' => $context,
+            'subject' => $article,
+            'params'  => $params,
+            'page'    => 0,
+        ]));
 
         return $article->text;
     }
diff --git a/libraries/src/HTML/Helpers/ContentLanguage.php b/libraries/src/HTML/Helpers/ContentLanguage.php
index 3a74fe2980bf5..d9edcd8489cec 100644
--- a/libraries/src/HTML/Helpers/ContentLanguage.php
+++ b/libraries/src/HTML/Helpers/ContentLanguage.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Object\CMSObject;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/HTML/Helpers/Date.php b/libraries/src/HTML/Helpers/Date.php
index 7bf34e1ff1871..011bf061db08a 100644
--- a/libraries/src/HTML/Helpers/Date.php
+++ b/libraries/src/HTML/Helpers/Date.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Language\Text;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/HTML/Helpers/Debug.php b/libraries/src/HTML/Helpers/Debug.php
index f98a2a6b57616..a58894e2e3a3f 100644
--- a/libraries/src/HTML/Helpers/Debug.php
+++ b/libraries/src/HTML/Helpers/Debug.php
@@ -9,11 +9,11 @@
 
 namespace Joomla\CMS\HTML\Helpers;
 
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/HTML/Helpers/DraggableList.php b/libraries/src/HTML/Helpers/DraggableList.php
index 9df8deeea269d..ebb8a27415449 100644
--- a/libraries/src/HTML/Helpers/DraggableList.php
+++ b/libraries/src/HTML/Helpers/DraggableList.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Session\Session;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/HTML/Helpers/Dropdown.php b/libraries/src/HTML/Helpers/Dropdown.php
index c2220c4733313..ac65a04142f5b 100644
--- a/libraries/src/HTML/Helpers/Dropdown.php
+++ b/libraries/src/HTML/Helpers/Dropdown.php
@@ -15,7 +15,7 @@
 use Joomla\CMS\Router\Route;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/HTML/Helpers/Email.php b/libraries/src/HTML/Helpers/Email.php
index 6912316a322c9..4b2e69654906a 100644
--- a/libraries/src/HTML/Helpers/Email.php
+++ b/libraries/src/HTML/Helpers/Email.php
@@ -15,7 +15,7 @@
 use Joomla\CMS\Uri\Uri;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/HTML/Helpers/Form.php b/libraries/src/HTML/Helpers/Form.php
index ac185e0518146..ee9a89eb20d77 100644
--- a/libraries/src/HTML/Helpers/Form.php
+++ b/libraries/src/HTML/Helpers/Form.php
@@ -15,7 +15,7 @@
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/HTML/Helpers/FormBehavior.php b/libraries/src/HTML/Helpers/FormBehavior.php
index e8fd188dd331f..6dd2b40c4cdd7 100644
--- a/libraries/src/HTML/Helpers/FormBehavior.php
+++ b/libraries/src/HTML/Helpers/FormBehavior.php
@@ -15,7 +15,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/HTML/Helpers/Grid.php b/libraries/src/HTML/Helpers/Grid.php
index 93f6df8071636..32af148173810 100644
--- a/libraries/src/HTML/Helpers/Grid.php
+++ b/libraries/src/HTML/Helpers/Grid.php
@@ -15,7 +15,7 @@
 use Joomla\CMS\Table\Table;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/HTML/Helpers/Icons.php b/libraries/src/HTML/Helpers/Icons.php
index a9792058ffa6c..5bc80e6674c00 100644
--- a/libraries/src/HTML/Helpers/Icons.php
+++ b/libraries/src/HTML/Helpers/Icons.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Layout\FileLayout;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/HTML/Helpers/JGrid.php b/libraries/src/HTML/Helpers/JGrid.php
index 839fda6bd7550..a2de64fd6a866 100644
--- a/libraries/src/HTML/Helpers/JGrid.php
+++ b/libraries/src/HTML/Helpers/JGrid.php
@@ -16,7 +16,7 @@
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/HTML/Helpers/Jquery.php b/libraries/src/HTML/Helpers/Jquery.php
index 27548d33f1324..73e5abd1d7a05 100644
--- a/libraries/src/HTML/Helpers/Jquery.php
+++ b/libraries/src/HTML/Helpers/Jquery.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\HTML\HTMLHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/HTML/Helpers/Links.php b/libraries/src/HTML/Helpers/Links.php
index 7a7a293b7d821..23bf177ed30e9 100644
--- a/libraries/src/HTML/Helpers/Links.php
+++ b/libraries/src/HTML/Helpers/Links.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Layout\FileLayout;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/HTML/Helpers/ListHelper.php b/libraries/src/HTML/Helpers/ListHelper.php
index 3225fd8829e07..d0d5d731fa66e 100644
--- a/libraries/src/HTML/Helpers/ListHelper.php
+++ b/libraries/src/HTML/Helpers/ListHelper.php
@@ -16,7 +16,7 @@
 use Joomla\String\StringHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/HTML/Helpers/Menu.php b/libraries/src/HTML/Helpers/Menu.php
index c5d279b3e8c0e..b4990e2d3095d 100644
--- a/libraries/src/HTML/Helpers/Menu.php
+++ b/libraries/src/HTML/Helpers/Menu.php
@@ -15,7 +15,7 @@
 use Joomla\Database\ParameterType;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/HTML/Helpers/Number.php b/libraries/src/HTML/Helpers/Number.php
index 71799654c8392..962f67dac43f5 100644
--- a/libraries/src/HTML/Helpers/Number.php
+++ b/libraries/src/HTML/Helpers/Number.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Language\Text;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/HTML/Helpers/SearchTools.php b/libraries/src/HTML/Helpers/SearchTools.php
index 104bd1b560061..942c19be22db5 100644
--- a/libraries/src/HTML/Helpers/SearchTools.php
+++ b/libraries/src/HTML/Helpers/SearchTools.php
@@ -14,7 +14,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/HTML/Helpers/Select.php b/libraries/src/HTML/Helpers/Select.php
index 71c232381eea6..52dc61200e6b3 100644
--- a/libraries/src/HTML/Helpers/Select.php
+++ b/libraries/src/HTML/Helpers/Select.php
@@ -15,7 +15,7 @@
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -142,16 +142,10 @@ public static function genericlist(
         // If the selectbox contains "form-select-color-state" then load the JS file
         if (strpos($attribs, 'form-select-color-state') !== false) {
             Factory::getDocument()->getWebAssetManager()
-                ->registerScript(
-                    'webcomponent.select-colour-es5',
-                    'system/fields/select-colour-es5.min.js',
-                    ['dependencies' => ['wcpolyfill']],
-                    ['defer'        => true, 'nomodule' => true]
-                )
                 ->registerAndUseScript(
                     'webcomponent.select-colour',
                     'system/fields/select-colour.min.js',
-                    ['dependencies' => ['webcomponent.select-colour-es5']],
+                    ['dependencies' => ['wcpolyfill']],
                     ['type'         => 'module']
                 );
         }
diff --git a/libraries/src/HTML/Helpers/Sidebar.php b/libraries/src/HTML/Helpers/Sidebar.php
index c1fc68c4552f2..cb5b49a9745fd 100644
--- a/libraries/src/HTML/Helpers/Sidebar.php
+++ b/libraries/src/HTML/Helpers/Sidebar.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Layout\FileLayout;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/HTML/Helpers/SortableList.php b/libraries/src/HTML/Helpers/SortableList.php
index 7129bd83425f1..61728dc7b25f8 100644
--- a/libraries/src/HTML/Helpers/SortableList.php
+++ b/libraries/src/HTML/Helpers/SortableList.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\HTML\HTMLHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/HTML/Helpers/StringHelper.php b/libraries/src/HTML/Helpers/StringHelper.php
index 1c05e89d9912e..1bc47f88a27f2 100644
--- a/libraries/src/HTML/Helpers/StringHelper.php
+++ b/libraries/src/HTML/Helpers/StringHelper.php
@@ -13,7 +13,7 @@
 use Joomla\String\StringHelper as FrameworkStringHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/HTML/Helpers/Tag.php b/libraries/src/HTML/Helpers/Tag.php
index f0e8edda7851c..594cdfa254cde 100644
--- a/libraries/src/HTML/Helpers/Tag.php
+++ b/libraries/src/HTML/Helpers/Tag.php
@@ -18,7 +18,7 @@
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/HTML/Helpers/Telephone.php b/libraries/src/HTML/Helpers/Telephone.php
index a843215aed1be..3112761416f1f 100644
--- a/libraries/src/HTML/Helpers/Telephone.php
+++ b/libraries/src/HTML/Helpers/Telephone.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\HTML\Helpers;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/HTML/Helpers/UiTab.php b/libraries/src/HTML/Helpers/UiTab.php
index 3e6a16c1aa5d0..bbe39f4498edf 100644
--- a/libraries/src/HTML/Helpers/UiTab.php
+++ b/libraries/src/HTML/Helpers/UiTab.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Factory;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/HTML/Helpers/User.php b/libraries/src/HTML/Helpers/User.php
index 85c1295cca1e7..a23f462f5c8ab 100644
--- a/libraries/src/HTML/Helpers/User.php
+++ b/libraries/src/HTML/Helpers/User.php
@@ -15,7 +15,7 @@
 use Joomla\CMS\HTML\HTMLHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/HTML/Helpers/WorkflowStage.php b/libraries/src/HTML/Helpers/WorkflowStage.php
index b8f9f26c35c68..805ece3490c8c 100644
--- a/libraries/src/HTML/Helpers/WorkflowStage.php
+++ b/libraries/src/HTML/Helpers/WorkflowStage.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Language\Text;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/HTML/Registry.php b/libraries/src/HTML/Registry.php
index 5335b4530cb4c..3e28893dd4338 100644
--- a/libraries/src/HTML/Registry.php
+++ b/libraries/src/HTML/Registry.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\HTML;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Help/Help.php b/libraries/src/Help/Help.php
index e00e150d06832..9e8afda5ad849 100644
--- a/libraries/src/Help/Help.php
+++ b/libraries/src/Help/Help.php
@@ -16,7 +16,7 @@
 use Joomla\CMS\Version;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Helper/AuthenticationHelper.php b/libraries/src/Helper/AuthenticationHelper.php
index 6478db16b9fb7..49ecc19498957 100644
--- a/libraries/src/Helper/AuthenticationHelper.php
+++ b/libraries/src/Helper/AuthenticationHelper.php
@@ -9,13 +9,12 @@
 
 namespace Joomla\CMS\Helper;
 
-use Exception;
-use Joomla\CMS\Application\CMSApplication;
+use Joomla\CMS\Event\User\LoginButtonsEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\PluginHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -90,19 +89,19 @@ public static function getTwoFactorMethods()
      */
     public static function getLoginButtons(string $formId): array
     {
-        // Get all the User plugins.
-        PluginHelper::importPlugin('user');
-
-        // Trigger the onUserLoginButtons event and return the button definitions.
         try {
-            /** @var CMSApplication $app */
-            $app = Factory::getApplication();
-        } catch (Exception $e) {
+            // Get all the User plugins.
+            $dispatcher = Factory::getApplication()->getDispatcher();
+            PluginHelper::importPlugin('user', null, true, $dispatcher);
+        } catch (\Exception $e) {
             return [];
         }
 
-        $results        = $app->triggerEvent('onUserLoginButtons', [$formId]);
-        $buttons        = [];
+        // Trigger the onUserLoginButtons event and return the button definitions.
+        $btnEvent = new LoginButtonsEvent('onUserLoginButtons', ['subject' => $formId]);
+        $dispatcher->dispatch('onUserLoginButtons', $btnEvent);
+        $results = $btnEvent['result'] ?? [];
+        $buttons = [];
 
         foreach ($results as $result) {
             // Did we get garbage back from the plugin?
diff --git a/libraries/src/Helper/CMSHelper.php b/libraries/src/Helper/CMSHelper.php
index 3df567d3eb1c7..cb2a8accb5418 100644
--- a/libraries/src/Helper/CMSHelper.php
+++ b/libraries/src/Helper/CMSHelper.php
@@ -19,7 +19,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Helper/ContentHelper.php b/libraries/src/Helper/ContentHelper.php
index bc0f24cb5a2cf..15e07de72a162 100644
--- a/libraries/src/Helper/ContentHelper.php
+++ b/libraries/src/Helper/ContentHelper.php
@@ -17,13 +17,13 @@
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
-use Joomla\CMS\Object\CMSObject;
+use Joomla\CMS\MVC\View\CanDo;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Table\Table;
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -153,7 +153,7 @@ public static function countRelations(&$items, $config)
      * @param   string   $section    The access section name.
      * @param   integer  $id         The item ID.
      *
-     * @return  CMSObject
+     * @return  Registry
      *
      * @since   3.2
      */
@@ -165,7 +165,8 @@ public static function getActions($component = '', $section = '', $id = 0)
             $assetName .= '.' . $section . '.' . (int) $id;
         }
 
-        $result = new CMSObject();
+        // Return a CanDo object to prevent any BC break, will be changed in 7.0 to Registry
+        $result = new CanDo();
 
         $user = Factory::getUser();
 
diff --git a/libraries/src/Helper/HelperFactory.php b/libraries/src/Helper/HelperFactory.php
index 7c1095f72e12e..cff79af70a717 100644
--- a/libraries/src/Helper/HelperFactory.php
+++ b/libraries/src/Helper/HelperFactory.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Helper;
diff --git a/libraries/src/Helper/HelperFactoryInterface.php b/libraries/src/Helper/HelperFactoryInterface.php
index cae641469b139..6d058f0904f7f 100644
--- a/libraries/src/Helper/HelperFactoryInterface.php
+++ b/libraries/src/Helper/HelperFactoryInterface.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Helper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Helper/LibraryHelper.php b/libraries/src/Helper/LibraryHelper.php
index d53e733b12f96..d8461e0d381e6 100644
--- a/libraries/src/Helper/LibraryHelper.php
+++ b/libraries/src/Helper/LibraryHelper.php
@@ -19,7 +19,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Helper/MediaHelper.php b/libraries/src/Helper/MediaHelper.php
index e23b702bfe8dc..b7c24ca376d8e 100644
--- a/libraries/src/Helper/MediaHelper.php
+++ b/libraries/src/Helper/MediaHelper.php
@@ -19,7 +19,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -54,7 +54,7 @@ class MediaHelper
      */
     public static function isImage($fileName)
     {
-        static $imageTypes = 'xcf|odg|gif|jpg|jpeg|png|bmp|webp';
+        static $imageTypes = 'xcf|odg|gif|jpg|jpeg|png|bmp|webp|avif';
 
         return preg_match("/\.(?:$imageTypes)$/i", $fileName);
     }
@@ -141,8 +141,8 @@ private function checkMimeType($mime, $component = 'com_media'): bool
         if ($params->get('check_mime', 1)) {
             $allowedMime = $params->get(
                 'upload_mime',
-                'image/jpeg,image/gif,image/png,image/bmp,image/webp,application/msword,application/excel,' .
-                    'application/pdf,application/powerpoint,text/plain,application/x-zip'
+                'image/jpeg,image/gif,image/png,image/bmp,image/webp,image/avif,application/msword,' .
+                    'application/excel,application/pdf,application/powerpoint,text/plain,application/x-zip'
             );
 
             // Get the mime type configuration
@@ -182,7 +182,7 @@ public static function checkFileExtension($extension, $component = 'com_media',
             return false;
         }
 
-        $allowable = array_map('trim', explode(',', $params->get('restrict_uploads_extensions', 'bmp,gif,jpg,jpeg,png,webp,ico,mp3,m4a,mp4a,ogg,mp4,mp4v,mpeg,mov,odg,odp,ods,odt,pdf,ppt,txt,xcf,xls,csv')));
+        $allowable = array_map('trim', explode(',', $params->get('restrict_uploads_extensions', 'bmp,gif,jpg,jpeg,png,webp,avif,ico,mp3,m4a,mp4a,ogg,mp4,mp4v,mpeg,mov,odg,odp,ods,odt,pdf,ppt,txt,xcf,xls,csv')));
         $ignored   = array_map('trim', explode(',', $params->get('ignore_extensions', '')));
 
         if ($extension == '' || $extension == false || (!\in_array($extension, $allowable, true) && !\in_array($extension, $ignored, true))) {
@@ -268,7 +268,7 @@ public function canUpload($file, $component = 'com_media', $allowedExecutables =
         }
 
         if ($params->get('restrict_uploads', 1)) {
-            $allowedExtensions = array_map('trim', explode(',', $params->get('restrict_uploads_extensions', 'bmp,gif,jpg,jpeg,png,webp,ico,mp3,m4a,mp4a,ogg,mp4,mp4v,mpeg,mov,odg,odp,ods,odt,pdf,png,ppt,txt,xcf,xls,csv')));
+            $allowedExtensions = array_map('trim', explode(',', $params->get('restrict_uploads_extensions', 'bmp,gif,jpg,jpeg,png,webp,avif,ico,mp3,m4a,mp4a,ogg,mp4,mp4v,mpeg,mov,odg,odp,ods,odt,pdf,png,ppt,txt,xcf,xls,csv')));
 
             if (\in_array($filetype, $allowedExtensions)) {
                 // If tmp_name is empty, then the file was bigger than the PHP limit
diff --git a/libraries/src/Helper/ModuleHelper.php b/libraries/src/Helper/ModuleHelper.php
index ebd67fa68bcb6..93b2b3a01df43 100644
--- a/libraries/src/Helper/ModuleHelper.php
+++ b/libraries/src/Helper/ModuleHelper.php
@@ -12,19 +12,21 @@
 use Joomla\CMS\Cache\CacheControllerFactoryInterface;
 use Joomla\CMS\Cache\Controller\CallbackController;
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Event\Module;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Filter\InputFilter;
 use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Profiler\Profiler;
+use Joomla\CMS\Proxy\ArrayProxy;
 use Joomla\Database\ParameterType;
+use Joomla\Filesystem\Path;
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -174,6 +176,7 @@ public static function renderModule($module, $attribs = [])
 
         // Set scope to component name
         $app->scope = $module->module;
+        $dispatcher = $app->getDispatcher();
 
         // Get the template
         $template = $app->getTemplate();
@@ -206,9 +209,13 @@ public static function renderModule($module, $attribs = [])
         $module->style = $attribs['style'];
 
         // If the $module is nulled it will return an empty content, otherwise it will render the module normally.
-        $app->triggerEvent('onRenderModule', [&$module, &$attribs]);
+        $attrProxy = new ArrayProxy($attribs);
+        $dispatcher->dispatch('onRenderModule', new Module\BeforeRenderModuleEvent('onRenderModule', [
+            'subject'    => $module,
+            'attributes' => $attrProxy,
+        ]));
 
-        if ($module === null || !isset($module->content)) {
+        if (!isset($module->content)) {
             return '';
         }
 
@@ -232,7 +239,10 @@ public static function renderModule($module, $attribs = [])
         // Revert the scope
         $app->scope = $scope;
 
-        $app->triggerEvent('onAfterRenderModule', [&$module, &$attribs]);
+        $dispatcher->dispatch('onAfterRenderModule', new Module\AfterRenderModuleEvent('onAfterRenderModule', [
+            'subject'    => $module,
+            'attributes' => $attrProxy,
+        ]));
 
         if (JDEBUG) {
             Profiler::getInstance('Application')->mark('afterRenderModule ' . $module->module . ' (' . $module->title . ')');
@@ -362,22 +372,27 @@ protected static function &load()
             return $modules;
         }
 
-        $app = Factory::getApplication();
-
-        $modules = null;
+        $dispatcher = Factory::getApplication()->getDispatcher();
+        $modules    = [];
 
-        $app->triggerEvent('onPrepareModuleList', [&$modules]);
+        $dispatcher->dispatch('onPrepareModuleList', new Module\PrepareModuleListEvent('onPrepareModuleList', [
+            'subject' => new ArrayProxy($modules),
+        ]));
 
         // If the onPrepareModuleList event returns an array of modules, then ignore the default module list creation
-        if (!\is_array($modules)) {
+        if (!$modules) {
             $modules = static::getModuleList();
         }
 
-        $app->triggerEvent('onAfterModuleList', [&$modules]);
+        $dispatcher->dispatch('onAfterModuleList', new Module\AfterModuleListEvent('onAfterModuleList', [
+            'subject' => new ArrayProxy($modules),
+        ]));
 
         $modules = static::cleanModuleList($modules);
 
-        $app->triggerEvent('onAfterCleanModuleList', [&$modules]);
+        $dispatcher->dispatch('onAfterCleanModuleList', new Module\AfterCleanModuleListEvent('onAfterCleanModuleList', [
+            'subject' => new ArrayProxy($modules),
+        ]));
 
         return $modules;
     }
diff --git a/libraries/src/Helper/RouteHelper.php b/libraries/src/Helper/RouteHelper.php
index e898a369c191d..0972a3dce4dca 100644
--- a/libraries/src/Helper/RouteHelper.php
+++ b/libraries/src/Helper/RouteHelper.php
@@ -16,7 +16,7 @@
 use Joomla\CMS\Language\Multilanguage;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Helper/TagsHelper.php b/libraries/src/Helper/TagsHelper.php
index 01a07fe340fff..cdba64f1c6703 100644
--- a/libraries/src/Helper/TagsHelper.php
+++ b/libraries/src/Helper/TagsHelper.php
@@ -16,12 +16,12 @@
 use Joomla\CMS\Table\TableInterface;
 use Joomla\CMS\UCM\UCMContent;
 use Joomla\CMS\UCM\UCMType;
-use Joomla\Database\DatabaseDriver;
+use Joomla\Database\DatabaseInterface;
 use Joomla\Database\ParameterType;
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -326,7 +326,7 @@ public function deleteTagData(TableInterface $table, $contentItemId)
         $result = $this->unTagItem($contentItemId[$key], $table);
 
         /** @var  CoreContent $ucmContentTable */
-        $ucmContentTable = Table::getInstance('Corecontent');
+        $ucmContentTable = Table::getInstance('CoreContent');
 
         return $result && $ucmContentTable->deleteByContentId($contentItemId[$key], $this->typeAlias);
     }
@@ -407,8 +407,8 @@ public function getMultipleItemTags($contentType, array $ids, $getTagData = true
 
         $ids = array_map('intval', $ids);
 
-        /** @var DatabaseDriver $db */
-        $db = Factory::getContainer()->get('DatabaseDriver');
+        /** @var DatabaseInterface $db */
+        $db = Factory::getContainer()->get(DatabaseInterface::class);
 
         $query = $db->getQuery(true)
             ->select($db->quoteName(['m.tag_id', 'm.content_item_id']))
@@ -843,7 +843,7 @@ public function postStoreProcess(TableInterface $table, $newTags = [], $replace
             } else {
                 // Process the tags
                 $data            = $this->getRowData($table);
-                $ucmContentTable = Table::getInstance('Corecontent');
+                $ucmContentTable = Table::getInstance('CoreContent');
 
                 $ucm     = new UCMContent($table, $this->typeAlias);
                 $ucmData = $data ? $ucm->mapData($data) : $ucm->ucmData;
diff --git a/libraries/src/Helper/UserGroupsHelper.php b/libraries/src/Helper/UserGroupsHelper.php
index 45fc27880e0c7..40a7cc98554df 100644
--- a/libraries/src/Helper/UserGroupsHelper.php
+++ b/libraries/src/Helper/UserGroupsHelper.php
@@ -13,7 +13,7 @@
 use Joomla\Database\ParameterType;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Http/Http.php b/libraries/src/Http/Http.php
index 76a736179c7da..f4020d2d59864 100644
--- a/libraries/src/Http/Http.php
+++ b/libraries/src/Http/Http.php
@@ -13,7 +13,7 @@
 use Joomla\Http\TransportInterface as FrameworkTransportInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Http/HttpFactory.php b/libraries/src/Http/HttpFactory.php
index 169a8c8c2a330..7bc49a085969e 100644
--- a/libraries/src/Http/HttpFactory.php
+++ b/libraries/src/Http/HttpFactory.php
@@ -13,7 +13,7 @@
 use Joomla\Http\TransportInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Http/Response.php b/libraries/src/Http/Response.php
index 610db8611bf12..345ee82e2c042 100644
--- a/libraries/src/Http/Response.php
+++ b/libraries/src/Http/Response.php
@@ -12,7 +12,7 @@
 use Joomla\Http\Response as FrameworkResponse;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Http/Transport/CurlTransport.php b/libraries/src/Http/Transport/CurlTransport.php
index c9df1339398f6..7cb2abd3966de 100644
--- a/libraries/src/Http/Transport/CurlTransport.php
+++ b/libraries/src/Http/Transport/CurlTransport.php
@@ -20,7 +20,7 @@
 use Laminas\Diactoros\Stream as StreamResponse;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Http/Transport/SocketTransport.php b/libraries/src/Http/Transport/SocketTransport.php
index d3df46d0a0c2e..4124d2e8c0036 100644
--- a/libraries/src/Http/Transport/SocketTransport.php
+++ b/libraries/src/Http/Transport/SocketTransport.php
@@ -19,7 +19,7 @@
 use Laminas\Diactoros\Stream as StreamResponse;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Http/Transport/StreamTransport.php b/libraries/src/Http/Transport/StreamTransport.php
index baebbc524a4ae..130004d569ce5 100644
--- a/libraries/src/Http/Transport/StreamTransport.php
+++ b/libraries/src/Http/Transport/StreamTransport.php
@@ -20,7 +20,7 @@
 use Laminas\Diactoros\Stream as StreamResponse;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Http/TransportInterface.php b/libraries/src/Http/TransportInterface.php
index bdeb30cf54189..4d40986073bcb 100644
--- a/libraries/src/Http/TransportInterface.php
+++ b/libraries/src/Http/TransportInterface.php
@@ -12,7 +12,7 @@
 use Joomla\Http\TransportInterface as FrameworkTransportInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Image/Exception/UnparsableImageException.php b/libraries/src/Image/Exception/UnparsableImageException.php
index d509af0a69f40..e50fdd66b79bb 100644
--- a/libraries/src/Image/Exception/UnparsableImageException.php
+++ b/libraries/src/Image/Exception/UnparsableImageException.php
@@ -4,13 +4,13 @@
  * Joomla! Content Management System
  *
  * @copyright   (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Image\Exception;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Image/Filter/Backgroundfill.php b/libraries/src/Image/Filter/Backgroundfill.php
index 21868f20422d2..2bf15f68fcd92 100644
--- a/libraries/src/Image/Filter/Backgroundfill.php
+++ b/libraries/src/Image/Filter/Backgroundfill.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright   (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Image\Filter;
@@ -12,7 +12,7 @@
 use Joomla\CMS\Image\ImageFilter;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Image/Filter/Brightness.php b/libraries/src/Image/Filter/Brightness.php
index 0f08173ffe5ee..dc6034c597190 100644
--- a/libraries/src/Image/Filter/Brightness.php
+++ b/libraries/src/Image/Filter/Brightness.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright   (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Image\Filter;
@@ -12,7 +12,7 @@
 use Joomla\CMS\Image\ImageFilter;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Image/Filter/Contrast.php b/libraries/src/Image/Filter/Contrast.php
index f76c6197bf5c3..2e8bcd64e2825 100644
--- a/libraries/src/Image/Filter/Contrast.php
+++ b/libraries/src/Image/Filter/Contrast.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright   (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Image\Filter;
@@ -12,7 +12,7 @@
 use Joomla\CMS\Image\ImageFilter;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Image/Filter/Edgedetect.php b/libraries/src/Image/Filter/Edgedetect.php
index 81c0b1024cf09..3dec5fa8ba6c6 100644
--- a/libraries/src/Image/Filter/Edgedetect.php
+++ b/libraries/src/Image/Filter/Edgedetect.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright   (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Image\Filter;
@@ -12,7 +12,7 @@
 use Joomla\CMS\Image\ImageFilter;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Image/Filter/Emboss.php b/libraries/src/Image/Filter/Emboss.php
index 9cd81e9e9637b..174be1629ea8e 100644
--- a/libraries/src/Image/Filter/Emboss.php
+++ b/libraries/src/Image/Filter/Emboss.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright   (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Image\Filter;
@@ -12,7 +12,7 @@
 use Joomla\CMS\Image\ImageFilter;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Image/Filter/Grayscale.php b/libraries/src/Image/Filter/Grayscale.php
index e2fe07c965e80..64dee73306120 100644
--- a/libraries/src/Image/Filter/Grayscale.php
+++ b/libraries/src/Image/Filter/Grayscale.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright   (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Image\Filter;
@@ -12,7 +12,7 @@
 use Joomla\CMS\Image\ImageFilter;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Image/Filter/Negate.php b/libraries/src/Image/Filter/Negate.php
index b96fd01240d91..bc8501074a792 100644
--- a/libraries/src/Image/Filter/Negate.php
+++ b/libraries/src/Image/Filter/Negate.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright   (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Image\Filter;
@@ -12,7 +12,7 @@
 use Joomla\CMS\Image\ImageFilter;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Image/Filter/Sketchy.php b/libraries/src/Image/Filter/Sketchy.php
index 0612f9c95031f..9a045508c10bf 100644
--- a/libraries/src/Image/Filter/Sketchy.php
+++ b/libraries/src/Image/Filter/Sketchy.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright   (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Image\Filter;
@@ -12,7 +12,7 @@
 use Joomla\CMS\Image\ImageFilter;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Image/Filter/Smooth.php b/libraries/src/Image/Filter/Smooth.php
index 5646b7bc010df..0f93aa4d94910 100644
--- a/libraries/src/Image/Filter/Smooth.php
+++ b/libraries/src/Image/Filter/Smooth.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright   (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Image\Filter;
@@ -12,7 +12,7 @@
 use Joomla\CMS\Image\ImageFilter;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Image/Image.php b/libraries/src/Image/Image.php
index 4f3f9686cd9bd..5ade75d3e4393 100644
--- a/libraries/src/Image/Image.php
+++ b/libraries/src/Image/Image.php
@@ -4,13 +4,13 @@
  * Joomla! Content Management System
  *
  * @copyright   (C) 2017 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Image;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Image/ImageFilter.php b/libraries/src/Image/ImageFilter.php
index 9dae74d67f93f..a5fb351c301e4 100644
--- a/libraries/src/Image/ImageFilter.php
+++ b/libraries/src/Image/ImageFilter.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Image;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Input/Cli.php b/libraries/src/Input/Cli.php
index 10eb07cf624bc..443202f6e9ee8 100644
--- a/libraries/src/Input/Cli.php
+++ b/libraries/src/Input/Cli.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Filter\InputFilter;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Input/Cookie.php b/libraries/src/Input/Cookie.php
index 077dc5d13c9a0..0959d9b8b4440 100644
--- a/libraries/src/Input/Cookie.php
+++ b/libraries/src/Input/Cookie.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Filter\InputFilter;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -56,32 +56,13 @@ public function __construct(array $source = null, array $options = [])
      *
      * @param   string   $name      Name of the value to set.
      * @param   mixed    $value     Value to assign to the input.
-     * @param   integer  $expire    The time the cookie expires. This is a Unix timestamp so is in number
-     *                              of seconds since the epoch. In other words, you'll most likely set this
-     *                              with the time() function plus the number of seconds before you want it
-     *                              to expire. Or you might use mktime(). time()+60*60*24*30 will set the
-     *                              cookie to expire in 30 days. If set to 0, or omitted, the cookie will
-     *                              expire at the end of the session (when the browser closes).
-     * @param   string   $path      The path on the server in which the cookie will be available on. If set
-     *                              to '/', the cookie will be available within the entire domain. If set to
-     *                              '/foo/', the cookie will only be available within the /foo/ directory and
-     *                              all sub-directories such as /foo/bar/ of domain. The default value is the
-     *                              current directory that the cookie is being set in.
-     * @param   string   $domain    The domain that the cookie is available to. To make the cookie available
-     *                              on all subdomains of example.com (including example.com itself) then you'd
-     *                              set it to '.example.com'. Although some browsers will accept cookies without
-     *                              the initial ., RFC 2109 requires it to be included. Setting the domain to
-     *                              'www.example.com' or '.www.example.com' will make the cookie only available
-     *                              in the www subdomain.
-     * @param   boolean  $secure    Indicates that the cookie should only be transmitted over a secure HTTPS
-     *                              connection from the client. When set to TRUE, the cookie will only be set
-     *                              if a secure connection exists. On the server-side, it's on the programmer
-     *                              to send this kind of cookie only on secure connection (e.g. with respect
-     *                              to $_SERVER["HTTPS"]).
-     * @param   boolean  $httpOnly  When TRUE the cookie will be made accessible only through the HTTP protocol.
-     *                              This means that the cookie won't be accessible by scripting languages, such
-     *                              as JavaScript. This setting can effectively help to reduce identity theft
-     *                              through XSS attacks (although it is not supported by all browsers).
+     * @param   array    $options   An associative array which may have any of the keys expires, path, domain,
+     *                              secure, httponly and samesite. The values have the same meaning as described
+     *                              for the parameters with the same name. The value of the samesite element
+     *                              should be either Lax or Strict. If any of the allowed options are not given,
+     *                              their default values are the same as the default values of the explicit
+     *                              parameters. If the samesite element is omitted, no SameSite cookie attribute
+     *                              is set.
      *
      * @return  void
      *
@@ -92,14 +73,85 @@ public function __construct(array $source = null, array $options = [])
      * @deprecated   4.3 will be removed in 6.0.
      *               Use Joomla\Input\Cookie instead
      */
-    public function set($name, $value, $expire = 0, $path = '', $domain = '', $secure = false, $httpOnly = false)
+    public function set($name, $value, $options = [])
     {
-        if (\is_array($value)) {
-            foreach ($value as $key => $val) {
-                setcookie($name . "[$key]", $val, $expire, $path, $domain, $secure, $httpOnly);
+        // BC layer to convert old method parameters.
+        if (is_array($options) === false) {
+            trigger_deprecation(
+                'joomla/input',
+                '1.4.0',
+                'The %s($name, $value, $expire, $path, $domain, $secure, $httpOnly) signature is deprecated and'
+                . ' will not be supported once support'
+                . ' for PHP 7.2 and earlier is dropped, use the %s($name, $value, $options) signature instead',
+                __METHOD__,
+                __METHOD__
+            );
+
+            $argList = func_get_args();
+
+            $options = [
+                'expires'  => $argList[2] ?? 0,
+                'path'     => $argList[3] ?? '',
+                'domain'   => $argList[4] ?? '',
+                'secure'   => $argList[5] ?? false,
+                'httponly' => $argList[6] ?? false,
+            ];
+        }
+
+        // Set the cookie
+        if (version_compare(PHP_VERSION, '7.3', '>=')) {
+            if (\is_array($value)) {
+                foreach ($value as $key => $val) {
+                    setcookie($name . "[$key]", $val, $options);
+                }
+            } else {
+                setcookie($name, $value, $options);
             }
         } else {
-            setcookie($name, $value, $expire, $path, $domain, $secure, $httpOnly);
+            // Using the setcookie function before php 7.3, make sure we have default values.
+            if (array_key_exists('expires', $options) === false) {
+                $options['expires'] = 0;
+            }
+
+            if (array_key_exists('path', $options) === false) {
+                $options['path'] = '';
+            }
+
+            if (array_key_exists('domain', $options) === false) {
+                $options['domain'] = '';
+            }
+
+            if (array_key_exists('secure', $options) === false) {
+                $options['secure'] = false;
+            }
+
+            if (array_key_exists('httponly', $options) === false) {
+                $options['httponly'] = false;
+            }
+
+            if (\is_array($value)) {
+                foreach ($value as $key => $val) {
+                    setcookie(
+                        $name . "[$key]",
+                        $val,
+                        $options['expires'],
+                        $options['path'],
+                        $options['domain'],
+                        $options['secure'],
+                        $options['httponly']
+                    );
+                }
+            } else {
+                setcookie(
+                    $name,
+                    $value,
+                    $options['expires'],
+                    $options['path'],
+                    $options['domain'],
+                    $options['secure'],
+                    $options['httponly']
+                );
+            }
         }
 
         $this->data[$name] = $value;
diff --git a/libraries/src/Input/Files.php b/libraries/src/Input/Files.php
index 16a18686d155b..17e5722c499fb 100644
--- a/libraries/src/Input/Files.php
+++ b/libraries/src/Input/Files.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Filter\InputFilter;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Input/Input.php b/libraries/src/Input/Input.php
index 9a04a7564dd3a..e3f5544d32ae5 100644
--- a/libraries/src/Input/Input.php
+++ b/libraries/src/Input/Input.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Filter\InputFilter;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Input/Json.php b/libraries/src/Input/Json.php
index 9ae665d27fdf0..e67d02c82ea96 100644
--- a/libraries/src/Input/Json.php
+++ b/libraries/src/Input/Json.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Filter\InputFilter;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Installer/Adapter/ComponentAdapter.php b/libraries/src/Installer/Adapter/ComponentAdapter.php
index 83e2beab0fe29..427180b9c8c9c 100644
--- a/libraries/src/Installer/Adapter/ComponentAdapter.php
+++ b/libraries/src/Installer/Adapter/ComponentAdapter.php
@@ -12,7 +12,6 @@
 use Joomla\CMS\Application\ApplicationHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filesystem\Folder;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Installer\Installer;
 use Joomla\CMS\Installer\InstallerAdapter;
 use Joomla\CMS\Language\Text;
@@ -22,10 +21,11 @@
 use Joomla\CMS\Table\Table;
 use Joomla\CMS\Table\Update;
 use Joomla\Database\ParameterType;
+use Joomla\Filesystem\Path;
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Installer/Adapter/FileAdapter.php b/libraries/src/Installer/Adapter/FileAdapter.php
index 696a6f6c01574..e73eb616badae 100644
--- a/libraries/src/Installer/Adapter/FileAdapter.php
+++ b/libraries/src/Installer/Adapter/FileAdapter.php
@@ -10,7 +10,6 @@
 namespace Joomla\CMS\Installer\Adapter;
 
 use Joomla\CMS\Filesystem\Folder;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Installer\Installer;
 use Joomla\CMS\Installer\InstallerAdapter;
 use Joomla\CMS\Language\Text;
@@ -18,9 +17,10 @@
 use Joomla\CMS\Table\Table;
 use Joomla\Database\ParameterType;
 use Joomla\Filesystem\File;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Installer/Adapter/LanguageAdapter.php b/libraries/src/Installer/Adapter/LanguageAdapter.php
index adbedd9bdb364..ae855805407dc 100644
--- a/libraries/src/Installer/Adapter/LanguageAdapter.php
+++ b/libraries/src/Installer/Adapter/LanguageAdapter.php
@@ -26,7 +26,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Installer/Adapter/LibraryAdapter.php b/libraries/src/Installer/Adapter/LibraryAdapter.php
index f7b72aed75d6e..e0987eb37b9e8 100644
--- a/libraries/src/Installer/Adapter/LibraryAdapter.php
+++ b/libraries/src/Installer/Adapter/LibraryAdapter.php
@@ -21,7 +21,7 @@
 use Joomla\Filesystem\File;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -54,12 +54,12 @@ protected function checkExtensionInFilesystem()
 
                 // Clear the cached data
                 $this->currentExtensionId = null;
-                $this->extension          = Table::getInstance('Extension', 'JTable', ['dbo' => $this->getDatabase()]);
+                $this->extension          = Table::getInstance('Extension', '\\Joomla\\CMS\\Table\\', ['dbo' => $this->getDatabase()]);
 
                 // From this point we'll consider this an update
                 $this->setRoute('update');
             } else {
-                // Abort the install, no upgrade possible
+                // Stop the install, no upgrade possible
                 throw new \RuntimeException(Text::_('JLIB_INSTALLER_ABORT_LIB_INSTALL_ALREADY_INSTALLED'));
             }
         }
@@ -225,12 +225,12 @@ public function loadLanguage($path = null)
         $source = $this->parent->getPath('source');
 
         if (!$source) {
-            $this->parent->setPath('source', JPATH_PLATFORM . '/' . $this->getElement());
+            $this->parent->setPath('source', JPATH_LIBRARIES . '/' . $this->getElement());
         }
 
         $extension   = 'lib_' . str_replace('/', '_', $this->getElement());
         $librarypath = (string) $this->getManifest()->libraryname;
-        $source      = $path ?: JPATH_PLATFORM . '/' . $librarypath;
+        $source      = $path ?: JPATH_LIBRARIES . '/' . $librarypath;
 
         $this->doLoadLanguage($extension, $source, JPATH_SITE);
     }
@@ -295,11 +295,11 @@ protected function removeExtensionFiles()
 
         // Delete empty vendor folders
         if (2 === \count($elementParts)) {
-            $folders = Folder::folders(JPATH_PLATFORM . '/' . $elementParts[0]);
+            $folders = Folder::folders(JPATH_LIBRARIES . '/' . $elementParts[0]);
 
             if (empty($folders)) {
                 Folder::delete(JPATH_MANIFESTS . '/libraries/' . $elementParts[0]);
-                Folder::delete(JPATH_PLATFORM . '/' . $elementParts[0]);
+                Folder::delete(JPATH_LIBRARIES . '/' . $elementParts[0]);
             }
         }
     }
@@ -327,7 +327,7 @@ protected function setupInstallPaths()
             throw new \RuntimeException(Text::_('JLIB_INSTALLER_ABORT_LIB_INSTALL_CORE_FOLDER'));
         }
 
-        $this->parent->setPath('extension_root', JPATH_PLATFORM . '/' . implode(DIRECTORY_SEPARATOR, explode('/', $group)));
+        $this->parent->setPath('extension_root', JPATH_LIBRARIES . '/' . implode(DIRECTORY_SEPARATOR, explode('/', $group)));
     }
 
     /**
@@ -352,7 +352,7 @@ protected function setupUninstall()
         $manifest = new LibraryManifest($manifestFile);
 
         // Set the library root path
-        $this->parent->setPath('extension_root', JPATH_PLATFORM . '/' . $manifest->libraryname);
+        $this->parent->setPath('extension_root', JPATH_LIBRARIES . '/' . $manifest->libraryname);
 
         // Set the source path to the library root, the manifest script may be found
         $this->parent->setPath('source', $this->parent->getPath('extension_root'));
diff --git a/libraries/src/Installer/Adapter/ModuleAdapter.php b/libraries/src/Installer/Adapter/ModuleAdapter.php
index 3005c2fcde58c..48d403daa1659 100644
--- a/libraries/src/Installer/Adapter/ModuleAdapter.php
+++ b/libraries/src/Installer/Adapter/ModuleAdapter.php
@@ -20,7 +20,7 @@
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Installer/Adapter/PackageAdapter.php b/libraries/src/Installer/Adapter/PackageAdapter.php
index d2f2d24af9083..5bd1b0dd97aef 100644
--- a/libraries/src/Installer/Adapter/PackageAdapter.php
+++ b/libraries/src/Installer/Adapter/PackageAdapter.php
@@ -27,7 +27,7 @@
 use Joomla\Filesystem\File;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Installer/Adapter/PluginAdapter.php b/libraries/src/Installer/Adapter/PluginAdapter.php
index 31e9354380f59..f9e0ff2a17b21 100644
--- a/libraries/src/Installer/Adapter/PluginAdapter.php
+++ b/libraries/src/Installer/Adapter/PluginAdapter.php
@@ -21,7 +21,7 @@
 use Joomla\Filesystem\File;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Installer/Adapter/TemplateAdapter.php b/libraries/src/Installer/Adapter/TemplateAdapter.php
index 2233c778a521a..7b768f4bdb20d 100644
--- a/libraries/src/Installer/Adapter/TemplateAdapter.php
+++ b/libraries/src/Installer/Adapter/TemplateAdapter.php
@@ -21,7 +21,7 @@
 use Joomla\Database\ParameterType;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Installer/Installer.php b/libraries/src/Installer/Installer.php
index 1b260d46d1646..84316ceb2de28 100644
--- a/libraries/src/Installer/Installer.php
+++ b/libraries/src/Installer/Installer.php
@@ -11,9 +11,14 @@
 
 use Joomla\CMS\Adapter\Adapter;
 use Joomla\CMS\Application\ApplicationHelper;
+use Joomla\CMS\Event\Extension\AfterInstallEvent;
+use Joomla\CMS\Event\Extension\AfterUninstallEvent;
+use Joomla\CMS\Event\Extension\AfterUpdateEvent;
+use Joomla\CMS\Event\Extension\BeforeInstallEvent;
+use Joomla\CMS\Event\Extension\BeforeUninstallEvent;
+use Joomla\CMS\Event\Extension\BeforeUpdateEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filesystem\Folder;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Plugin\PluginHelper;
@@ -21,15 +26,15 @@
 use Joomla\CMS\Table\Table;
 use Joomla\Database\DatabaseAwareInterface;
 use Joomla\Database\DatabaseAwareTrait;
-use Joomla\Database\DatabaseDriver;
 use Joomla\Database\DatabaseInterface;
 use Joomla\Database\Exception\ExecutionFailureException;
 use Joomla\Database\ParameterType;
 use Joomla\DI\ContainerAwareInterface;
 use Joomla\Filesystem\File;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -628,17 +633,16 @@ public function install($path = null)
             $adapter->loadLanguage($path);
         }
 
+        $dispatcher = Factory::getApplication()->getDispatcher();
+
         // Fire the onExtensionBeforeInstall event.
-        PluginHelper::importPlugin('extension');
-        Factory::getApplication()->triggerEvent(
-            'onExtensionBeforeInstall',
-            [
-                'method'    => 'install',
-                'type'      => $this->manifest->attributes()->type,
-                'manifest'  => $this->manifest,
-                'extension' => 0,
-            ]
-        );
+        PluginHelper::importPlugin('extension', null, true, $dispatcher);
+        $dispatcher->dispatch('onExtensionBeforeInstall', new BeforeInstallEvent('onExtensionBeforeInstall', [
+            'method'    => 'install',
+            'type'      => $this->manifest->attributes()->type,
+            'manifest'  => $this->manifest,
+            'extension' => 0,
+        ]));
 
         // Run the install
         $result = $adapter->install();
@@ -647,10 +651,10 @@ public function install($path = null)
         clearstatcache();
 
         // Fire the onExtensionAfterInstall
-        Factory::getApplication()->triggerEvent(
-            'onExtensionAfterInstall',
-            ['installer' => clone $this, 'eid' => $result]
-        );
+        $dispatcher->dispatch('onExtensionAfterInstall', new AfterInstallEvent('onExtensionAfterInstall', [
+            'installer' => clone $this,
+            'eid'       => $result,
+        ]));
 
         if ($result !== false) {
             // Refresh versionable assets cache
@@ -723,26 +727,25 @@ public function discover_install($eid = null)
             $adapter->loadLanguage();
         }
 
+        $dispatcher = Factory::getApplication()->getDispatcher();
+
         // Fire the onExtensionBeforeInstall event.
-        PluginHelper::importPlugin('extension');
-        Factory::getApplication()->triggerEvent(
-            'onExtensionBeforeInstall',
-            [
-                'method'    => 'discover_install',
-                'type'      => $this->extension->get('type'),
-                'manifest'  => null,
-                'extension' => $this->extension->get('extension_id'),
-            ]
-        );
+        PluginHelper::importPlugin('extension', null, true, $dispatcher);
+        $dispatcher->dispatch('onExtensionBeforeInstall', new BeforeInstallEvent('onExtensionBeforeInstall', [
+            'method'    => 'discover_install',
+            'type'      => $this->extension->get('type'),
+            'manifest'  => null,
+            'extension' => (int) $this->extension->get('extension_id'),
+        ]));
 
         // Run the install
         $result = $adapter->discover_install();
 
         // Fire the onExtensionAfterInstall
-        Factory::getApplication()->triggerEvent(
-            'onExtensionAfterInstall',
-            ['installer' => clone $this, 'eid' => $result]
-        );
+        $dispatcher->dispatch('onExtensionAfterInstall', new AfterInstallEvent('onExtensionAfterInstall', [
+            'installer' => clone $this,
+            'eid'       => $result,
+        ]));
 
         if ($result !== false) {
             // Refresh versionable assets cache
@@ -819,21 +822,23 @@ public function update($path = null)
             $adapter->loadLanguage($path);
         }
 
+        $dispatcher = Factory::getApplication()->getDispatcher();
+
         // Fire the onExtensionBeforeUpdate event.
-        PluginHelper::importPlugin('extension');
-        Factory::getApplication()->triggerEvent(
-            'onExtensionBeforeUpdate',
-            ['type' => $this->manifest->attributes()->type, 'manifest' => $this->manifest]
-        );
+        PluginHelper::importPlugin('extension', null, true, $dispatcher);
+        $dispatcher->dispatch('onExtensionBeforeUpdate', new BeforeUpdateEvent('onExtensionBeforeUpdate', [
+            'type'     => $this->manifest->attributes()->type,
+            'manifest' => $this->manifest,
+        ]));
 
         // Run the update
         $result = $adapter->update();
 
         // Fire the onExtensionAfterUpdate
-        Factory::getApplication()->triggerEvent(
-            'onExtensionAfterUpdate',
-            ['installer' => clone $this, 'eid' => $result]
-        );
+        $dispatcher->dispatch('onExtensionAfterUpdate', new AfterUpdateEvent('onExtensionAfterUpdate', [
+            'installer' => clone $this,
+            'eid'       => $result,
+        ]));
 
         if ($result !== false) {
             return true;
@@ -862,22 +867,24 @@ public function uninstall($type, $identifier)
             return false;
         }
 
+        $dispatcher = Factory::getApplication()->getDispatcher();
+
         // We don't load languages here, we get the extension adapter to work it out
         // Fire the onExtensionBeforeUninstall event.
-        PluginHelper::importPlugin('extension');
-        Factory::getApplication()->triggerEvent(
-            'onExtensionBeforeUninstall',
-            ['eid' => $identifier]
-        );
+        PluginHelper::importPlugin('extension', null, true, $dispatcher);
+        $dispatcher->dispatch('onExtensionBeforeUninstall', new BeforeUninstallEvent('onExtensionBeforeUninstall', [
+            'eid' => (int) $identifier,
+        ]));
 
         // Run the uninstall
         $result = $adapter->uninstall($identifier);
 
         // Fire the onExtensionAfterInstall
-        Factory::getApplication()->triggerEvent(
-            'onExtensionAfterUninstall',
-            ['installer' => clone $this, 'eid' => $identifier, 'removed' => $result]
-        );
+        $dispatcher->dispatch('onExtensionAfterUninstall', new AfterUninstallEvent('onExtensionAfterUninstall', [
+            'installer' => clone $this,
+            'eid'       => (int) $identifier,
+            'removed'   => $result,
+        ]));
 
         // Refresh versionable assets cache
         Factory::getApplication()->flushAssets();
@@ -1327,8 +1334,7 @@ public function parseSchemaUpdates(\SimpleXMLElement $schema, $eid)
      */
     protected function updateSchemaTable(int $eid, string $version, bool $update = false): void
     {
-        /** @var DatabaseDriver $db */
-        $db    = Factory::getContainer()->get('DatabaseDriver');
+        $db = $this->getDatabase();
 
         $o = (object) [
             'extension_id' => $eid,
diff --git a/libraries/src/Installer/InstallerAdapter.php b/libraries/src/Installer/InstallerAdapter.php
index 70d47ca68e51d..c83803b3b4262 100644
--- a/libraries/src/Installer/InstallerAdapter.php
+++ b/libraries/src/Installer/InstallerAdapter.php
@@ -21,6 +21,7 @@
 use Joomla\Database\DatabaseAwareInterface;
 use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Database\DatabaseDriver;
+use Joomla\Database\DatabaseInterface;
 use Joomla\DI\Container;
 use Joomla\DI\ContainerAwareInterface;
 use Joomla\DI\ContainerAwareTrait;
@@ -28,7 +29,7 @@
 use Joomla\DI\ServiceProviderInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -996,6 +997,11 @@ function (Container $container) use ($classname) {
         // Create a new instance
         $this->parent->manifestClass = $container->get(InstallerScriptInterface::class);
 
+        // Set the database
+        if ($this->parent->manifestClass instanceof DatabaseAwareInterface) {
+            $this->parent->manifestClass->setDatabase($container->get(DatabaseInterface::class));
+        }
+
         // And set this so we can copy it later
         $this->manifest_script = $manifestScript;
     }
diff --git a/libraries/src/Installer/InstallerExtension.php b/libraries/src/Installer/InstallerExtension.php
index e5f4130231700..15052b485d8a1 100644
--- a/libraries/src/Installer/InstallerExtension.php
+++ b/libraries/src/Installer/InstallerExtension.php
@@ -12,10 +12,11 @@
 use Joomla\CMS\Application\ApplicationHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
-use Joomla\CMS\Object\CMSObject;
+use Joomla\CMS\Object\LegacyErrorHandlingTrait;
+use Joomla\CMS\Object\LegacyPropertyManagementTrait;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -23,8 +24,11 @@
  *
  * @since  3.1
  */
-class InstallerExtension extends CMSObject
+class InstallerExtension
 {
+    use LegacyErrorHandlingTrait;
+    use LegacyPropertyManagementTrait;
+
     /**
      * Client ID of the extension
      *
diff --git a/libraries/src/Installer/InstallerHelper.php b/libraries/src/Installer/InstallerHelper.php
index f32adc93204ab..5989e144ea250 100644
--- a/libraries/src/Installer/InstallerHelper.php
+++ b/libraries/src/Installer/InstallerHelper.php
@@ -10,19 +10,21 @@
 namespace Joomla\CMS\Installer;
 
 use Joomla\Archive\Archive;
+use Joomla\CMS\Event\Installer\BeforePackageDownloadEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filesystem\Folder;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Http\HttpFactory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\Proxy\ArrayProxy;
 use Joomla\CMS\Updater\Update;
 use Joomla\CMS\Version;
 use Joomla\Filesystem\File;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -77,9 +79,15 @@ public static function downloadPackage($url, $target = false)
         ini_set('user_agent', $version->getUserAgent('Installer'));
 
         // Load installer plugins, and allow URL and headers modification
-        $headers = [];
-        PluginHelper::importPlugin('installer');
-        Factory::getApplication()->triggerEvent('onInstallerBeforePackageDownload', [&$url, &$headers]);
+        $headers    = [];
+        $dispatcher = Factory::getApplication()->getDispatcher();
+        PluginHelper::importPlugin('installer', null, true, $dispatcher);
+        $event = new BeforePackageDownloadEvent('onInstallerBeforePackageDownload', [
+            'url'     => &$url, // TODO: Remove reference in Joomla 6, see BeforePackageDownloadEvent::__constructor()
+            'headers' => new ArrayProxy($headers),
+        ]);
+        $dispatcher->dispatch('onInstallerBeforePackageDownload', $event);
+        $url = $event->getUrl();
 
         try {
             $response = HttpFactory::getHttp()->get($url, $headers);
@@ -118,8 +126,11 @@ public static function downloadPackage($url, $target = false)
             $target = $tmpPath . '/' . basename($target);
         }
 
+        // Fix Indirect Modification of Overloaded Property
+        $body = $response->body;
+
         // Write buffer to file
-        File::write($target, $response->body);
+        File::write($target, $body);
 
         // Restore error tracking to what it was before
         ini_set('track_errors', $track_errors);
diff --git a/libraries/src/Installer/LegacyInstallerScript.php b/libraries/src/Installer/LegacyInstallerScript.php
index 65627c25ebfd1..bcf40befa51be 100644
--- a/libraries/src/Installer/LegacyInstallerScript.php
+++ b/libraries/src/Installer/LegacyInstallerScript.php
@@ -9,6 +9,11 @@
 
 namespace Joomla\CMS\Installer;
 
+use Joomla\CMS\Factory;
+use Joomla\Database\DatabaseAwareInterface;
+use Joomla\Database\DatabaseAwareTrait;
+use Joomla\Database\Exception\DatabaseNotFoundException;
+
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
@@ -18,8 +23,10 @@
  *
  * @since  4.2.0
  */
-class LegacyInstallerScript implements InstallerScriptInterface
+class LegacyInstallerScript implements InstallerScriptInterface, DatabaseAwareInterface
 {
+    use DatabaseAwareTrait;
+
     /**
      * @var    \stdClass
      * @since  4.2.0
@@ -168,6 +175,15 @@ private function callOnScript(string $name, array $arguments): bool
             return true;
         }
 
+        if ($this->installerScript instanceof DatabaseAwareInterface) {
+            try {
+                $this->installerScript->setDatabase($this->getDatabase());
+            } catch (DatabaseNotFoundException $e) {
+                @trigger_error(sprintf('Database must be set, this will not be caught anymore in 6.0 in %s.', __METHOD__), E_USER_DEPRECATED);
+                $this->installerScript->setDatabase(Factory::getContainer()->get(DatabaseInterface::class));
+            }
+        }
+
         $return = $this->__call($name, $arguments);
 
         // When function doesn't have a return value, assume it succeeded
diff --git a/libraries/src/Installer/Manifest.php b/libraries/src/Installer/Manifest.php
index d05ce1119e575..2350e32ea6b25 100644
--- a/libraries/src/Installer/Manifest.php
+++ b/libraries/src/Installer/Manifest.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Language\Text;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Installer/Manifest/LibraryManifest.php b/libraries/src/Installer/Manifest/LibraryManifest.php
index 1cdc254bf12a8..8851de89cf55e 100644
--- a/libraries/src/Installer/Manifest/LibraryManifest.php
+++ b/libraries/src/Installer/Manifest/LibraryManifest.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Installer\Manifest;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Installer/Manifest/PackageManifest.php b/libraries/src/Installer/Manifest/PackageManifest.php
index f664cb10f2d41..eab6fa036a6b8 100644
--- a/libraries/src/Installer/Manifest/PackageManifest.php
+++ b/libraries/src/Installer/Manifest/PackageManifest.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Installer\Manifest;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Language/Associations.php b/libraries/src/Language/Associations.php
index 87cd1fcf4cd93..34e993e0422a2 100644
--- a/libraries/src/Language/Associations.php
+++ b/libraries/src/Language/Associations.php
@@ -15,7 +15,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Language/Language.php b/libraries/src/Language/Language.php
index e7734c8954def..283333b56d207 100644
--- a/libraries/src/Language/Language.php
+++ b/libraries/src/Language/Language.php
@@ -10,10 +10,11 @@
 namespace Joomla\CMS\Language;
 
 use Joomla\CMS\Factory;
+use Joomla\Language\Language as BaseLanguage;
 use Joomla\String\StringHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -21,7 +22,7 @@
  *
  * @since  1.7.0
  */
-class Language
+class Language extends BaseLanguage
 {
     /**
      * Array of Language objects
@@ -31,70 +32,6 @@ class Language
      */
     protected static $languages = [];
 
-    /**
-     * Debug language, If true, highlights if string isn't found.
-     *
-     * @var    boolean
-     * @since  1.7.0
-     */
-    protected $debug = false;
-
-    /**
-     * The default language, used when a language file in the requested language does not exist.
-     *
-     * @var    string
-     * @since  1.7.0
-     */
-    protected $default = 'en-GB';
-
-    /**
-     * An array of orphaned text.
-     *
-     * @var    array
-     * @since  1.7.0
-     */
-    protected $orphans = [];
-
-    /**
-     * Array holding the language metadata.
-     *
-     * @var    array
-     * @since  1.7.0
-     */
-    protected $metadata = null;
-
-    /**
-     * Array holding the language locale or boolean null if none.
-     *
-     * @var    array|boolean
-     * @since  1.7.0
-     */
-    protected $locale = null;
-
-    /**
-     * The language to load.
-     *
-     * @var    string
-     * @since  1.7.0
-     */
-    protected $lang = null;
-
-    /**
-     * A nested array of language files that have been loaded
-     *
-     * @var    array
-     * @since  1.7.0
-     */
-    protected $paths = [];
-
-    /**
-     * List of language files that are in error state
-     *
-     * @var    array
-     * @since  1.7.0
-     */
-    protected $errorfiles = [];
-
     /**
      * Translations
      *
@@ -103,30 +40,6 @@ class Language
      */
     protected $strings = [];
 
-    /**
-     * An array of used text, used during debugging.
-     *
-     * @var    array
-     * @since  1.7.0
-     */
-    protected $used = [];
-
-    /**
-     * Counter for number of loads.
-     *
-     * @var    integer
-     * @since  1.7.0
-     */
-    protected $counter = 0;
-
-    /**
-     * An array used to store overrides.
-     *
-     * @var    array
-     * @since  1.7.0
-     */
-    protected $override = [];
-
     /**
      * Name of the transliterator function for this language.
      *
@@ -148,6 +61,8 @@ class Language
      *
      * @var    callable
      * @since  1.7.0
+     *
+     * @deprecated  4.4 will be removed in 6.0 without replacement
      */
     protected $ignoredSearchWordsCallback = null;
 
@@ -156,6 +71,8 @@ class Language
      *
      * @var    callable
      * @since  1.7.0
+     *
+     * @deprecated  4.4 will be removed in 6.0 without replacement
      */
     protected $lowerLimitSearchWordCallback = null;
 
@@ -164,6 +81,8 @@ class Language
      *
      * @var    callable
      * @since  1.7.0
+     *
+     * @deprecated  4.4 will be removed in 6.0 without replacement
      */
     protected $upperLimitSearchWordCallback = null;
 
@@ -172,6 +91,8 @@ class Language
      *
      * @var    callable
      * @since  1.7.0
+     *
+     * @deprecated  4.4 will be removed in 6.0 without replacement
      */
     protected $searchDisplayedCharactersNumberCallback = null;
 
@@ -484,6 +405,8 @@ public function setPluralSuffixesCallback(callable $function)
      * @return  array  The array of ignored search words.
      *
      * @since   1.7.0
+     *
+     * @deprecated  4.4 will be removed in 6.0 without replacement
      */
     public function getIgnoredSearchWords()
     {
@@ -500,6 +423,8 @@ public function getIgnoredSearchWords()
      * @return  callable  Function name or the actual function.
      *
      * @since   1.7.0
+     *
+     * @deprecated  4.4 will be removed in 6.0 without replacement
      */
     public function getIgnoredSearchWordsCallback()
     {
@@ -514,6 +439,8 @@ public function getIgnoredSearchWordsCallback()
      * @return  callable  The previous function.
      *
      * @since   1.7.0
+     *
+     * @deprecated  4.4 will be removed in 6.0 without replacement
      */
     public function setIgnoredSearchWordsCallback(callable $function)
     {
@@ -529,6 +456,8 @@ public function setIgnoredSearchWordsCallback(callable $function)
      * @return  integer  The lower limit integer for length of search words (3 if no value was set for a specific language).
      *
      * @since   1.7.0
+     *
+     * @deprecated  4.4 will be removed in 6.0 without replacement
      */
     public function getLowerLimitSearchWord()
     {
@@ -545,6 +474,8 @@ public function getLowerLimitSearchWord()
      * @return  callable  Function name or the actual function.
      *
      * @since   1.7.0
+     *
+     * @deprecated  4.4 will be removed in 6.0 without replacement
      */
     public function getLowerLimitSearchWordCallback()
     {
@@ -559,6 +490,8 @@ public function getLowerLimitSearchWordCallback()
      * @return  callable  The previous function.
      *
      * @since   1.7.0
+     *
+     * @deprecated  4.4 will be removed in 6.0 without replacement
      */
     public function setLowerLimitSearchWordCallback(callable $function)
     {
@@ -574,6 +507,8 @@ public function setLowerLimitSearchWordCallback(callable $function)
      * @return  integer  The upper limit integer for length of search words (200 if no value was set or if default value is < 200).
      *
      * @since   1.7.0
+     *
+     * @deprecated  4.4 will be removed in 6.0 without replacement
      */
     public function getUpperLimitSearchWord()
     {
@@ -590,6 +525,8 @@ public function getUpperLimitSearchWord()
      * @return  callable  Function name or the actual function.
      *
      * @since   1.7.0
+     *
+     * @deprecated  4.4 will be removed in 6.0 without replacement
      */
     public function getUpperLimitSearchWordCallback()
     {
@@ -604,6 +541,8 @@ public function getUpperLimitSearchWordCallback()
      * @return  callable  The previous function.
      *
      * @since   1.7.0
+     *
+     * @deprecated  4.4 will be removed in 6.0 without replacement
      */
     public function setUpperLimitSearchWordCallback(callable $function)
     {
@@ -619,6 +558,8 @@ public function setUpperLimitSearchWordCallback(callable $function)
      * @return  integer  The number of characters displayed (200 if no value was set for a specific language).
      *
      * @since   1.7.0
+     *
+     * @deprecated  4.4 will be removed in 6.0 without replacement
      */
     public function getSearchDisplayedCharactersNumber()
     {
@@ -635,6 +576,8 @@ public function getSearchDisplayedCharactersNumber()
      * @return  callable  Function name or the actual function.
      *
      * @since   1.7.0
+     *
+     * @deprecated  4.4 will be removed in 6.0 without replacement
      */
     public function getSearchDisplayedCharactersNumberCallback()
     {
@@ -649,6 +592,8 @@ public function getSearchDisplayedCharactersNumberCallback()
      * @return  callable  The previous function.
      *
      * @since   1.7.0
+     *
+     * @deprecated  4.4 will be removed in 6.0 without replacement
      */
     public function setSearchDisplayedCharactersNumberCallback(callable $function)
     {
@@ -782,7 +727,7 @@ protected function parse($fileName)
      * @since   3.6.3
      * @throws  \InvalidArgumentException
      */
-    public function debugFile($filename)
+    public function debugFile(string $filename): int
     {
         // Make sure our file actually exists
         if (!is_file($filename)) {
@@ -857,25 +802,6 @@ public function debugFile($filename)
         return \count($errors);
     }
 
-    /**
-     * Get a metadata language property.
-     *
-     * @param   string  $property  The name of the property.
-     * @param   mixed   $default   The default value.
-     *
-     * @return  mixed  The value of the property.
-     *
-     * @since   1.7.0
-     */
-    public function get($property, $default = null)
-    {
-        if (isset($this->metadata[$property])) {
-            return $this->metadata[$property];
-        }
-
-        return $default;
-    }
-
     /**
      * Get a back trace.
      *
@@ -888,59 +814,6 @@ protected function getTrace()
         return \function_exists('debug_backtrace') ? debug_backtrace() : [];
     }
 
-    /**
-     * Determine who called Language or Text.
-     *
-     * @return  array  Caller information.
-     *
-     * @since   1.7.0
-     */
-    protected function getCallerInfo()
-    {
-        // Try to determine the source if none was provided
-        if (!\function_exists('debug_backtrace')) {
-            return;
-        }
-
-        $backtrace = debug_backtrace();
-        $info      = [];
-
-        // Search through the backtrace to our caller
-        $continue = true;
-
-        while ($continue && next($backtrace)) {
-            $step  = current($backtrace);
-            $class = @$step['class'];
-
-            // We're looking for something outside of language.php
-            if ($class != self::class && $class != Text::class) {
-                $info['function'] = @$step['function'];
-                $info['class']    = $class;
-                $info['step']     = prev($backtrace);
-
-                // Determine the file and name of the file
-                $info['file'] = @$step['file'];
-                $info['line'] = @$step['line'];
-
-                $continue = false;
-            }
-        }
-
-        return $info;
-    }
-
-    /**
-     * Getter for Name.
-     *
-     * @return  string  Official name element of the language.
-     *
-     * @since   1.7.0
-     */
-    public function getName()
-    {
-        return $this->metadata['name'];
-    }
-
     /**
      * Get a list of language files that have been loaded.
      *
@@ -963,30 +836,6 @@ public function getPaths($extension = null)
         return $this->paths;
     }
 
-    /**
-     * Get a list of language files that are in error state.
-     *
-     * @return  array
-     *
-     * @since   1.7.0
-     */
-    public function getErrorFiles()
-    {
-        return $this->errorfiles;
-    }
-
-    /**
-     * Getter for the language tag (as defined in RFC 3066)
-     *
-     * @return  string  The language tag.
-     *
-     * @since   1.7.0
-     */
-    public function getTag()
-    {
-        return $this->metadata['tag'];
-    }
-
     /**
      * Getter for the calendar type
      *
@@ -1003,102 +852,6 @@ public function getCalendar()
         }
     }
 
-    /**
-     * Get the RTL property.
-     *
-     * @return  boolean  True is it an RTL language.
-     *
-     * @since   1.7.0
-     */
-    public function isRtl()
-    {
-        return (bool) $this->metadata['rtl'];
-    }
-
-    /**
-     * Set the Debug property.
-     *
-     * @param   boolean  $debug  The debug setting.
-     *
-     * @return  boolean  Previous value.
-     *
-     * @since   1.7.0
-     */
-    public function setDebug($debug)
-    {
-        $previous    = $this->debug;
-        $this->debug = (bool) $debug;
-
-        return $previous;
-    }
-
-    /**
-     * Get the Debug property.
-     *
-     * @return  boolean  True is in debug mode.
-     *
-     * @since   1.7.0
-     */
-    public function getDebug()
-    {
-        return $this->debug;
-    }
-
-    /**
-     * Get the default language code.
-     *
-     * @return  string  Language code.
-     *
-     * @since   1.7.0
-     */
-    public function getDefault()
-    {
-        return $this->default;
-    }
-
-    /**
-     * Set the default language code.
-     *
-     * @param   string  $lang  The language code.
-     *
-     * @return  string  Previous value.
-     *
-     * @since   1.7.0
-     */
-    public function setDefault($lang)
-    {
-        $previous      = $this->default;
-        $this->default = $lang;
-
-        return $previous;
-    }
-
-    /**
-     * Get the list of orphaned strings if being tracked.
-     *
-     * @return  array  Orphaned text.
-     *
-     * @since   1.7.0
-     */
-    public function getOrphans()
-    {
-        return $this->orphans;
-    }
-
-    /**
-     * Get the list of used strings.
-     *
-     * Used strings are those strings requested and found either as a string or a constant.
-     *
-     * @return  array  Used strings.
-     *
-     * @since   1.7.0
-     */
-    public function getUsed()
-    {
-        return $this->used;
-    }
-
     /**
      * Determines is a key exists.
      *
@@ -1116,50 +869,4 @@ public function hasKey($string)
 
         return isset($this->strings[strtoupper($string)]);
     }
-
-    /**
-     * Get the language locale based on current language.
-     *
-     * @return  array  The locale according to the language.
-     *
-     * @since   1.7.0
-     */
-    public function getLocale()
-    {
-        if (!isset($this->locale)) {
-            $locale = str_replace(' ', '', $this->metadata['locale'] ?? '');
-
-            if ($locale) {
-                $this->locale = explode(',', $locale);
-            } else {
-                $this->locale = false;
-            }
-        }
-
-        return $this->locale;
-    }
-
-    /**
-     * Get the first day of the week for this language.
-     *
-     * @return  integer  The first day of the week according to the language
-     *
-     * @since   1.7.0
-     */
-    public function getFirstDay()
-    {
-        return (int) ($this->metadata['firstDay'] ?? 0);
-    }
-
-    /**
-     * Get the weekends days for this language.
-     *
-     * @return  string  The weekend days of the week separated by a comma according to the language
-     *
-     * @since   3.2
-     */
-    public function getWeekEnd()
-    {
-        return $this->metadata['weekEnd'] ?? '0,6';
-    }
 }
diff --git a/libraries/src/Language/LanguageAwareInterface.php b/libraries/src/Language/LanguageAwareInterface.php
new file mode 100644
index 0000000000000..6af9fd23ea884
--- /dev/null
+++ b/libraries/src/Language/LanguageAwareInterface.php
@@ -0,0 +1,33 @@
+<?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\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.
+ *
+ * @since  4.4.0
+ */
+interface LanguageAwareInterface
+{
+    /**
+     * Set the language to use.
+     *
+     * @param   Language  $language  The language to use
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function setLanguage(Language $language): void;
+}
diff --git a/libraries/src/Language/LanguageAwareTrait.php b/libraries/src/Language/LanguageAwareTrait.php
new file mode 100644
index 0000000000000..aa5df7cab2ad7
--- /dev/null
+++ b/libraries/src/Language/LanguageAwareTrait.php
@@ -0,0 +1,61 @@
+<?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\Language;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Defines the trait for a language aware class.
+ *
+ * @since  4.4.0
+ */
+trait LanguageAwareTrait
+{
+    /**
+     * Language
+     *
+     * @var    Language
+     * @since  4.4.0
+     */
+    private $language;
+
+    /**
+     * Get the Language.
+     *
+     * @return  Language
+     *
+     * @since   4.4.0
+     * @throws  \UnexpectedValueException May be thrown if the language has not been set.
+     */
+    protected function getLanguage(): Language
+    {
+        if ($this->language) {
+            return $this->language;
+        }
+
+        throw new \UnexpectedValueException('Language not set in ' . __CLASS__);
+    }
+
+    /**
+     * Set the language to use.
+     *
+     * @param   Language  $language  The language to use
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function setLanguage(Language $language): void
+    {
+        $this->language = $language;
+    }
+}
diff --git a/libraries/src/Language/LanguageHelper.php b/libraries/src/Language/LanguageHelper.php
index 8dba582a12ab2..e5caf6710375e 100644
--- a/libraries/src/Language/LanguageHelper.php
+++ b/libraries/src/Language/LanguageHelper.php
@@ -14,12 +14,13 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Installer\Installer;
 use Joomla\CMS\Log\Log;
+use Joomla\Database\DatabaseInterface;
 use Joomla\Filesystem\File;
 use Joomla\Registry\Registry;
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -161,12 +162,13 @@ public static function getLanguages($key = 'default')
     /**
      * Get a list of installed languages.
      *
-     * @param   integer  $clientId         The client app id.
-     * @param   boolean  $processMetaData  Fetch Language metadata.
-     * @param   boolean  $processManifest  Fetch Language manifest.
-     * @param   string   $pivot            The pivot of the returning array.
-     * @param   string   $orderField       Field to order the results.
-     * @param   string   $orderDirection   Direction to order the results.
+     * @param   integer            $clientId         The client app id.
+     * @param   boolean            $processMetaData  Fetch Language metadata.
+     * @param   boolean            $processManifest  Fetch Language manifest.
+     * @param   string             $pivot            The pivot of the returning array.
+     * @param   string             $orderField       Field to order the results.
+     * @param   string             $orderDirection   Direction to order the results.
+     * @param   DatabaseInterface  $db               Database object to use database queries
      *
      * @return  array  Array with the installed languages.
      *
@@ -178,7 +180,8 @@ public static function getInstalledLanguages(
         $processManifest = false,
         $pivot = 'element',
         $orderField = null,
-        $orderDirection = null
+        $orderDirection = null,
+        DatabaseInterface $db = null
     ) {
         static $installedLanguages = null;
 
@@ -190,7 +193,7 @@ public static function getInstalledLanguages(
             if ($cache->contains('installedlanguages')) {
                 $installedLanguages = $cache->get('installedlanguages');
             } else {
-                $db = Factory::getDbo();
+                $db = $db ?? Factory::getContainer()->get(DatabaseInterface::class);
 
                 $query = $db->getQuery(true)
                     ->select(
diff --git a/libraries/src/Language/Multilanguage.php b/libraries/src/Language/Multilanguage.php
index 02450596a0c45..886094c67c955 100644
--- a/libraries/src/Language/Multilanguage.php
+++ b/libraries/src/Language/Multilanguage.php
@@ -14,7 +14,7 @@
 use Joomla\Database\DatabaseInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Language/Text.php b/libraries/src/Language/Text.php
index 06e787981a525..66ef6a4a2ac8b 100644
--- a/libraries/src/Language/Text.php
+++ b/libraries/src/Language/Text.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\HTML\HTMLHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Language/Transliterate.php b/libraries/src/Language/Transliterate.php
index b3628b3fbcea4..4e785196e174e 100644
--- a/libraries/src/Language/Transliterate.php
+++ b/libraries/src/Language/Transliterate.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Language;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Layout/BaseLayout.php b/libraries/src/Layout/BaseLayout.php
index 212a6e40e574d..9aedf61199518 100644
--- a/libraries/src/Layout/BaseLayout.php
+++ b/libraries/src/Layout/BaseLayout.php
@@ -12,7 +12,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Layout/FileLayout.php b/libraries/src/Layout/FileLayout.php
index ce4f4567e23d3..0588420bec156 100644
--- a/libraries/src/Layout/FileLayout.php
+++ b/libraries/src/Layout/FileLayout.php
@@ -12,16 +12,16 @@
 use Joomla\CMS\Application\ApplicationHelper;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Version;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
  * Base class for rendering a display layout
- * loaded from from a layout file
+ * loaded from a layout file
  *
  * @link   https://docs.joomla.org/Special:MyLanguage/Sharing_layouts_across_views_or_extensions_with_JLayout
  * @since  3.0
diff --git a/libraries/src/Layout/LayoutHelper.php b/libraries/src/Layout/LayoutHelper.php
index 4cb5d61ec6e14..bd6c28c71dbfa 100644
--- a/libraries/src/Layout/LayoutHelper.php
+++ b/libraries/src/Layout/LayoutHelper.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Layout;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Layout/LayoutInterface.php b/libraries/src/Layout/LayoutInterface.php
index cddee9d9b27a9..1a06f4765536d 100644
--- a/libraries/src/Layout/LayoutInterface.php
+++ b/libraries/src/Layout/LayoutInterface.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Layout;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Log/DelegatingPsrLogger.php b/libraries/src/Log/DelegatingPsrLogger.php
index 0ed20a0ab9096..8a57ffb5a7ade 100644
--- a/libraries/src/Log/DelegatingPsrLogger.php
+++ b/libraries/src/Log/DelegatingPsrLogger.php
@@ -14,7 +14,7 @@
 use Psr\Log\LogLevel;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Log/Log.php b/libraries/src/Log/Log.php
index 2bd6da9febbcb..69e3d1f47e445 100644
--- a/libraries/src/Log/Log.php
+++ b/libraries/src/Log/Log.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Log;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Log/LogEntry.php b/libraries/src/Log/LogEntry.php
index 5cf09e35b1467..7c28aaa615bf0 100644
--- a/libraries/src/Log/LogEntry.php
+++ b/libraries/src/Log/LogEntry.php
@@ -10,10 +10,10 @@
 namespace Joomla\CMS\Log;
 
 use Joomla\CMS\Date\Date;
-use Joomla\CMS\Filesystem\Path;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Log/Logger.php b/libraries/src/Log/Logger.php
index 3d94d4e581c9b..11de42cec4068 100644
--- a/libraries/src/Log/Logger.php
+++ b/libraries/src/Log/Logger.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Log;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Log/Logger/CallbackLogger.php b/libraries/src/Log/Logger/CallbackLogger.php
index 4cb39f37076ff..20b26b328d6a8 100644
--- a/libraries/src/Log/Logger/CallbackLogger.php
+++ b/libraries/src/Log/Logger/CallbackLogger.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Log\Logger;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Log/Logger/DatabaseLogger.php b/libraries/src/Log/Logger/DatabaseLogger.php
index f3de4ff953eae..eee2dd67f7865 100644
--- a/libraries/src/Log/Logger/DatabaseLogger.php
+++ b/libraries/src/Log/Logger/DatabaseLogger.php
@@ -15,7 +15,7 @@
 use Joomla\Database\DatabaseDriver;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Log/Logger/EchoLogger.php b/libraries/src/Log/Logger/EchoLogger.php
index 8a2032e4c90dc..09855b4373b87 100644
--- a/libraries/src/Log/Logger/EchoLogger.php
+++ b/libraries/src/Log/Logger/EchoLogger.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Log\Logger;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Log/Logger/FormattedtextLogger.php b/libraries/src/Log/Logger/FormattedtextLogger.php
index d513fbf8515fe..a74fb082e641e 100644
--- a/libraries/src/Log/Logger/FormattedtextLogger.php
+++ b/libraries/src/Log/Logger/FormattedtextLogger.php
@@ -18,7 +18,7 @@
 use Joomla\Utilities\IpHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Log/Logger/InMemoryLogger.php b/libraries/src/Log/Logger/InMemoryLogger.php
index 243c9af0b594c..86fc1b508c414 100644
--- a/libraries/src/Log/Logger/InMemoryLogger.php
+++ b/libraries/src/Log/Logger/InMemoryLogger.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Log\Logger;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Log/Logger/MessagequeueLogger.php b/libraries/src/Log/Logger/MessagequeueLogger.php
index 0eb394b8a1aff..6c17f2477fb43 100644
--- a/libraries/src/Log/Logger/MessagequeueLogger.php
+++ b/libraries/src/Log/Logger/MessagequeueLogger.php
@@ -15,7 +15,7 @@
 use Joomla\CMS\Log\Logger;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Log/Logger/SyslogLogger.php b/libraries/src/Log/Logger/SyslogLogger.php
index 7946d2b44ad94..bcd10ac8834dc 100644
--- a/libraries/src/Log/Logger/SyslogLogger.php
+++ b/libraries/src/Log/Logger/SyslogLogger.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Log\Logger;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Log/Logger/W3cLogger.php b/libraries/src/Log/Logger/W3cLogger.php
index e95467091b670..65e7c2a3758d9 100644
--- a/libraries/src/Log/Logger/W3cLogger.php
+++ b/libraries/src/Log/Logger/W3cLogger.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Log\Logger;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Log/LoggerRegistry.php b/libraries/src/Log/LoggerRegistry.php
index d5f17e43feb2d..3c56600d7310c 100644
--- a/libraries/src/Log/LoggerRegistry.php
+++ b/libraries/src/Log/LoggerRegistry.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Log;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/MVC/Controller/AdminController.php b/libraries/src/MVC/Controller/AdminController.php
index ebc47b6c87567..8a0f306cdd0c6 100644
--- a/libraries/src/MVC/Controller/AdminController.php
+++ b/libraries/src/MVC/Controller/AdminController.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\CMS\MVC\Controller;
 
-use Joomla\CMS\Application\CMSApplication;
+use Joomla\CMS\Application\CMSWebApplicationInterface;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
@@ -20,7 +20,7 @@
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -33,6 +33,14 @@
  */
 class AdminController extends BaseController
 {
+    /**
+     * The Application. Redeclared to show this class requires a web application.
+     *
+     * @var    CMSWebApplicationInterface
+     * @since  __DEPLOY_VERSION__
+     */
+    protected $app;
+
     /**
      * The URL option for the component.
      *
@@ -60,16 +68,17 @@ class AdminController extends BaseController
     /**
      * 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).
-     * @param   ?MVCFactoryInterface  $factory  The factory.
-     * @param   ?CMSApplication       $app      The Application for the dispatcher
-     * @param   ?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   ?CMSWebApplicationInterface  $app      The Application for the dispatcher
+     * @param   ?Input                       $input    The Input object for the request
      *
      * @since   3.0
      */
-    public function __construct($config = [], MVCFactoryInterface $factory = null, ?CMSApplication $app = null, ?Input $input = null)
+    public function __construct($config = [], MVCFactoryInterface $factory = null, ?CMSWebApplicationInterface $app = null, ?Input $input = null)
     {
         parent::__construct($config, $factory, $app, $input);
 
@@ -134,7 +143,7 @@ public function delete()
         $cid = array_filter($cid);
 
         if (empty($cid)) {
-            $this->app->getLogger()->warning(Text::_($this->text_prefix . '_NO_ITEM_SELECTED'), ['category' => 'jerror']);
+            $this->getLogger()->warning(Text::_($this->text_prefix . '_NO_ITEM_SELECTED'), ['category' => 'jerror']);
         } else {
             // Get the model.
             $model = $this->getModel();
@@ -196,7 +205,7 @@ public function publish()
         $cid = array_filter($cid);
 
         if (empty($cid)) {
-            $this->app->getLogger()->warning(Text::_($this->text_prefix . '_NO_ITEM_SELECTED'), ['category' => 'jerror']);
+            $this->getLogger()->warning(Text::_($this->text_prefix . '_NO_ITEM_SELECTED'), ['category' => 'jerror']);
         } else {
             // Get the model.
             $model = $this->getModel();
@@ -209,7 +218,10 @@ public function publish()
 
                 if ($value === 1) {
                     if ($errors) {
-                        $this->app->enqueueMessage(Text::plural($this->text_prefix . '_N_ITEMS_FAILED_PUBLISHING', \count($cid)), 'error');
+                        $this->app->enqueueMessage(
+                            Text::plural($this->text_prefix . '_N_ITEMS_FAILED_PUBLISHING', \count($cid)),
+                            CMSWebApplicationInterface::MSG_ERROR
+                        );
                     } else {
                         $ntext = $this->text_prefix . '_N_ITEMS_PUBLISHED';
                     }
diff --git a/libraries/src/MVC/Controller/ApiController.php b/libraries/src/MVC/Controller/ApiController.php
index e040e6ad205f4..c73f7226d4207 100644
--- a/libraries/src/MVC/Controller/ApiController.php
+++ b/libraries/src/MVC/Controller/ApiController.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\MVC\Controller;
 
 use Joomla\CMS\Access\Exception\NotAllowed;
-use Joomla\CMS\Application\CMSApplication;
+use Joomla\CMS\Application\CMSWebApplicationInterface;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Text;
@@ -23,7 +23,7 @@
 use Tobscure\JsonApi\Exception\InvalidParameterException;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -36,6 +36,14 @@
  */
 class ApiController extends BaseController
 {
+    /**
+     * The Application. Redeclared to show this class requires a web application.
+     *
+     * @var    CMSWebApplicationInterface
+     * @since  __DEPLOY_VERSION__
+     */
+    protected $app;
+
     /**
      * The content type of the item.
      *
@@ -78,24 +86,25 @@ class ApiController extends BaseController
     /**
      * The model state to inject
      *
-     * @var  CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $modelState;
 
     /**
      * 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).
-     * @param   ?MVCFactoryInterface  $factory  The factory.
-     * @param   ?CMSApplication       $app      The Application for the dispatcher
-     * @param   ?Input                $input    Input
+     * @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   ?CMSWebApplicationInterface  $app      The Application for the dispatcher
+     * @param   ?Input                       $input    Input
      *
-     * @since   4.0.0
      * @throws  \Exception
+     * @since   4.0.0
      */
-    public function __construct($config = [], MVCFactoryInterface $factory = null, ?CMSApplication $app = null, ?Input $input = null)
+    public function __construct($config = [], MVCFactoryInterface $factory = null, ?CMSWebApplicationInterface $app = null, ?Input $input = null)
     {
         $this->modelState = new CMSObject();
 
diff --git a/libraries/src/MVC/Controller/BaseController.php b/libraries/src/MVC/Controller/BaseController.php
index 9cd07059ab231..5cdf9a504a4db 100644
--- a/libraries/src/MVC/Controller/BaseController.php
+++ b/libraries/src/MVC/Controller/BaseController.php
@@ -9,11 +9,14 @@
 
 namespace Joomla\CMS\MVC\Controller;
 
-use Joomla\CMS\Application\CMSApplication;
+use Joomla\Application\AbstractApplication;
+use Joomla\CMS\Application\CMSApplicationInterface;
+use Joomla\CMS\Application\CMSWebApplicationInterface;
 use Joomla\CMS\Cache\Exception\CacheExceptionInterface;
+use Joomla\CMS\Document\DocumentAwareInterface;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Filter\InputFilter;
+use Joomla\CMS\Language\LanguageAwareInterface;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\MVC\Factory\LegacyFactory;
@@ -26,10 +29,16 @@
 use Joomla\CMS\User\CurrentUserInterface;
 use Joomla\Event\DispatcherAwareInterface;
 use Joomla\Event\DispatcherAwareTrait;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Filesystem\Path;
 use Joomla\Input\Input;
+use Psr\Log\LoggerAwareInterface;
+use Psr\Log\LoggerAwareTrait;
+use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -40,8 +49,9 @@
  *
  * @since  2.5.5
  */
-class BaseController implements ControllerInterface, DispatcherAwareInterface
+class BaseController implements ControllerInterface, DispatcherAwareInterface, LoggerAwareInterface
 {
+    use LoggerAwareTrait;
     use DispatcherAwareTrait;
 
     /**
@@ -175,7 +185,7 @@ class BaseController implements ControllerInterface, DispatcherAwareInterface
     /**
      * The Application
      *
-     * @var    CMSApplication|null
+     * @var    CMSApplicationInterface
      * @since  4.0.0
      */
     protected $app;
@@ -345,16 +355,17 @@ public static function getInstance($prefix, $config = [])
     /**
      * 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).
-     * @param   ?MVCFactoryInterface  $factory  The factory.
-     * @param   ?CMSApplication       $app      The Application for the dispatcher
-     * @param   ?Input                $input    Input
+     * @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   ?CMSApplicationInterface  $app      The Application for the dispatcher
+     * @param   ?Input                    $input    Input
      *
      * @since   3.0
      */
-    public function __construct($config = [], MVCFactoryInterface $factory = null, ?CMSApplication $app = null, ?Input $input = null)
+    public function __construct($config = [], MVCFactoryInterface $factory = null, ?CMSApplicationInterface $app = null, ?Input $input = null)
     {
         $this->methods     = [];
         $this->message     = null;
@@ -366,6 +377,15 @@ public function __construct($config = [], MVCFactoryInterface $factory = null, ?
         $this->app   = $app ?: Factory::getApplication();
         $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
+         *             removed and instead the logger should be injected by the MVCFactory using
+         *             BaseController::setLogger()
+         */
+        if ($this->app instanceof AbstractApplication) {
+            $this->setLogger($this->app->getLogger());
+        }
+
         if (\defined('JDEBUG') && JDEBUG) {
             Log::addLogger(['text_file' => 'jcontroller.log.php'], Log::ALL, ['controller']);
         }
@@ -454,7 +474,7 @@ public function __construct($config = [], MVCFactoryInterface $factory = null, ?
      * @param   string  $type  The path type (e.g. 'model', 'view').
      * @param   mixed   $path  The directory string  or stream array to search.
      *
-     * @return  static  A \JControllerLegacy object to support chaining.
+     * @return  static  A BaseController object to support chaining.
      *
      * @since   3.0
      */
@@ -502,13 +522,24 @@ public function addViewPath($path)
      */
     protected function checkEditId($context, $id)
     {
+        if (!($this->app instanceof CMSWebApplicationInterface)) {
+            throw new \Exception(
+                sprintf(
+                    'The %s method requires an instance of %s but instead %s was supplied',
+                    __METHOD__,
+                    CMSWebApplicationInterface::class,
+                    get_class($this->app)
+                )
+            );
+        }
+
         if ($id) {
             $values = (array) $this->app->getUserState($context . '.id');
 
             $result = \in_array((int) $id, $values);
 
             if (\defined('JDEBUG') && JDEBUG) {
-                $this->app->getLogger()->info(
+                $this->getLogger()->info(
                     sprintf(
                         'Checking edit ID %s.%s: %d %s',
                         $context,
@@ -581,6 +612,10 @@ protected function createView($name, $prefix = '', $type = '', $config = [])
             $view->setCurrentUser($this->app->getIdentity());
         }
 
+        if ($view instanceof LanguageAwareInterface && $this->app->getLanguage()) {
+            $view->setLanguage($this->app->getLanguage());
+        }
+
         return $view;
     }
 
@@ -591,7 +626,8 @@ protected function createView($name, $prefix = '', $type = '', $config = [])
      * you will need to override it in your own controllers.
      *
      * @param   boolean  $cachable   If true, the view output will be cached
-     * @param   array    $urlparams  An array of safe url parameters and their variable types, for valid values see {@link InputFilter::clean()}.
+     * @param   array    $urlparams  An array of safe url parameters and their variable types.
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      *
      * @return  static  A \JControllerLegacy object to support chaining.
      *
@@ -600,6 +636,17 @@ protected function createView($name, $prefix = '', $type = '', $config = [])
      */
     public function display($cachable = false, $urlparams = [])
     {
+        if (!($this->app instanceof CMSWebApplicationInterface)) {
+            throw new \Exception(
+                sprintf(
+                    'The %s method requires an instance of %s but instead %s was supplied',
+                    __METHOD__,
+                    CMSWebApplicationInterface::class,
+                    get_class($this->app)
+                )
+            );
+        }
+
         $document   = $this->app->getDocument();
         $viewType   = $document->getType();
         $viewName   = $this->input->get('view', $this->default_view);
@@ -610,7 +657,15 @@ public function display($cachable = false, $urlparams = [])
         // Set models for the View
         $this->prepareViewModel($view);
 
-        $view->document = $document;
+        if ($view instanceof DocumentAwareInterface && $document) {
+            $view->setDocument($this->app->getDocument());
+        } else {
+            @trigger_error(
+                'View should implement document aware interface.',
+                E_USER_DEPRECATED
+            );
+            $view->document = $document;
+        }
 
         // Display the view
         if ($cachable && $viewType !== 'feed' && $this->app->get('caching') >= 1) {
@@ -713,14 +768,21 @@ public function getModel($name = '', $prefix = '', $config = [])
                 return $model;
             }
 
-            // Let's get the application object and set menu information if it's available
-            $menu = $this->app->getMenu();
+            if ($this->app instanceof CMSWebApplicationInterface) {
+                // Let's get the application object and set menu information if it's available
+                $menu = $this->app->getMenu();
+
+                if (\is_object($menu) && $item = $menu->getActive()) {
+                    // Let's get the application object and set menu information if it's available
+                    $menu = $this->app->getMenu();
 
-            if (\is_object($menu) && $item = $menu->getActive()) {
-                $params = $menu->getParams($item->id);
+                    if (\is_object($menu) && $item = $menu->getActive()) {
+                        $params = $menu->getParams($item->id);
 
-                // Set default state data
-                $model->setState('parameters.menu', $params);
+                        // Set default state data
+                        $model->setState('parameters.menu', $params);
+                    }
+                }
             }
         }
 
@@ -832,9 +894,21 @@ public function getView($name = '', $type = '', $prefix = '', $config = [])
      * @return  void
      *
      * @since   3.0
+     * @throws  \Exception
      */
     protected function holdEditId($context, $id)
     {
+        if (!($this->app instanceof CMSWebApplicationInterface)) {
+            throw new \Exception(
+                sprintf(
+                    'The %s method requires an instance of %s but instead %s was supplied',
+                    __METHOD__,
+                    CMSWebApplicationInterface::class,
+                    get_class($this->app)
+                )
+            );
+        }
+
         $values = (array) $this->app->getUserState($context . '.id');
 
         // Add the id to the list if non-zero.
@@ -844,7 +918,7 @@ protected function holdEditId($context, $id)
             $this->app->setUserState($context . '.id', $values);
 
             if (\defined('JDEBUG') && JDEBUG) {
-                $this->app->getLogger()->info(
+                $this->getLogger()->info(
                     sprintf(
                         'Holding edit ID %s.%s %s',
                         $context,
@@ -863,9 +937,21 @@ protected function holdEditId($context, $id)
      * @return  boolean  False if no redirect exists.
      *
      * @since   3.0
+     * @throws  \Exception
      */
     public function redirect()
     {
+        if (!($this->app instanceof CMSWebApplicationInterface)) {
+            throw new \Exception(
+                sprintf(
+                    'The %s method requires an instance of %s but instead %s was supplied',
+                    __METHOD__,
+                    CMSWebApplicationInterface::class,
+                    get_class($this->app)
+                )
+            );
+        }
+
         if ($this->redirect) {
             // Enqueue the redirect message
             $this->app->enqueueMessage($this->message, $this->messageType);
@@ -937,9 +1023,21 @@ public function unregisterTask($task)
      * @return  void
      *
      * @since   3.0
+     * @throws  \Exception
      */
     protected function releaseEditId($context, $id)
     {
+        if (!($this->app instanceof CMSWebApplicationInterface)) {
+            throw new \Exception(
+                sprintf(
+                    'The %s method requires an instance of %s but instead %s was supplied',
+                    __METHOD__,
+                    CMSWebApplicationInterface::class,
+                    get_class($this->app)
+                )
+            );
+        }
+
         $values = (array) $this->app->getUserState($context . '.id');
 
         // Do a strict search of the edit list values.
@@ -950,7 +1048,7 @@ protected function releaseEditId($context, $id)
             $this->app->setUserState($context . '.id', $values);
 
             if (\defined('JDEBUG') && JDEBUG) {
-                $this->app->getLogger()->info(
+                $this->getLogger()->info(
                     sprintf(
                         'Releasing edit ID %s.%s %s',
                         $context,
@@ -963,6 +1061,23 @@ protected function releaseEditId($context, $id)
         }
     }
 
+    /**
+     * Get the logger.
+     *
+     * @return  LoggerInterface
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    protected function getLogger()
+    {
+        // If a logger hasn't been set, use NullLogger
+        if (!($this->logger instanceof LoggerInterface)) {
+            $this->setLogger(new NullLogger());
+        }
+
+        return $this->logger;
+    }
+
     /**
      * Sets the internal message that is passed with a redirect
      *
@@ -1012,10 +1127,22 @@ protected function setPath($type, $path)
      * @return  boolean  True if found and valid, otherwise return false or redirect to referrer page.
      *
      * @since   3.7.0
+     * @throws  \Exception
      * @see     Session::checkToken()
      */
     public function checkToken($method = 'post', $redirect = true)
     {
+        if (!($this->app instanceof CMSWebApplicationInterface)) {
+            throw new \Exception(
+                sprintf(
+                    'The %s method requires an instance of %s but instead %s was supplied',
+                    __METHOD__,
+                    CMSWebApplicationInterface::class,
+                    get_class($this->app)
+                )
+            );
+        }
+
         $valid = Session::checkToken($method);
 
         if (!$valid && $redirect) {
@@ -1025,7 +1152,7 @@ public function checkToken($method = 'post', $redirect = true)
                 $referrer = 'index.php';
             }
 
-            $this->app->enqueueMessage(Text::_('JINVALID_TOKEN_NOTICE'), 'warning');
+            $this->app->enqueueMessage(Text::_('JINVALID_TOKEN_NOTICE'), CMSWebApplicationInterface::MSG_WARNING);
             $this->app->redirect($referrer);
         }
 
@@ -1077,7 +1204,7 @@ public function setRedirect($url, $msg = null, $type = null)
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   5.0.0
      */
     protected function prepareViewModel(ViewInterface $view)
     {
@@ -1093,4 +1220,29 @@ protected function prepareViewModel(ViewInterface $view)
             $view->setModel($model, true);
         }
     }
+
+    /**
+     * Get the event dispatcher.
+     *
+     * The override was made to keep a backward compatibility for legacy component.
+     * TODO: Remove the override in 6.0
+     *
+     * @return  DispatcherInterface
+     *
+     * @since   4.4.0
+     * @throws  \UnexpectedValueException May be thrown if the dispatcher has not been set.
+     */
+    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__),
+                E_USER_DEPRECATED
+            );
+
+            return $this->app->getDispatcher();
+        }
+
+        return $this->dispatcher;
+    }
 }
diff --git a/libraries/src/MVC/Controller/ControllerInterface.php b/libraries/src/MVC/Controller/ControllerInterface.php
index 0ed8ae7754d46..c6204b57f961c 100644
--- a/libraries/src/MVC/Controller/ControllerInterface.php
+++ b/libraries/src/MVC/Controller/ControllerInterface.php
@@ -4,13 +4,13 @@
  * Joomla! Content Management System
  *
  * @copyright   (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\MVC\Controller;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/MVC/Controller/Exception/CheckinCheckout.php b/libraries/src/MVC/Controller/Exception/CheckinCheckout.php
index e6399a1b5d831..775091df24988 100644
--- a/libraries/src/MVC/Controller/Exception/CheckinCheckout.php
+++ b/libraries/src/MVC/Controller/Exception/CheckinCheckout.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\MVC\Controller\Exception;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/MVC/Controller/Exception/ResourceNotFound.php b/libraries/src/MVC/Controller/Exception/ResourceNotFound.php
index e1e3b87b62665..8e9f8c477445a 100644
--- a/libraries/src/MVC/Controller/Exception/ResourceNotFound.php
+++ b/libraries/src/MVC/Controller/Exception/ResourceNotFound.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\MVC\Controller\Exception;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/MVC/Controller/Exception/Save.php b/libraries/src/MVC/Controller/Exception/Save.php
index 30f5db09ad6d1..a49900e2d5486 100644
--- a/libraries/src/MVC/Controller/Exception/Save.php
+++ b/libraries/src/MVC/Controller/Exception/Save.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\MVC\Controller\Exception;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/MVC/Controller/Exception/SendEmail.php b/libraries/src/MVC/Controller/Exception/SendEmail.php
index 81cd516f23da8..c729a9ee1a423 100644
--- a/libraries/src/MVC/Controller/Exception/SendEmail.php
+++ b/libraries/src/MVC/Controller/Exception/SendEmail.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\MVC\Controller\Exception;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/MVC/Controller/FormController.php b/libraries/src/MVC/Controller/FormController.php
index fe0ea99859e84..f6c8b886ff0c1 100644
--- a/libraries/src/MVC/Controller/FormController.php
+++ b/libraries/src/MVC/Controller/FormController.php
@@ -9,8 +9,10 @@
 
 namespace Joomla\CMS\MVC\Controller;
 
-use Joomla\CMS\Application\CMSApplication;
+use Doctrine\Inflector\InflectorFactory;
+use Joomla\CMS\Application\CMSWebApplicationInterface;
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Event\Model;
 use Joomla\CMS\Form\FormFactoryAwareInterface;
 use Joomla\CMS\Form\FormFactoryAwareTrait;
 use Joomla\CMS\Form\FormFactoryInterface;
@@ -22,7 +24,7 @@
 use Joomla\Input\Input;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -35,6 +37,14 @@ class FormController extends BaseController implements FormFactoryAwareInterface
 {
     use FormFactoryAwareTrait;
 
+    /**
+     * The Application. Redeclared to show this class requires a web application.
+     *
+     * @var    CMSWebApplicationInterface
+     * @since  __DEPLOY_VERSION__
+     */
+    protected $app;
+
     /**
      * The context for storing internal data, e.g. record.
      *
@@ -78,20 +88,21 @@ class FormController extends BaseController implements FormFactoryAwareInterface
     /**
      * 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).
-     * @param   ?MVCFactoryInterface   $factory      The factory.
-     * @param   ?CMSApplication        $app          The Application for the dispatcher
-     * @param   ?Input                 $input        Input
-     * @param   ?FormFactoryInterface  $formFactory  The form factory.
+     * @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   ?CMSWebApplicationInterface  $app          The Application for the dispatcher
+     * @param   ?Input                       $input        Input
+     * @param   ?FormFactoryInterface        $formFactory  The form factory.
      *
      * @since   3.0
      */
     public function __construct(
         $config = [],
         MVCFactoryInterface $factory = null,
-        ?CMSApplication $app = null,
+        ?CMSWebApplicationInterface $app = null,
         ?Input $input = null,
         FormFactoryInterface $formFactory = null
     ) {
@@ -133,7 +144,7 @@ public function __construct(
 
         // Guess the list view as the plural of the item view.
         if (empty($this->view_list)) {
-            $this->view_list = \Joomla\String\Inflector::getInstance()->toPlural($this->view_item);
+            $this->view_list = InflectorFactory::create()->build()->pluralize($this->view_item);
         }
 
         $this->setFormFactory($formFactory);
@@ -538,7 +549,6 @@ public function save($key = null, $urlVar = null)
         // Check for request forgeries.
         $this->checkToken();
 
-        $app     = $this->app;
         $model   = $this->getModel();
         $table   = $model->getTable();
         $data    = $this->input->post->get('jform', [], 'array');
@@ -605,16 +615,20 @@ public function save($key = null, $urlVar = null)
         $form = $model->getForm($data, false);
 
         if (!$form) {
-            $app->enqueueMessage($model->getError(), 'error');
+            $this->app->enqueueMessage($model->getError(), CMSWebApplicationInterface::MSG_ERROR);
 
             return false;
         }
 
         // Send an object which can be modified through the plugin event
         $objData = (object) $data;
-        $app->triggerEvent(
+        $this->getDispatcher()->dispatch(
             'onContentNormaliseRequestData',
-            [$this->option . '.' . $this->context, $objData, $form]
+            new Model\NormaliseRequestDataEvent('onContentNormaliseRequestData', [
+                'context' => $this->option . '.' . $this->context,
+                'data'    => $objData,
+                'subject' => $form,
+            ])
         );
         $data = (array) $objData;
 
@@ -629,9 +643,9 @@ public function save($key = null, $urlVar = null)
             // 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) {
-                    $app->enqueueMessage($errors[$i]->getMessage(), 'warning');
+                    $this->app->enqueueMessage($errors[$i]->getMessage(), CMSWebApplicationInterface::MSG_WARNING);
                 } else {
-                    $app->enqueueMessage($errors[$i], 'warning');
+                    $this->app->enqueueMessage($errors[$i], CMSWebApplicationInterface::MSG_WARNING);
                 }
             }
 
@@ -653,7 +667,7 @@ public function save($key = null, $urlVar = null)
             }
 
             // Save the data in the session.
-            $app->setUserState($context . '.data', $data);
+            $this->app->setUserState($context . '.data', $data);
 
             // Redirect back to the edit screen.
             $this->setRedirect(
@@ -674,7 +688,7 @@ public function save($key = null, $urlVar = null)
         // Attempt to save the data.
         if (!$model->save($validData)) {
             // Save the data in the session.
-            $app->setUserState($context . '.data', $validData);
+            $this->app->setUserState($context . '.data', $validData);
 
             // Redirect back to the edit screen.
             $this->setMessage(Text::sprintf('JLIB_APPLICATION_ERROR_SAVE_FAILED', $model->getError()), 'error');
@@ -693,7 +707,7 @@ public function save($key = null, $urlVar = null)
         // Save succeeded, so check-in the record.
         if ($checkin && $model->checkin($validData[$key]) === false) {
             // Save the data in the session.
-            $app->setUserState($context . '.data', $validData);
+            $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');
@@ -709,10 +723,10 @@ public function save($key = null, $urlVar = null)
             return false;
         }
 
-        $langKey = $this->text_prefix . ($recordId === 0 && $app->isClient('site') ? '_SUBMIT' : '') . '_SAVE_SUCCESS';
+        $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 && $app->isClient('site') ? '_SUBMIT' : '') . '_SAVE_SUCCESS'));
+        $this->setMessage(Text::_($prefix . ($recordId === 0 && $this->app->isClient('site') ? '_SUBMIT' : '') . '_SAVE_SUCCESS'));
 
         // Redirect the user and adjust session state based on the chosen task.
         switch ($task) {
@@ -720,7 +734,7 @@ public function save($key = null, $urlVar = null)
                 // Set the record data in the session.
                 $recordId = $model->getState($model->getName() . '.id');
                 $this->holdEditId($context, $recordId);
-                $app->setUserState($context . '.data', null);
+                $this->app->setUserState($context . '.data', null);
                 $model->checkout($recordId);
 
                 // Redirect back to the edit screen.
@@ -736,7 +750,7 @@ public function save($key = null, $urlVar = null)
             case 'save2new':
                 // Clear the record id and data from the session.
                 $this->releaseEditId($context, $recordId);
-                $app->setUserState($context . '.data', null);
+                $this->app->setUserState($context . '.data', null);
 
                 // Redirect back to the edit screen.
                 $this->setRedirect(
@@ -751,7 +765,7 @@ public function save($key = null, $urlVar = null)
             default:
                 // Clear the record id and data from the session.
                 $this->releaseEditId($context, $recordId);
-                $app->setUserState($context . '.data', null);
+                $this->app->setUserState($context . '.data', null);
 
                 $url = 'index.php?option=' . $this->option . '&view=' . $this->view_list
                     . $this->getRedirectToListAppend();
@@ -789,7 +803,6 @@ public function reload($key = null, $urlVar = null)
         // Check for request forgeries.
         $this->checkToken();
 
-        $app     = $this->app;
         $model   = $this->getModel();
         $data    = $this->input->post->get('jform', [], 'array');
 
@@ -854,7 +867,7 @@ public function reload($key = null, $urlVar = null)
         }
 
         // Save the data in the session.
-        $app->setUserState($this->option . '.edit.' . $this->context . '.data', $data);
+        $this->app->setUserState($this->option . '.edit.' . $this->context . '.data', $data);
 
         $this->setRedirect($redirectUrl);
         $this->redirect();
@@ -873,11 +886,9 @@ public function reload($key = null, $urlVar = null)
     public function editAssociations()
     {
         // Initialise variables.
-        $app   = $this->app;
-        $input = $app->getInput();
         $model = $this->getModel();
+        $data  = $this->input->get('jform', [], 'array');
 
-        $data = $input->get('jform', [], 'array');
         $model->editAssociations($data);
     }
 }
diff --git a/libraries/src/MVC/Factory/ApiMVCFactory.php b/libraries/src/MVC/Factory/ApiMVCFactory.php
index 21893ad8722a6..2f4a7f5fed81c 100644
--- a/libraries/src/MVC/Factory/ApiMVCFactory.php
+++ b/libraries/src/MVC/Factory/ApiMVCFactory.php
@@ -4,13 +4,13 @@
  * 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
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\MVC\Factory;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/MVC/Factory/LegacyFactory.php b/libraries/src/MVC/Factory/LegacyFactory.php
index 00a4ee090d94c..712211c867951 100644
--- a/libraries/src/MVC/Factory/LegacyFactory.php
+++ b/libraries/src/MVC/Factory/LegacyFactory.php
@@ -4,22 +4,22 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2017 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\MVC\Factory;
 
 use Joomla\CMS\Application\CMSApplicationInterface;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 use Joomla\CMS\MVC\Model\ModelInterface;
 use Joomla\CMS\Table\Table;
+use Joomla\Filesystem\Path;
 use Joomla\Input\Input;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/MVC/Factory/MVCFactory.php b/libraries/src/MVC/Factory/MVCFactory.php
index d1b218244b432..b2de886101c90 100644
--- a/libraries/src/MVC/Factory/MVCFactory.php
+++ b/libraries/src/MVC/Factory/MVCFactory.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2017 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\MVC\Factory;
@@ -15,9 +15,13 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\FormFactoryAwareInterface;
 use Joomla\CMS\Form\FormFactoryAwareTrait;
+use Joomla\CMS\Mail\MailerFactoryAwareInterface;
+use Joomla\CMS\Mail\MailerFactoryAwareTrait;
 use Joomla\CMS\MVC\Model\ModelInterface;
 use Joomla\CMS\Router\SiteRouterAwareInterface;
 use Joomla\CMS\Router\SiteRouterAwareTrait;
+use Joomla\CMS\User\UserFactoryAwareInterface;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\Database\DatabaseAwareInterface;
 use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Database\DatabaseInterface;
@@ -25,9 +29,11 @@
 use Joomla\Event\DispatcherAwareInterface;
 use Joomla\Event\DispatcherAwareTrait;
 use Joomla\Input\Input;
+use Psr\Log\LoggerAwareInterface;
+use Psr\Log\LoggerInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -35,13 +41,15 @@
  *
  * @since  3.10.0
  */
-class MVCFactory implements MVCFactoryInterface, FormFactoryAwareInterface, SiteRouterAwareInterface
+class MVCFactory implements MVCFactoryInterface, FormFactoryAwareInterface, SiteRouterAwareInterface, UserFactoryAwareInterface, MailerFactoryAwareInterface
 {
     use FormFactoryAwareTrait;
     use DispatcherAwareTrait;
     use DatabaseAwareTrait;
     use SiteRouterAwareTrait;
     use CacheControllerFactoryAwareTrait;
+    use UserFactoryAwareTrait;
+    use MailerFactoryAwareTrait;
 
     /**
      * The namespace to create the objects from.
@@ -51,17 +59,27 @@ class MVCFactory implements MVCFactoryInterface, FormFactoryAwareInterface, Site
      */
     private $namespace;
 
+    /**
+     * The namespace to create the objects from.
+     *
+     * @var    LoggerInterface
+     * @since  4.0.0
+     */
+    private $logger;
+
     /**
      * The namespace must be like:
      * Joomla\Component\Content
      *
-     * @param   string  $namespace  The namespace
+     * @param   string                $namespace  The namespace
+     * @param   LoggerInterface|null  $logger     A logging instance to inject into the controller if required
      *
      * @since   4.0.0
      */
-    public function __construct($namespace)
+    public function __construct($namespace, LoggerInterface $logger = null)
     {
         $this->namespace = $namespace;
+        $this->logger    = $logger;
     }
 
     /**
@@ -73,7 +91,7 @@ public function __construct($namespace)
      * @param   CMSApplicationInterface  $app     The app
      * @param   Input                    $input   The input
      *
-     * @return  \Joomla\CMS\MVC\Controller\ControllerInterface
+     * @return  \Joomla\CMS\MVC\Controller\ControllerInterface|null
      *
      * @since   3.10.0
      * @throws  \Exception
@@ -95,6 +113,12 @@ public function createController($name, $prefix, array $config, CMSApplicationIn
         $this->setDispatcherOnObject($controller);
         $this->setRouterOnObject($controller);
         $this->setCacheControllerOnObject($controller);
+        $this->setUserFactoryOnObject($controller);
+        $this->setMailerFactoryOnObject($controller);
+
+        if ($controller instanceof LoggerAwareInterface && $this->logger !== null) {
+            $controller->setLogger($this->logger);
+        }
 
         return $controller;
     }
@@ -140,6 +164,8 @@ public function createModel($name, $prefix = '', array $config = [])
         $this->setDispatcherOnObject($model);
         $this->setRouterOnObject($model);
         $this->setCacheControllerOnObject($model);
+        $this->setUserFactoryOnObject($model);
+        $this->setMailerFactoryOnObject($model);
 
         if ($model instanceof DatabaseAwareInterface) {
             try {
@@ -196,6 +222,7 @@ public function createView($name, $prefix = '', $type = '', array $config = [])
         $this->setDispatcherOnObject($view);
         $this->setRouterOnObject($view);
         $this->setCacheControllerOnObject($view);
+        $this->setUserFactoryOnObject($view);
 
         return $view;
     }
@@ -244,7 +271,11 @@ public function createTable($name, $prefix = '', array $config = [])
             $db = Factory::getContainer()->get(DatabaseInterface::class);
         }
 
-        return new $className($db);
+        $table = new $className($db);
+
+        $this->setUserFactoryOnObject($table);
+
+        return $table;
     }
 
     /**
@@ -359,4 +390,48 @@ private function setCacheControllerOnObject($object): void
             // Ignore it
         }
     }
+
+    /**
+     * Sets the internal user factory on the given object.
+     *
+     * @param   object  $object  The object
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    private function setUserFactoryOnObject($object): void
+    {
+        if (!$object instanceof UserFactoryAwareInterface) {
+            return;
+        }
+
+        try {
+            $object->setUserFactory($this->getUserFactory());
+        } catch (\UnexpectedValueException $e) {
+            // Ignore it
+        }
+    }
+
+    /**
+     * Sets the internal mailer factory on the given object.
+     *
+     * @param   object  $object  The object
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    private function setMailerFactoryOnObject($object): void
+    {
+        if (!$object instanceof MailerFactoryAwareInterface) {
+            return;
+        }
+
+        try {
+            $object->setMailerFactory($this->getMailerFactory());
+        } catch (\UnexpectedValueException $e) {
+            // Ignore it
+        }
+    }
 }
diff --git a/libraries/src/MVC/Factory/MVCFactoryInterface.php b/libraries/src/MVC/Factory/MVCFactoryInterface.php
index b042c1f5ca3ab..33c85d731ca91 100644
--- a/libraries/src/MVC/Factory/MVCFactoryInterface.php
+++ b/libraries/src/MVC/Factory/MVCFactoryInterface.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2017 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\MVC\Factory;
@@ -14,7 +14,7 @@
 use Joomla\Input\Input;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/MVC/Model/AdminModel.php b/libraries/src/MVC/Model/AdminModel.php
index 75a407d600378..3f2c9e6239d8d 100644
--- a/libraries/src/MVC/Model/AdminModel.php
+++ b/libraries/src/MVC/Model/AdminModel.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\MVC\Model;
 
 use Joomla\CMS\Component\ComponentHelper;
-use Joomla\CMS\Event\Model\BeforeBatchEvent;
+use Joomla\CMS\Event\Model;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\FormFactoryInterface;
 use Joomla\CMS\Language\Associations;
@@ -31,7 +31,7 @@
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -159,7 +159,7 @@ abstract class AdminModel extends FormModel
     protected $user = null;
 
     /**
-     * A JTable instance (of appropriate type) to manage the DB records (re-usable in batch methods & saveorder(), initialized via initBatch())
+     * A \Joomla\CMS\Table\Table instance (of appropriate type) to manage the DB records (re-usable in batch methods & saveorder(), initialized via initBatch())
      *
      * @var     Table
      * @since   3.8.2
@@ -167,7 +167,7 @@ abstract class AdminModel extends FormModel
     protected $table = null;
 
     /**
-     * The class name of the JTable instance managing the DB records (re-usable in batch methods & saveorder(), initialized via initBatch())
+     * The class name of the \Joomla\CMS\Table\Table instance managing the DB records (re-usable in batch methods & saveorder(), initialized via initBatch())
      *
      * @var     string
      * @since   3.8.2
@@ -359,17 +359,19 @@ protected function batchAccess($value, $pks, $contexts)
         // Initialize re-usable member properties, and re-usable local variables
         $this->initBatch();
 
+        $dispatcher = $this->getDispatcher();
+
         foreach ($pks as $pk) {
             if ($this->user->authorise('core.edit', $contexts[$pk])) {
                 $this->table->reset();
                 $this->table->load($pk);
                 $this->table->access = (int) $value;
 
-                $event = new BeforeBatchEvent(
+                $event = new Model\BeforeBatchEvent(
                     $this->event_before_batch,
                     ['src' => $this->table, 'type' => 'access']
                 );
-                $this->dispatchEvent($event);
+                $dispatcher->dispatch($event->getName(), $event);
 
                 // Check the row.
                 if (!$this->table->check()) {
@@ -418,8 +420,9 @@ protected function batchCopy($value, $pks, $contexts)
             return false;
         }
 
-        $newIds = [];
-        $db     = $this->getDatabase();
+        $newIds     = [];
+        $db         = $this->getDatabase();
+        $dispatcher = $this->getDispatcher();
 
         // Parent exists so let's proceed
         while (!empty($pks)) {
@@ -468,11 +471,11 @@ protected function batchCopy($value, $pks, $contexts)
             // New category ID
             $this->table->catid = $categoryId;
 
-            $event = new BeforeBatchEvent(
+            $event = new Model\BeforeBatchEvent(
                 $this->event_before_batch,
                 ['src' => $this->table, 'type' => 'copy']
             );
-            $this->dispatchEvent($event);
+            $dispatcher->dispatch($event->getName(), $event);
 
             // @todo: Deal with ordering?
             // $this->table->ordering = 1;
@@ -563,17 +566,19 @@ protected function batchLanguage($value, $pks, $contexts)
         // Initialize re-usable member properties, and re-usable local variables
         $this->initBatch();
 
+        $dispatcher = $this->getDispatcher();
+
         foreach ($pks as $pk) {
             if ($this->user->authorise('core.edit', $contexts[$pk])) {
                 $this->table->reset();
                 $this->table->load($pk);
                 $this->table->language = $value;
 
-                $event = new BeforeBatchEvent(
+                $event = new Model\BeforeBatchEvent(
                     $this->event_before_batch,
                     ['src' => $this->table, 'type' => 'language']
                 );
-                $this->dispatchEvent($event);
+                $dispatcher->dispatch($event->getName(), $event);
 
                 // Check the row.
                 if (!$this->table->check()) {
@@ -622,6 +627,8 @@ protected function batchMove($value, $pks, $contexts)
             return false;
         }
 
+        $dispatcher = $this->getDispatcher();
+
         // Parent exists so we proceed
         foreach ($pks as $pk) {
             if (!$this->user->authorise('core.edit', $contexts[$pk])) {
@@ -647,11 +654,11 @@ protected function batchMove($value, $pks, $contexts)
             // Set the new category ID
             $this->table->catid = $categoryId;
 
-            $event = new BeforeBatchEvent(
+            $event = new Model\BeforeBatchEvent(
                 $this->event_before_batch,
                 ['src' => $this->table, 'type' => 'move']
             );
-            $this->dispatchEvent($event);
+            $dispatcher->dispatch($event->getName(), $event);
 
             // Check the row.
             if (!$this->table->check()) {
@@ -736,7 +743,7 @@ protected function batchTag($value, $pks, $contexts)
      */
     protected function canDelete($record)
     {
-        return Factory::getUser()->authorise('core.delete', $this->option);
+        return $this->getCurrentUser()->authorise('core.delete', $this->option);
     }
 
     /**
@@ -750,7 +757,7 @@ protected function canDelete($record)
      */
     protected function canEditState($record)
     {
-        return Factory::getUser()->authorise('core.edit.state', $this->option);
+        return $this->getCurrentUser()->authorise('core.edit.state', $this->option);
     }
 
     /**
@@ -821,11 +828,12 @@ public function checkout($pk = null)
      */
     public function delete(&$pks)
     {
-        $pks   = ArrayHelper::toInteger((array) $pks);
-        $table = $this->getTable();
+        $pks        = ArrayHelper::toInteger((array) $pks);
+        $table      = $this->getTable();
+        $dispatcher = $this->getDispatcher();
 
         // Include the plugins for the delete events.
-        PluginHelper::importPlugin($this->events_map['delete']);
+        PluginHelper::importPlugin($this->events_map['delete'], null, true, $dispatcher);
 
         // Iterate the items to delete each one.
         foreach ($pks as $i => $pk) {
@@ -834,7 +842,11 @@ public function delete(&$pks)
                     $context = $this->option . '.' . $this->name;
 
                     // Trigger the before delete event.
-                    $result = Factory::getApplication()->triggerEvent($this->event_before_delete, [$context, $table]);
+                    $beforeDeleteEvent = new Model\BeforeDeleteEvent($this->event_before_delete, [
+                        'context' => $context,
+                        'subject' => $table,
+                    ]);
+                    $result = $dispatcher->dispatch($this->event_before_delete, $beforeDeleteEvent)->getArgument('result', []);
 
                     if (\in_array(false, $result, true)) {
                         $this->setError($table->getError());
@@ -896,7 +908,10 @@ public function delete(&$pks)
                     }
 
                     // Trigger the after event.
-                    Factory::getApplication()->triggerEvent($this->event_after_delete, [$context, $table]);
+                    $dispatcher->dispatch($this->event_after_delete, new Model\AfterDeleteEvent($this->event_after_delete, [
+                        'context' => $context,
+                        'subject' => $table,
+                    ]));
                 } else {
                     // Prune items that you can't change.
                     unset($pks[$i]);
@@ -1059,14 +1074,15 @@ protected function prepareTable($table)
      */
     public function publish(&$pks, $value = 1)
     {
-        $user  = Factory::getUser();
+        $user  = $this->getCurrentUser();
         $table = $this->getTable();
         $pks   = (array) $pks;
 
-        $context = $this->option . '.' . $this->name;
+        $context    = $this->option . '.' . $this->name;
+        $dispatcher = $this->getDispatcher();
 
         // Include the plugins for the change of state event.
-        PluginHelper::importPlugin($this->events_map['change_state']);
+        PluginHelper::importPlugin($this->events_map['change_state'], null, true, $dispatcher);
 
         // Access checks.
         foreach ($pks as $i => $pk) {
@@ -1110,7 +1126,12 @@ public function publish(&$pks, $value = 1)
         }
 
         // Trigger the before change state event.
-        $result = Factory::getApplication()->triggerEvent($this->event_before_change_state, [$context, $pks, $value]);
+        $beforeChngEvent = new Model\BeforeChangeStateEvent($this->event_before_change_state, [
+            'context' => $context,
+            'subject' => $pks,
+            'value'   => $value,
+        ]);
+        $result = $dispatcher->dispatch($this->event_before_change_state, $beforeChngEvent)->getArgument('result', []);
 
         if (\in_array(false, $result, true)) {
             $this->setError($table->getError());
@@ -1126,7 +1147,12 @@ public function publish(&$pks, $value = 1)
         }
 
         // Trigger the change state event.
-        $result = Factory::getApplication()->triggerEvent($this->event_change_state, [$context, $pks, $value]);
+        $afterChngEvent = new Model\AfterChangeStateEvent($this->event_change_state, [
+            'context' => $context,
+            'subject' => $pks,
+            'value'   => $value,
+        ]);
+        $result = $dispatcher->dispatch($this->event_change_state, $afterChngEvent)->getArgument('result', []);
 
         if (\in_array(false, $result, true)) {
             $this->setError($table->getError());
@@ -1217,6 +1243,7 @@ public function save($data)
         $table      = $this->getTable();
         $context    = $this->option . '.' . $this->name;
         $app        = Factory::getApplication();
+        $dispatcher = $this->getDispatcher();
 
         if (\array_key_exists('tags', $data) && \is_array($data['tags'])) {
             $table->newTags = $data['tags'];
@@ -1227,7 +1254,7 @@ public function save($data)
         $isNew = true;
 
         // Include the plugins for the save events.
-        PluginHelper::importPlugin($this->events_map['save']);
+        PluginHelper::importPlugin($this->events_map['save'], null, true, $dispatcher);
 
         // Allow an exception to be thrown.
         try {
@@ -1255,7 +1282,13 @@ public function save($data)
             }
 
             // Trigger the before save event.
-            $result = $app->triggerEvent($this->event_before_save, [$context, $table, $isNew, $data]);
+            $beforeSaveEvent = new Model\BeforeSaveEvent($this->event_before_save, [
+                'context' => $context,
+                'subject' => $table,
+                'isNew'   => $isNew,
+                'data'    => $data,
+            ]);
+            $result = $dispatcher->dispatch($this->event_before_save, $beforeSaveEvent)->getArgument('result', []);
 
             if (\in_array(false, $result, true)) {
                 $this->setError($table->getError());
@@ -1274,7 +1307,12 @@ public function save($data)
             $this->cleanCache();
 
             // Trigger the after save event.
-            $app->triggerEvent($this->event_after_save, [$context, $table, $isNew, $data]);
+            $dispatcher->dispatch($this->event_after_save, new Model\AfterSaveEvent($this->event_after_save, [
+                'context' => $context,
+                'subject' => $table,
+                'isNew'   => $isNew,
+                'data'    => $data,
+            ]));
         } catch (\Exception $e) {
             $this->setError($e->getMessage());
 
@@ -1501,7 +1539,7 @@ protected function checkCategoryId($categoryId)
 
         // Check that the user has create permission for the component
         $extension = Factory::getApplication()->getInput()->get('option', '');
-        $user      = Factory::getUser();
+        $user      = $this->getCurrentUser();
 
         if (!$user->authorise('core.create', $extension . '.category.' . $categoryId)) {
             $this->setError(Text::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_CREATE'));
@@ -1546,7 +1584,7 @@ public function initBatch()
             $this->batchSet = true;
 
             // Get current user
-            $this->user = Factory::getUser();
+            $this->user = $this->getCurrentUser();
 
             // Get table
             $this->table = $this->getTable();
diff --git a/libraries/src/MVC/Model/BaseDatabaseModel.php b/libraries/src/MVC/Model/BaseDatabaseModel.php
index ae1e86b3b3f24..0209c6d7d701a 100644
--- a/libraries/src/MVC/Model/BaseDatabaseModel.php
+++ b/libraries/src/MVC/Model/BaseDatabaseModel.php
@@ -14,6 +14,7 @@
 use Joomla\CMS\Cache\Controller\CallbackController;
 use Joomla\CMS\Cache\Exception\CacheExceptionInterface;
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Event\Model\AfterCleanCacheEvent;
 use Joomla\CMS\Extension\ComponentInterface;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
@@ -24,7 +25,6 @@
 use Joomla\CMS\Table\Table;
 use Joomla\CMS\User\CurrentUserInterface;
 use Joomla\CMS\User\CurrentUserTrait;
-use Joomla\Database\DatabaseAwareInterface;
 use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Database\DatabaseInterface;
 use Joomla\Database\DatabaseQuery;
@@ -32,11 +32,10 @@
 use Joomla\Event\DispatcherAwareInterface;
 use Joomla\Event\DispatcherAwareTrait;
 use Joomla\Event\DispatcherInterface;
-use Joomla\Event\Event;
 use Joomla\Event\EventInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -222,7 +221,7 @@ protected function _getListCount($query)
      * @return  Table|boolean  Table object or boolean false if failed
      *
      * @since   3.0
-     * @see     \JTable::getInstance()
+     * @see     Table::getInstance()
      */
     protected function _createTable($name, $prefix = 'Table', $config = [])
     {
@@ -317,7 +316,7 @@ protected function cleanCache($group = null)
         }
 
         // Trigger the onContentCleanCache event.
-        $this->dispatchEvent(new Event($this->event_clean_cache, $options));
+        $this->getDispatcher()->dispatch($this->event_clean_cache, new AfterCleanCacheEvent($this->event_clean_cache, $options));
     }
 
     /**
@@ -334,6 +333,31 @@ protected function bootComponent($component): ComponentInterface
         return Factory::getApplication()->bootComponent($component);
     }
 
+    /**
+     * Get the event dispatcher.
+     *
+     * The override was made to keep a backward compatibility for legacy component.
+     * TODO: Remove the override in 6.0
+     *
+     * @return  DispatcherInterface
+     *
+     * @since   4.4.0
+     * @throws  \UnexpectedValueException May be thrown if the dispatcher has not been set.
+     */
+    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__),
+                E_USER_DEPRECATED
+            );
+
+            return Factory::getContainer()->get(DispatcherInterface::class);
+        }
+
+        return $this->dispatcher;
+    }
+
     /**
      * Dispatches the given event on the internal dispatcher, does a fallback to the global one.
      *
@@ -342,14 +366,20 @@ protected function bootComponent($component): ComponentInterface
      * @return  void
      *
      * @since   4.1.0
+     *
+     * @deprecated 4.4 will be removed in 6.0. Use $this->getDispatcher() directly.
      */
     protected function dispatchEvent(EventInterface $event)
     {
-        try {
-            $this->getDispatcher()->dispatch($event->getName(), $event);
-        } catch (\UnexpectedValueException $e) {
-            Factory::getContainer()->get(DispatcherInterface::class)->dispatch($event->getName(), $event);
-        }
+        $this->getDispatcher()->dispatch($event->getName(), $event);
+
+        @trigger_error(
+            sprintf(
+                'Method %s is deprecated and will be removed in 6.0. Use getDispatcher()->dispatch() directly.',
+                __METHOD__
+            ),
+            E_USER_DEPRECATED
+        );
     }
 
     /**
diff --git a/libraries/src/MVC/Model/BaseModel.php b/libraries/src/MVC/Model/BaseModel.php
index 540fe49f10f8b..1a37c93eff8c6 100644
--- a/libraries/src/MVC/Model/BaseModel.php
+++ b/libraries/src/MVC/Model/BaseModel.php
@@ -9,12 +9,13 @@
 
 namespace Joomla\CMS\MVC\Model;
 
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Object\CMSObject;
+use Joomla\CMS\Object\LegacyErrorHandlingTrait;
+use Joomla\CMS\Object\LegacyPropertyManagementTrait;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -22,10 +23,14 @@
  *
  * @since  4.0.0
  */
-abstract class BaseModel extends CMSObject implements ModelInterface, StatefulModelInterface
+#[\AllowDynamicProperties]
+abstract class BaseModel implements ModelInterface, StatefulModelInterface
 {
     use StateBehaviorTrait;
     use LegacyModelLoaderTrait;
+    use LegacyErrorHandlingTrait;
+    use LegacyPropertyManagementTrait;
+
 
     /**
      * The model (base) name
diff --git a/libraries/src/MVC/Model/DatabaseAwareTrait.php b/libraries/src/MVC/Model/DatabaseAwareTrait.php
index 20b074322795c..9f2421a53748c 100644
--- a/libraries/src/MVC/Model/DatabaseAwareTrait.php
+++ b/libraries/src/MVC/Model/DatabaseAwareTrait.php
@@ -12,7 +12,7 @@
 use Joomla\Database\DatabaseInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/MVC/Model/DatabaseModelInterface.php b/libraries/src/MVC/Model/DatabaseModelInterface.php
index 2cebb031ed3af..0fc558aa3c242 100644
--- a/libraries/src/MVC/Model/DatabaseModelInterface.php
+++ b/libraries/src/MVC/Model/DatabaseModelInterface.php
@@ -12,7 +12,7 @@
 use Joomla\Database\DatabaseInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/MVC/Model/FormBehaviorTrait.php b/libraries/src/MVC/Model/FormBehaviorTrait.php
index 320acb540179e..37f1a22cf8433 100644
--- a/libraries/src/MVC/Model/FormBehaviorTrait.php
+++ b/libraries/src/MVC/Model/FormBehaviorTrait.php
@@ -4,20 +4,25 @@
  * 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
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\MVC\Model;
 
+use Joomla\CMS\Event\Model;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Form\FormFactoryInterface;
 use Joomla\CMS\Form\FormField;
 use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\Proxy\ArrayProxy;
+use Joomla\CMS\User\CurrentUserInterface;
+use Joomla\Event\DispatcherAwareInterface;
+use Joomla\Event\DispatcherInterface;
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -84,6 +89,10 @@ protected function loadForm($name, $source = null, $options = [], $clear = false
 
         $form = $formFactory->createForm($name, $options);
 
+        if ($form instanceof CurrentUserInterface && method_exists($this, 'getCurrentUser')) {
+            $form->setCurrentUser($this->getCurrentUser());
+        }
+
         // Load the data.
         if (substr($source, 0, 1) === '<') {
             if ($form->load($source, false, $xpath) == false) {
@@ -140,11 +149,26 @@ protected function loadFormData()
      */
     protected function preprocessData($context, &$data, $group = 'content')
     {
+        if ($this instanceof DispatcherAwareInterface) {
+            $dispatcher = $this->getDispatcher();
+        } else {
+            $dispatcher = Factory::getContainer()->get(DispatcherInterface::class);
+        }
+
         // Get the dispatcher and load the users plugins.
-        PluginHelper::importPlugin($group);
+        PluginHelper::importPlugin($group, null, true, $dispatcher);
+
+        // When the data is an array wrap it in to an array-access object
+        $eventData = $data;
+        if (is_array($data)) {
+            $eventData = new ArrayProxy($data);
+        }
 
         // Trigger the data preparation event.
-        Factory::getApplication()->triggerEvent('onContentPrepareData', [$context, &$data]);
+        $dispatcher->dispatch(
+            'onContentPrepareData',
+            new Model\PrepareDataEvent('onContentPrepareData', ['context' => $context, 'subject' => $eventData])
+        );
     }
 
     /**
@@ -162,11 +186,20 @@ protected function preprocessData($context, &$data, $group = 'content')
      */
     protected function preprocessForm(Form $form, $data, $group = 'content')
     {
+        if ($this instanceof DispatcherAwareInterface) {
+            $dispatcher = $this->getDispatcher();
+        } else {
+            $dispatcher = Factory::getContainer()->get(DispatcherInterface::class);
+        }
+
         // Import the appropriate plugin group.
-        PluginHelper::importPlugin($group);
+        PluginHelper::importPlugin($group, null, true, $dispatcher);
 
         // Trigger the form preparation event.
-        Factory::getApplication()->triggerEvent('onContentPrepareForm', [$form, $data]);
+        $dispatcher->dispatch(
+            'onContentPrepareForm',
+            new Model\PrepareFormEvent('onContentPrepareForm', ['subject' => $form, 'data' => $data])
+        );
     }
 
     /**
diff --git a/libraries/src/MVC/Model/FormModel.php b/libraries/src/MVC/Model/FormModel.php
index 8e1627e6aa402..309610129a782 100644
--- a/libraries/src/MVC/Model/FormModel.php
+++ b/libraries/src/MVC/Model/FormModel.php
@@ -9,6 +9,7 @@
 
 namespace Joomla\CMS\MVC\Model;
 
+use Joomla\CMS\Event\Model;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filter\InputFilter;
 use Joomla\CMS\Form\Form;
@@ -19,9 +20,10 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\Proxy\ArrayProxy;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -192,10 +194,16 @@ public function checkout($pk = null)
      */
     public function validate($form, $data, $group = null)
     {
+        $dispatcher = $this->getDispatcher();
+
         // Include the plugins for the delete events.
-        PluginHelper::importPlugin($this->events_map['validate']);
+        PluginHelper::importPlugin($this->events_map['validate'], null, true, $dispatcher);
 
-        $dispatcher = Factory::getContainer()->get('dispatcher');
+        // When the data is an array wrap it in to an array-access object
+        $eventData = $data;
+        if (is_array($data)) {
+            $eventData = new ArrayProxy($data);
+        }
 
         if (!empty($dispatcher->getListeners('onUserBeforeDataValidation'))) {
             @trigger_error(
@@ -204,10 +212,16 @@ public function validate($form, $data, $group = null)
                 E_USER_DEPRECATED
             );
 
-            Factory::getApplication()->triggerEvent('onUserBeforeDataValidation', [$form, &$data]);
+            $dispatcher->dispatch('onUserBeforeDataValidation', new Model\BeforeValidateDataEvent('onUserBeforeDataValidation', [
+                'subject' => $form,
+                'data'    => $eventData,
+            ]));
         }
 
-        Factory::getApplication()->triggerEvent('onContentBeforeValidateData', [$form, &$data]);
+        $dispatcher->dispatch('onContentBeforeValidateData', new Model\BeforeValidateDataEvent('onContentBeforeValidateData', [
+            'subject' => $form,
+            'data'    => $eventData,
+        ]));
 
         // Filter and validate the form data.
         $return = $form->process($data, $group);
diff --git a/libraries/src/MVC/Model/FormModelInterface.php b/libraries/src/MVC/Model/FormModelInterface.php
index bf5efd287ead5..16548fdf02017 100644
--- a/libraries/src/MVC/Model/FormModelInterface.php
+++ b/libraries/src/MVC/Model/FormModelInterface.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Form\Form;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/MVC/Model/ItemModel.php b/libraries/src/MVC/Model/ItemModel.php
index b28d51b015125..9dcec8efceb62 100644
--- a/libraries/src/MVC/Model/ItemModel.php
+++ b/libraries/src/MVC/Model/ItemModel.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\MVC\Model;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/MVC/Model/ItemModelInterface.php b/libraries/src/MVC/Model/ItemModelInterface.php
index e89645ee3a68e..965ae00739395 100644
--- a/libraries/src/MVC/Model/ItemModelInterface.php
+++ b/libraries/src/MVC/Model/ItemModelInterface.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\MVC\Model;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/MVC/Model/LegacyModelLoaderTrait.php b/libraries/src/MVC/Model/LegacyModelLoaderTrait.php
index b2ac4f24e7b61..3e475cb44b4d5 100644
--- a/libraries/src/MVC/Model/LegacyModelLoaderTrait.php
+++ b/libraries/src/MVC/Model/LegacyModelLoaderTrait.php
@@ -4,21 +4,21 @@
  * 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
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\MVC\Model;
 
 use Joomla\CMS\Extension\LegacyComponent;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\MVC\Factory\MVCFactoryServiceInterface;
 use Joomla\CMS\Table\Table;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/MVC/Model/ListModel.php b/libraries/src/MVC/Model/ListModel.php
index e36f2222d65f5..185fa0e4d7775 100644
--- a/libraries/src/MVC/Model/ListModel.php
+++ b/libraries/src/MVC/Model/ListModel.php
@@ -9,7 +9,6 @@
 
 namespace Joomla\CMS\MVC\Model;
 
-use Exception;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filter\InputFilter;
 use Joomla\CMS\Form\Form;
@@ -20,7 +19,7 @@
 use Joomla\Database\DatabaseQuery;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -133,7 +132,7 @@ class ListModel extends BaseDatabaseModel implements FormFactoryAwareInterface,
      * @param   ?MVCFactoryInterface  $factory  The factory.
      *
      * @since   1.6
-     * @throws  Exception
+     * @throws  \Exception
      */
     public function __construct($config = [], MVCFactoryInterface $factory = null)
     {
@@ -194,7 +193,7 @@ protected function getEmptyStateQuery()
      *
      * @return boolean
      *
-     * @throws Exception
+     * @throws \Exception
      *
      * @since 4.0.0
      */
@@ -241,7 +240,7 @@ public function getActiveFilters()
             foreach ($this->filter_fields as $filter) {
                 $filterName = 'filter.' . $filter;
 
-                if (property_exists($this->state, $filterName) && (!empty($this->state->{$filterName}) || is_numeric($this->state->{$filterName}))) {
+                if (!empty($this->state->get($filterName)) || is_numeric($this->state->get($filterName))) {
                     $activeFilters[$filter] = $this->state->get($filterName);
                 }
             }
@@ -630,7 +629,8 @@ protected function populateState($ordering = null, $direction = null)
      * @param   string   $key        The key of the user state variable.
      * @param   string   $request    The name of the variable passed in a request.
      * @param   string   $default    The default value for the variable if not found. Optional.
-     * @param   string   $type       Filter for the variable, for valid values see {@link InputFilter::clean()}. Optional.
+     * @param   string   $type       Filter for the variable. Optional.
+     *                   @see        \Joomla\CMS\Filter\InputFilter::clean() for valid values.
      * @param   boolean  $resetPage  If true, the limitstart in request is set to zero
      *
      * @return  mixed  The request user state.
diff --git a/libraries/src/MVC/Model/ListModelInterface.php b/libraries/src/MVC/Model/ListModelInterface.php
index e0404b38b26bf..1728b92ee4c85 100644
--- a/libraries/src/MVC/Model/ListModelInterface.php
+++ b/libraries/src/MVC/Model/ListModelInterface.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\MVC\Model;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/MVC/Model/ModelInterface.php b/libraries/src/MVC/Model/ModelInterface.php
index 79d46dae2e0b9..5b8bc7ac4de47 100644
--- a/libraries/src/MVC/Model/ModelInterface.php
+++ b/libraries/src/MVC/Model/ModelInterface.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\MVC\Model;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/MVC/Model/State.php b/libraries/src/MVC/Model/State.php
new file mode 100644
index 0000000000000..eb26955ab553d
--- /dev/null
+++ b/libraries/src/MVC/Model/State.php
@@ -0,0 +1,137 @@
+<?php
+
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  (C) 2022 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\Registry\Registry;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * A simple state holder class. This class acts for transition from CMSObject to Registry
+ * and should not be used directly. Instead of, use the Registry class.
+ *
+ * @since  5.0.0
+ *
+ * @deprecated  7.0 Use the Registry directly
+ */
+class State extends Registry
+{
+    /**
+    * Constructor
+    *
+    * @param  mixed  $data  The data to bind to the new Registry object.
+    *
+    * @since   5.0.0
+    */
+    public function __construct($data = null)
+    {
+        parent::__construct($data);
+
+        // To speed up things
+        $this->separator = null;
+    }
+
+    /**
+     * Get a registry value.
+     *
+     * @param  string  $path     Registry path (e.g. joomla.content.showauthor)
+     * @param  mixed   $default  Optional default value, returned if the internal value is null.
+     *
+     * @return  mixed  Value of entry or null
+     *
+     * @since   5.0.0
+     */
+    public function get($path, $default = null)
+    {
+        if (isset($this->data->$path) && empty($this->data->$path)) {
+            @trigger_error(
+                sprintf('Instead of an empty value, the default value will be returned in 7.0 in %s::%s.', __METHOD__, __CLASS__),
+                E_USER_DEPRECATED
+            );
+            return $this->data->$path;
+        }
+
+        return parent::get($path, $default);
+    }
+
+    /**
+      * Returns an associative array of object properties.
+      *
+      * @return  array  The data array
+      *
+      * @since   5.0.0
+      *
+      * @deprecated  7.0 Use toArray instead
+      */
+    public function getProperties()
+    {
+        return $this->toArray();
+    }
+
+    /**
+     * Proxy for internal data access for the given name.
+     *
+     * @param   string  $name  The name of the element
+     *
+     * @return  mixed  The value of the element if set, null otherwise
+     *
+     * @since   5.0.0
+     *
+     * @deprecated  5.0.0 will be removed in 7.0
+     *
+     */
+    public function __get($name)
+    {
+        @trigger_error(sprintf('Direct property access will not be supported in 7.0 in %s::%s.', __METHOD__, __CLASS__), E_USER_DEPRECATED);
+
+        return $this->get($name);
+    }
+
+    /**
+     * Proxy for internal data storage for the given name and value.
+     *
+     * @param   string  $name   The name of the element
+     * @param   string  $value  The value
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     *
+     * @deprecated  5.0.0 will be removed in 7.0
+     *
+     */
+    public function __set($name, $value)
+    {
+        @trigger_error(sprintf('Direct property access will not be supported in 7.0 in %s::%s.', __METHOD__, __CLASS__), E_USER_DEPRECATED);
+
+        return $this->set($name, $value);
+    }
+
+    /**
+     * Proxy for internal data check for a variable with the given key.
+     *
+     * @param   string  $name  The name of the element
+     *
+     * @return  bool    Returns if the internal data storage contains a key with the given
+     *
+     * @since   5.0.0
+     *
+     * @deprecated  5.0.0 will be removed in 7.0
+     *
+     */
+    public function __isset($name)
+    {
+        @trigger_error(sprintf('Direct property access will not be supported in 7.0 in %s::%s.', __METHOD__, __CLASS__), E_USER_DEPRECATED);
+
+        return $this->exists($name);
+    }
+}
diff --git a/libraries/src/MVC/Model/StateBehaviorTrait.php b/libraries/src/MVC/Model/StateBehaviorTrait.php
index 629f17b88200d..c389de147ab04 100644
--- a/libraries/src/MVC/Model/StateBehaviorTrait.php
+++ b/libraries/src/MVC/Model/StateBehaviorTrait.php
@@ -4,15 +4,13 @@
  * 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
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\MVC\Model;
 
-use Joomla\CMS\Object\CMSObject;
-
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -33,7 +31,7 @@ trait StateBehaviorTrait
     /**
      * A state object
      *
-     * @var    CMSObject
+     * @var    State
      * @since  4.0.0
      */
     protected $state = null;
@@ -51,7 +49,7 @@ trait StateBehaviorTrait
     public function getState($property = null, $default = null)
     {
         if ($this->state === null) {
-            $this->state = new CMSObject();
+            $this->state = new State();
         }
 
         if (!$this->__state_set) {
@@ -78,7 +76,7 @@ public function getState($property = null, $default = null)
     public function setState($property, $value = null)
     {
         if ($this->state === null) {
-            $this->state = new CMSObject();
+            $this->state = new State();
         }
 
         return $this->state->set($property, $value);
diff --git a/libraries/src/MVC/Model/StatefulModelInterface.php b/libraries/src/MVC/Model/StatefulModelInterface.php
index 9fb00a24b5cd8..2f93b62402afe 100644
--- a/libraries/src/MVC/Model/StatefulModelInterface.php
+++ b/libraries/src/MVC/Model/StatefulModelInterface.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\MVC\Model;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/MVC/Model/WorkflowBehaviorTrait.php b/libraries/src/MVC/Model/WorkflowBehaviorTrait.php
index d6b1d7abd92df..ba4601e2de2e8 100644
--- a/libraries/src/MVC/Model/WorkflowBehaviorTrait.php
+++ b/libraries/src/MVC/Model/WorkflowBehaviorTrait.php
@@ -4,22 +4,22 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\MVC\Model;
 
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Workflow\Workflow;
 use Joomla\Database\DatabaseDriver;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -83,7 +83,7 @@ public function setUpWorkflow($extension)
         if (method_exists($this, 'getDatabase')) {
             $db = $this->getDatabase();
         } else {
-            @trigger_error('In Joomla 6.0 will the getDatabase function be mandatory.', E_USER_DEPRECATED);
+            @trigger_error('From 6.0 implementing the getDatabase method will be mandatory.', E_USER_DEPRECATED);
             $db = Factory::getContainer()->get(DatabaseDriver::class);
         }
 
@@ -97,7 +97,7 @@ public function setUpWorkflow($extension)
     }
 
     /**
-     * Add the workflow batch to the command list. Can be overwritten bei the child class
+     * Add the workflow batch to the command list. Can be overwritten by the child class
      *
      * @return  void
      *
diff --git a/libraries/src/MVC/Model/WorkflowModelInterface.php b/libraries/src/MVC/Model/WorkflowModelInterface.php
index fb614810a8286..7509a6fe6be50 100644
--- a/libraries/src/MVC/Model/WorkflowModelInterface.php
+++ b/libraries/src/MVC/Model/WorkflowModelInterface.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Table\Table;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/MVC/View/AbstractView.php b/libraries/src/MVC/View/AbstractView.php
index 70bd24f83f122..af8f3e85103cc 100644
--- a/libraries/src/MVC/View/AbstractView.php
+++ b/libraries/src/MVC/View/AbstractView.php
@@ -10,17 +10,20 @@
 namespace Joomla\CMS\MVC\View;
 
 use Joomla\CMS\Document\Document;
+use Joomla\CMS\Document\DocumentAwareInterface;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
+use Joomla\CMS\Language\LanguageAwareInterface;
+use Joomla\CMS\Language\LanguageAwareTrait;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\CMS\Object\CMSObject;
+use Joomla\CMS\Object\LegacyErrorHandlingTrait;
+use Joomla\CMS\Object\LegacyPropertyManagementTrait;
 use Joomla\Event\DispatcherAwareInterface;
 use Joomla\Event\DispatcherAwareTrait;
 use Joomla\Event\DispatcherInterface;
 use Joomla\Event\EventInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -30,15 +33,25 @@
  *
  * @since  2.5.5
  */
-abstract class AbstractView extends CMSObject implements ViewInterface, DispatcherAwareInterface
+#[\AllowDynamicProperties]
+abstract class AbstractView implements ViewInterface, DispatcherAwareInterface, DocumentAwareInterface, LanguageAwareInterface
 {
     use DispatcherAwareTrait;
+    use LanguageAwareTrait;
+    use LegacyErrorHandlingTrait;
+    use LegacyPropertyManagementTrait {
+        get as private legacyGet;
+    }
+
 
     /**
      * The active document object
      *
      * @var    Document
      * @since  3.0
+     *
+     * @deprecated 4.4.0 will be removed in 6.0
+     *             Use $this->getDocument() instead
      */
     public $document;
 
@@ -147,8 +160,7 @@ public function get($property, $default = null)
             }
         }
 
-        // Degrade to CMSObject::get
-        return parent::get($property, $default);
+        return $this->legacyGet($property, $default);
     }
 
     /**
@@ -227,13 +239,69 @@ public function getName()
             }
 
             if (empty($this->_name)) {
-                throw new \Exception(Text::sprintf('JLIB_APPLICATION_ERROR_GET_NAME', __METHOD__), 500);
+                throw new \Exception(sprintf($this->text('JLIB_APPLICATION_ERROR_GET_NAME'), __METHOD__), 500);
             }
         }
 
         return $this->_name;
     }
 
+    /**
+     * Get the Document.
+     *
+     * @return  Document
+     *
+     * @since   4.4.0
+     * @throws  \UnexpectedValueException May be thrown if the document has not been set.
+     */
+    protected function getDocument(): Document
+    {
+        if ($this->document) {
+            return $this->document;
+        }
+
+        throw new \UnexpectedValueException('Document not set in ' . __CLASS__);
+    }
+
+    /**
+     * Set the document to use.
+     *
+     * @param   Document  $document  The document to use
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function setDocument(Document $document): void
+    {
+        $this->document = $document;
+    }
+
+    /**
+     * Get the event dispatcher.
+     *
+     * The override was made to keep a backward compatibility for legacy component.
+     * TODO: Remove the override in 6.0
+     *
+     * @return  DispatcherInterface
+     *
+     * @since   4.4.0
+     * @throws  \UnexpectedValueException May be thrown if the dispatcher has not been set.
+     */
+    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__),
+                E_USER_DEPRECATED
+            );
+
+            return Factory::getContainer()->get(DispatcherInterface::class);
+        }
+
+        return $this->dispatcher;
+    }
+
     /**
      * Dispatches the given event on the internal dispatcher, does a fallback to the global one.
      *
@@ -242,13 +310,19 @@ public function getName()
      * @return  void
      *
      * @since   4.1.0
+     *
+     * @deprecated 4.4 will be removed in 6.0. Use $this->getDispatcher() directly.
      */
     protected function dispatchEvent(EventInterface $event)
     {
-        try {
-            $this->getDispatcher()->dispatch($event->getName(), $event);
-        } catch (\UnexpectedValueException $e) {
-            Factory::getContainer()->get(DispatcherInterface::class)->dispatch($event->getName(), $event);
-        }
+        $this->getDispatcher()->dispatch($event->getName(), $event);
+
+        @trigger_error(
+            sprintf(
+                'Method %s is deprecated and will be removed in 6.0. Use getDispatcher()->dispatch() directly.',
+                __METHOD__
+            ),
+            E_USER_DEPRECATED
+        );
     }
 }
diff --git a/libraries/src/MVC/View/CanDo.php b/libraries/src/MVC/View/CanDo.php
new file mode 100644
index 0000000000000..96e1417cbed23
--- /dev/null
+++ b/libraries/src/MVC/View/CanDo.php
@@ -0,0 +1,137 @@
+<?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\MVC\View;
+
+use Joomla\Registry\Registry;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * A simple state holder class. This class acts for transition from CMSObject to Registry
+ * and should not be used directly. Instead of, use the Registry class.
+ *
+ * @since  5.0.0
+ *
+ * @deprecated  7.0 Use the Registry directly
+ */
+class CanDo extends Registry
+{
+    /**
+    * Constructor
+    *
+    * @param  mixed  $data  The data to bind to the new Registry object.
+    *
+    * @since   5.0.0
+    */
+    public function __construct($data = null)
+    {
+        parent::__construct($data);
+
+        // To speed up things
+        $this->separator = null;
+    }
+
+    /**
+     * Get a registry value.
+     *
+     * @param  string  $path     Registry path (e.g. joomla.content.showauthor)
+     * @param  mixed   $default  Optional default value, returned if the internal value is null.
+     *
+     * @return  mixed  Value of entry or null
+     *
+     * @since   5.0.0
+     */
+    public function get($path, $default = null)
+    {
+        if (isset($this->data->$path) && empty($this->data->$path)) {
+            @trigger_error(
+                sprintf('Instead of an empty value, the default value will be returned in 7.0 in %s::%s.', __METHOD__, __CLASS__),
+                E_USER_DEPRECATED
+            );
+            return $this->data->$path;
+        }
+
+        return parent::get($path, $default);
+    }
+
+    /**
+      * Returns an associative array of object properties.
+      *
+      * @return  array  The data array
+      *
+      * @since   5.0.0
+      *
+      * @deprecated  7.0 Use toArray instead
+      */
+    public function getProperties()
+    {
+        return $this->toArray();
+    }
+
+    /**
+     * Proxy for internal data access for the given name.
+     *
+     * @param   string  $name  The name of the element
+     *
+     * @return  mixed  The value of the element if set, null otherwise
+     *
+     * @since   5.0.0
+     *
+     * @deprecated  5.0.0 will be removed in 7.0
+     *
+     */
+    public function __get($name)
+    {
+        @trigger_error(sprintf('Direct property access will not be supported in 7.0 in %s::%s.', __METHOD__, __CLASS__), E_USER_DEPRECATED);
+
+        return $this->get($name);
+    }
+
+    /**
+     * Proxy for internal data storage for the given name and value.
+     *
+     * @param   string  $name   The name of the element
+     * @param   string  $value  The value
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     *
+     * @deprecated  5.0.0 will be removed in 7.0
+     *
+     */
+    public function __set($name, $value)
+    {
+        @trigger_error(sprintf('Direct property access will not be supported in 7.0 in %s::%s.', __METHOD__, __CLASS__), E_USER_DEPRECATED);
+
+        return $this->set($name, $value);
+    }
+
+    /**
+     * Proxy for internal data check for a variable with the given key.
+     *
+     * @param   string  $name  The name of the element
+     *
+     * @return  bool    Returns if the internal data storage contains a key with the given
+     *
+     * @since   5.0.0
+     *
+     * @deprecated  5.0.0 will be removed in 7.0
+     *
+     */
+    public function __isset($name)
+    {
+        @trigger_error(sprintf('Direct property access will not be supported in 7.0 in %s::%s.', __METHOD__, __CLASS__), E_USER_DEPRECATED);
+
+        return $this->exists($name);
+    }
+}
diff --git a/libraries/src/MVC/View/CategoriesView.php b/libraries/src/MVC/View/CategoriesView.php
index 0c771bb23f76c..36da54d53b5d5 100644
--- a/libraries/src/MVC/View/CategoriesView.php
+++ b/libraries/src/MVC/View/CategoriesView.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Language\Text;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -122,11 +122,11 @@ protected function prepareDocument()
         $this->setDocumentTitle($this->params->get('page_title', ''));
 
         if ($this->params->get('menu-meta_description')) {
-            $this->document->setDescription($this->params->get('menu-meta_description'));
+            $this->getDocument()->setDescription($this->params->get('menu-meta_description'));
         }
 
         if ($this->params->get('robots')) {
-            $this->document->setMetaData('robots', $this->params->get('robots'));
+            $this->getDocument()->setMetaData('robots', $this->params->get('robots'));
         }
     }
 }
diff --git a/libraries/src/MVC/View/CategoryFeedView.php b/libraries/src/MVC/View/CategoryFeedView.php
index 7d42795fe8843..72b9f1668a606 100644
--- a/libraries/src/MVC/View/CategoryFeedView.php
+++ b/libraries/src/MVC/View/CategoryFeedView.php
@@ -17,7 +17,7 @@
 use Joomla\CMS\UCM\UCMType;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -40,7 +40,7 @@ class CategoryFeedView extends HtmlView
     public function display($tpl = null)
     {
         $app      = Factory::getApplication();
-        $document = Factory::getDocument();
+        $document = $this->getDocument();
 
         $extension      = $app->getInput()->getString('option');
         $contentType    = $extension . '.' . $this->viewName;
@@ -86,7 +86,7 @@ public function display($tpl = null)
             // Strip html from feed item title
             if ($titleField) {
                 $title = $this->escape($item->$titleField);
-                $title = html_entity_decode($title, ENT_COMPAT, 'UTF-8');
+                $title = html_entity_decode($title, ENT_QUOTES, 'UTF-8');
             } else {
                 $title = '';
             }
diff --git a/libraries/src/MVC/View/CategoryView.php b/libraries/src/MVC/View/CategoryView.php
index b65767f651a5c..e1ed667723968 100644
--- a/libraries/src/MVC/View/CategoryView.php
+++ b/libraries/src/MVC/View/CategoryView.php
@@ -17,7 +17,7 @@
 use Joomla\CMS\Router\Route;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -126,7 +126,7 @@ class CategoryView extends HtmlView
     public function commonCategoryDisplay()
     {
         $app    = Factory::getApplication();
-        $user   = Factory::getUser();
+        $user   = $this->getCurrentUser();
         $params = $app->getParams();
 
         // Get some data from the models
@@ -184,23 +184,23 @@ 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]);
+                Factory::getApplication()->triggerEvent('onContentPrepare', [$this->extension . '.category', $itemElement, $itemElement->params, 0]);
 
                 $results = Factory::getApplication()->triggerEvent(
                     'onContentAfterTitle',
-                    [$this->extension . '.category', &$itemElement, &$itemElement->core_params, 0]
+                    [$this->extension . '.category', $itemElement, $itemElement->core_params ?? $itemElement->params, 0]
                 );
                 $itemElement->event->afterDisplayTitle = trim(implode("\n", $results));
 
                 $results = Factory::getApplication()->triggerEvent(
                     'onContentBeforeDisplay',
-                    [$this->extension . '.category', &$itemElement, &$itemElement->core_params, 0]
+                    [$this->extension . '.category', $itemElement, $itemElement->core_params ?? $itemElement->params, 0]
                 );
                 $itemElement->event->beforeDisplayContent = trim(implode("\n", $results));
 
                 $results = Factory::getApplication()->triggerEvent(
                     'onContentAfterDisplay',
-                    [$this->extension . '.category', &$itemElement, &$itemElement->core_params, 0]
+                    [$this->extension . '.category', $itemElement, $itemElement->core_params ?? $itemElement->params, 0]
                 );
                 $itemElement->event->afterDisplayContent = trim(implode("\n", $results));
 
@@ -286,11 +286,11 @@ protected function prepareDocument()
         $this->setDocumentTitle($this->params->get('page_title', ''));
 
         if ($this->params->get('menu-meta_description')) {
-            $this->document->setDescription($this->params->get('menu-meta_description'));
+            $this->getDocument()->setDescription($this->params->get('menu-meta_description'));
         }
 
         if ($this->params->get('robots')) {
-            $this->document->setMetaData('robots', $this->params->get('robots'));
+            $this->getDocument()->setMetaData('robots', $this->params->get('robots'));
         }
     }
 
@@ -305,10 +305,10 @@ protected function addFeed()
     {
         if ($this->params->get('show_feed_link', 1) == 1) {
             $link    = '&format=feed&limitstart=';
-            $attribs = ['type' => 'application/rss+xml', 'title' => 'RSS 2.0'];
-            $this->document->addHeadLink(Route::_($link . '&type=rss'), 'alternate', 'rel', $attribs);
-            $attribs = ['type' => 'application/atom+xml', 'title' => 'Atom 1.0'];
-            $this->document->addHeadLink(Route::_($link . '&type=atom'), 'alternate', 'rel', $attribs);
+            $attribs = ['type' => 'application/rss+xml', 'title' => htmlspecialchars($this->getDocument()->getTitle())];
+            $this->getDocument()->addHeadLink(Route::_($link . '&type=rss'), 'alternate', 'rel', $attribs);
+            $attribs = ['type' => 'application/atom+xml', 'title' => htmlspecialchars($this->getDocument()->getTitle())];
+            $this->getDocument()->addHeadLink(Route::_($link . '&type=atom'), 'alternate', 'rel', $attribs);
         }
     }
 }
diff --git a/libraries/src/MVC/View/Event/OnGetApiFields.php b/libraries/src/MVC/View/Event/OnGetApiFields.php
index 42a5132939ea1..598eb18472ab7 100644
--- a/libraries/src/MVC/View/Event/OnGetApiFields.php
+++ b/libraries/src/MVC/View/Event/OnGetApiFields.php
@@ -9,7 +9,6 @@
 
 namespace Joomla\CMS\MVC\View\Event;
 
-use BadMethodCallException;
 use Joomla\CMS\Event\AbstractImmutableEvent;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -63,20 +62,20 @@ final class OnGetApiFields extends AbstractImmutableEvent
      * @param   string  $name       The event name.
      * @param   array   $arguments  The event arguments.
      *
-     * @throws  BadMethodCallException
+     * @throws  \BadMethodCallException
      */
     public function __construct($name, array $arguments = [])
     {
         if (!\array_key_exists('type', $arguments)) {
-            throw new BadMethodCallException("Argument 'type' is required for event $name");
+            throw new \BadMethodCallException("Argument 'type' is required for event $name");
         }
 
         if (!\array_key_exists('fields', $arguments)) {
-            throw new BadMethodCallException("Argument 'fields' is required for event $name");
+            throw new \BadMethodCallException("Argument 'fields' is required for event $name");
         }
 
         if (!\array_key_exists('context', $arguments)) {
-            throw new BadMethodCallException("Argument 'context' is required for event $name");
+            throw new \BadMethodCallException("Argument 'context' is required for event $name");
         }
 
         parent::__construct($name, $arguments);
@@ -89,12 +88,12 @@ public function __construct($name, array $arguments = [])
      *
      * @return  mixed
      *
-     * @throws  BadMethodCallException  if the argument is not of the expected type
+     * @throws  \BadMethodCallException  if the argument is not of the expected type
      */
     protected function setType($value)
     {
         if (!in_array($value, [static::ITEM, static::LIST])) {
-            throw new BadMethodCallException("Argument 'type' of event {$this->name} must be a valid value");
+            throw new \BadMethodCallException("Argument 'type' of event {$this->name} must be a valid value");
         }
 
         return $value;
@@ -107,12 +106,12 @@ protected function setType($value)
      *
      * @return  array
      *
-     * @throws  BadMethodCallException  if the argument is not a non-empty array
+     * @throws  \BadMethodCallException  if the argument is not a non-empty array
      */
     protected function setFields($value)
     {
         if (!\is_array($value) || is_array($value) && empty($value)) {
-            throw new BadMethodCallException("Argument 'fields' of event {$this->name} must be be an array and not empty");
+            throw new \BadMethodCallException("Argument 'fields' of event {$this->name} must be be an array and not empty");
         }
 
         return $value;
@@ -125,12 +124,12 @@ protected function setFields($value)
      *
      * @return  array
      *
-     * @throws  BadMethodCallException  if the argument is not a non-empty array
+     * @throws  \BadMethodCallException  if the argument is not a non-empty array
      */
     protected function setRelations($value)
     {
         if (!\is_array($value)) {
-            throw new BadMethodCallException("Argument 'relations' of event {$this->name} must be be an array");
+            throw new \BadMethodCallException("Argument 'relations' of event {$this->name} must be be an array");
         }
 
         return $value;
diff --git a/libraries/src/MVC/View/FormView.php b/libraries/src/MVC/View/FormView.php
index 8769b2f395ddb..f683c4df0ffd8 100644
--- a/libraries/src/MVC/View/FormView.php
+++ b/libraries/src/MVC/View/FormView.php
@@ -11,13 +11,13 @@
 
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Table\TableInterface;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -60,7 +60,7 @@ class FormView extends HtmlView
     /**
      * The actions the user is authorised to perform
      *
-     * @var  CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $canDo;
 
@@ -112,7 +112,8 @@ public function __construct(array $config)
         }
 
         // Set default value for $canDo to avoid fatal error if child class doesn't set value for this property
-        $this->canDo = new CMSObject();
+        // Return a CanDo object to prevent any BC break, will be changed in 7.0 to Registry
+        $this->canDo = new CanDo();
     }
 
     /**
@@ -170,7 +171,7 @@ protected function addToolbar()
     {
         Factory::getApplication()->getInput()->set('hidemainmenu', true);
 
-        $user       = Factory::getUser();
+        $user       = $this->getCurrentUser();
         $userId     = $user->id;
         $isNew      = empty($this->item->{$this->keyName});
         $viewName   = $this->getName();
@@ -238,6 +239,15 @@ protected function addToolbar()
 
         ToolbarHelper::divider();
 
+        if ($this->form instanceof Form) {
+            $formConfig  = $this->form->getXml()->config->inlinehelp;
+            $targetClass = (string) $formConfig['targetclass'] ?: 'hide-aware-inline-help';
+
+            if ((string) $formConfig['button'] === 'show') {
+                ToolbarHelper::inlinehelp($targetClass);
+            }
+        }
+
         if ($this->helpLink) {
             ToolbarHelper::help($this->helpLink);
         }
diff --git a/libraries/src/MVC/View/GenericDataException.php b/libraries/src/MVC/View/GenericDataException.php
index ddfde1f2a01c5..b00bda016f02f 100644
--- a/libraries/src/MVC/View/GenericDataException.php
+++ b/libraries/src/MVC/View/GenericDataException.php
@@ -4,13 +4,13 @@
  * Joomla! Content Management System
  *
  * @copyright   (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\MVC\View;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/MVC/View/HtmlView.php b/libraries/src/MVC/View/HtmlView.php
index 9a559e180766c..3ab10cbb5f326 100644
--- a/libraries/src/MVC/View/HtmlView.php
+++ b/libraries/src/MVC/View/HtmlView.php
@@ -12,14 +12,14 @@
 use Joomla\CMS\Application\ApplicationHelper;
 use Joomla\CMS\Event\AbstractEvent;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\User\CurrentUserInterface;
 use Joomla\CMS\User\CurrentUserTrait;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -368,8 +368,13 @@ public function loadTemplate($tpl = null)
         $file = preg_replace('/[^A-Z0-9_\.-]/i', '', $file);
         $tpl  = isset($tpl) ? preg_replace('/[^A-Z0-9_\.-]/i', '', $tpl) : $tpl;
 
-        // Load the language file for the template
-        $lang = Factory::getLanguage();
+        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);
@@ -590,6 +595,6 @@ public function setDocumentTitle($title)
             $title = Text::sprintf('JPAGETITLE', $title, $app->get('sitename'));
         }
 
-        $this->document->setTitle($title);
+        $this->getDocument()->setTitle($title);
     }
 }
diff --git a/libraries/src/MVC/View/JsonApiView.php b/libraries/src/MVC/View/JsonApiView.php
index 91db120317d6c..7726f08edc0e1 100644
--- a/libraries/src/MVC/View/JsonApiView.php
+++ b/libraries/src/MVC/View/JsonApiView.php
@@ -142,7 +142,7 @@ public function displayList(array $items = null)
         // Set up links for pagination
         $totalItemsCount = ($pagination->pagesTotal * $pagination->limit);
 
-        $this->document->addMeta('total-pages', $pagination->pagesTotal)
+        $this->getDocument()->addMeta('total-pages', $pagination->pagesTotal)
             ->addLink('self', (string) $currentUrl);
 
         // Check for first and previous pages
@@ -158,7 +158,7 @@ public function displayList(array $items = null)
             $previousPageQuery['offset'] = $previousOffset >= 0 ? $previousOffset : 0;
             $previousPage->setVar('page', $previousPageQuery);
 
-            $this->document->addLink('first', $this->queryEncode((string) $firstPage))
+            $this->getDocument()->addLink('first', $this->queryEncode((string) $firstPage))
                 ->addLink('previous', $this->queryEncode((string) $previousPage));
         }
 
@@ -175,7 +175,7 @@ public function displayList(array $items = null)
             $lastPageQuery['offset'] = ($pagination->pagesTotal - 1) * $pagination->limit;
             $lastPage->setVar('page', $lastPageQuery);
 
-            $this->document->addLink('next', $this->queryEncode((string) $nextPage))
+            $this->getDocument()->addLink('next', $this->queryEncode((string) $nextPage))
                 ->addLink('last', $this->queryEncode((string) $lastPage));
         }
 
@@ -193,9 +193,9 @@ public function displayList(array $items = null)
         }
 
         // Set the data into the document and render it
-        $this->document->setData($collection);
+        $this->getDocument()->setData($collection);
 
-        return $this->document->render();
+        return $this->getDocument()->render();
     }
 
     /**
@@ -246,10 +246,10 @@ public function displayItem($item = null)
             $element->with($eventResult->getAllRelationsToRender());
         }
 
-        $this->document->setData($element);
-        $this->document->addLink('self', Uri::current());
+        $this->getDocument()->setData($element);
+        $this->getDocument()->addLink('self', Uri::current());
 
-        return $this->document->render();
+        return $this->getDocument()->render();
     }
 
     /**
diff --git a/libraries/src/MVC/View/JsonView.php b/libraries/src/MVC/View/JsonView.php
index 75300105b5b32..479a30e26d615 100644
--- a/libraries/src/MVC/View/JsonView.php
+++ b/libraries/src/MVC/View/JsonView.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\MVC\View;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -96,6 +96,6 @@ public function display($tpl = null)
         $result = json_encode($this->_output);
 
         // Pushing output to the document
-        $this->document->setBuffer($result);
+        $this->getDocument()->setBuffer($result);
     }
 }
diff --git a/libraries/src/MVC/View/ListView.php b/libraries/src/MVC/View/ListView.php
index b6dfcf48d2afc..4d9767cbbdc69 100644
--- a/libraries/src/MVC/View/ListView.php
+++ b/libraries/src/MVC/View/ListView.php
@@ -9,15 +9,15 @@
 
 namespace Joomla\CMS\MVC\View;
 
-use Joomla\CMS\Factory;
+use Doctrine\Inflector\InflectorFactory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\FileLayout;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
+use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -46,14 +46,14 @@ class ListView extends HtmlView
     /**
      * The model state
      *
-     * @var  CMSObject
+     * @var  \Joomla\Registry\Registry
      */
     protected $state;
 
     /**
      * The actions the user is authorised to perform
      *
-     * @var  CMSObject
+     * @var  Registry
      */
     protected $canDo;
 
@@ -137,7 +137,8 @@ public function __construct(array $config)
         }
 
         // Set default value for $canDo to avoid fatal error if child class doesn't set value for this property
-        $this->canDo = new CMSObject();
+        // Return a CanDo object to prevent any BC break, will be changed in 7.0 to Registry
+        $this->canDo = new CanDo();
     }
 
     /**
@@ -203,13 +204,13 @@ protected function initializeView()
     protected function addToolbar()
     {
         $canDo = $this->canDo;
-        $user  = Factory::getUser();
+        $user  = $this->getCurrentUser();
 
         // Get the toolbar object instance
         $bar = Toolbar::getInstance('toolbar');
 
         $viewName         = $this->getName();
-        $singularViewName = \Joomla\String\Inflector::getInstance()->toSingular($viewName);
+        $singularViewName = InflectorFactory::create()->build()->singularize($viewName);
 
         ToolbarHelper::title(Text::_($this->toolbarTitle), $this->toolbarIcon);
 
diff --git a/libraries/src/MVC/View/ViewInterface.php b/libraries/src/MVC/View/ViewInterface.php
index b9401086d7dda..ce0cd2f375793 100644
--- a/libraries/src/MVC/View/ViewInterface.php
+++ b/libraries/src/MVC/View/ViewInterface.php
@@ -4,7 +4,7 @@
  * 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
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\MVC\View;
@@ -12,7 +12,7 @@
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -49,7 +49,7 @@ public function getModel($name = null);
      *
      * @return  string  The name of the view
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   5.0.0
      */
     public function getName();
 }
diff --git a/libraries/src/Mail/Exception/MailDisabledException.php b/libraries/src/Mail/Exception/MailDisabledException.php
index ef07f41c9a04e..2e6c96102e1a1 100644
--- a/libraries/src/Mail/Exception/MailDisabledException.php
+++ b/libraries/src/Mail/Exception/MailDisabledException.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Mail\Exception;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Mail/Mail.php b/libraries/src/Mail/Mail.php
index 5696a4e59f0ef..353fa0046b266 100644
--- a/libraries/src/Mail/Mail.php
+++ b/libraries/src/Mail/Mail.php
@@ -17,7 +17,7 @@
 use PHPMailer\PHPMailer\PHPMailer;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -25,15 +25,18 @@
  *
  * @since  1.7.0
  */
-class Mail extends PHPMailer
+class Mail extends PHPMailer implements MailerInterface
 {
     /**
      * Mail instances container.
      *
      * @var    Mail[]
      * @since  1.7.3
+     *
+     * @deprecated  4.4.0 will be removed in 6.0
+     *              See getInstance() for more details
      */
-    protected static $instances = [];
+    public static $instances = [];
 
     /**
      * Charset of the message.
@@ -100,12 +103,19 @@ public function __construct($exceptions = true)
      *
      * @return  Mail  The global Mail object
      *
-     * @since   1.7.0
+     * @since   4.4.0
+     *
+     * @deprecated  4.4.0 will be removed in 6.0
+     *              Use the mailer service in the DI container and create a mailer from there
+     *              Example:
+     *              Factory::getContainer()->get(MailerFactoryInterface::class)->createMailer();
      */
     public static function getInstance($id = 'Joomla', $exceptions = true)
     {
         if (empty(static::$instances[$id])) {
-            static::$instances[$id] = new static($exceptions);
+            $config = clone Factory::getConfig();
+            $config->set('throw_exceptions', $exceptions);
+            static::$instances[$id] = Factory::getContainer()->get(MailerFactoryInterface::class)->createMailer($config);
         }
 
         return static::$instances[$id];
@@ -172,9 +182,10 @@ public function Send()
     /**
      * Set the email sender
      *
-     * @param   mixed  $from  email address and Name of sender
-     *                        <code>array([0] => email Address, [1] => Name)</code>
-     *                        or as a string
+     * @param   mixed  $from   email address and Name of sender
+     *                         <code>array([0] => email Address, [1] => Name)</code>
+     *                         or as a string
+     * @param   mixed   $name  Either a string or array of strings [name(s)]
      *
      * @return  Mail|boolean  Returns this object for chaining on success or boolean false on failure.
      *
@@ -183,7 +194,7 @@ public function Send()
      * @throws  \UnexpectedValueException  if the sender is not a valid address
      * @throws  phpmailerException          if setting the sender failed and exception throwing is enabled
      */
-    public function setSender($from)
+    public function setSender($from, $name = '')
     {
         if (\is_array($from)) {
             // If $from is an array we assume it has an address and a name
@@ -195,7 +206,7 @@ public function setSender($from)
             }
         } elseif (\is_string($from)) {
             // If it is a string we assume it is just the address
-            $result = $this->setFrom(MailHelper::cleanLine($from));
+            $result = $this->setFrom(MailHelper::cleanLine($from), $name);
         } else {
             // If it is neither, we log a message and throw an exception
             Log::add(Text::sprintf('JLIB_MAIL_INVALID_EMAIL_SENDER', $from), Log::WARNING, 'jerror');
diff --git a/libraries/src/Mail/MailHelper.php b/libraries/src/Mail/MailHelper.php
index 11c168545e5a9..4c5f313cf6594 100644
--- a/libraries/src/Mail/MailHelper.php
+++ b/libraries/src/Mail/MailHelper.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Uri\Uri;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Mail/MailTemplate.php b/libraries/src/Mail/MailTemplate.php
index 508ca76359212..42785c5dcab06 100644
--- a/libraries/src/Mail/MailTemplate.php
+++ b/libraries/src/Mail/MailTemplate.php
@@ -12,15 +12,15 @@
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filesystem\File;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Mail\Exception\MailDisabledException;
 use Joomla\Database\ParameterType;
+use Joomla\Filesystem\Path;
 use Joomla\Registry\Registry;
 use PHPMailer\PHPMailer\Exception as phpmailerException;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -327,8 +327,9 @@ protected function replaceTags($text, $tags)
         foreach ($tags as $key => $value) {
             if (is_array($value)) {
                 $matches = [];
+                $pregKey = preg_quote(strtoupper($key), '/');
 
-                if (preg_match_all('/{' . strtoupper($key) . '}(.*?){\/' . strtoupper($key) . '}/s', $text, $matches)) {
+                if (preg_match_all('/{' . $pregKey . '}(.*?){\/' . $pregKey . '}/s', $text, $matches)) {
                     foreach ($matches[0] as $i => $match) {
                         $replacement = '';
 
@@ -406,9 +407,10 @@ public static function createTemplate($key, $subject, $body, $tags, $htmlbody =
         $template->subject     = $subject;
         $template->body        = $body;
         $template->htmlbody    = $htmlbody;
+        $template->extension   = explode('.', $key, 2)[0] ?? '';
         $template->attachments = '';
         $params                = new \stdClass();
-        $params->tags          = [$tags];
+        $params->tags          = (array) $tags;
         $template->params      = json_encode($params);
 
         return $db->insertObject('#__mail_templates', $template);
@@ -438,7 +440,7 @@ public static function updateTemplate($key, $subject, $body, $tags, $htmlbody =
         $template->body        = $body;
         $template->htmlbody    = $htmlbody;
         $params                = new \stdClass();
-        $params->tags          = [$tags];
+        $params->tags          = (array) $tags;
         $template->params      = json_encode($params);
 
         return $db->updateObject('#__mail_templates', $template, ['template_id', 'language']);
diff --git a/libraries/src/Mail/MailerFactory.php b/libraries/src/Mail/MailerFactory.php
new file mode 100644
index 0000000000000..d2e71bff69584
--- /dev/null
+++ b/libraries/src/Mail/MailerFactory.php
@@ -0,0 +1,108 @@
+<?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\Mail;
+
+use Exception;
+use Joomla\CMS\Log\Log;
+use Joomla\Registry\Registry;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Default factory for creating mailer objects.
+ *
+ * @since  4.4.0
+ */
+class MailerFactory implements MailerFactoryInterface
+{
+    /**
+     * The default configuration.
+     *
+     * @var     Registry
+     * @since   4.4.0
+     */
+    private $defaultConfiguration;
+
+    /**
+     * The MailerFactory constructor.
+     *
+     * @param   Registry  $defaultConfiguration  The default configuration
+     */
+    public function __construct(Registry $defaultConfiguration)
+    {
+        $this->defaultConfiguration = $defaultConfiguration;
+    }
+
+    /**
+     * Method to get an instance of a mailer. If the passed settings are null,
+     * then the mailer does use the internal configuration.
+     *
+     * @param   ?Registry  $settings  The configuration
+     *
+     * @return  MailerInterface
+     *
+     * @since   4.4.0
+     */
+    public function createMailer(?Registry $settings = null): MailerInterface
+    {
+        $configuration = clone $this->defaultConfiguration;
+
+        if ($settings) {
+            $configuration->merge($settings);
+        }
+
+        $mailer = new Mail((bool) $configuration->get('throw_exceptions', true));
+
+        $smtpauth   = $configuration->get('smtpauth') == 0 ? null : 1;
+        $smtpuser   = $configuration->get('smtpuser');
+        $smtppass   = $configuration->get('smtppass');
+        $smtphost   = $configuration->get('smtphost');
+        $smtpsecure = $configuration->get('smtpsecure');
+        $smtpport   = $configuration->get('smtpport');
+        $mailfrom   = $configuration->get('mailfrom');
+        $fromname   = $configuration->get('fromname');
+        $mailType   = $configuration->get('mailer');
+
+        // Clean the email address
+        $mailfrom = MailHelper::cleanLine($mailfrom);
+
+        // Set default sender without Reply-to if the mailfrom is a valid address
+        if (MailHelper::isEmailAddress($mailfrom)) {
+            // Wrap in try/catch to catch Exception if it is throwing them
+            try {
+                // Check for a false return value if exception throwing is disabled
+                if ($mailer->setFrom($mailfrom, MailHelper::cleanLine($fromname), false) === false) {
+                    Log::add(__METHOD__ . '() could not set the sender data.', Log::WARNING, 'mail');
+                }
+            } catch (\Exception $e) {
+                Log::add(__METHOD__ . '() could not set the sender data.', Log::WARNING, 'mail');
+            }
+        }
+
+        // Default mailer is to use PHP's mail function
+        switch ($mailType) {
+            case 'smtp':
+                $mailer->useSmtp($smtpauth, $smtphost, $smtpuser, $smtppass, $smtpsecure, $smtpport);
+                break;
+
+            case 'sendmail':
+                $mailer->isSendmail();
+                break;
+
+            default:
+                $mailer->isMail();
+                break;
+        }
+
+        return $mailer;
+    }
+}
diff --git a/libraries/src/Mail/MailerFactoryAwareInterface.php b/libraries/src/Mail/MailerFactoryAwareInterface.php
new file mode 100644
index 0000000000000..b60d0a88afb15
--- /dev/null
+++ b/libraries/src/Mail/MailerFactoryAwareInterface.php
@@ -0,0 +1,33 @@
+<?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\Mail;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Interface to be implemented by classes depending on a mailer factory.
+ *
+ * @since  4.4.0
+ */
+interface MailerFactoryAwareInterface
+{
+    /**
+     * Set the mailer factory to use.
+     *
+     * @param   ?MailerFactoryInterface  $mailerFactory  The mailer factory to use.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function setMailerFactory(?MailerFactoryInterface $mailerFactory = null): void;
+}
diff --git a/libraries/src/Mail/MailerFactoryAwareTrait.php b/libraries/src/Mail/MailerFactoryAwareTrait.php
new file mode 100644
index 0000000000000..4c8cf6ac79cd7
--- /dev/null
+++ b/libraries/src/Mail/MailerFactoryAwareTrait.php
@@ -0,0 +1,61 @@
+<?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\Mail;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Defines the trait for a MailerFactoryInterface aware class.
+ *
+ * @since  4.4.0
+ */
+trait MailerFactoryAwareTrait
+{
+    /**
+     * MailerFactoryInterface
+     *
+     * @var    MailerFactoryInterface
+     * @since  4.4.0
+     */
+    private $mailerFactory;
+
+    /**
+     * Get the MailerFactoryInterface.
+     *
+     * @return  MailerFactoryInterface
+     *
+     * @since   4.4.0
+     * @throws  \UnexpectedValueException May be thrown if the MailerFactory has not been set.
+     */
+    protected function getMailerFactory(): MailerFactoryInterface
+    {
+        if ($this->mailerFactory) {
+            return $this->mailerFactory;
+        }
+
+        throw new \UnexpectedValueException('MailerFactory not set in ' . __CLASS__);
+    }
+
+    /**
+     * Set the mailer factory to use.
+     *
+     * @param   ?MailerFactoryInterface  $mailerFactory  The mailer factory to use.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function setMailerFactory(?MailerFactoryInterface $mailerFactory = null): void
+    {
+        $this->mailerFactory = $mailerFactory;
+    }
+}
diff --git a/libraries/src/Mail/MailerFactoryInterface.php b/libraries/src/Mail/MailerFactoryInterface.php
new file mode 100644
index 0000000000000..9c7d0969b1b96
--- /dev/null
+++ b/libraries/src/Mail/MailerFactoryInterface.php
@@ -0,0 +1,36 @@
+<?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\Mail;
+
+use Joomla\Registry\Registry;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Interface defining a factory which can create mailer objects.
+ *
+ * @since  4.4.0
+ */
+interface MailerFactoryInterface
+{
+    /**
+     * Method to get an instance of a mailer. If the passed settings are null,
+     * then the mailer does use the internal configuration.
+     *
+     * @param   ?Registry  $settings  The configuration
+     *
+     * @return  MailerInterface
+     *
+     * @since   4.4.0
+     */
+    public function createMailer(?Registry $settings = null): MailerInterface;
+}
diff --git a/libraries/src/Mail/MailerInterface.php b/libraries/src/Mail/MailerInterface.php
new file mode 100644
index 0000000000000..b3290260910db
--- /dev/null
+++ b/libraries/src/Mail/MailerInterface.php
@@ -0,0 +1,139 @@
+<?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\Mail;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Provides a common interface to send emails with.
+ *
+ * @since  4.4.0
+ */
+interface MailerInterface
+{
+    /**
+     * Send the mail. Throws an exception when something goes wrong.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     *
+     * @throws  \RuntimeException
+     */
+    public function send();
+
+    /**
+     * Set the email sender.
+     *
+     * @param   string  $fromEmail  The Email address of the sender
+     * @param   string  $name       The name of the sender
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     *
+     * @throws  \UnexpectedValueException  if the sender is not a valid address
+     */
+    public function setSender(string $fromEmail, string $name = '');
+
+    /**
+     * Set the email subject.
+     *
+     * @param   string  $subject  Subject of the email
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function setSubject(string $subject);
+
+    /**
+     * Set the email body.
+     *
+     * @param   string  $content  Body of the email
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function setBody(string $content);
+
+    /**
+     * Add a recipient to the email.
+     *
+     * @param   string  $recipientEmail  The email of the recipient
+     * @param   string  $name            The name of the recipient
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     *
+     * @throws  \UnexpectedValueException  if the recipient is not a valid address
+     */
+    public function addRecipient(string $recipientEmail, string $name = '');
+
+    /**
+     * Add a carbon copy recipient to the email.
+     *
+     * @param   string  $ccEmail  The email of the CC recipient
+     * @param   string  $name     The name of the CC recipient
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     *
+     * @throws  \UnexpectedValueException  if the CC is not a valid address
+     */
+    public function addCc(string $ccEmail, string $name = '');
+
+    /**
+     * Add a blind carbon copy recipient to the email.
+     *
+     * @param   string  $bccEmail  The email of the BCC recipient
+     * @param   string  $name      The name of the BCC recipient
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     *
+     * @throws  \UnexpectedValueException  if the BCC is not a valid address
+     */
+    public function addBcc(string $bccEmail, string $name = '');
+
+    /**
+     * Add file attachment to the email.
+     *
+     * @param   string  $data         The data of the attachment
+     * @param   string  $name         The name of the attachment
+     * @param   string  $encoding     The encoding of the attachment
+     * @param   string  $type         The mime type of the attachment
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function addAttachment(string $data, string $name = '', string $encoding = 'base64', string $type = 'application/octet-stream');
+
+    /**
+     * Add Reply to email address to the email
+     *
+     * @param   string  $replyToEmail  The email of the reply address
+     * @param   string  $name          The name of the reply address
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     *
+     * @throws  \UnexpectedValueException  if the replay to is not a valid address
+     */
+    public function addReplyTo(string $replyToEmail, string $name = '');
+}
diff --git a/libraries/src/Mail/language/phpmailer.lang-en_gb.php b/libraries/src/Mail/language/phpmailer.lang-en_gb.php
index 3d8370226339b..4e65e84b609d7 100644
--- a/libraries/src/Mail/language/phpmailer.lang-en_gb.php
+++ b/libraries/src/Mail/language/phpmailer.lang-en_gb.php
@@ -7,7 +7,7 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_PLATFORM') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Language\Text;
 
diff --git a/libraries/src/Menu/AbstractMenu.php b/libraries/src/Menu/AbstractMenu.php
index e37d475227161..eabff47616c84 100644
--- a/libraries/src/Menu/AbstractMenu.php
+++ b/libraries/src/Menu/AbstractMenu.php
@@ -15,7 +15,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -100,7 +100,7 @@ public function __construct($options = [])
          * user object is not updated, the menu will render incorrectly, not complying with
          * menu items access levels.
          *
-         * @see https://github.com/joomla/joomla-cms/issues/11541
+         * @link https://github.com/joomla/joomla-cms/issues/11541
          */
         $this->storedUser = isset($options['user']) && $options['user'] instanceof User ? $options['user'] : null;
     }
diff --git a/libraries/src/Menu/AdministratorMenu.php b/libraries/src/Menu/AdministratorMenu.php
index e33d582fc095b..12d419534a359 100644
--- a/libraries/src/Menu/AdministratorMenu.php
+++ b/libraries/src/Menu/AdministratorMenu.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Menu;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Menu/AdministratorMenuItem.php b/libraries/src/Menu/AdministratorMenuItem.php
index 3eed1778b8281..341749cf577b9 100644
--- a/libraries/src/Menu/AdministratorMenuItem.php
+++ b/libraries/src/Menu/AdministratorMenuItem.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Menu;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Menu/MenuItem.php b/libraries/src/Menu/MenuItem.php
index 7fbe7140885e4..247daef28bd8e 100644
--- a/libraries/src/Menu/MenuItem.php
+++ b/libraries/src/Menu/MenuItem.php
@@ -14,7 +14,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Menu/SiteMenu.php b/libraries/src/Menu/SiteMenu.php
index 0c25234af8e2d..2f6023c2fef7a 100644
--- a/libraries/src/Menu/SiteMenu.php
+++ b/libraries/src/Menu/SiteMenu.php
@@ -22,7 +22,7 @@
 use Joomla\Database\Exception\ExecutionFailureException;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Microdata/Microdata.php b/libraries/src/Microdata/Microdata.php
index d8a13875d3500..eeb59a7654e9e 100644
--- a/libraries/src/Microdata/Microdata.php
+++ b/libraries/src/Microdata/Microdata.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Microdata;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Object/CMSObject.php b/libraries/src/Object/CMSObject.php
index 4a13c2c8eb902..942a2997b3a62 100644
--- a/libraries/src/Object/CMSObject.php
+++ b/libraries/src/Object/CMSObject.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Object;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Object/LegacyErrorHandlingTrait.php b/libraries/src/Object/LegacyErrorHandlingTrait.php
index b4025ed98c6fc..bbbcb54ffd9ef 100644
--- a/libraries/src/Object/LegacyErrorHandlingTrait.php
+++ b/libraries/src/Object/LegacyErrorHandlingTrait.php
@@ -4,13 +4,13 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Object;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Object/LegacyPropertyManagementTrait.php b/libraries/src/Object/LegacyPropertyManagementTrait.php
index 5e23bdaecf417..0980ee8b221d7 100644
--- a/libraries/src/Object/LegacyPropertyManagementTrait.php
+++ b/libraries/src/Object/LegacyPropertyManagementTrait.php
@@ -4,13 +4,13 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Object;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -93,6 +93,24 @@ public function getProperties($public = true)
                     unset($vars[$key]);
                 }
             }
+
+            // Collect all none public properties of the current class and it's parents
+            $nonePublicProperties = [];
+            $reflection           = new \ReflectionObject($this);
+            do {
+                $nonePublicProperties = array_merge(
+                    $reflection->getProperties(\ReflectionProperty::IS_PRIVATE | \ReflectionProperty::IS_PROTECTED),
+                    $nonePublicProperties
+                );
+            } while ($reflection = $reflection->getParentClass());
+
+            // Unset all none public properties, this is needed as get_object_vars returns now all vars
+            // from the current object and not only the CMSObject and the public ones from the inheriting classes
+            foreach ($nonePublicProperties as $prop) {
+                if (array_key_exists($prop->getName(), $vars)) {
+                    unset($vars[$prop->getName()]);
+                }
+            }
         }
 
         return $vars;
diff --git a/libraries/src/Pagination/Pagination.php b/libraries/src/Pagination/Pagination.php
index 3cc6f90907ab3..d59dc6e9a15fc 100644
--- a/libraries/src/Pagination/Pagination.php
+++ b/libraries/src/Pagination/Pagination.php
@@ -17,7 +17,7 @@
 use Joomla\CMS\Router\Route;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Pagination/PaginationObject.php b/libraries/src/Pagination/PaginationObject.php
index 837610d77a05a..8bce306388e85 100644
--- a/libraries/src/Pagination/PaginationObject.php
+++ b/libraries/src/Pagination/PaginationObject.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Pagination;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Pathway/Pathway.php b/libraries/src/Pathway/Pathway.php
index 96bdf04a8411d..d4529618fec4c 100644
--- a/libraries/src/Pathway/Pathway.php
+++ b/libraries/src/Pathway/Pathway.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Language\Text;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Pathway/SitePathway.php b/libraries/src/Pathway/SitePathway.php
index 412cae126f45e..eed24b09a956e 100644
--- a/libraries/src/Pathway/SitePathway.php
+++ b/libraries/src/Pathway/SitePathway.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Language\Multilanguage;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Plugin/CMSPlugin.php b/libraries/src/Plugin/CMSPlugin.php
index 019b8c452b0be..800253ccee17b 100644
--- a/libraries/src/Plugin/CMSPlugin.php
+++ b/libraries/src/Plugin/CMSPlugin.php
@@ -10,8 +10,12 @@
 namespace Joomla\CMS\Plugin;
 
 use Joomla\CMS\Application\CMSApplicationInterface;
+use Joomla\CMS\Event\AbstractImmutableEvent;
+use Joomla\CMS\Event\Result\ResultAwareInterface;
 use Joomla\CMS\Extension\PluginInterface;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Language\LanguageAwareInterface;
+use Joomla\CMS\Language\LanguageAwareTrait;
 use Joomla\Event\AbstractEvent;
 use Joomla\Event\DispatcherAwareInterface;
 use Joomla\Event\DispatcherAwareTrait;
@@ -21,7 +25,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -29,9 +33,10 @@
  *
  * @since  1.5
  */
-abstract class CMSPlugin implements DispatcherAwareInterface, PluginInterface
+abstract class CMSPlugin implements DispatcherAwareInterface, PluginInterface, LanguageAwareInterface
 {
     use DispatcherAwareTrait;
+    use LanguageAwareTrait;
 
     /**
      * A Registry object holding the parameters for the plugin
@@ -96,14 +101,14 @@ abstract class CMSPlugin implements DispatcherAwareInterface, PluginInterface
     /**
      * Constructor
      *
-     * @param   DispatcherInterface  &$subject  The object to observe
-     * @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).
+     * @param   DispatcherInterface  $dispatcher  The event dispatcher
+     * @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(&$subject, $config = [])
+    public function __construct(DispatcherInterface $dispatcher, array $config = [])
     {
         // Get the parameters.
         if (isset($config['params'])) {
@@ -150,7 +155,7 @@ public function __construct(&$subject, $config = [])
         }
 
         // Set the dispatcher we are to register our listeners with
-        $this->setDispatcher($subject);
+        $this->setDispatcher($dispatcher);
     }
 
     /**
@@ -288,9 +293,13 @@ function (AbstractEvent $event) use ($methodName) {
                     return;
                 }
 
-                // Restore the old results and add the new result from our method call
-                $allResults[]    = $result;
-                $event['result'] = $allResults;
+                if ($event instanceof ResultAwareInterface) {
+                    $event->addResult($result);
+                } elseif (!$event instanceof AbstractImmutableEvent) {
+                    // Restore the old results and add the new result from our method call
+                    $allResults[]    = $result;
+                    $event['result'] = $allResults;
+                }
             }
         );
     }
@@ -376,5 +385,9 @@ protected function getApplication(): ?CMSApplicationInterface
     public function setApplication(CMSApplicationInterface $application): void
     {
         $this->application = $application;
+
+        if ($application->getLanguage()) {
+            $this->setLanguage($application->getLanguage());
+        }
     }
 }
diff --git a/libraries/src/Plugin/PluginHelper.php b/libraries/src/Plugin/PluginHelper.php
index ec531b0503f14..9c3c591e311ae 100644
--- a/libraries/src/Plugin/PluginHelper.php
+++ b/libraries/src/Plugin/PluginHelper.php
@@ -15,7 +15,7 @@
 use Joomla\Event\DispatcherInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -47,7 +47,17 @@ abstract class PluginHelper
      */
     public static function getLayoutPath($type, $name, $layout = 'default')
     {
-        $templateObj   = Factory::getApplication()->getTemplate(true);
+        $app = Factory::getApplication();
+
+        if ($app->isClient('site') || $app->isClient('administrator')) {
+            $templateObj = $app->getTemplate(true);
+        } else {
+            $templateObj = (object) [
+                'template' => '',
+                'parent'   => '',
+            ];
+        }
+
         $defaultLayout = $layout;
         $template      = $templateObj->template;
 
@@ -60,25 +70,26 @@ public static function getLayoutPath($type, $name, $layout = 'default')
         }
 
         // Build the template and base path for the layout
-        $tPath = JPATH_THEMES . '/' . $template . '/html/plg_' . $type . '_' . $name . '/' . $layout . '.php';
-        $iPath = JPATH_THEMES . '/' . $templateObj->parent . '/html/plg_' . $type . '_' . $name . '/' . $layout . '.php';
-        $bPath = JPATH_PLUGINS . '/' . $type . '/' . $name . '/tmpl/' . $defaultLayout . '.php';
-        $dPath = JPATH_PLUGINS . '/' . $type . '/' . $name . '/tmpl/default.php';
-
-        // If the template has a layout override use it
-        if (is_file($tPath)) {
-            return $tPath;
+        $layoutPaths = [];
+
+        if ($template) {
+            $layoutPaths[] = JPATH_THEMES . '/' . $template . '/html/plg_' . $type . '_' . $name . '/' . $layout . '.php';
         }
 
-        if (!empty($templateObj->parent) && is_file($iPath)) {
-            return $iPath;
+        if ($templateObj->parent) {
+            $layoutPaths[] = JPATH_THEMES . '/' . $templateObj->parent . '/html/plg_' . $type . '_' . $name . '/' . $layout . '.php';
         }
 
-        if (is_file($bPath)) {
-            return $bPath;
+        $layoutPaths[] = JPATH_PLUGINS . '/' . $type . '/' . $name . '/tmpl/' . $defaultLayout . '.php';
+        $layoutPaths[] = JPATH_PLUGINS . '/' . $type . '/' . $name . '/tmpl/default.php';
+
+        foreach ($layoutPaths as $path) {
+            if (is_file($path)) {
+                return $path;
+            }
         }
 
-        return $dPath;
+        return end($layoutPaths);
     }
 
     /**
diff --git a/libraries/src/Profiler/Profiler.php b/libraries/src/Profiler/Profiler.php
index 285d8592bd76b..6bc1dcbe26581 100644
--- a/libraries/src/Profiler/Profiler.php
+++ b/libraries/src/Profiler/Profiler.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Profiler;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Proxy/ArrayProxy.php b/libraries/src/Proxy/ArrayProxy.php
new file mode 100644
index 0000000000000..b48e300d9dc78
--- /dev/null
+++ b/libraries/src/Proxy/ArrayProxy.php
@@ -0,0 +1,174 @@
+<?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\Proxy;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Array proxy class
+ *
+ * @since  5.0.0
+ */
+class ArrayProxy implements ProxyInterface, \Countable, \ArrayAccess, \Iterator
+{
+    /**
+     * Data source
+     *
+     * @var array
+     *
+     * @since  5.0.0
+     */
+    protected $data = [];
+
+    /**
+     * Class constructor
+     *
+     * @param  array  $data  The array for Proxy access
+     *
+     * @since  5.0.0
+     */
+    public function __construct(array &$data)
+    {
+        $this->data = &$data;
+    }
+
+    /**
+     * Implementation of ArrayAccess interface
+     *
+     * @param  mixed   $offset  The key to check
+     *
+     * @return boolean
+     *
+     * @since  5.0.0
+     */
+    public function offsetExists(mixed $offset): bool
+    {
+        return \array_key_exists($offset, $this->data);
+    }
+
+    /**
+     * Implementation of ArrayAccess interface
+     *
+     * @param mixed $offset The key to get
+     *
+     * @return mixed
+     *
+     * @since  5.0.0
+     */
+    public function offsetGet(mixed $offset): mixed
+    {
+        return $this->data[$offset] ?? null;
+    }
+
+    /**
+     * Implementation of ArrayAccess interface
+     *
+     * @param  mixed   $offset The key to set
+     * @param  mixed   $value  The value to set
+     *
+     * @return void
+     *
+     * @since  5.0.0
+     */
+    public function offsetSet(mixed $offset, mixed $value): void
+    {
+        $this->data[$offset] = $value;
+    }
+
+    /**
+     * Implementation of ArrayAccess interface
+     *
+     * @param  mixed   $offset  The key to remove
+     *
+     * @return void
+     *
+     * @since  5.0.0
+     */
+    public function offsetUnset(mixed $offset): void
+    {
+        unset($this->data[$offset]);
+    }
+
+    /**
+     * Implementation of Countable interface
+     *
+     * @return int
+     *
+     * @since  5.0.0
+     */
+    public function count(): int
+    {
+        return \count($this->data);
+    }
+
+    /**
+     * Implementation of Iterator interface
+     *
+     * @return mixed
+     *
+     * @since  5.0.0
+     */
+    public function current(): mixed
+    {
+        $key = key($this->data);
+
+        return $this->offsetGet($key);
+    }
+
+    /**
+     * Implementation of Iterator interface
+     *
+     * @return mixed
+     *
+     * @since  5.0.0
+     */
+    public function key(): mixed
+    {
+        return key($this->data);
+    }
+
+    /**
+     * Implementation of Iterator interface
+     *
+     * @return void
+     *
+     * @since  5.0.0
+     */
+    public function next(): void
+    {
+        next($this->data);
+    }
+
+    /**
+     * Implementation of Iterator interface
+     *
+     * @return void
+     *
+     * @since  5.0.0
+     */
+    public function rewind(): void
+    {
+        reset($this->data);
+    }
+
+    /**
+     * Implementation of Iterator interface
+     *
+     * @return boolean
+     *
+     * @since  5.0.0
+     */
+    public function valid(): bool
+    {
+        return key($this->data) !== null;
+    }
+}
diff --git a/libraries/src/Proxy/ArrayReadOnlyProxy.php b/libraries/src/Proxy/ArrayReadOnlyProxy.php
new file mode 100644
index 0000000000000..7ab98d689adff
--- /dev/null
+++ b/libraries/src/Proxy/ArrayReadOnlyProxy.php
@@ -0,0 +1,65 @@
+<?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\Proxy;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Array read-only proxy class.
+ * The class provides read-only feature for Array, including its children.
+ *
+ * @since  5.0.0
+ */
+class ArrayReadOnlyProxy extends ArrayProxy implements ReadOnlyProxyInterface
+{
+    /**
+     * Implementation of ArrayAccess interface
+     *
+     * @param mixed $offset The key to get
+     *
+     * @return mixed
+     *
+     * @since  5.0.0
+     */
+    public function offsetGet(mixed $offset): mixed
+    {
+        $value = $this->data[$offset] ?? null;
+
+        // Ensure that the child also is a read-only
+        if (\is_scalar($value) || $value === null) {
+            return $value;
+        } elseif (\is_array($value)) {
+            $value = new static($value);
+        } elseif (\is_object($value)) {
+            $value = new ObjectReadOnlyProxy($value);
+        }
+
+        return $value;
+    }
+
+    /**
+     * Implementation of ArrayAccess interface
+     *
+     * @param  mixed   $offset The key to set
+     * @param  mixed   $value  The value to set
+     *
+     * @return void
+     *
+     * @throws \RuntimeException
+     *
+     * @since  5.0.0
+     */
+    public function offsetSet(mixed $offset, mixed $value): void
+    {
+        throw new \RuntimeException(sprintf('ArrayReadOnlyProxy: trying to modify read-only element, by key "%s"', $offset));
+    }
+}
diff --git a/libraries/src/Proxy/ObjectProxy.php b/libraries/src/Proxy/ObjectProxy.php
new file mode 100644
index 0000000000000..abda35187de07
--- /dev/null
+++ b/libraries/src/Proxy/ObjectProxy.php
@@ -0,0 +1,141 @@
+<?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\Proxy;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Object proxy class
+ *
+ * @since  5.0.0
+ */
+class ObjectProxy implements ProxyInterface, \Iterator
+{
+    /**
+     * Data source
+     *
+     * @var object
+     *
+     * @since  5.0.0
+     */
+    protected $data;
+
+    /**
+     * An iterator instance
+     *
+     * @var \ArrayIterator
+     *
+     * @since  5.0.0
+     */
+    protected $iterator;
+
+    /**
+     * Class constructor
+     *
+     * @param  object  $data  The object for Proxy access
+     *
+     * @since  5.0.0
+     */
+    public function __construct(object $data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * Implementing reading from object
+     *
+     * @param mixed $key  The key name to read
+     *
+     * @return mixed
+     *
+     * @since  5.0.0
+     */
+    public function __get($key): mixed
+    {
+        return $this->data->$key ?? null;
+    }
+
+    /**
+     * Implementing writing to object
+     *
+     * @param mixed $key    The key name to write
+     * @param mixed $value  The value to write
+     *
+     * @return void
+     *
+     * @since  5.0.0
+     */
+    public function __set($key, $value): void
+    {
+        $this->data->$key = $value;
+    }
+
+    /**
+     * Implementation of Iterator interface
+     *
+     * @return mixed
+     *
+     * @since  5.0.0
+     */
+    public function current(): mixed
+    {
+        return $this->iterator->current();
+    }
+
+    /**
+     * Implementation of Iterator interface
+     *
+     * @return mixed
+     *
+     * @since  5.0.0
+     */
+    public function key(): mixed
+    {
+        return $this->iterator->key();
+    }
+
+    /**
+     * Implementation of Iterator interface
+     *
+     * @return void
+     *
+     * @since  5.0.0
+     */
+    public function next(): void
+    {
+        $this->iterator->next();
+    }
+
+    /**
+     * Implementation of Iterator interface
+     *
+     * @return void
+     *
+     * @since  5.0.0
+     */
+    public function rewind(): void
+    {
+        $this->iterator = new \ArrayIterator($this->data);
+    }
+
+    /**
+     * Implementation of Iterator interface
+     *
+     * @return boolean
+     *
+     * @since  5.0.0
+     */
+    public function valid(): bool
+    {
+        return $this->iterator->valid();
+    }
+}
diff --git a/libraries/src/Proxy/ObjectReadOnlyProxy.php b/libraries/src/Proxy/ObjectReadOnlyProxy.php
new file mode 100644
index 0000000000000..da4522cd456e2
--- /dev/null
+++ b/libraries/src/Proxy/ObjectReadOnlyProxy.php
@@ -0,0 +1,88 @@
+<?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\Proxy;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Object read-only proxy class.
+ * The class provides read-only feature for Object, including its children.
+ *
+ * @since  5.0.0
+ */
+class ObjectReadOnlyProxy extends ObjectProxy implements ReadOnlyProxyInterface
+{
+    /**
+     * Implementing reading from object
+     *
+     * @param mixed $key  The key name to read
+     *
+     * @return mixed
+     *
+     * @since  5.0.0
+     */
+    public function __get($key): mixed
+    {
+        $value = $this->data->$key ?? null;
+
+        // Ensure that the child also is a read-only
+        if (\is_scalar($value) || $value === null) {
+            return $value;
+        } elseif (\is_object($value)) {
+            $value = new static($value);
+        } elseif (\is_array($value)) {
+            $value = new ArrayReadOnlyProxy($value);
+        }
+
+        return $value;
+    }
+
+    /**
+     * Implementing writing to object
+     *
+     * @param mixed $key    The key name to write
+     * @param mixed $value  The value to write
+     *
+     * @return void
+     *
+     * @throws \RuntimeException
+     *
+     * @since  5.0.0
+     */
+    public function __set($key, $value): void
+    {
+        throw new \RuntimeException(sprintf('ObjectReadOnlyProxy: trying to modify read-only element, by key "%s"', $key));
+    }
+
+    /**
+     * Implementation of Iterator interface
+     *
+     * @return mixed
+     *
+     * @since  5.0.0
+     */
+    public function current(): mixed
+    {
+        $value = $this->iterator->current();
+
+        // Ensure that the child also is a read-only
+        if (\is_scalar($value) || $value === null) {
+            return $value;
+        } elseif (\is_object($value)) {
+            $value = new static($value);
+        } elseif (\is_array($value)) {
+            $value = new ArrayReadOnlyProxy($value);
+        }
+
+        return $value;
+    }
+}
diff --git a/libraries/src/Proxy/ProxyInterface.php b/libraries/src/Proxy/ProxyInterface.php
new file mode 100644
index 0000000000000..c975494bd9595
--- /dev/null
+++ b/libraries/src/Proxy/ProxyInterface.php
@@ -0,0 +1,23 @@
+<?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\Proxy;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Interface for Proxy classes
+ *
+ * @since  5.0.0
+ */
+interface ProxyInterface
+{
+}
diff --git a/libraries/src/Proxy/ReadOnlyProxyInterface.php b/libraries/src/Proxy/ReadOnlyProxyInterface.php
new file mode 100644
index 0000000000000..0c6187e4eeb9a
--- /dev/null
+++ b/libraries/src/Proxy/ReadOnlyProxyInterface.php
@@ -0,0 +1,23 @@
+<?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\Proxy;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Interface for read-only Proxy classes
+ *
+ * @since  5.0.0
+ */
+interface ReadOnlyProxyInterface extends ProxyInterface
+{
+}
diff --git a/libraries/src/Response/JsonResponse.php b/libraries/src/Response/JsonResponse.php
index 41c5415f3ade5..561b574a3f4b5 100644
--- a/libraries/src/Response/JsonResponse.php
+++ b/libraries/src/Response/JsonResponse.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Factory;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Router/AdministratorRouter.php b/libraries/src/Router/AdministratorRouter.php
index aedab248a3104..232ca20ef229a 100644
--- a/libraries/src/Router/AdministratorRouter.php
+++ b/libraries/src/Router/AdministratorRouter.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Uri\Uri;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Router/ApiRouter.php b/libraries/src/Router/ApiRouter.php
index e9c7d7e3e3bce..e7d7387fd5dd7 100644
--- a/libraries/src/Router/ApiRouter.php
+++ b/libraries/src/Router/ApiRouter.php
@@ -99,13 +99,6 @@ public function parseApiRoute($method = 'GET')
         // Get the path from the route and remove and leading or trailing slash.
         $routePath = $this->getRoutePath();
 
-        $query = Uri::getInstance()->getQuery(true);
-
-        // Remove the public key as it is only supported coming from the route definition
-        if (array_key_exists('public', $query)) {
-            unset($query['public']);
-        }
-
         // Iterate through all of the known routes looking for a match.
         foreach ($this->routes as $route) {
             if (\in_array($method, $route->getMethods())) {
@@ -119,11 +112,6 @@ public function parseApiRoute($method = 'GET')
 
                     $controller = preg_split("/[.]+/", $route->getController());
 
-                    /** @deprecated  4.3  will be removed in 5.0
-                     *               Query parameters will not be merged into route variables from 5.0
-                     */
-                    $vars       = array_merge($vars, $query);
-
                     return [
                         'controller' => $controller[0],
                         'task'       => $controller[1],
diff --git a/libraries/src/Router/Exception/RouteNotFoundException.php b/libraries/src/Router/Exception/RouteNotFoundException.php
index 5f46ab545142d..f6316d0a894cf 100644
--- a/libraries/src/Router/Exception/RouteNotFoundException.php
+++ b/libraries/src/Router/Exception/RouteNotFoundException.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Router\Exception;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Router/Route.php b/libraries/src/Router/Route.php
index 06c2a14ecda7d..9335c1478c24a 100644
--- a/libraries/src/Router/Route.php
+++ b/libraries/src/Router/Route.php
@@ -15,7 +15,7 @@
 use Joomla\DI\Exception\KeyNotFoundException;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Router/Router.php b/libraries/src/Router/Router.php
index b43c21337d7f2..16237592222c5 100644
--- a/libraries/src/Router/Router.php
+++ b/libraries/src/Router/Router.php
@@ -15,7 +15,7 @@
 use Joomla\CMS\Uri\Uri;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Router/SiteRouter.php b/libraries/src/Router/SiteRouter.php
index 594f8fda681ba..73edd157c90f3 100644
--- a/libraries/src/Router/SiteRouter.php
+++ b/libraries/src/Router/SiteRouter.php
@@ -19,7 +19,7 @@
 use Joomla\CMS\Uri\Uri;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Schema/ChangeItem.php b/libraries/src/Schema/ChangeItem.php
index 19919f1e814e0..70080080d5630 100644
--- a/libraries/src/Schema/ChangeItem.php
+++ b/libraries/src/Schema/ChangeItem.php
@@ -14,7 +14,7 @@
 use Joomla\Database\Exception\ExecutionFailureException;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Schema/ChangeItem/MysqlChangeItem.php b/libraries/src/Schema/ChangeItem/MysqlChangeItem.php
index ca2533ae85df7..bf920f04c11e0 100644
--- a/libraries/src/Schema/ChangeItem/MysqlChangeItem.php
+++ b/libraries/src/Schema/ChangeItem/MysqlChangeItem.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Schema\ChangeItem;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Schema/ChangeItem/PostgresqlChangeItem.php b/libraries/src/Schema/ChangeItem/PostgresqlChangeItem.php
index 740ce139bb053..59dc41289171d 100644
--- a/libraries/src/Schema/ChangeItem/PostgresqlChangeItem.php
+++ b/libraries/src/Schema/ChangeItem/PostgresqlChangeItem.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Schema\ChangeItem;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Schema/ChangeSet.php b/libraries/src/Schema/ChangeSet.php
index af415600d68b5..734fb3c1c7855 100644
--- a/libraries/src/Schema/ChangeSet.php
+++ b/libraries/src/Schema/ChangeSet.php
@@ -13,7 +13,7 @@
 use Joomla\Database\DatabaseDriver;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -188,7 +188,7 @@ public function getSchema()
     {
         $updateFiles = $this->getUpdateFiles();
 
-        // No schema files found - abort and return empty string
+        // No schema files found - stop and return empty string
         if (empty($updateFiles)) {
             return '';
         }
diff --git a/libraries/src/Schemaorg/SchemaorgPluginTrait.php b/libraries/src/Schemaorg/SchemaorgPluginTrait.php
new file mode 100755
index 0000000000000..2d54a3f5f89a1
--- /dev/null
+++ b/libraries/src/Schemaorg/SchemaorgPluginTrait.php
@@ -0,0 +1,195 @@
+<?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\Schemaorg;
+
+use Joomla\CMS\Event\Plugin\System\Schemaorg\PrepareFormEvent;
+use Joomla\CMS\Form\Field\ListField;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Trait for component schemaorg plugins.
+ *
+ * @since 5.0.0
+ */
+trait SchemaorgPluginTrait
+{
+    /**
+     * Returns an array of events this subscriber will listen to.
+     *
+     * @return  array
+     *
+     * @since   5.0.0
+     */
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            'onSchemaPrepareForm' => 'onSchemaPrepareForm',
+        ];
+    }
+
+    /**
+     * Add a new option to schemaType list field in schema form
+     *
+     * @param   PrepareFormEvent  $event
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    protected function addSchemaType(PrepareFormEvent $event): void
+    {
+        $form = $event->getForm();
+        $name = $this->pluginName;
+
+        if (!$form || !$name) {
+            return;
+        }
+
+        $schemaType = $form->getField('schemaType', 'schema');
+
+        if ($schemaType instanceof ListField) {
+            $schemaType->addOption($name, ['value' => $name]);
+        }
+    }
+
+    /**
+     * Add a new option to the schema type in the item editing page
+     *
+     * @param   PrepareFormEvent  $event  The form to be altered.
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function onSchemaPrepareForm(PrepareFormEvent $event): void
+    {
+        $form    = $event->getForm();
+        $context = $form->getName();
+
+        if (!$this->isSupported($context)) {
+            return;
+        }
+
+        $this->addSchemaType($event);
+
+        // Load the form fields
+        if (is_file(JPATH_PLUGINS . '/' . $this->_type . '/' . $this->_name . '/forms/schemaorg.xml')) {
+            $form->loadFile(JPATH_PLUGINS . '/' . $this->_type . '/' . $this->_name . '/forms/schemaorg.xml');
+        }
+    }
+
+    /**
+     * To create an array from repeatable text field data
+     *
+     * @param   array  $schema            Schema form
+     * @param   array  $repeatableFields  Names of all the Repeatable fields
+     *
+     * @return  array
+     *
+     * @since   5.0.0
+     */
+    protected function convertToArray(array $schema, array $repeatableFields)
+    {
+        foreach ($repeatableFields as $repeatableField) {
+            $field = $schema[$repeatableField] ?? [];
+
+            if (empty($field)) {
+                continue;
+            }
+
+            $result = [];
+
+            foreach ($field as $key => $value) {
+                if (is_array($value)) {
+                    foreach ($value as $k => $v) {
+                        $result[] = $v;
+                    }
+
+                    continue;
+                }
+
+                $result[] = $value;
+            }
+
+            if (empty($result)) {
+                unset($schema[$repeatableField]);
+
+                continue;
+            }
+
+            $schema[$repeatableField] = $result;
+        }
+
+        return $schema;
+    }
+
+    /**
+     * Check if the current plugin should execute schemaorg related activities
+     *
+     * @param   string  $context
+     *
+     * @return  boolean
+     *
+     * @since   5.0.0
+     */
+    protected function isSupported($context)
+    {
+        if (!$this->checkAllowedAndForbiddenlist($context)) {
+            return false;
+        }
+
+        $parts = explode('.', $context);
+
+        // We need at least the extension + view for loading the table fields
+        if (count($parts) < 2) {
+            return false;
+        }
+
+        $component = $this->getApplication()->bootComponent($parts[0]);
+
+        return $component instanceof SchemaorgServiceInterface;
+    }
+
+    /**
+     * Check if the context is listed in the allowed or forbidden lists and return the result.
+     *
+     * @param   string  $context  Context to check
+     *
+     * @return  boolean
+     *
+     * @since   5.0.0
+     */
+    protected function checkAllowedAndForbiddenlist($context)
+    {
+        $allowedlist   = \array_filter((array) $this->params->get('allowedlist', []));
+        $forbiddenlist = \array_filter((array) $this->params->get('forbiddenlist', []));
+
+        if (!empty($allowedlist)) {
+            foreach ($allowedlist as $allowed) {
+                if ($context === $allowed) {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        foreach ($forbiddenlist as $forbidden) {
+            if ($context === $forbidden) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}
diff --git a/libraries/src/Schemaorg/SchemaorgPrepareDateTrait.php b/libraries/src/Schemaorg/SchemaorgPrepareDateTrait.php
new file mode 100644
index 0000000000000..3d7f7bcc2e78f
--- /dev/null
+++ b/libraries/src/Schemaorg/SchemaorgPrepareDateTrait.php
@@ -0,0 +1,53 @@
+<?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\Schemaorg;
+
+use Joomla\CMS\Factory;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Prepare dates to be valid for JSON-LD output
+ *
+ * @since  5.0.0
+ */
+trait SchemaorgPrepareDateTrait
+{
+    /**
+     * Prepare date
+     *
+     * @param   string|array $date
+     *
+     * @return  string|array
+     *
+     * @since   5.0.0
+     */
+    protected function prepareDate($date)
+    {
+        if (is_array($date)) {
+            // We don't handle references, they should be ok
+            if (count($date) === 1 && isset($date['@id'])) {
+                return $date;
+            }
+
+            $newDates = [];
+
+            foreach ($date as $d) {
+                $newDates[] = $this->prepareDate($d);
+            }
+
+            return $newDates;
+        }
+
+        return Factory::getDate($date)->format('Y-m-d');
+    }
+}
diff --git a/libraries/src/Schemaorg/SchemaorgPrepareDurationTrait.php b/libraries/src/Schemaorg/SchemaorgPrepareDurationTrait.php
new file mode 100644
index 0000000000000..12f491135ab97
--- /dev/null
+++ b/libraries/src/Schemaorg/SchemaorgPrepareDurationTrait.php
@@ -0,0 +1,42 @@
+<?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\Schemaorg;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Prepare duration to be valid for JSON-LD output
+ *
+ * @since  5.0.0
+ */
+trait SchemaorgPrepareDurationTrait
+{
+    /**
+     * Prepare duration
+     *
+     * @param   array $duration
+     *
+     * @return  ?string
+     *
+     * @since   5.0.0
+     */
+    protected function prepareDuration($duration)
+    {
+        if (!is_array($duration)) {
+            return null;
+        }
+
+        $newDuration = 'PT' . (!empty($duration['hour']) ? (int) $duration['hour'] . 'H' : '') . (!empty($duration['min']) ? (int) $duration['min'] . 'M' : '');
+
+        return $newDuration !== 'PT' ? $newDuration : null;
+    }
+}
diff --git a/libraries/src/Schemaorg/SchemaorgPrepareImageTrait.php b/libraries/src/Schemaorg/SchemaorgPrepareImageTrait.php
new file mode 100644
index 0000000000000..94da86645ccc7
--- /dev/null
+++ b/libraries/src/Schemaorg/SchemaorgPrepareImageTrait.php
@@ -0,0 +1,55 @@
+<?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\Schemaorg;
+
+use Joomla\CMS\HTML\HTMLHelper;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Prepare images to be valid for JSON-LD output
+ *
+ * @since  5.0.0
+ */
+trait SchemaorgPrepareImageTrait
+{
+    /**
+     * Prepare media image files
+     *
+     * @param   string|array $image
+     *
+     * @return  string|array
+     *
+     * @since   5.0.0
+     */
+    protected function prepareImage($image)
+    {
+        if (is_array($image)) {
+            // We don't handle references, they should be ok
+            if (count($image) === 1 && isset($image['@id'])) {
+                return $image;
+            }
+
+            $newImages = [];
+
+            foreach ($image as $img) {
+                $newImages[] = $this->prepareImage($img);
+            }
+
+            return $newImages;
+        }
+
+        $img = HTMLHelper::_('cleanImageUrl', $image);
+
+        return $img->url ?? null;
+    }
+}
diff --git a/libraries/src/Schemaorg/SchemaorgServiceInterface.php b/libraries/src/Schemaorg/SchemaorgServiceInterface.php
new file mode 100755
index 0000000000000..4e9b83b4d7f2b
--- /dev/null
+++ b/libraries/src/Schemaorg/SchemaorgServiceInterface.php
@@ -0,0 +1,31 @@
+<?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\Schemaorg;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * The schemaorg service.
+ *
+ * @since  5.0.0
+ */
+interface SchemaorgServiceInterface
+{
+    /**
+     * Returns valid contexts.
+     *
+     * @return  array
+     *
+     * @since   5.0.0
+     */
+    public function getSchemaorgContexts(): array;
+}
diff --git a/libraries/src/Schemaorg/SchemaorgServiceTrait.php b/libraries/src/Schemaorg/SchemaorgServiceTrait.php
new file mode 100755
index 0000000000000..a2324b998442b
--- /dev/null
+++ b/libraries/src/Schemaorg/SchemaorgServiceTrait.php
@@ -0,0 +1,33 @@
+<?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\Schemaorg;
+
+use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Trait for component schemaorg service.
+ *
+ * @since  5.0.0
+ */
+trait SchemaorgServiceTrait
+{
+    /**
+     * Get a MVC factory
+     *
+     * @return  MVCFactoryInterface
+     *
+     * @since   5.0.0
+     */
+    abstract public function getMVCFactory(): MVCFactoryInterface;
+}
diff --git a/libraries/src/Service/Provider/Application.php b/libraries/src/Service/Provider/Application.php
index 262532609dbb5..a3a814d0cbb0c 100644
--- a/libraries/src/Service/Provider/Application.php
+++ b/libraries/src/Service/Provider/Application.php
@@ -34,7 +34,7 @@
 use Joomla\CMS\Console\TasksRunCommand;
 use Joomla\CMS\Console\TasksStateCommand;
 use Joomla\CMS\Console\UpdateCoreCommand;
-use Joomla\CMS\Factory;
+use Joomla\CMS\Input\Input as CMSInput;
 use Joomla\CMS\Language\LanguageFactoryInterface;
 use Joomla\CMS\Menu\MenuFactoryInterface;
 use Joomla\CMS\User\UserFactoryInterface;
@@ -46,11 +46,13 @@
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
 use Joomla\Event\DispatcherInterface;
+use Joomla\Event\Priority;
+use Joomla\Session\SessionEvents;
 use Joomla\Session\SessionInterface;
 use Psr\Log\LoggerInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -75,19 +77,16 @@ public function register(Container $container)
             ->share(
                 'JApplicationAdministrator',
                 function (Container $container) {
-                    $app = new AdministratorApplication(null, $container->get('config'), null, $container);
-
-                    // The session service provider needs Factory::$application, set it if still null
-                    if (Factory::$application === null) {
-                        Factory::$application = $app;
-                    }
-
+                    $app = new AdministratorApplication($container->get(CMSInput::class), $container->get('config'), null, $container);
                     $app->setDispatcher($container->get(DispatcherInterface::class));
                     $app->setLogger($container->get(LoggerInterface::class));
                     $app->setSession($container->get(SessionInterface::class));
                     $app->setUserFactory($container->get(UserFactoryInterface::class));
                     $app->setMenuFactory($container->get(MenuFactoryInterface::class));
 
+                    // Ensure that session purging is configured now we have a dispatcher
+                    $app->getDispatcher()->addListener(SessionEvents::START, [$app, 'afterSessionStart'], Priority::HIGH);
+
                     return $app;
                 },
                 true
@@ -97,13 +96,7 @@ function (Container $container) {
             ->share(
                 'JApplicationSite',
                 function (Container $container) {
-                    $app = new SiteApplication(null, $container->get('config'), null, $container);
-
-                    // The session service provider needs Factory::$application, set it if still null
-                    if (Factory::$application === null) {
-                        Factory::$application = $app;
-                    }
-
+                    $app = new SiteApplication($container->get(CMSInput::class), $container->get('config'), null, $container);
                     $app->setDispatcher($container->get(DispatcherInterface::class));
                     $app->setLogger($container->get(LoggerInterface::class));
                     $app->setSession($container->get(SessionInterface::class));
@@ -111,6 +104,9 @@ function (Container $container) {
                     $app->setCacheControllerFactory($container->get(CacheControllerFactoryInterface::class));
                     $app->setMenuFactory($container->get(MenuFactoryInterface::class));
 
+                    // Ensure that session purging is configured now we have a dispatcher
+                    $app->getDispatcher()->addListener(SessionEvents::START, [$app, 'afterSessionStart'], Priority::HIGH);
+
                     return $app;
                 },
                 true
@@ -130,12 +126,6 @@ function (Container $container) {
                     $lang = $container->get(LanguageFactoryInterface::class)->createLanguage($locale, $debug);
 
                     $app = new ConsoleApplication($config, $dispatcher, $container, $lang);
-
-                    // The session service provider needs Factory::$application, set it if still null
-                    if (Factory::$application === null) {
-                        Factory::$application = $app;
-                    }
-
                     $app->setCommandLoader($container->get(LoaderInterface::class));
                     $app->setLogger($container->get(LoggerInterface::class));
                     $app->setSession($container->get(SessionInterface::class));
@@ -185,17 +175,14 @@ function (Container $container) {
                 'JApplicationApi',
                 function (Container $container) {
                     $app = new ApiApplication(null, $container->get('config'), null, $container);
-
-                    // The session service provider needs Factory::$application, set it if still null
-                    if (Factory::$application === null) {
-                        Factory::$application = $app;
-                    }
-
                     $app->setDispatcher($container->get('Joomla\Event\DispatcherInterface'));
                     $app->setLogger($container->get(LoggerInterface::class));
                     $app->setSession($container->get('Joomla\Session\SessionInterface'));
                     $app->setMenuFactory($container->get(MenuFactoryInterface::class));
 
+                    // Ensure that session purging is configured now we have a dispatcher
+                    $app->getDispatcher()->addListener(SessionEvents::START, [$app, 'afterSessionStart'], Priority::HIGH);
+
                     return $app;
                 },
                 true
diff --git a/libraries/src/Service/Provider/Authentication.php b/libraries/src/Service/Provider/Authentication.php
index fec9e0631d0cd..bc61cea1b5037 100644
--- a/libraries/src/Service/Provider/Authentication.php
+++ b/libraries/src/Service/Provider/Authentication.php
@@ -22,7 +22,7 @@
 use Joomla\DI\ServiceProviderInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Service/Provider/CacheController.php b/libraries/src/Service/Provider/CacheController.php
index 38680b1b53e82..fd4a405ef343c 100644
--- a/libraries/src/Service/Provider/CacheController.php
+++ b/libraries/src/Service/Provider/CacheController.php
@@ -15,7 +15,7 @@
 use Joomla\DI\ServiceProviderInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Service/Provider/CaptchaRegistry.php b/libraries/src/Service/Provider/CaptchaRegistry.php
new file mode 100644
index 0000000000000..59585a04f1abe
--- /dev/null
+++ b/libraries/src/Service/Provider/CaptchaRegistry.php
@@ -0,0 +1,56 @@
+<?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\Service\Provider;
+
+use Joomla\CMS\Captcha\CaptchaRegistry as Registry;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Service provider for the application's CaptchaRegistry dependency
+ *
+ * @since  5.0.0
+ */
+class CaptchaRegistry implements ServiceProviderInterface
+{
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function register(Container $container)
+    {
+        $container->alias('captcharegistry', Registry::class)
+            ->share(
+                Registry::class,
+                function (Container $container) {
+                    $dispatcher = $container->get(DispatcherInterface::class);
+                    $registry   = new Registry();
+                    $registry->setDispatcher($dispatcher);
+
+                    PluginHelper::importPlugin('captcha', null, true, $dispatcher);
+                    $registry->initRegistry();
+
+                    return $registry;
+                },
+                true
+            );
+    }
+}
diff --git a/libraries/src/Service/Provider/Config.php b/libraries/src/Service/Provider/Config.php
index fbdc4f844fff5..8187c1c31dd77 100644
--- a/libraries/src/Service/Provider/Config.php
+++ b/libraries/src/Service/Provider/Config.php
@@ -14,7 +14,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Service/Provider/Console.php b/libraries/src/Service/Provider/Console.php
index acc4f3d8f913d..d482802c8a584 100644
--- a/libraries/src/Service/Provider/Console.php
+++ b/libraries/src/Service/Provider/Console.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright   (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Service\Provider;
@@ -27,6 +27,7 @@
 use Joomla\CMS\Console\TasksRunCommand;
 use Joomla\CMS\Console\TasksStateCommand;
 use Joomla\CMS\Console\UpdateCoreCommand;
+use Joomla\CMS\Language\LanguageFactoryInterface;
 use Joomla\CMS\Session\MetadataManager;
 use Joomla\Database\Command\ExportCommand;
 use Joomla\Database\Command\ImportCommand;
@@ -35,7 +36,7 @@
 use Joomla\DI\ServiceProviderInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -82,7 +83,7 @@ function (Container $container) {
         $container->share(
             ExportCommand::class,
             function (Container $container) {
-                return new ExportCommand($container->get('db'));
+                return new ExportCommand($container->get(DatabaseInterface::class));
             },
             true
         );
@@ -90,7 +91,7 @@ function (Container $container) {
         $container->share(
             ImportCommand::class,
             function (Container $container) {
-                return new ImportCommand($container->get('db'));
+                return new ImportCommand($container->get(DatabaseInterface::class));
             },
             true
         );
@@ -130,7 +131,7 @@ function (Container $container) {
         $container->share(
             ExtensionsListCommand::class,
             function (Container $container) {
-                return new ExtensionsListCommand($container->get('db'));
+                return new ExtensionsListCommand($container->get(DatabaseInterface::class));
             },
             true
         );
@@ -170,7 +171,7 @@ function (Container $container) {
         $container->share(
             ExtensionDiscoverInstallCommand::class,
             function (Container $container) {
-                return new ExtensionDiscoverInstallCommand($container->get('db'));
+                return new ExtensionDiscoverInstallCommand($container->get(DatabaseInterface::class));
             },
             true
         );
@@ -178,7 +179,7 @@ function (Container $container) {
         $container->share(
             ExtensionDiscoverListCommand::class,
             function (Container $container) {
-                return new ExtensionDiscoverListCommand($container->get('db'));
+                return new ExtensionDiscoverListCommand($container->get(DatabaseInterface::class));
             },
             true
         );
@@ -186,7 +187,7 @@ function (Container $container) {
         $container->share(
             UpdateCoreCommand::class,
             function (Container $container) {
-                return new UpdateCoreCommand($container->get('db'));
+                return new UpdateCoreCommand($container->get(DatabaseInterface::class));
             },
             true
         );
@@ -194,7 +195,13 @@ function (Container $container) {
         $container->share(
             FinderIndexCommand::class,
             function (Container $container) {
-                return new FinderIndexCommand($container->get('db'));
+                $command = new FinderIndexCommand($container->get(DatabaseInterface::class));
+                $command->setLanguage($container->get(LanguageFactoryInterface::class)->createLanguage(
+                    $container->get('config')->get('language'),
+                    $container->get('config')->get('debug_lang')
+                ));
+
+                return $command;
             },
             true
         );
diff --git a/libraries/src/Service/Provider/Database.php b/libraries/src/Service/Provider/Database.php
index 5d8f9a211293e..76a5d033d1240 100644
--- a/libraries/src/Service/Provider/Database.php
+++ b/libraries/src/Service/Provider/Database.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright   (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Service\Provider;
@@ -17,7 +17,7 @@
 use Joomla\Event\DispatcherInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Service/Provider/Dispatcher.php b/libraries/src/Service/Provider/Dispatcher.php
index 7c45ac7168064..9743c31126298 100644
--- a/libraries/src/Service/Provider/Dispatcher.php
+++ b/libraries/src/Service/Provider/Dispatcher.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright   (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Service\Provider;
@@ -15,7 +15,7 @@
 use Joomla\Event\DispatcherInterface as EventDispatcherInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Service/Provider/Document.php b/libraries/src/Service/Provider/Document.php
index afd932668c777..3232c5a685d0c 100644
--- a/libraries/src/Service/Provider/Document.php
+++ b/libraries/src/Service/Provider/Document.php
@@ -16,7 +16,7 @@
 use Joomla\DI\ServiceProviderInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Service/Provider/EditorsRegistry.php b/libraries/src/Service/Provider/EditorsRegistry.php
new file mode 100644
index 0000000000000..4cd6f69402bf1
--- /dev/null
+++ b/libraries/src/Service/Provider/EditorsRegistry.php
@@ -0,0 +1,56 @@
+<?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\Service\Provider;
+
+use Joomla\CMS\Editor\EditorsRegistry as Registry;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Service provider for the application's EditorsRegistry dependency
+ *
+ * @since  5.0.0
+ */
+class EditorsRegistry implements ServiceProviderInterface
+{
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function register(Container $container)
+    {
+        $container->alias('editorsregistry', Registry::class)
+            ->share(
+                Registry::class,
+                function (Container $container) {
+                    $dispatcher = $container->get(DispatcherInterface::class);
+                    $registry   = new Registry();
+                    $registry->setDispatcher($dispatcher);
+
+                    PluginHelper::importPlugin('editors', null, true, $dispatcher);
+                    $registry->initRegistry();
+
+                    return $registry;
+                },
+                true
+            );
+    }
+}
diff --git a/libraries/src/Service/Provider/Form.php b/libraries/src/Service/Provider/Form.php
index beb07e98c4bc8..ccad9db6d1347 100644
--- a/libraries/src/Service/Provider/Form.php
+++ b/libraries/src/Service/Provider/Form.php
@@ -16,7 +16,7 @@
 use Joomla\DI\ServiceProviderInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Service/Provider/HTMLRegistry.php b/libraries/src/Service/Provider/HTMLRegistry.php
index 11ca2087e8394..d75dee81ec4c1 100644
--- a/libraries/src/Service/Provider/HTMLRegistry.php
+++ b/libraries/src/Service/Provider/HTMLRegistry.php
@@ -14,7 +14,7 @@
 use Joomla\DI\ServiceProviderInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Service/Provider/Input.php b/libraries/src/Service/Provider/Input.php
new file mode 100644
index 0000000000000..f1d2f82dd3f6f
--- /dev/null
+++ b/libraries/src/Service/Provider/Input.php
@@ -0,0 +1,50 @@
+<?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\Service\Provider;
+
+use Joomla\CMS\Input\Input as CMSInput;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+
+/**
+ * Service provider for the the Joomla Input object.
+ *
+ * Whilst generally speaking it's an anti-pattern for the request object to be in a DIC, in the case of Joomla whilst
+ * there, both the web application class and session class have a hard dependency on the input object, as a result it's
+ * required that this exists in the DIC for now. Strategically there should be a long term plan to remove this from the
+ * DIC.
+ *
+ * @note It is strongly recommended that extensions get the input object from the application and DO NOT use this
+ * service container.
+ *
+ * @since  5.0.0
+ */
+class Input implements ServiceProviderInterface
+{
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function register(Container $container)
+    {
+        $container->share(
+            CMSInput::class,
+            function () {
+                return new CMSInput();
+            },
+            true
+        );
+    }
+}
diff --git a/libraries/src/Service/Provider/Language.php b/libraries/src/Service/Provider/Language.php
index f51e59dfcede5..5c000891d22f3 100644
--- a/libraries/src/Service/Provider/Language.php
+++ b/libraries/src/Service/Provider/Language.php
@@ -15,7 +15,7 @@
 use Joomla\DI\ServiceProviderInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Service/Provider/Logger.php b/libraries/src/Service/Provider/Logger.php
index b38dad8330d6b..850cce9708604 100644
--- a/libraries/src/Service/Provider/Logger.php
+++ b/libraries/src/Service/Provider/Logger.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright   (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Service\Provider;
@@ -15,7 +15,7 @@
 use Psr\Log\LoggerInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Service/Provider/Mailer.php b/libraries/src/Service/Provider/Mailer.php
new file mode 100644
index 0000000000000..4563c32773168
--- /dev/null
+++ b/libraries/src/Service/Provider/Mailer.php
@@ -0,0 +1,47 @@
+<?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\Service\Provider;
+
+use Joomla\CMS\Mail\MailerFactory;
+use Joomla\CMS\Mail\MailerFactoryInterface;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Service provider for the mailer dependency
+ *
+ * @since  4.4.0
+ */
+class Mailer implements ServiceProviderInterface
+{
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container)
+    {
+        $container->share(
+            MailerFactoryInterface::class,
+            function (Container $container) {
+                return new MailerFactory($container->get('config'));
+            },
+            true
+        );
+    }
+}
diff --git a/libraries/src/Service/Provider/Menu.php b/libraries/src/Service/Provider/Menu.php
index 013a0f875d10b..e506bdb0aea6e 100644
--- a/libraries/src/Service/Provider/Menu.php
+++ b/libraries/src/Service/Provider/Menu.php
@@ -17,7 +17,7 @@
 use Joomla\DI\ServiceProviderInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Service/Provider/Pathway.php b/libraries/src/Service/Provider/Pathway.php
index 48a1b47a1d24c..1ff6907d42138 100644
--- a/libraries/src/Service/Provider/Pathway.php
+++ b/libraries/src/Service/Provider/Pathway.php
@@ -15,7 +15,7 @@
 use Joomla\DI\ServiceProviderInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Service/Provider/Router.php b/libraries/src/Service/Provider/Router.php
index 0d5313f33083a..2ee718e48e188 100644
--- a/libraries/src/Service/Provider/Router.php
+++ b/libraries/src/Service/Provider/Router.php
@@ -18,7 +18,7 @@
 use Joomla\DI\ServiceProviderInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Service/Provider/Session.php b/libraries/src/Service/Provider/Session.php
index f2bda120042b2..7b480c72f4e75 100644
--- a/libraries/src/Service/Provider/Session.php
+++ b/libraries/src/Service/Provider/Session.php
@@ -4,17 +4,16 @@
  * Joomla! Content Management System
  *
  * @copyright   (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Service\Provider;
 
 use Joomla\CMS\Application\AdministratorApplication;
-use Joomla\CMS\Application\ApplicationHelper;
-use Joomla\CMS\Application\CMSApplicationInterface;
 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;
@@ -27,16 +26,13 @@
 use Joomla\DI\ServiceProviderInterface;
 use Joomla\Event\DispatcherInterface;
 use Joomla\Event\LazyServiceEventListener;
-use Joomla\Event\Priority;
 use Joomla\Registry\Registry;
 use Joomla\Session\HandlerInterface;
 use Joomla\Session\SessionEvents;
-use Joomla\Session\SessionInterface;
 use Joomla\Session\Storage\RuntimeStorage;
-use Joomla\Session\StorageInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -62,10 +58,10 @@ public function register(Container $container)
             function (Container $container) {
                 /** @var Registry $config */
                 $config = $container->get('config');
-                $app    = Factory::getApplication();
+                $input = $container->get(CMSInput::class);
 
                 // Generate a session name.
-                $name = ApplicationHelper::getHash($config->get('session_name', AdministratorApplication::class));
+                $name = $this->generateSessionName($config, AdministratorApplication::class);
 
                 // Calculate the session lifetime.
                 $lifetime = $config->get('lifetime') ? $config->get('lifetime') * 60 : 900;
@@ -86,9 +82,11 @@ function (Container $container) {
                     $this->registerSessionHandlerAsService($container, $handler);
                 }
 
-                return $this->buildSession(
-                    new JoomlaStorage($app->getInput(), $handler, $options),
-                    $app,
+                $options['cookie_domain'] = $config->get('cookie_domain', '');
+                $options['cookie_path'] = $config->get('cookie_path', '/');
+
+                return new \Joomla\CMS\Session\Session(
+                    new JoomlaStorage($input, $handler),
                     $container->get(DispatcherInterface::class),
                     $options
                 );
@@ -101,7 +99,7 @@ function (Container $container) {
             function (Container $container) {
                 /** @var Registry $config */
                 $config = $container->get('config');
-                $app    = Factory::getApplication();
+                $input = $container->get(CMSInput::class);
 
                 /**
                  * Session handler for the session is always filesystem so it doesn't flip to the database after
@@ -131,9 +129,11 @@ function (Container $container) {
                     $this->registerSessionHandlerAsService($container, $handler);
                 }
 
-                return $this->buildSession(
-                    new JoomlaStorage($app->getInput(), $handler),
-                    $app,
+                $options['cookie_domain'] = $config->get('cookie_domain', '');
+                $options['cookie_path'] = $config->get('cookie_path', '/');
+
+                return new \Joomla\CMS\Session\Session(
+                    new JoomlaStorage($input, $handler),
                     $container->get(DispatcherInterface::class),
                     $options
                 );
@@ -146,10 +146,10 @@ function (Container $container) {
             function (Container $container) {
                 /** @var Registry $config */
                 $config = $container->get('config');
-                $app    = Factory::getApplication();
+                $input = $container->get(CMSInput::class);
 
                 // Generate a session name.
-                $name = ApplicationHelper::getHash($config->get('session_name', SiteApplication::class));
+                $name = $this->generateSessionName($config, SiteApplication::class);
 
                 // Calculate the session lifetime.
                 $lifetime = $config->get('lifetime') ? $config->get('lifetime') * 60 : 900;
@@ -170,9 +170,11 @@ function (Container $container) {
                     $this->registerSessionHandlerAsService($container, $handler);
                 }
 
-                return $this->buildSession(
-                    new JoomlaStorage($app->getInput(), $handler, $options),
-                    $app,
+                $options['cookie_domain'] = $config->get('cookie_domain', '');
+                $options['cookie_path'] = $config->get('cookie_path', '/');
+
+                return new \Joomla\CMS\Session\Session(
+                    new JoomlaStorage($input, $handler),
                     $container->get(DispatcherInterface::class),
                     $options
                 );
@@ -185,10 +187,9 @@ function (Container $container) {
             function (Container $container) {
                 /** @var Registry $config */
                 $config = $container->get('config');
-                $app    = Factory::getApplication();
 
                 // Generate a session name.
-                $name = ApplicationHelper::getHash($config->get('session_name', ConsoleApplication::class));
+                $name = $this->generateSessionName($config, ConsoleApplication::class);
 
                 // Calculate the session lifetime.
                 $lifetime = $config->get('lifetime') ? $config->get('lifetime') * 60 : 900;
@@ -210,9 +211,8 @@ function (Container $container) {
                     $this->registerSessionHandlerAsService($container, $handler);
                 }
 
-                return $this->buildSession(
+                return new \Joomla\CMS\Session\Session(
                     new RuntimeStorage(),
-                    $app,
                     $container->get(DispatcherInterface::class),
                     $options
                 );
@@ -287,32 +287,20 @@ function (Container $container) {
     }
 
     /**
-     * Build the root session service
+     * This is a straight up clone of \Joomla\CMS\Application\ApplicationHelper::getHash but instead getting the secret
+     * directly from the DIC rather than via the application - as we haven't actually set the app up yet in Factory
      *
-     * @param   StorageInterface         $storage     The session storage engine.
-     * @param   CMSApplicationInterface  $app         The application instance.
-     * @param   DispatcherInterface      $dispatcher  The event dispatcher.
-     * @param   array                    $options     The configured session options.
+     * @param   Registry  $config       The application configuration.
+     * @param   string    $seedDefault  The default seed for the secret if there isn't a session name configured
+     *                                  globally. This is the relevant application's classname
      *
-     * @return  SessionInterface
+     * @return  string
      *
      * @since   4.0.0
      */
-    private function buildSession(
-        StorageInterface $storage,
-        CMSApplicationInterface $app,
-        DispatcherInterface $dispatcher,
-        array $options
-    ): SessionInterface {
-        $input = $app->getInput();
-
-        if (method_exists($app, 'afterSessionStart')) {
-            $dispatcher->addListener(SessionEvents::START, [$app, 'afterSessionStart'], Priority::HIGH);
-        }
-
-        $session = new \Joomla\CMS\Session\Session($storage, $dispatcher, $options);
-
-        return $session;
+    private function generateSessionName(Registry $config, string $seedDefault): string
+    {
+        return md5($config->get('secret') . $config->get('session_name', $seedDefault));
     }
 
     /**
diff --git a/libraries/src/Service/Provider/Toolbar.php b/libraries/src/Service/Provider/Toolbar.php
index 38e1c67fcfced..7928cd3cf6312 100644
--- a/libraries/src/Service/Provider/Toolbar.php
+++ b/libraries/src/Service/Provider/Toolbar.php
@@ -15,7 +15,7 @@
 use Joomla\DI\ServiceProviderInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Service/Provider/User.php b/libraries/src/Service/Provider/User.php
index 63d1b33723bf9..43db10d78b71c 100644
--- a/libraries/src/Service/Provider/User.php
+++ b/libraries/src/Service/Provider/User.php
@@ -16,7 +16,7 @@
 use Joomla\DI\ServiceProviderInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Service/Provider/WebAssetRegistry.php b/libraries/src/Service/Provider/WebAssetRegistry.php
index 38d1c48bf64c9..21530872da59a 100644
--- a/libraries/src/Service/Provider/WebAssetRegistry.php
+++ b/libraries/src/Service/Provider/WebAssetRegistry.php
@@ -14,7 +14,7 @@
 use Joomla\DI\ServiceProviderInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Session/EventListener/MetadataManagerListener.php b/libraries/src/Session/EventListener/MetadataManagerListener.php
index 742613a0c772f..814a9c26bd960 100644
--- a/libraries/src/Session/EventListener/MetadataManagerListener.php
+++ b/libraries/src/Session/EventListener/MetadataManagerListener.php
@@ -14,7 +14,7 @@
 use Joomla\Session\SessionEvent;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Session/Exception/UnsupportedStorageException.php b/libraries/src/Session/Exception/UnsupportedStorageException.php
index f274a3b39526f..340c776b70918 100644
--- a/libraries/src/Session/Exception/UnsupportedStorageException.php
+++ b/libraries/src/Session/Exception/UnsupportedStorageException.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Session\Exception;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Session/MetadataManager.php b/libraries/src/Session/MetadataManager.php
index 6950d508549b5..0c58e944bffac 100644
--- a/libraries/src/Session/MetadataManager.php
+++ b/libraries/src/Session/MetadataManager.php
@@ -18,7 +18,7 @@
 use Joomla\Session\SessionInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Session/Session.php b/libraries/src/Session/Session.php
index 777483e56de07..111fd168bce5d 100644
--- a/libraries/src/Session/Session.php
+++ b/libraries/src/Session/Session.php
@@ -18,7 +18,7 @@
 use Joomla\Session\StorageInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Session/SessionFactory.php b/libraries/src/Session/SessionFactory.php
index 28c05eda11db3..d3be61542eec5 100644
--- a/libraries/src/Session/SessionFactory.php
+++ b/libraries/src/Session/SessionFactory.php
@@ -4,25 +4,21 @@
  * Joomla! Content Management System
  *
  * @copyright   (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Session;
 
-use InvalidArgumentException;
 use Joomla\Database\DatabaseInterface;
 use Joomla\DI\ContainerAwareInterface;
 use Joomla\DI\ContainerAwareTrait;
 use Joomla\Registry\Registry;
 use Joomla\Session\Handler;
 use Joomla\Session\HandlerInterface;
-use Memcached;
-use Redis;
-use RuntimeException;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -58,7 +54,7 @@ public function createSessionHandler(array $options): HandlerInterface
         switch ($handlerType) {
             case 'apcu':
                 if (!Handler\ApcuHandler::isSupported()) {
-                    throw new RuntimeException('APCu is not supported on this system.');
+                    throw new \RuntimeException('APCu is not supported on this system.');
                 }
 
                 return new Handler\ApcuHandler();
@@ -80,13 +76,13 @@ public function createSessionHandler(array $options): HandlerInterface
 
             case 'memcached':
                 if (!Handler\MemcachedHandler::isSupported()) {
-                    throw new RuntimeException('Memcached is not supported on this system.');
+                    throw new \RuntimeException('Memcached is not supported on this system.');
                 }
 
                 $host = $config->get('session_memcached_server_host', 'localhost');
                 $port = $config->get('session_memcached_server_port', 11211);
 
-                $memcached = new Memcached($config->get('session_memcached_server_id', 'joomla_cms'));
+                $memcached = new \Memcached($config->get('session_memcached_server_id', 'joomla_cms'));
                 $memcached->addServer($host, $port);
 
                 ini_set('session.save_path', "$host:$port");
@@ -96,10 +92,10 @@ public function createSessionHandler(array $options): HandlerInterface
 
             case 'redis':
                 if (!Handler\RedisHandler::isSupported()) {
-                    throw new RuntimeException('Redis is not supported on this system.');
+                    throw new \RuntimeException('Redis is not supported on this system.');
                 }
 
-                $redis = new Redis();
+                $redis = new \Redis();
                 $host  = $config->get('session_redis_server_host', '127.0.0.1');
 
                 // Use default port if connecting over a socket whatever the config value
@@ -132,13 +128,13 @@ public function createSessionHandler(array $options): HandlerInterface
             case 'wincache':
                 // @TODO Remove WinCache with Joomla 5.0
                 if (!Handler\WincacheHandler::isSupported()) {
-                    throw new RuntimeException('Wincache is not supported on this system.');
+                    throw new \RuntimeException('Wincache is not supported on this system.');
                 }
 
                 return new Handler\WincacheHandler();
 
             default:
-                throw new InvalidArgumentException(sprintf('The "%s" session handler is not recognised.', $handlerType));
+                throw new \InvalidArgumentException(sprintf('The "%s" session handler is not recognised.', $handlerType));
         }
     }
 
diff --git a/libraries/src/Session/SessionManager.php b/libraries/src/Session/SessionManager.php
index 911250a1c7b87..5ef71976f850c 100644
--- a/libraries/src/Session/SessionManager.php
+++ b/libraries/src/Session/SessionManager.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Session;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Session/Storage/JoomlaStorage.php b/libraries/src/Session/Storage/JoomlaStorage.php
index c9a7f9c87425f..1d725901ff17d 100644
--- a/libraries/src/Session/Storage/JoomlaStorage.php
+++ b/libraries/src/Session/Storage/JoomlaStorage.php
@@ -4,18 +4,17 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Session\Storage;
 
-use Joomla\CMS\Factory;
 use Joomla\Input\Input;
 use Joomla\Registry\Registry;
 use Joomla\Session\Storage\NativeStorage;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -41,6 +40,22 @@ class JoomlaStorage extends NativeStorage
      */
     private $forceSSL = false;
 
+    /**
+     * The domain to set in the session cookie
+     *
+     * @var    string
+     * @since  5.0.0
+     */
+    private $cookieDomain = '';
+
+    /**
+     * The path to set in the session cookie
+     *
+     * @var    string
+     * @since  5.0.0
+     */
+    private $cookiePath = '/';
+
     /**
      * Input object
      *
@@ -110,11 +125,8 @@ public function clear(): void
          * then the session cookie must be deleted.
          */
         if (isset($_COOKIE[$session_name])) {
-            $app           = Factory::getApplication();
-            $cookie_domain = $app->get('cookie_domain', '');
-            $cookie_path   = $app->get('cookie_path', '/');
-            $cookie        = session_get_cookie_params();
-            setcookie($session_name, '', time() - 42000, $cookie_path, $cookie_domain, $cookie['secure'], true);
+            $cookie = session_get_cookie_params();
+            setcookie($session_name, '', time() - 42000, $this->cookiePath, $this->cookieDomain, $cookie['secure'], true);
         }
 
         $this->data = new Registry();
@@ -237,14 +249,12 @@ protected function setCookieParams(): void
             $cookie['secure'] = true;
         }
 
-        $app = Factory::getApplication();
-
-        if ($app->get('cookie_domain', '') != '') {
-            $cookie['domain'] = $app->get('cookie_domain');
+        if ($this->cookieDomain !== '') {
+            $cookie['domain'] = $this->cookieDomain;
         }
 
-        if ($app->get('cookie_path', '') != '') {
-            $cookie['path'] = $app->get('cookie_path');
+        if ($this->cookiePath !== '') {
+            $cookie['path'] = $this->cookiePath;
         }
 
         session_set_cookie_params($cookie['lifetime'], $cookie['path'], $cookie['domain'], $cookie['secure'], true);
@@ -257,11 +267,19 @@ protected function setCookieParams(): void
      *
      * @return  $this
      *
-     * @see     http://php.net/session.configuration
+     * @link    http://php.net/session.configuration
      * @since   4.0.0
      */
     public function setOptions(array $options): NativeStorage
     {
+        if (isset($options['cookie_domain'])) {
+            $this->cookieDomain = $options['cookie_domain'];
+        }
+
+        if (isset($options['cookie_path'])) {
+            $this->cookiePath = $options['cookie_path'];
+        }
+
         if (isset($options['force_ssl'])) {
             $this->forceSSL = (bool) $options['force_ssl'];
         }
diff --git a/libraries/src/String/PunycodeHelper.php b/libraries/src/String/PunycodeHelper.php
index 5aaab8f0a0231..74fd4539debf2 100644
--- a/libraries/src/String/PunycodeHelper.php
+++ b/libraries/src/String/PunycodeHelper.php
@@ -15,7 +15,7 @@
 use Joomla\Uri\UriHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -195,6 +195,11 @@ 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);
+            return '';
+        }
+
         $explodedAddress = explode('@', $email);
 
         // Not addressing UTF-8 user names
diff --git a/libraries/src/Table/Asset.php b/libraries/src/Table/Asset.php
index 696714112a492..3517fdeddc5c9 100644
--- a/libraries/src/Table/Asset.php
+++ b/libraries/src/Table/Asset.php
@@ -13,7 +13,7 @@
 use Joomla\Database\DatabaseDriver;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Table/Category.php b/libraries/src/Table/Category.php
index 44e536d227190..8d8cf125646ba 100644
--- a/libraries/src/Table/Category.php
+++ b/libraries/src/Table/Category.php
@@ -15,13 +15,15 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Tag\TaggableTableInterface;
 use Joomla\CMS\Tag\TaggableTableTrait;
+use Joomla\CMS\User\CurrentUserInterface;
+use Joomla\CMS\User\CurrentUserTrait;
 use Joomla\CMS\Versioning\VersionableTableInterface;
 use Joomla\Database\DatabaseDriver;
 use Joomla\Database\ParameterType;
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -29,9 +31,10 @@
  *
  * @since  1.5
  */
-class Category extends Nested implements VersionableTableInterface, TaggableTableInterface
+class Category extends Nested implements VersionableTableInterface, TaggableTableInterface, CurrentUserInterface
 {
     use TaggableTableTrait;
+    use CurrentUserTrait;
 
     /**
      * Indicates that columns fully support the NULL value in the database
@@ -227,7 +230,7 @@ public function bind($array, $ignore = '')
     public function store($updateNulls = true)
     {
         $date = Factory::getDate()->toSql();
-        $user = Factory::getUser();
+        $user = $this->getCurrentUser();
 
         // Set created date if not set.
         if (!(int) $this->created_time) {
@@ -254,7 +257,7 @@ public function store($updateNulls = true)
         }
 
         // Verify that the alias is unique
-        $table = Table::getInstance('Category', 'JTable', ['dbo' => $this->getDbo()]);
+        $table = Table::getInstance('Category', '\\Joomla\\CMS\\Table\\', ['dbo' => $this->getDbo()]);
 
         if (
             $table->load(['alias' => $this->alias, 'parent_id' => (int) $this->parent_id, 'extension' => $this->extension])
diff --git a/libraries/src/Table/Content.php b/libraries/src/Table/Content.php
index 529233cb1ff56..cc6106d0271ed 100644
--- a/libraries/src/Table/Content.php
+++ b/libraries/src/Table/Content.php
@@ -15,6 +15,8 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Tag\TaggableTableInterface;
 use Joomla\CMS\Tag\TaggableTableTrait;
+use Joomla\CMS\User\CurrentUserInterface;
+use Joomla\CMS\User\CurrentUserTrait;
 use Joomla\CMS\Versioning\VersionableTableInterface;
 use Joomla\Database\DatabaseDriver;
 use Joomla\Database\ParameterType;
@@ -22,7 +24,7 @@
 use Joomla\String\StringHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -30,9 +32,10 @@
  *
  * @since  1.5
  */
-class Content extends Table implements VersionableTableInterface, TaggableTableInterface
+class Content extends Table implements VersionableTableInterface, TaggableTableInterface, CurrentUserInterface
 {
     use TaggableTableTrait;
+    use CurrentUserTrait;
 
     /**
      * Indicates that columns fully support the NULL value in the database
@@ -314,7 +317,7 @@ public function check()
     public function store($updateNulls = true)
     {
         $date = Factory::getDate()->toSql();
-        $user = Factory::getUser();
+        $user = $this->getCurrentUser();
 
         // Set created date if not set.
         if (!(int) $this->created) {
@@ -343,7 +346,7 @@ public function store($updateNulls = true)
         }
 
         // Verify that the alias is unique
-        $table = Table::getInstance('Content', 'JTable', ['dbo' => $this->getDbo()]);
+        $table = Table::getInstance('Content', '\\Joomla\\CMS\\Table\\', ['dbo' => $this->getDbo()]);
 
         if ($table->load(['alias' => $this->alias, 'catid' => $this->catid]) && ($table->id != $this->id || $this->id == 0)) {
             // Is the existing article trashed?
diff --git a/libraries/src/Table/ContentHistory.php b/libraries/src/Table/ContentHistory.php
index 3e27480481ef5..0b592e7fa6804 100644
--- a/libraries/src/Table/ContentHistory.php
+++ b/libraries/src/Table/ContentHistory.php
@@ -10,11 +10,13 @@
 namespace Joomla\CMS\Table;
 
 use Joomla\CMS\Factory;
+use Joomla\CMS\User\CurrentUserInterface;
+use Joomla\CMS\User\CurrentUserTrait;
 use Joomla\Database\DatabaseDriver;
 use Joomla\Database\ParameterType;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -22,8 +24,10 @@
  *
  * @since  3.2
  */
-class ContentHistory extends Table
+class ContentHistory extends Table implements CurrentUserInterface
 {
+    use CurrentUserTrait;
+
     /**
      * Array of object fields to unset from the data object before calculating SHA1 hash. This allows us to detect a meaningful change
      * in the database row using the hash. This can be read from the #__content_types content_history_options column.
@@ -79,7 +83,7 @@ public function __construct(DatabaseDriver $db)
     public function store($updateNulls = false)
     {
         $this->set('character_count', \strlen($this->get('version_data')));
-        $typeTable = Table::getInstance('ContentType', 'JTable', ['dbo' => $this->getDbo()]);
+        $typeTable = Table::getInstance('ContentType', '\\Joomla\\CMS\\Table\\', ['dbo' => $this->getDbo()]);
         $typeAlias = explode('.', $this->item_id);
         array_pop($typeAlias);
         $typeTable->load(['type_alias' => implode('.', $typeAlias)]);
@@ -90,7 +94,7 @@ public function store($updateNulls = false)
 
         // Modify author and date only when not toggling Keep Forever
         if ($this->get('keep_forever') === null) {
-            $this->set('editor_user_id', Factory::getUser()->id);
+            $this->set('editor_user_id', $this->getCurrentUser()->id);
             $this->set('save_date', Factory::getDate()->toSql());
         }
 
diff --git a/libraries/src/Table/ContentType.php b/libraries/src/Table/ContentType.php
index e529a4f6863cc..a2009d64836d9 100644
--- a/libraries/src/Table/ContentType.php
+++ b/libraries/src/Table/ContentType.php
@@ -13,7 +13,7 @@
 use Joomla\Database\DatabaseDriver;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -79,7 +79,7 @@ public function check()
     public function store($updateNulls = false)
     {
         // Verify that the alias is unique
-        $table = Table::getInstance('Contenttype', 'JTable', ['dbo' => $this->getDbo()]);
+        $table = Table::getInstance('ContentType', '\\Joomla\\CMS\\Table\\', ['dbo' => $this->getDbo()]);
 
         if ($table->load(['type_alias' => $this->type_alias]) && ($table->type_id != $this->type_id || $this->type_id == 0)) {
             $this->setError(Text::_('COM_TAGS_ERROR_UNIQUE_ALIAS'));
@@ -145,7 +145,7 @@ public function getContentTable()
                 $class = $tableInfo->special->class ?? 'Joomla\\CMS\\Table\\Table';
 
                 if (!class_implements($class, 'Joomla\\CMS\\Table\\TableInterface')) {
-                    // This isn't an instance of TableInterface. Abort.
+                    // This isn't an instance of TableInterface. Stop.
                     throw new \RuntimeException('Class must be an instance of Joomla\\CMS\\Table\\TableInterface');
                 }
 
diff --git a/libraries/src/Table/CoreContent.php b/libraries/src/Table/CoreContent.php
index 219f9a93390be..08553eaa32b6a 100644
--- a/libraries/src/Table/CoreContent.php
+++ b/libraries/src/Table/CoreContent.php
@@ -13,12 +13,14 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\User\CurrentUserInterface;
+use Joomla\CMS\User\CurrentUserTrait;
 use Joomla\Database\DatabaseDriver;
 use Joomla\Database\ParameterType;
 use Joomla\String\StringHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -26,8 +28,10 @@
  *
  * @since  3.1
  */
-class CoreContent extends Table
+class CoreContent extends Table implements CurrentUserInterface
 {
+    use CurrentUserTrait;
+
     /**
      * Indicates that columns fully support the NULL value in the database
      *
@@ -149,7 +153,7 @@ public function check()
     }
 
     /**
-     * Override JTable delete method to include deleting corresponding row from #__ucm_base.
+     * Override \Joomla\CMS\Table\Table delete method to include deleting corresponding row from #__ucm_base.
      *
      * @param   integer  $pk  primary key value to delete. Must be set or throws an exception.
      *
@@ -160,7 +164,7 @@ public function check()
      */
     public function delete($pk = null)
     {
-        $baseTable = Table::getInstance('Ucm', 'JTable', ['dbo' => $this->getDbo()]);
+        $baseTable = Table::getInstance('Ucm', '\\Joomla\\CMS\\Table\\', ['dbo' => $this->getDbo()]);
 
         return parent::delete($pk) && $baseTable->delete($pk);
     }
@@ -222,7 +226,7 @@ public function deleteByContentId($contentItemId = null, $typeAlias = null)
     public function store($updateNulls = true)
     {
         $date = Factory::getDate();
-        $user = Factory::getUser();
+        $user = $this->getCurrentUser();
 
         if ($this->core_content_id) {
             // Existing item
diff --git a/libraries/src/Table/Extension.php b/libraries/src/Table/Extension.php
index 03b36de73df5f..dbf53400a95e5 100644
--- a/libraries/src/Table/Extension.php
+++ b/libraries/src/Table/Extension.php
@@ -13,7 +13,7 @@
 use Joomla\Database\DatabaseDriver;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Table/Language.php b/libraries/src/Table/Language.php
index a0a3f26c54e22..1d6462cc00ff3 100644
--- a/libraries/src/Table/Language.php
+++ b/libraries/src/Table/Language.php
@@ -13,7 +13,7 @@
 use Joomla\Database\DatabaseDriver;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -72,7 +72,7 @@ public function check()
      */
     public function store($updateNulls = false)
     {
-        $table = Table::getInstance('Language', 'JTable', ['dbo' => $this->getDbo()]);
+        $table = Table::getInstance('Language', '\\Joomla\\CMS\\Table\\', ['dbo' => $this->getDbo()]);
 
         // Verify that the language code is unique
         if ($table->load(['lang_code' => $this->lang_code]) && ($table->lang_id != $this->lang_id || $this->lang_id == 0)) {
diff --git a/libraries/src/Table/Menu.php b/libraries/src/Table/Menu.php
index ecebce6d9508d..b140068d6afa2 100644
--- a/libraries/src/Table/Menu.php
+++ b/libraries/src/Table/Menu.php
@@ -20,7 +20,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -172,7 +172,7 @@ public function store($updateNulls = true)
         $db = $this->getDbo();
 
         // Verify that the alias is unique
-        $table = Table::getInstance('Menu', 'JTable', ['dbo' => $db]);
+        $table = Table::getInstance('Menu', '\\Joomla\\CMS\\Table\\', ['dbo' => $db]);
 
         $originalAlias = trim($this->alias);
         $this->alias   = !$originalAlias ? $this->title : $originalAlias;
@@ -240,7 +240,7 @@ public function store($updateNulls = true)
 
             // The alias already exists. Enqueue an error message.
             if ($error) {
-                $menuTypeTable = Table::getInstance('MenuType', 'JTable', ['dbo' => $db]);
+                $menuTypeTable = Table::getInstance('MenuType', '\\Joomla\\CMS\\Table\\', ['dbo' => $db]);
                 $menuTypeTable->load(['menutype' => $table->menutype]);
                 $url = Route::_('index.php?option=com_menus&task=item.edit&id=' . (int) $table->id);
 
diff --git a/libraries/src/Table/MenuType.php b/libraries/src/Table/MenuType.php
index 348da756827ec..71ed580eeefaa 100644
--- a/libraries/src/Table/MenuType.php
+++ b/libraries/src/Table/MenuType.php
@@ -10,13 +10,14 @@
 namespace Joomla\CMS\Table;
 
 use Joomla\CMS\Application\ApplicationHelper;
-use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\User\CurrentUserInterface;
+use Joomla\CMS\User\CurrentUserTrait;
 use Joomla\Database\DatabaseDriver;
 use Joomla\Database\ParameterType;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -24,8 +25,10 @@
  *
  * @since  1.6
  */
-class MenuType extends Table
+class MenuType extends Table implements CurrentUserInterface
 {
+    use CurrentUserTrait;
+
     /**
      * Constructor
      *
@@ -106,11 +109,11 @@ public function store($updateNulls = false)
     {
         if ($this->id) {
             // Get the user id
-            $userId = (int) Factory::getUser()->id;
+            $userId = (int) $this->getCurrentUser()->id;
             $notIn  = [0, $userId];
 
             // Get the old value of the table
-            $table = Table::getInstance('Menutype', 'JTable', ['dbo' => $this->getDbo()]);
+            $table = Table::getInstance('Menutype', '\\Joomla\\CMS\\Table\\', ['dbo' => $this->getDbo()]);
             $table->load($this->id);
 
             // Verify that no items are checked out
@@ -197,12 +200,12 @@ public function delete($pk = null)
         // If no primary key is given, return false.
         if ($pk !== null) {
             // Get the user id
-            $userId = (int) Factory::getUser()->id;
+            $userId = (int) $this->getCurrentUser()->id;
             $notIn  = [0, $userId];
             $star   = '*';
 
             // Get the old value of the table
-            $table = Table::getInstance('Menutype', 'JTable', ['dbo' => $this->getDbo()]);
+            $table = Table::getInstance('Menutype', '\\Joomla\\CMS\\Table\\', ['dbo' => $this->getDbo()]);
             $table->load($pk);
 
             // Verify that no items are checked out
diff --git a/libraries/src/Table/Module.php b/libraries/src/Table/Module.php
index 59c4a1ac6f9e0..43dfc34dd89b7 100644
--- a/libraries/src/Table/Module.php
+++ b/libraries/src/Table/Module.php
@@ -16,7 +16,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Table/Nested.php b/libraries/src/Table/Nested.php
index 99845f3d33850..2adccdeb3f6f2 100644
--- a/libraries/src/Table/Nested.php
+++ b/libraries/src/Table/Nested.php
@@ -15,7 +15,7 @@
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -530,7 +530,7 @@ public function delete($pk = null, $children = true)
             $name = $this->_getAssetName();
 
             /** @var Asset $asset */
-            $asset = Table::getInstance('Asset', 'JTable', ['dbo' => $this->getDbo()]);
+            $asset = Table::getInstance('Asset', '\\Joomla\\CMS\\Table\\', ['dbo' => $this->getDbo()]);
 
             if ($asset->loadByName($name)) {
                 // Delete the node in assets table.
diff --git a/libraries/src/Table/Table.php b/libraries/src/Table/Table.php
index 38a842b733f61..9962d729d1e40 100644
--- a/libraries/src/Table/Table.php
+++ b/libraries/src/Table/Table.php
@@ -11,19 +11,22 @@
 
 use Joomla\CMS\Access\Rules;
 use Joomla\CMS\Event\AbstractEvent;
+use Joomla\CMS\Event\Checkin\AfterCheckinEvent as GlobalAfterCheckinEvent;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Object\CMSObject;
+use Joomla\CMS\Object\LegacyErrorHandlingTrait;
+use Joomla\CMS\Object\LegacyPropertyManagementTrait;
 use Joomla\Database\DatabaseDriver;
+use Joomla\Database\DatabaseInterface;
 use Joomla\Database\DatabaseQuery;
 use Joomla\Event\DispatcherAwareInterface;
 use Joomla\Event\DispatcherAwareTrait;
 use Joomla\Event\DispatcherInterface;
+use Joomla\Filesystem\Path;
 use Joomla\String\StringHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -34,9 +37,12 @@
  * @since  1.7.0
  */
 #[\AllowDynamicProperties]
-abstract class Table extends CMSObject implements TableInterface, DispatcherAwareInterface
+abstract class Table implements TableInterface, DispatcherAwareInterface
 {
     use DispatcherAwareTrait;
+    use LegacyErrorHandlingTrait;
+    use LegacyPropertyManagementTrait;
+
 
     /**
      * Include paths for searching for Table classes.
@@ -164,8 +170,6 @@ abstract class Table extends CMSObject implements TableInterface, DispatcherAwar
      */
     public function __construct($table, $key, DatabaseDriver $db, DispatcherInterface $dispatcher = null)
     {
-        parent::__construct();
-
         // Set internal variables.
         $this->_tbl = $table;
 
@@ -276,23 +280,46 @@ public function getFields($reload = false)
      */
     public static function getInstance($type, $prefix = 'JTable', $config = [])
     {
+        /**
+         * For B/C reasons we don't change the $prefix to \\Joomla\\CMS\\Table\\ since extensions which
+         * use JTable as table prefix instead of an own prefix and not adding 'JTable' as prefix will
+         * fail to load the table. We can't detect this situation.
+         * Example:
+         * class JTableMytable {}
+         * JTable::getInstance('Mytable');
+         * This will fail when we change the function default $prefix from JTable to \\Joomla\\CMS\\Table\\
+         *
+         * In case of $prefix is 'JTable' we make an additional check for '\\Joomla\\CMS\\Table\\' $type
+         *
+         */
+
         // Sanitize and prepare the table class name.
         $type       = preg_replace('/[^A-Z0-9_\.-]/i', '', $type);
-        $tableClass = $prefix . ucfirst($type);
+
+        $tableClass       = $prefix . ucfirst($type);
+        $tableClassLegacy = $tableClass;
+
+        if ($prefix === 'JTable') {
+            $tableClass = '\\Joomla\\CMS\\Table\\' . ucfirst($type);
+        }
 
         // Only try to load the class if it doesn't already exist.
-        if (!class_exists($tableClass)) {
+        if (!class_exists($tableClass) && !class_exists($tableClassLegacy)) {
             // Search for the class file in the JTable include paths.
             $paths     = self::addIncludePath();
             $pathIndex = 0;
 
-            while (!class_exists($tableClass) && $pathIndex < \count($paths)) {
+            while (!class_exists($tableClass) && !class_exists($tableClassLegacy) && $pathIndex < \count($paths)) {
                 if ($tryThis = Path::find($paths[$pathIndex++], strtolower($type) . '.php')) {
                     // Import the class file.
                     include_once $tryThis;
                 }
             }
 
+            if (!class_exists($tableClass) && class_exists($tableClassLegacy)) {
+                $tableClass = $tableClassLegacy;
+            }
+
             if (!class_exists($tableClass)) {
                 /*
                 * If unable to find the class file in the Table include paths. Return false.
@@ -306,7 +333,7 @@ public static function getInstance($type, $prefix = 'JTable', $config = [])
         }
 
         // If a database object was passed in the configuration array use it, otherwise get the global one from Factory.
-        $db = $config['dbo'] ?? Factory::getDbo();
+        $db = $config['dbo'] ?? Factory::getContainer()->get(DatabaseInterface::class);
 
         // Check for a possible service from the container otherwise manually instantiate the class
         if (Factory::getContainer()->has($tableClass)) {
@@ -409,7 +436,7 @@ protected function _getAssetParentId(Table $table = null, $id = null)
     {
         // For simple cases, parent to the asset root.
         /** @var Asset $assets */
-        $assets = self::getInstance('Asset', 'JTable', ['dbo' => $this->getDbo()]);
+        $assets = self::getInstance('Asset', '\\Joomla\\CMS\\Table\\', ['dbo' => $this->getDbo()]);
         $rootId = $assets->getRootId();
 
         if (!empty($rootId)) {
@@ -871,7 +898,7 @@ public function store($updateNulls = false)
             $title    = $this->_getAssetTitle();
 
             /** @var Asset $asset */
-            $asset = self::getInstance('Asset', 'JTable', ['dbo' => $this->getDbo()]);
+            $asset = self::getInstance('Asset', '\\Joomla\\CMS\\Table\\', ['dbo' => $this->getDbo()]);
             $asset->loadByName($name);
 
             // Re-inject the asset id.
@@ -1228,8 +1255,9 @@ public function checkIn($pk = null)
             ]
         );
         $this->getDispatcher()->dispatch('onTableAfterCheckin', $event);
-
-        Factory::getApplication()->triggerEvent('onAfterCheckin', [$this->_tbl]);
+        $this->getDispatcher()->dispatch('onAfterCheckin', new GlobalAfterCheckinEvent('onAfterCheckin', [
+            'subject' => $this->_tbl,
+        ]));
 
         return true;
     }
diff --git a/libraries/src/Table/TableInterface.php b/libraries/src/Table/TableInterface.php
index dbae503db8716..f6fa21ce8b8ba 100644
--- a/libraries/src/Table/TableInterface.php
+++ b/libraries/src/Table/TableInterface.php
@@ -12,7 +12,7 @@
 use Joomla\Database\DatabaseDriver;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Table/Ucm.php b/libraries/src/Table/Ucm.php
index 92f7526d308bb..cb5f07a39d87c 100644
--- a/libraries/src/Table/Ucm.php
+++ b/libraries/src/Table/Ucm.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Table;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Table/Update.php b/libraries/src/Table/Update.php
index 61538e32b8e9f..cf92537ced23c 100644
--- a/libraries/src/Table/Update.php
+++ b/libraries/src/Table/Update.php
@@ -13,7 +13,7 @@
 use Joomla\Database\DatabaseDriver;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Table/UpdateSite.php b/libraries/src/Table/UpdateSite.php
index e100da1fe4300..120380e25bcf1 100644
--- a/libraries/src/Table/UpdateSite.php
+++ b/libraries/src/Table/UpdateSite.php
@@ -13,7 +13,7 @@
 use Joomla\Database\DatabaseDriver;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Table/User.php b/libraries/src/Table/User.php
index f3ba9861d48a4..189ef453cad90 100644
--- a/libraries/src/Table/User.php
+++ b/libraries/src/Table/User.php
@@ -21,7 +21,7 @@
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Table/Usergroup.php b/libraries/src/Table/Usergroup.php
index 8a77acba4d89a..3533bf75c8d0b 100644
--- a/libraries/src/Table/Usergroup.php
+++ b/libraries/src/Table/Usergroup.php
@@ -15,7 +15,7 @@
 use Joomla\Database\ParameterType;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -93,7 +93,7 @@ public function check()
 
         // We do not allow to move non public to root and public to non-root
         if (!empty($this->id)) {
-            $table = self::getInstance('Usergroup', 'JTable', ['dbo' => $this->getDbo()]);
+            $table = self::getInstance('Usergroup', '\\Joomla\\CMS\\Table\\', ['dbo' => $this->getDbo()]);
 
             $table->load($this->id);
 
@@ -111,7 +111,7 @@ public function check()
 
         // The new parent_id has to be a valid group
         if ($this->parent_id) {
-            $table = self::getInstance('Usergroup', 'JTable', ['dbo' => $this->getDbo()]);
+            $table = self::getInstance('Usergroup', '\\Joomla\\CMS\\Table\\', ['dbo' => $this->getDbo()]);
             $table->load($this->parent_id);
 
             if ($table->id != $this->parent_id) {
diff --git a/libraries/src/Table/ViewLevel.php b/libraries/src/Table/ViewLevel.php
index 6e22601fd83fd..143c371b161e9 100644
--- a/libraries/src/Table/ViewLevel.php
+++ b/libraries/src/Table/ViewLevel.php
@@ -14,11 +14,11 @@
 use Joomla\Database\ParameterType;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Viewlevels table class.
+ * ViewLevel table class.
  *
  * @since  1.7.0
  */
diff --git a/libraries/src/Tag/TagApiSerializerTrait.php b/libraries/src/Tag/TagApiSerializerTrait.php
index 9197530a3e1e7..790e9df8e030a 100644
--- a/libraries/src/Tag/TagApiSerializerTrait.php
+++ b/libraries/src/Tag/TagApiSerializerTrait.php
@@ -17,7 +17,7 @@
 use Tobscure\JsonApi\Resource;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Tag/TagServiceInterface.php b/libraries/src/Tag/TagServiceInterface.php
index 3a3d3e7891314..41924a89e12d3 100644
--- a/libraries/src/Tag/TagServiceInterface.php
+++ b/libraries/src/Tag/TagServiceInterface.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Tag;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Tag/TagServiceTrait.php b/libraries/src/Tag/TagServiceTrait.php
index e86d7cc5f1a35..d18ba07471b34 100644
--- a/libraries/src/Tag/TagServiceTrait.php
+++ b/libraries/src/Tag/TagServiceTrait.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Tag;
@@ -12,7 +12,7 @@
 use Joomla\CMS\Helper\ContentHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Tag/TaggableTableInterface.php b/libraries/src/Tag/TaggableTableInterface.php
index 4cfdbfa2a073f..b0769ddcdafe4 100644
--- a/libraries/src/Tag/TaggableTableInterface.php
+++ b/libraries/src/Tag/TaggableTableInterface.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Table\TableInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Tag/TaggableTableTrait.php b/libraries/src/Tag/TaggableTableTrait.php
index 98c56b8feeb8e..b38fb552e768b 100644
--- a/libraries/src/Tag/TaggableTableTrait.php
+++ b/libraries/src/Tag/TaggableTableTrait.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Helper\TagsHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Toolbar/Button/BasicButton.php b/libraries/src/Toolbar/Button/BasicButton.php
index e796fa8064a16..cb04fe3583170 100644
--- a/libraries/src/Toolbar/Button/BasicButton.php
+++ b/libraries/src/Toolbar/Button/BasicButton.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Toolbar\ToolbarButton;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Toolbar/Button/ConfirmButton.php b/libraries/src/Toolbar/Button/ConfirmButton.php
index 0a4659c258516..122a6c24d3bb4 100644
--- a/libraries/src/Toolbar/Button/ConfirmButton.php
+++ b/libraries/src/Toolbar/Button/ConfirmButton.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Language\Text;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Toolbar/Button/CustomButton.php b/libraries/src/Toolbar/Button/CustomButton.php
index a78f0985ae270..daee67d557bd2 100644
--- a/libraries/src/Toolbar/Button/CustomButton.php
+++ b/libraries/src/Toolbar/Button/CustomButton.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Toolbar\ToolbarButton;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Toolbar/Button/DropdownButton.php b/libraries/src/Toolbar/Button/DropdownButton.php
index 99fc2b51cd5f2..97272da54c19e 100644
--- a/libraries/src/Toolbar/Button/DropdownButton.php
+++ b/libraries/src/Toolbar/Button/DropdownButton.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Toolbar\ToolbarButton;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Toolbar/Button/HelpButton.php b/libraries/src/Toolbar/Button/HelpButton.php
index 84873c8471f6c..189e7e8079bce 100644
--- a/libraries/src/Toolbar/Button/HelpButton.php
+++ b/libraries/src/Toolbar/Button/HelpButton.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Language\Text;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Toolbar/Button/InlinehelpButton.php b/libraries/src/Toolbar/Button/InlinehelpButton.php
index b4faf8c979acc..238ab9614a032 100644
--- a/libraries/src/Toolbar/Button/InlinehelpButton.php
+++ b/libraries/src/Toolbar/Button/InlinehelpButton.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Toolbar\Button;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Toolbar/Button/LinkButton.php b/libraries/src/Toolbar/Button/LinkButton.php
index 715637627c14e..3ee3a87f89578 100644
--- a/libraries/src/Toolbar/Button/LinkButton.php
+++ b/libraries/src/Toolbar/Button/LinkButton.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Toolbar\ToolbarButton;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Toolbar/Button/PopupButton.php b/libraries/src/Toolbar/Button/PopupButton.php
index de5f714e3999d..fc97119f7c8c9 100644
--- a/libraries/src/Toolbar/Button/PopupButton.php
+++ b/libraries/src/Toolbar/Button/PopupButton.php
@@ -15,7 +15,7 @@
 use Joomla\CMS\Uri\Uri;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Toolbar/Button/SeparatorButton.php b/libraries/src/Toolbar/Button/SeparatorButton.php
index 37341f4be0f35..4857812fcae21 100644
--- a/libraries/src/Toolbar/Button/SeparatorButton.php
+++ b/libraries/src/Toolbar/Button/SeparatorButton.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Toolbar\ToolbarButton;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Toolbar/Button/StandardButton.php b/libraries/src/Toolbar/Button/StandardButton.php
index 6616c99407983..9e48e290224eb 100644
--- a/libraries/src/Toolbar/Button/StandardButton.php
+++ b/libraries/src/Toolbar/Button/StandardButton.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Language\Text;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Toolbar/ContainerAwareToolbarFactory.php b/libraries/src/Toolbar/ContainerAwareToolbarFactory.php
index ff33118838337..365a241190cb0 100644
--- a/libraries/src/Toolbar/ContainerAwareToolbarFactory.php
+++ b/libraries/src/Toolbar/ContainerAwareToolbarFactory.php
@@ -9,12 +9,12 @@
 
 namespace Joomla\CMS\Toolbar;
 
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Filter\InputFilter;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
 use Joomla\DI\ContainerAwareInterface;
 use Joomla\DI\ContainerAwareTrait;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
diff --git a/libraries/src/Toolbar/Toolbar.php b/libraries/src/Toolbar/Toolbar.php
index 4b4f507fda10d..df2c10680adb9 100644
--- a/libraries/src/Toolbar/Toolbar.php
+++ b/libraries/src/Toolbar/Toolbar.php
@@ -25,7 +25,7 @@
 use Joomla\CMS\Toolbar\Button\StandardButton;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -77,6 +77,10 @@ class Toolbar
      *
      * @var    Toolbar[]
      * @since  2.5
+     *
+     * @deprecated  5.0 will be removed in 7.0
+     *              Toolbars instances will be stored in the \Joomla\CMS\Document\HTMLDocument object
+     *              Request the instance from Factory::getApplication()->getDocument()->getToolbar('name');
      */
     protected static $instances = [];
 
@@ -141,11 +145,14 @@ public function __construct($name = 'toolbar', ToolbarFactoryInterface $factory
      */
     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
         if (empty(self::$instances[$name])) {
-            self::$instances[$name] = Factory::getContainer()->get(ToolbarFactoryInterface::class)->createToolbar($name);
+            self::$instances[$name] = $toolbar;
         }
 
-        return self::$instances[$name];
+        return $toolbar;
     }
 
     /**
@@ -290,6 +297,10 @@ public function prependButton($button, ...$args)
      */
     public function render(array $options = [])
     {
+        if (!$this->_bar) {
+            return '';
+        }
+
         $html = [];
 
         $isChild = !empty($options['is_child']);
diff --git a/libraries/src/Toolbar/ToolbarButton.php b/libraries/src/Toolbar/ToolbarButton.php
index 4eac821f781ea..48e31df54f621 100644
--- a/libraries/src/Toolbar/ToolbarButton.php
+++ b/libraries/src/Toolbar/ToolbarButton.php
@@ -14,7 +14,7 @@
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Toolbar/ToolbarHelper.php b/libraries/src/Toolbar/ToolbarHelper.php
index 25e5bb42eab90..e5a19fdf6df5e 100644
--- a/libraries/src/Toolbar/ToolbarHelper.php
+++ b/libraries/src/Toolbar/ToolbarHelper.php
@@ -52,7 +52,7 @@ public static function title($title, $icon = 'generic.png')
             $title .= ' - ' . Text::_('JADMINISTRATION');
         }
 
-        Factory::getDocument()->setTitle($title);
+        $app->getDocument()->setTitle($title);
     }
 
     /**
@@ -675,7 +675,7 @@ public static function versions($typeAlias, $itemId, $height = 800, $width = 500
         $lang->load('com_contenthistory', JPATH_ADMINISTRATOR, $lang->getTag(), true);
 
         /** @var \Joomla\CMS\Table\ContentType $contentTypeTable */
-        $contentTypeTable = Table::getInstance('Contenttype');
+        $contentTypeTable = Table::getInstance('ContentType', '\\Joomla\\CMS\\Table\\');
         $typeId           = $contentTypeTable->getTypeId($typeAlias);
 
         // Options array for Layout
diff --git a/libraries/src/Tree/ImmutableNodeInterface.php b/libraries/src/Tree/ImmutableNodeInterface.php
index 8b4e3c957c1e8..8f33d38865e2d 100644
--- a/libraries/src/Tree/ImmutableNodeInterface.php
+++ b/libraries/src/Tree/ImmutableNodeInterface.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Tree;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Tree/ImmutableNodeTrait.php b/libraries/src/Tree/ImmutableNodeTrait.php
index f467cc75d2864..98879523af90f 100644
--- a/libraries/src/Tree/ImmutableNodeTrait.php
+++ b/libraries/src/Tree/ImmutableNodeTrait.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Tree;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Tree/NodeInterface.php b/libraries/src/Tree/NodeInterface.php
index e2b82369beba8..c08bb6b0a3f09 100644
--- a/libraries/src/Tree/NodeInterface.php
+++ b/libraries/src/Tree/NodeInterface.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Tree;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Tree/NodeTrait.php b/libraries/src/Tree/NodeTrait.php
index 83760e11cb360..fa02f795f177d 100644
--- a/libraries/src/Tree/NodeTrait.php
+++ b/libraries/src/Tree/NodeTrait.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Tree;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/UCM/UCM.php b/libraries/src/UCM/UCM.php
index e33cd0a81c917..f3cbc903d48d5 100644
--- a/libraries/src/UCM/UCM.php
+++ b/libraries/src/UCM/UCM.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\UCM;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/UCM/UCMBase.php b/libraries/src/UCM/UCMBase.php
index bfd8999c36748..9b83ee809c4f6 100644
--- a/libraries/src/UCM/UCMBase.php
+++ b/libraries/src/UCM/UCMBase.php
@@ -15,7 +15,7 @@
 use Joomla\CMS\Table\TableInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/UCM/UCMContent.php b/libraries/src/UCM/UCMContent.php
index 7235a671f82da..d5ab7b966f5de 100644
--- a/libraries/src/UCM/UCMContent.php
+++ b/libraries/src/UCM/UCMContent.php
@@ -16,7 +16,7 @@
 use Joomla\Database\ParameterType;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -182,7 +182,7 @@ public function mapData($original, UCMType $type = null)
      */
     protected function store($data, TableInterface $table = null, $primaryKey = null)
     {
-        $table = $table ?: Table::getInstance('Corecontent');
+        $table = $table ?: Table::getInstance('CoreContent');
 
         $typeId     = $this->getType()->type->type_id;
         $primaryKey = $primaryKey ?: $this->getPrimaryKey($typeId, $data['core_content_item_id']);
diff --git a/libraries/src/UCM/UCMType.php b/libraries/src/UCM/UCMType.php
index d6897b227cbf2..8754fe3831685 100644
--- a/libraries/src/UCM/UCMType.php
+++ b/libraries/src/UCM/UCMType.php
@@ -15,7 +15,7 @@
 use Joomla\Database\ParameterType;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -230,9 +230,9 @@ public function fieldmapExpand($assoc = false)
     }
 
     /**
-     * Magic method to get the name of the field mapped to a ucm field (core_something).
+     * Magic method to get the name of the field mapped to an ucm field (core_something).
      *
-     * @param   string  $ucmField  The name of the field in JTableCorecontent
+     * @param   string  $ucmField  The name of the field in \Joomla\CMS\Table\CoreContent
      *
      * @return  string  The name mapped to the $ucmField for a given content type
      *
diff --git a/libraries/src/Updater/Adapter/CollectionAdapter.php b/libraries/src/Updater/Adapter/CollectionAdapter.php
index 73a96eca61f92..d52c65c6eaf58 100644
--- a/libraries/src/Updater/Adapter/CollectionAdapter.php
+++ b/libraries/src/Updater/Adapter/CollectionAdapter.php
@@ -18,7 +18,7 @@
 use Joomla\CMS\Version;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Updater/Adapter/ExtensionAdapter.php b/libraries/src/Updater/Adapter/ExtensionAdapter.php
index b2f266d664011..2314254c1ebe8 100644
--- a/libraries/src/Updater/Adapter/ExtensionAdapter.php
+++ b/libraries/src/Updater/Adapter/ExtensionAdapter.php
@@ -19,7 +19,7 @@
 use Joomla\CMS\Version;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -29,6 +29,9 @@
  */
 class ExtensionAdapter extends UpdateAdapter
 {
+    protected $currentUpdate;
+    protected $latest;
+
     /**
      * Start element parser callback.
      *
diff --git a/libraries/src/Updater/DownloadSource.php b/libraries/src/Updater/DownloadSource.php
index 3f9e0dfa8bd38..ee69f8228e971 100644
--- a/libraries/src/Updater/DownloadSource.php
+++ b/libraries/src/Updater/DownloadSource.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Updater;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Updater/Update.php b/libraries/src/Updater/Update.php
index 8ad6f92f9c600..10c1a5242ccb6 100644
--- a/libraries/src/Updater/Update.php
+++ b/libraries/src/Updater/Update.php
@@ -14,12 +14,13 @@
 use Joomla\CMS\Http\HttpFactory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
-use Joomla\CMS\Object\CMSObject;
+use Joomla\CMS\Object\LegacyErrorHandlingTrait;
+use Joomla\CMS\Object\LegacyPropertyManagementTrait;
 use Joomla\CMS\Version;
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -28,8 +29,11 @@
  *
  * @since  1.7.0
  */
-class Update extends CMSObject
+class Update
 {
+    use LegacyErrorHandlingTrait;
+    use LegacyPropertyManagementTrait;
+
     /**
      * Update manifest `<name>` element
      *
@@ -228,6 +232,11 @@ class Update extends CMSObject
      * @since  3.10.2
      */
     protected $compatibleVersions = [];
+    public $downloadurl;
+    protected $tag;
+    protected $stability;
+    protected $supported_databases;
+    protected $php_minimum;
 
     /**
      * Gets the reference to the current direct parent
diff --git a/libraries/src/Updater/UpdateAdapter.php b/libraries/src/Updater/UpdateAdapter.php
index ac8bd05439a12..009f5cf1ea010 100644
--- a/libraries/src/Updater/UpdateAdapter.php
+++ b/libraries/src/Updater/UpdateAdapter.php
@@ -19,7 +19,7 @@
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Updater/Updater.php b/libraries/src/Updater/Updater.php
index b63b8c10d8b84..30aafda50e4e2 100644
--- a/libraries/src/Updater/Updater.php
+++ b/libraries/src/Updater/Updater.php
@@ -15,7 +15,7 @@
 use Joomla\Database\ParameterType;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Uri/Uri.php b/libraries/src/Uri/Uri.php
index 0d4bd717969ca..7cb03cdda7508 100644
--- a/libraries/src/Uri/Uri.php
+++ b/libraries/src/Uri/Uri.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Factory;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/User/CurrentUserTrait.php b/libraries/src/User/CurrentUserTrait.php
index a6cdced3a769b..5a1f57b58052a 100644
--- a/libraries/src/User/CurrentUserTrait.php
+++ b/libraries/src/User/CurrentUserTrait.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\User;
@@ -12,7 +12,7 @@
 use Joomla\CMS\Factory;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -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 5.0 and an empty user will be returned.
+     * is returned. This will change in 6.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 5.0', __METHOD__),
+                sprintf('User must be set in %s. This will not be caught anymore in 6.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 082320e5671b8..2025d53b9af27 100644
--- a/libraries/src/User/User.php
+++ b/libraries/src/User/User.php
@@ -10,17 +10,21 @@
 namespace Joomla\CMS\User;
 
 use Joomla\CMS\Access\Access;
+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\Language\Text;
-use Joomla\CMS\Log\Log;
-use Joomla\CMS\Object\CMSObject;
+use Joomla\CMS\Object\LegacyErrorHandlingTrait;
+use Joomla\CMS\Object\LegacyPropertyManagementTrait;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Table\Table;
 use Joomla\Registry\Registry;
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -28,8 +32,12 @@
  *
  * @since  1.7.0
  */
-class User extends CMSObject
+#[\AllowDynamicProperties]
+class User
 {
+    use LegacyErrorHandlingTrait;
+    use LegacyPropertyManagementTrait;
+
     /**
      * A cached switch for if this user has root access rights.
      *
@@ -174,6 +182,38 @@ class User extends CMSObject
      */
     public $requireReset = null;
 
+    /**
+     * The type alias
+     *
+     * @var    string
+     * @since  5.0.0
+     */
+    public $typeAlias = null;
+
+    /**
+     * The otp key
+     *
+     * @var    string
+     * @since  5.0.0
+     */
+    public $otpKey = null;
+
+    /**
+     * The otp
+     *
+     * @var    string
+     * @since  5.0.0
+     */
+    public $otep = null;
+
+    /**
+     * The authentication provider
+     *
+     * @var    string
+     * @since  5.0.0
+     */
+    public $authProvider = null;
+
     /**
      * User parameters
      *
@@ -220,16 +260,6 @@ class User extends CMSObject
      */
     protected static $instances = [];
 
-    /**
-     * The access level id
-     *
-     * @var    integer
-     * @since  4.3.0
-     *
-     * @deprecated __DEPLOY_VERSION__ will be removed in 6.0 as this property is not used anymore
-     */
-    public $aid = null;
-
     /**
      * Constructor activating the default information of the language
      *
@@ -249,7 +279,6 @@ public function __construct($identifier = 0)
             // Initialise
             $this->id        = 0;
             $this->sendEmail = 0;
-            $this->aid       = 0;
             $this->guest     = 1;
         }
     }
@@ -547,14 +576,14 @@ public function setParameters($params)
      * @note    At 4.0 this method will no longer be static
      * @since   1.7.0
      */
-    public static function getTable($type = null, $prefix = 'JTable')
+    public static function getTable($type = null, $prefix = '\\Joomla\\CMS\\Table\\')
     {
         static $tabletype;
 
         // Set the default tabletype;
         if (!isset($tabletype)) {
             $tabletype['name']   = 'user';
-            $tabletype['prefix'] = 'JTable';
+            $tabletype['prefix'] = '\\Joomla\\CMS\\Table\\';
         }
 
         // Set a custom table type is defined
@@ -741,9 +770,16 @@ public function save($updateOnly = false)
             }
 
             // Fire the onUserBeforeSave event.
-            PluginHelper::importPlugin('user');
+            $dispatcher = Factory::getApplication()->getDispatcher();
+            PluginHelper::importPlugin('user', null, true, $dispatcher);
 
-            $result = Factory::getApplication()->triggerEvent('onUserBeforeSave', [$oldUser->getProperties(), $isNew, $this->getProperties()]);
+            $saveEvent = new BeforeSaveEvent('onUserBeforeSave', [
+                'subject' => $oldUser->getProperties(),
+                'isNew'   => $isNew,
+                'data'    => $this->getProperties(),
+            ]);
+            $dispatcher->dispatch('onUserBeforeSave', $saveEvent);
+            $result = $saveEvent['result'] ?? [];
 
             if (\in_array(false, $result, true)) {
                 // Plugin will have to raise its own error or throw an exception.
@@ -764,7 +800,12 @@ public function save($updateOnly = false)
             }
 
             // Fire the onUserAfterSave event
-            Factory::getApplication()->triggerEvent('onUserAfterSave', [$this->getProperties(), $isNew, $result, $this->getError()]);
+            $dispatcher->dispatch('onUserAfterSave', new AfterSaveEvent('onUserAfterSave', [
+                'subject'      => $this->getProperties(),
+                'isNew'        => $isNew,
+                'savingResult' => $result,
+                'errorMessage' => $this->getError() ?? '',
+            ]));
         } catch (\Exception $e) {
             $this->setError($e->getMessage());
 
@@ -783,10 +824,13 @@ public function save($updateOnly = false)
      */
     public function delete()
     {
-        PluginHelper::importPlugin('user');
+        $dispatcher = Factory::getApplication()->getDispatcher();
+        PluginHelper::importPlugin('user', null, true, $dispatcher);
 
         // Trigger the onUserBeforeDelete event
-        Factory::getApplication()->triggerEvent('onUserBeforeDelete', [$this->getProperties()]);
+        $dispatcher->dispatch('onUserBeforeDelete', new BeforeDeleteEvent('onUserBeforeDelete', [
+            'subject' => $this->getProperties(),
+        ]));
 
         // Create the user table object
         $table = $this->getTable();
@@ -796,7 +840,11 @@ public function delete()
         }
 
         // Trigger the onUserAfterDelete event
-        Factory::getApplication()->triggerEvent('onUserAfterDelete', [$this->getProperties(), $result, $this->getError()]);
+        $dispatcher->dispatch('onUserAfterDelete', new AfterDeleteEvent('onUserAfterDelete', [
+            'subject'        => $this->getProperties(),
+            'deletingResult' => $result,
+            'errorMessage'   => $this->getError() ?? '',
+        ]));
 
         return $result;
     }
@@ -820,8 +868,6 @@ public function load($id)
             // Reset to guest user
             $this->guest = 1;
 
-            Log::add(Text::sprintf('JLIB_USER_ERROR_UNABLE_TO_LOAD_USER', $id), Log::WARNING, 'jerror');
-
             return false;
         }
 
@@ -880,7 +926,6 @@ public function __wakeup()
             // Initialise
             $this->id        = 0;
             $this->sendEmail = 0;
-            $this->aid       = 0;
             $this->guest     = 1;
         }
     }
diff --git a/libraries/src/User/UserFactoryAwareInterface.php b/libraries/src/User/UserFactoryAwareInterface.php
new file mode 100644
index 0000000000000..809275d66d60f
--- /dev/null
+++ b/libraries/src/User/UserFactoryAwareInterface.php
@@ -0,0 +1,33 @@
+<?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\User;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Interface to be implemented by classes depending on a user factory.
+ *
+ * @since  4.4.0
+ */
+interface UserFactoryAwareInterface
+{
+    /**
+     * Set the user factory to use.
+     *
+     * @param   UserFactoryInterface  $factory  The user factory to use.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function setUserFactory(UserFactoryInterface $factory): void;
+}
diff --git a/libraries/src/User/UserFactoryAwareTrait.php b/libraries/src/User/UserFactoryAwareTrait.php
new file mode 100644
index 0000000000000..d286fc43a1b1d
--- /dev/null
+++ b/libraries/src/User/UserFactoryAwareTrait.php
@@ -0,0 +1,61 @@
+<?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\User;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Defines the trait for a UserFactoryInterface Aware Class.
+ *
+ * @since  4.4.0
+ */
+trait UserFactoryAwareTrait
+{
+    /**
+     * UserFactoryInterface
+     *
+     * @var    UserFactoryInterface
+     * @since  4.4.0
+     */
+    private $userFactory;
+
+    /**
+     * Get the UserFactoryInterface.
+     *
+     * @return  UserFactoryInterface
+     *
+     * @since   4.4.0
+     * @throws  \UnexpectedValueException May be thrown if the UserFactory has not been set.
+     */
+    protected function getUserFactory(): UserFactoryInterface
+    {
+        if ($this->userFactory) {
+            return $this->userFactory;
+        }
+
+        throw new \UnexpectedValueException('UserFactory not set in ' . __CLASS__);
+    }
+
+    /**
+     * Set the user factory to use.
+     *
+     * @param   UserFactoryInterface  $userFactory  The user factory to use.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function setUserFactory(UserFactoryInterface $userFactory): void
+    {
+        $this->userFactory = $userFactory;
+    }
+}
diff --git a/libraries/src/User/UserHelper.php b/libraries/src/User/UserHelper.php
index 266785ba4bc74..5fd5c907df018 100644
--- a/libraries/src/User/UserHelper.php
+++ b/libraries/src/User/UserHelper.php
@@ -30,7 +30,7 @@
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Utility/BufferStreamHandler.php b/libraries/src/Utility/BufferStreamHandler.php
index e0c1062fea4c3..d0c290c349c85 100644
--- a/libraries/src/Utility/BufferStreamHandler.php
+++ b/libraries/src/Utility/BufferStreamHandler.php
@@ -12,7 +12,7 @@
 
 namespace Joomla\CMS\Utility;
 
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 
 /**
  * @deprecated  3.8 will be removed in 5.0
diff --git a/libraries/src/Utility/Utility.php b/libraries/src/Utility/Utility.php
index 6f7472789b994..243901bfc4224 100644
--- a/libraries/src/Utility/Utility.php
+++ b/libraries/src/Utility/Utility.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\HTML\HTMLHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Version.php b/libraries/src/Version.php
index d0563d73cf0f4..7e643d5ba8a50 100644
--- a/libraries/src/Version.php
+++ b/libraries/src/Version.php
@@ -15,7 +15,7 @@
 use Joomla\CMS\Date\Date;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -66,7 +66,7 @@ final class Version
      * @var    string
      * @since  3.8.0
      */
-    public const EXTRA_VERSION = 'dev';
+    public const EXTRA_VERSION = 'beta1-dev';
 
     /**
      * Development status.
@@ -82,7 +82,7 @@ final class Version
      * @var    string
      * @since  3.5
      */
-    public const CODENAME = 'Schnitzel';
+    public const CODENAME = 'Kuboresha';
 
     /**
      * Release date.
@@ -90,7 +90,7 @@ final class Version
      * @var    string
      * @since  3.5
      */
-    public const RELDATE = '29-August-2022';
+    public const RELDATE = '22-August-2023';
 
     /**
      * Release time.
@@ -98,7 +98,7 @@ final class Version
      * @var    string
      * @since  3.5
      */
-    public const RELTIME = '12:18';
+    public const RELTIME = '16:47';
 
     /**
      * Release timezone.
diff --git a/libraries/src/Versioning/VersionableControllerTrait.php b/libraries/src/Versioning/VersionableControllerTrait.php
index 08f2ce8bf677e..8e9d8a1e7eeaf 100644
--- a/libraries/src/Versioning/VersionableControllerTrait.php
+++ b/libraries/src/Versioning/VersionableControllerTrait.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Router\Route;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Versioning/VersionableModelTrait.php b/libraries/src/Versioning/VersionableModelTrait.php
index a18f6ade4c53f..73c43bd910d41 100644
--- a/libraries/src/Versioning/VersionableModelTrait.php
+++ b/libraries/src/Versioning/VersionableModelTrait.php
@@ -14,7 +14,7 @@
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -42,7 +42,7 @@ public function loadHistory($versionId, Table &$table)
         }
 
         // Get an instance of the row to checkout.
-        $historyTable = Table::getInstance('Contenthistory');
+        $historyTable = Table::getInstance('ContentHistory');
 
         if (!$historyTable->load($versionId)) {
             $this->setError($historyTable->getError());
diff --git a/libraries/src/Versioning/VersionableTableInterface.php b/libraries/src/Versioning/VersionableTableInterface.php
index 734ae2918580b..52795eaa1300c 100644
--- a/libraries/src/Versioning/VersionableTableInterface.php
+++ b/libraries/src/Versioning/VersionableTableInterface.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Table\TableInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Versioning/Versioning.php b/libraries/src/Versioning/Versioning.php
index 2219ef0a6c371..c94a0058bdd3a 100644
--- a/libraries/src/Versioning/Versioning.php
+++ b/libraries/src/Versioning/Versioning.php
@@ -18,7 +18,7 @@
 use Joomla\Database\ParameterType;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -92,10 +92,10 @@ public static function delete($typeAlias, $id)
      */
     public static function store($typeAlias, $id, $data, $note = '')
     {
-        $typeTable = Table::getInstance('Contenttype', 'JTable');
+        $typeTable = Table::getInstance('ContentType', '\\Joomla\\CMS\\Table\\');
         $typeTable->load(['type_alias' => $typeAlias]);
 
-        $historyTable          = Table::getInstance('Contenthistory', 'JTable');
+        $historyTable          = Table::getInstance('ContentHistory', '\\Joomla\\CMS\\Table\\');
         $historyTable->item_id = $typeAlias . '.' . $id;
 
         $aliasParts = explode('.', $typeAlias);
diff --git a/libraries/src/WebAsset/AssetItem/CoreAssetItem.php b/libraries/src/WebAsset/AssetItem/CoreAssetItem.php
index aaab6c4893b79..7a00a7bc7757d 100644
--- a/libraries/src/WebAsset/AssetItem/CoreAssetItem.php
+++ b/libraries/src/WebAsset/AssetItem/CoreAssetItem.php
@@ -16,7 +16,7 @@
 use Joomla\CMS\WebAsset\WebAssetItem;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/WebAsset/AssetItem/FormValidateAssetItem.php b/libraries/src/WebAsset/AssetItem/FormValidateAssetItem.php
index 80a94cc29755f..31edfc1e44230 100644
--- a/libraries/src/WebAsset/AssetItem/FormValidateAssetItem.php
+++ b/libraries/src/WebAsset/AssetItem/FormValidateAssetItem.php
@@ -15,7 +15,7 @@
 use Joomla\CMS\WebAsset\WebAssetItem;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/WebAsset/AssetItem/KeepaliveAssetItem.php b/libraries/src/WebAsset/AssetItem/KeepaliveAssetItem.php
index 1a655eb3bb64c..88d4bdbbd0eed 100644
--- a/libraries/src/WebAsset/AssetItem/KeepaliveAssetItem.php
+++ b/libraries/src/WebAsset/AssetItem/KeepaliveAssetItem.php
@@ -16,7 +16,7 @@
 use Joomla\CMS\WebAsset\WebAssetItem;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/WebAsset/AssetItem/LangActiveAssetItem.php b/libraries/src/WebAsset/AssetItem/LangActiveAssetItem.php
index 12dbec00a6c8f..fa17f1eeb4674 100644
--- a/libraries/src/WebAsset/AssetItem/LangActiveAssetItem.php
+++ b/libraries/src/WebAsset/AssetItem/LangActiveAssetItem.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\WebAsset\WebAssetItem;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/WebAsset/AssetItem/TableColumnsAssetItem.php b/libraries/src/WebAsset/AssetItem/TableColumnsAssetItem.php
index cb55499a119c7..3df2fe550ff49 100644
--- a/libraries/src/WebAsset/AssetItem/TableColumnsAssetItem.php
+++ b/libraries/src/WebAsset/AssetItem/TableColumnsAssetItem.php
@@ -15,7 +15,7 @@
 use Joomla\CMS\WebAsset\WebAssetItem;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/WebAsset/Exception/InvalidActionException.php b/libraries/src/WebAsset/Exception/InvalidActionException.php
index 4a2b1569c8ffb..d4d11dee083f8 100644
--- a/libraries/src/WebAsset/Exception/InvalidActionException.php
+++ b/libraries/src/WebAsset/Exception/InvalidActionException.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\WebAsset\Exception;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/WebAsset/Exception/UnknownAssetException.php b/libraries/src/WebAsset/Exception/UnknownAssetException.php
index aef6c71da7c48..ed2c5a4406e86 100644
--- a/libraries/src/WebAsset/Exception/UnknownAssetException.php
+++ b/libraries/src/WebAsset/Exception/UnknownAssetException.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\WebAsset\Exception;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/WebAsset/Exception/UnsatisfiedDependencyException.php b/libraries/src/WebAsset/Exception/UnsatisfiedDependencyException.php
index 40f2a115f256f..eff5ad81806bc 100644
--- a/libraries/src/WebAsset/Exception/UnsatisfiedDependencyException.php
+++ b/libraries/src/WebAsset/Exception/UnsatisfiedDependencyException.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\WebAsset\Exception;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/WebAsset/Exception/WebAssetExceptionInterface.php b/libraries/src/WebAsset/Exception/WebAssetExceptionInterface.php
index 4bc21fcd19f47..88dec62a30909 100644
--- a/libraries/src/WebAsset/Exception/WebAssetExceptionInterface.php
+++ b/libraries/src/WebAsset/Exception/WebAssetExceptionInterface.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\WebAsset\Exception;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/WebAsset/WebAssetAttachBehaviorInterface.php b/libraries/src/WebAsset/WebAssetAttachBehaviorInterface.php
index 1b957690e7b20..e9cabd88edec4 100644
--- a/libraries/src/WebAsset/WebAssetAttachBehaviorInterface.php
+++ b/libraries/src/WebAsset/WebAssetAttachBehaviorInterface.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Document\Document;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/WebAsset/WebAssetItem.php b/libraries/src/WebAsset/WebAssetItem.php
index 3bb084ebd6b83..aef3cd6e63d75 100644
--- a/libraries/src/WebAsset/WebAssetItem.php
+++ b/libraries/src/WebAsset/WebAssetItem.php
@@ -10,9 +10,10 @@
 namespace Joomla\CMS\WebAsset;
 
 use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Uri\Uri;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -175,6 +176,10 @@ public function getUri($resolvePath = true): string
                     $path = $this->resolvePath($path, 'stylesheet');
                     break;
                 default:
+                    // Asset for the ES modules may give us a folder for ESM import map
+                    if (str_ends_with($path, '/') && !str_starts_with($path, '.')) {
+                        $path = Uri::root(true) . '/' . $path;
+                    }
                     break;
             }
         }
@@ -338,6 +343,6 @@ protected function isPathExternal(string $path): bool
     protected function isPathAbsolute(string $path): bool
     {
         // We have a full path or not
-        return is_file(JPATH_ROOT . '/' . $path);
+        return strpos($path, '/') !== false && is_file(JPATH_ROOT . '/' . $path);
     }
 }
diff --git a/libraries/src/WebAsset/WebAssetItemInterface.php b/libraries/src/WebAsset/WebAssetItemInterface.php
index 79ef5e96fa50e..508a734d0c833 100644
--- a/libraries/src/WebAsset/WebAssetItemInterface.php
+++ b/libraries/src/WebAsset/WebAssetItemInterface.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\WebAsset;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/WebAsset/WebAssetManager.php b/libraries/src/WebAsset/WebAssetManager.php
index c77ff55c1064f..a354d82edf2f5 100644
--- a/libraries/src/WebAsset/WebAssetManager.php
+++ b/libraries/src/WebAsset/WebAssetManager.php
@@ -15,7 +15,7 @@
 use Joomla\CMS\WebAsset\Exception\UnsatisfiedDependencyException;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/WebAsset/WebAssetManagerInterface.php b/libraries/src/WebAsset/WebAssetManagerInterface.php
index 1784cee6f7194..fe774f356bfcd 100644
--- a/libraries/src/WebAsset/WebAssetManagerInterface.php
+++ b/libraries/src/WebAsset/WebAssetManagerInterface.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\WebAsset\Exception\UnsatisfiedDependencyException;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/WebAsset/WebAssetRegistry.php b/libraries/src/WebAsset/WebAssetRegistry.php
index 0efbd4c06fe56..38fc23976b436 100644
--- a/libraries/src/WebAsset/WebAssetRegistry.php
+++ b/libraries/src/WebAsset/WebAssetRegistry.php
@@ -10,14 +10,14 @@
 namespace Joomla\CMS\WebAsset;
 
 use Joomla\CMS\Event\AbstractEvent;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\WebAsset\Exception\UnknownAssetException;
 use Joomla\Event\Dispatcher as EventDispatcher;
 use Joomla\Event\DispatcherAwareInterface;
 use Joomla\Event\DispatcherAwareTrait;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/WebAsset/WebAssetRegistryInterface.php b/libraries/src/WebAsset/WebAssetRegistryInterface.php
index 8428d5c86d998..03bbd18819e5d 100644
--- a/libraries/src/WebAsset/WebAssetRegistryInterface.php
+++ b/libraries/src/WebAsset/WebAssetRegistryInterface.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\WebAsset\Exception\UnknownAssetException;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/WebAuthn/Server.php b/libraries/src/WebAuthn/Server.php
index 090149862ff9b..3c185be28ac12 100644
--- a/libraries/src/WebAuthn/Server.php
+++ b/libraries/src/WebAuthn/Server.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\WebAuthn;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 use Cose\Algorithm\Algorithm;
@@ -53,7 +53,7 @@
 /**
  * WebAuthn server abstraction Class.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  5.0.0
  * @internal
  */
 final class Server
@@ -62,7 +62,7 @@ final class Server
      * Default WebAuthn timeout in milliseconds
      *
      * @var int
-     * @since __DEPLOY_VERSION__
+     * @since 5.0.0
      */
     public int $timeout = 60000;
 
@@ -70,7 +70,7 @@ final class Server
      * Random challenge size in bytes
      *
      * @var int
-     * @since __DEPLOY_VERSION__
+     * @since 5.0.0
      */
     public int $challengeSize = 32;
 
@@ -78,7 +78,7 @@ final class Server
      * The relaying party entity
      *
      * @var PublicKeyCredentialRpEntity
-     * @since __DEPLOY_VERSION__
+     * @since 5.0.0
      */
     private PublicKeyCredentialRpEntity $rpEntity;
 
@@ -86,7 +86,7 @@ final class Server
      * COSE algorithm manager factory instance
      *
      * @var ManagerFactory
-     * @since __DEPLOY_VERSION__
+     * @since 5.0.0
      */
     private ManagerFactory $coseAlgorithmManagerFactory;
 
@@ -94,7 +94,7 @@ final class Server
      * Public Key credential source respoitory instance
      *
      * @var PublicKeyCredentialSourceRepository
-     * @since __DEPLOY_VERSION__
+     * @since 5.0.0
      */
     private PublicKeyCredentialSourceRepository $publicKeyCredentialSourceRepository;
 
@@ -102,7 +102,7 @@ final class Server
      * Token binding handler
      *
      * @var TokenBindingHandler
-     * @since __DEPLOY_VERSION__
+     * @since 5.0.0
      * @deprecated 6.0 Will be removed when we upgrade to WebAuthn library 5.0 or later
      */
     private TokenBindingHandler $tokenBindingHandler;
@@ -111,7 +111,7 @@ final class Server
      * Authentication extension output checker
      *
      * @var ExtensionOutputCheckerHandler
-     * @since __DEPLOY_VERSION__
+     * @since 5.0.0
      */
     private ExtensionOutputCheckerHandler $extensionOutputCheckerHandler;
 
@@ -119,7 +119,7 @@ final class Server
      * COSE algorithms supported
      *
      * @var string[]
-     * @since __DEPLOY_VERSION__
+     * @since 5.0.0
      */
     private array $selectedAlgorithms;
 
@@ -127,7 +127,7 @@ final class Server
      * Metadata statement repository service
      *
      * @var MetadataStatementRepository|null
-     * @since __DEPLOY_VERSION__
+     * @since 5.0.0
      */
     private ?MetadataStatementRepository $metadataStatementRepository;
 
@@ -138,7 +138,7 @@ final class Server
      * @param PublicKeyCredentialSourceRepository $publicKeyCredentialSourceRepository Public Key repository service
      * @param MetadataStatementRepository|null $metadataStatementRepository Metadata Statement (MDS) service (optional)
      *
-     * @since __DEPLOY_VERSION__
+     * @since 5.0.0
      */
     public function __construct(PublicKeyCredentialRpEntity $relayingParty, PublicKeyCredentialSourceRepository $publicKeyCredentialSourceRepository, ?MetadataStatementRepository $metadataStatementRepository)
     {
@@ -171,7 +171,7 @@ public function __construct(PublicKeyCredentialRpEntity $relayingParty, PublicKe
      * @param string[] $selectedAlgorithms
      *
      * @return void
-     * @since __DEPLOY_VERSION__
+     * @since 5.0.0
      */
     public function setSelectedAlgorithms(array $selectedAlgorithms): void
     {
@@ -185,7 +185,7 @@ public function setSelectedAlgorithms(array $selectedAlgorithms): void
      * @param Algorithm $algorithm The algorithm object instance
      *
      * @return void
-     * @since __DEPLOY_VERSION__
+     * @since 5.0.0
      */
     public function addAlgorithm(string $alias, Algorithm $algorithm): void
     {
@@ -200,7 +200,7 @@ public function addAlgorithm(string $alias, Algorithm $algorithm): void
      * @param ExtensionOutputCheckerHandler $extensionOutputCheckerHandler
      *
      * @return void
-     * @since __DEPLOY_VERSION__
+     * @since 5.0.0
      */
     public function setExtensionOutputCheckerHandler(ExtensionOutputCheckerHandler $extensionOutputCheckerHandler): void
     {
@@ -219,7 +219,7 @@ public function setExtensionOutputCheckerHandler(ExtensionOutputCheckerHandler $
      * @param AuthenticationExtensionsClientInputs|null $extensions Allowed client inputs
      *
      * @return PublicKeyCredentialCreationOptions
-     * @since __DEPLOY_VERSION__
+     * @since 5.0.0
      *
      * @throws InvalidDataException
      */
@@ -262,7 +262,7 @@ public function generatePublicKeyCredentialCreationOptions(PublicKeyCredentialUs
      * @param AuthenticationExtensionsClientInputs|null $extensions Allowed client inputs.
      *
      * @return PublicKeyCredentialRequestOptions
-     * @since __DEPLOY_VERSION__
+     * @since 5.0.0
      *
      * @throws InvalidDataException
      */
@@ -284,7 +284,7 @@ public function generatePublicKeyCredentialRequestOptions(?string $userVerificat
      * @param ServerRequestInterface $serverRequest Abstraction of the request data
      *
      * @return PublicKeyCredentialSource
-     * @since __DEPLOY_VERSION__
+     * @since 5.0.0
      *
      * @throws \JsonException
      * @throws \Throwable
@@ -344,7 +344,7 @@ public function loadAndCheckAttestationResponse(string $data, PublicKeyCredentia
      * @param ServerRequestInterface $serverRequest Abstraction of the request data
      *
      * @return PublicKeyCredentialSource
-     * @since __DEPLOY_VERSION__
+     * @since 5.0.0
      *
      * @throws \JsonException
      * @throws \Throwable
@@ -407,7 +407,7 @@ public function loadAndCheckAssertionResponse(string $data, PublicKeyCredentialR
      * Get the attestation statement support manager object.
      *
      * @return AttestationStatementSupportManager
-     * @since __DEPLOY_VERSION__
+     * @since 5.0.0
      */
     private function getAttestationStatementSupportManager(): AttestationStatementSupportManager
     {
diff --git a/libraries/src/Workflow/Workflow.php b/libraries/src/Workflow/Workflow.php
index 22e1b5b3c5637..892d2626da3af 100644
--- a/libraries/src/Workflow/Workflow.php
+++ b/libraries/src/Workflow/Workflow.php
@@ -21,7 +21,7 @@
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -109,14 +109,14 @@ public function __construct(string $extension, ?CMSApplication $app = null, ?Dat
 
         // Initialise default objects if none have been provided
         if ($app === null) {
-            @trigger_error('In 6.0 is the app dependency mandatory.', E_USER_DEPRECATED);
+            @trigger_error('From 6.0 declaring the app dependency will be mandatory.', E_USER_DEPRECATED);
             $app = Factory::getApplication();
         }
 
         $this->app = $app;
 
         if ($db === null) {
-            @trigger_error('In 6.0 is the database dependency mandatory.', E_USER_DEPRECATED);
+            @trigger_error('From 6.0 declaring the database dependency will be mandatory.', E_USER_DEPRECATED);
             $db = Factory::getContainer()->get(DatabaseDriver::class);
         }
 
diff --git a/libraries/src/Workflow/WorkflowPluginTrait.php b/libraries/src/Workflow/WorkflowPluginTrait.php
index d8f35891a571b..85db1110cd6f3 100644
--- a/libraries/src/Workflow/WorkflowPluginTrait.php
+++ b/libraries/src/Workflow/WorkflowPluginTrait.php
@@ -4,17 +4,16 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Workflow;
 
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Object\CMSObject;
-use ReflectionClass;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
@@ -45,7 +44,11 @@ protected function enhanceWorkflowTransitionForm(Form $form, $data)
         }
 
         // Load XML file from "parent" plugin
-        $path = dirname((new ReflectionClass(static::class))->getFileName());
+        $path = dirname((new \ReflectionClass(static::class))->getFileName());
+
+        if (!is_file($path . '/forms/action.xml')) {
+            $path = JPATH_PLUGINS . '/' . $this->_type . '/' . $this->_name;
+        }
 
         if (is_file($path . '/forms/action.xml')) {
             $form->loadFile($path . '/forms/action.xml');
@@ -65,13 +68,14 @@ protected function enhanceWorkflowTransitionForm(Form $form, $data)
      */
     protected function getWorkflow(int $workflowId = null)
     {
-        $workflowId = !empty($workflowId) ? $workflowId : $this->app->getInput()->getInt('workflow_id');
+        $app        = $this->getApplication() ?? $this->app;
+        $workflowId = !empty($workflowId) ? $workflowId : $app->getInput()->getInt('workflow_id');
 
         if (is_array($workflowId)) {
             return false;
         }
 
-        return $this->app->bootComponent('com_workflow')
+        return $app->bootComponent('com_workflow')
             ->getMVCFactory()
             ->createModel('Workflow', 'Administrator', ['ignore_request' => true])
             ->getItem($workflowId);
@@ -134,7 +138,7 @@ protected function checkExtensionSupport($context, $functionality)
     {
         $parts = explode('.', $context);
 
-        $component = $this->app->bootComponent($parts[0]);
+        $component = ($this->getApplication() ?? $this->app)->bootComponent($parts[0]);
 
         if (
             !$component instanceof WorkflowServiceInterface
diff --git a/libraries/src/Workflow/WorkflowServiceInterface.php b/libraries/src/Workflow/WorkflowServiceInterface.php
index 71ce31623e90e..25b81a1d2444f 100644
--- a/libraries/src/Workflow/WorkflowServiceInterface.php
+++ b/libraries/src/Workflow/WorkflowServiceInterface.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Workflow;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/libraries/src/Workflow/WorkflowServiceTrait.php b/libraries/src/Workflow/WorkflowServiceTrait.php
index eefc64f4d76ae..7280c090485c2 100644
--- a/libraries/src/Workflow/WorkflowServiceTrait.php
+++ b/libraries/src/Workflow/WorkflowServiceTrait.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\CMS\Workflow;
@@ -17,7 +17,7 @@
 use Joomla\Event\DispatcherAwareInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
diff --git a/modules/mod_articles_archive/services/provider.php b/modules/mod_articles_archive/services/provider.php
index 1a248c7e243d7..9eb4ed7e2dad6 100644
--- a/modules/mod_articles_archive/services/provider.php
+++ b/modules/mod_articles_archive/services/provider.php
@@ -19,7 +19,7 @@
 /**
  * The articles archive module service provider.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.4.0
  */
 return new class () implements ServiceProviderInterface {
     /**
@@ -29,7 +29,7 @@
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.4.0
      */
     public function register(Container $container): void
     {
diff --git a/modules/mod_articles_archive/src/Dispatcher/Dispatcher.php b/modules/mod_articles_archive/src/Dispatcher/Dispatcher.php
index 4c7ae5784b37a..46b4ee703abb1 100644
--- a/modules/mod_articles_archive/src/Dispatcher/Dispatcher.php
+++ b/modules/mod_articles_archive/src/Dispatcher/Dispatcher.php
@@ -15,13 +15,13 @@
 use Joomla\CMS\Helper\HelperFactoryAwareTrait;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
  * Dispatcher class for mod_articles_archive
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.4.0
  */
 class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareInterface
 {
@@ -32,7 +32,7 @@ class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareI
      *
      * @return  array
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.4.0
      */
     protected function getLayoutData(): array
     {
diff --git a/modules/mod_articles_archive/src/Helper/ArticlesArchiveHelper.php b/modules/mod_articles_archive/src/Helper/ArticlesArchiveHelper.php
index 6501488a302b2..690b62407cc46 100644
--- a/modules/mod_articles_archive/src/Helper/ArticlesArchiveHelper.php
+++ b/modules/mod_articles_archive/src/Helper/ArticlesArchiveHelper.php
@@ -42,7 +42,7 @@ class ArticlesArchiveHelper implements DatabaseAwareInterface
      *
      * @return  \stdClass[]
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.4.0
      */
     public function getArticlesByMonths(Registry $moduleParams, SiteApplication $app): array
     {
@@ -109,7 +109,7 @@ public function getArticlesByMonths(Registry $moduleParams, SiteApplication $app
      *
      * @since   1.5
      *
-     * @deprecated  __DEPLOY_VERSION__  will be removed in 6.0
+     * @deprecated  4.4.0  will be removed in 6.0
      *              Use the non-static method getArticlesByMonths
      *              Example: Factory::getApplication()->bootModule('mod_articles_archive', 'site')
      *                           ->getHelper('ArticlesArchiveHelper')
diff --git a/modules/mod_articles_categories/mod_articles_categories.php b/modules/mod_articles_categories/mod_articles_categories.php
deleted file mode 100644
index 6f7f2b5f508f1..0000000000000
--- a/modules/mod_articles_categories/mod_articles_categories.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Site
- * @subpackage  mod_articles_categories
- *
- * @copyright   (C) 2010 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\ModuleHelper;
-
-$cacheid = md5($module->id);
-
-$cacheparams               = new \stdClass();
-$cacheparams->cachemode    = 'id';
-$cacheparams->class        = 'Joomla\Module\ArticlesCategories\Site\Helper\ArticlesCategoriesHelper';
-$cacheparams->method       = 'getList';
-$cacheparams->methodparams = $params;
-$cacheparams->modeparams   = $cacheid;
-
-$list       = ModuleHelper::moduleCache($module, $params, $cacheparams);
-$startLevel = $list ? reset($list)->getParent()->level : null;
-
-require ModuleHelper::getLayoutPath('mod_articles_categories', $params->get('layout', 'default'));
diff --git a/modules/mod_articles_categories/mod_articles_categories.xml b/modules/mod_articles_categories/mod_articles_categories.xml
index 32c5589e6f73d..9bbe42d937896 100644
--- a/modules/mod_articles_categories/mod_articles_categories.xml
+++ b/modules/mod_articles_categories/mod_articles_categories.xml
@@ -11,7 +11,7 @@
 	<description>MOD_ARTICLES_CATEGORIES_XML_DESCRIPTION</description>
 	<namespace path="src">Joomla\Module\ArticlesCategories</namespace>
 	<files>
-		<filename module="mod_articles_categories">mod_articles_categories.php</filename>
+		<folder module="mod_articles_categories">services</folder>
 		<folder>src</folder>
 		<folder>tmpl</folder>
 	</files>
diff --git a/modules/mod_articles_categories/services/provider.php b/modules/mod_articles_categories/services/provider.php
new file mode 100644
index 0000000000000..8aaca5a002a8d
--- /dev/null
+++ b/modules/mod_articles_categories/services/provider.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_articles_categories
+ *
+ * @copyright   (C) 2022 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 articles categories module service provider.
+ *
+ * @since  4.4.0
+ */
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container)
+    {
+        $container->registerServiceProvider(new ModuleDispatcherFactory('\\Joomla\\Module\\ArticlesCategories'));
+        $container->registerServiceProvider(new HelperFactory('\\Joomla\\Module\\ArticlesCategories\\Site\\Helper'));
+
+        $container->registerServiceProvider(new Module());
+    }
+};
diff --git a/modules/mod_articles_categories/src/Dispatcher/Dispatcher.php b/modules/mod_articles_categories/src/Dispatcher/Dispatcher.php
new file mode 100644
index 0000000000000..06415bd5b7692
--- /dev/null
+++ b/modules/mod_articles_categories/src/Dispatcher/Dispatcher.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_articles_categories
+ *
+ * @copyright   (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Module\ArticlesCategories\Site\Dispatcher;
+
+use Joomla\CMS\Dispatcher\AbstractModuleDispatcher;
+use Joomla\CMS\Helper\HelperFactoryAwareInterface;
+use Joomla\CMS\Helper\HelperFactoryAwareTrait;
+use Joomla\CMS\Helper\ModuleHelper;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Dispatcher class for mod_articles_categories
+ *
+ * @since  4.4.0
+ */
+class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareInterface
+{
+    use HelperFactoryAwareTrait;
+
+    /**
+     * Returns the layout data.
+     *
+     * @return  array
+     *
+     * @since   4.4.0
+     */
+    protected function getLayoutData(): array
+    {
+        $data   = parent::getLayoutData();
+        $params = $data['params'];
+
+        $cacheParams               = new \stdClass();
+        $cacheParams->cachemode    = 'id';
+        $cacheParams->class        = $this->getHelperFactory()->getHelper('ArticlesCategoriesHelper');
+        $cacheParams->method       = 'getChildrenCategories';
+        $cacheParams->methodparams = [$params, $data['app']];
+        $cacheParams->modeparams   = md5(serialize($this->module->id));
+
+        $data['list'] = ModuleHelper::moduleCache($this->module, $params, $cacheParams);
+
+        $data['startLevel'] = $data['list'] ? reset($data['list'])->getParent()->level : null;
+
+        return $data;
+    }
+}
diff --git a/modules/mod_articles_categories/src/Helper/ArticlesCategoriesHelper.php b/modules/mod_articles_categories/src/Helper/ArticlesCategoriesHelper.php
index 80a944fdceda6..e1fb507376b62 100644
--- a/modules/mod_articles_categories/src/Helper/ArticlesCategoriesHelper.php
+++ b/modules/mod_articles_categories/src/Helper/ArticlesCategoriesHelper.php
@@ -10,7 +10,13 @@
 
 namespace Joomla\Module\ArticlesCategories\Site\Helper;
 
-use Joomla\CMS\Categories\Categories;
+use Joomla\CMS\Application\SiteApplication;
+use Joomla\CMS\Categories\CategoryInterface;
+use Joomla\CMS\Categories\CategoryNode;
+use Joomla\CMS\Factory;
+use Joomla\Database\DatabaseAwareInterface;
+use Joomla\Database\DatabaseAwareTrait;
+use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -21,35 +27,70 @@
  *
  * @since  1.5
  */
-abstract class ArticlesCategoriesHelper
+class ArticlesCategoriesHelper implements DatabaseAwareInterface
 {
+    use DatabaseAwareTrait;
+
     /**
-     * Get list of articles
+     * Given a parent category, return a list of children categories
      *
-     * @param   \Joomla\Registry\Registry  &$params  module parameters
+     * @param   Registry         $moduleParams  The module parameters.
+     * @param   SiteApplication  $app           The current application.
      *
-     * @return  array
+     * @return  CategoryNode[]
      *
-     * @since   1.5
+     * @since   4.4.0
      */
-    public static function getList(&$params)
+    public function getChildrenCategories(Registry $moduleParams, SiteApplication $app): array
     {
-        $options               = [];
-        $options['countItems'] = $params->get('numitems', 0);
+        // Joomla\CMS\Categories\Categories options to set
+        $options = [];
+
+        // Get the number of items in this category or descendants of this category at the expense of performance.
+        $options['countItems'] = $moduleParams->get('numitems', 0);
 
-        $categories = Categories::getInstance('Content', $options);
-        $category   = $categories->get($params->get('parent', 'root'));
+        /** @var CategoryInterface $categoryFactory */
+        $categoryFactory = $app->bootComponent('com_content')->getCategory($options);
 
-        if ($category !== null) {
-            $items = $category->getChildren();
+        /** @var CategoryNode $parentCategory */
+        $parentCategory = $categoryFactory->get($moduleParams->get('parent', 'root'));
+
+        if ($parentCategory === null) {
+            return [];
+        }
 
-            $count = $params->get('count', 0);
+        // Get all the children categories of this node
+        $childrenCategories = $parentCategory->getChildren(true);
 
-            if ($count > 0 && \count($items) > $count) {
-                $items = \array_slice($items, 0, $count);
-            }
+        $count = $moduleParams->get('count', 0);
 
-            return $items;
+        if ($count > 0 && \count($childrenCategories) > $count) {
+            $childrenCategories = \array_slice($childrenCategories, 0, $count);
         }
+
+        return $childrenCategories;
+    }
+
+    /**
+     * Get list of categories
+     *
+     * @param   Registry  $params  module parameters
+     *
+     * @return  array
+     *
+     * @since   1.6
+     *
+     * @deprecated  4.4.0  will be removed in 6.0
+     *              Use the non-static method getChildrenCategories
+     *              Example: Factory::getApplication()->bootModule('mod_articles_categories', 'site')
+     *                           ->getHelper('ArticlesCategoriesHelper')
+     *                           ->getChildrenCategories($params, Factory::getApplication())
+     */
+    public static function getList($params)
+    {
+        /** @var SiteApplication $app */
+        $app = Factory::getApplication();
+
+        return (new self())->getChildrenCategories($params, $app);
     }
 }
diff --git a/modules/mod_articles_category/services/provider.php b/modules/mod_articles_category/services/provider.php
index 0c3e8bcb7a562..d5316e7cc4d6c 100644
--- a/modules/mod_articles_category/services/provider.php
+++ b/modules/mod_articles_category/services/provider.php
@@ -19,7 +19,7 @@
 /**
  * The articles category module service provider.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.4.0
  */
 return new class () implements ServiceProviderInterface {
     /**
@@ -29,7 +29,7 @@
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.4.0
      */
     public function register(Container $container)
     {
diff --git a/modules/mod_articles_category/src/Dispatcher/Dispatcher.php b/modules/mod_articles_category/src/Dispatcher/Dispatcher.php
index 7bb5ac3c6e8c0..27a83eafcecfd 100644
--- a/modules/mod_articles_category/src/Dispatcher/Dispatcher.php
+++ b/modules/mod_articles_category/src/Dispatcher/Dispatcher.php
@@ -16,13 +16,13 @@
 use Joomla\CMS\Helper\ModuleHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
  * Dispatcher class for mod_articles_category
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.4.0
  */
 class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareInterface
 {
@@ -33,7 +33,7 @@ class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareI
      *
      * @return  array
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.4.0
      */
     protected function getLayoutData(): array
     {
diff --git a/modules/mod_articles_category/src/Helper/ArticlesCategoryHelper.php b/modules/mod_articles_category/src/Helper/ArticlesCategoryHelper.php
index a84abfa9ad2ce..593e6640f5dde 100644
--- a/modules/mod_articles_category/src/Helper/ArticlesCategoryHelper.php
+++ b/modules/mod_articles_category/src/Helper/ArticlesCategoryHelper.php
@@ -10,16 +10,16 @@
 
 namespace Joomla\Module\ArticlesCategory\Site\Helper;
 
-use Joomla\Component\Content\Administrator\Extension\ContentComponent;
-use Joomla\Component\Content\Site\Helper\RouteHelper;
 use Joomla\CMS\Access\Access;
 use Joomla\CMS\Application\SiteApplication;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Date\Date;
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
-use Joomla\CMS\Router\Route;
 use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\Component\Content\Administrator\Extension\ContentComponent;
+use Joomla\Component\Content\Site\Helper\RouteHelper;
 use Joomla\Database\DatabaseAwareInterface;
 use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Registry\Registry;
@@ -46,7 +46,7 @@ class ArticlesCategoryHelper implements DatabaseAwareInterface
      *
      * @return  object[]
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.4.0
      */
     public function getArticles(Registry $params, SiteApplication $app)
     {
@@ -325,7 +325,7 @@ public function getArticles(Registry $params, SiteApplication $app)
      *
      * @since   1.6
      *
-     * @deprecated  __DEPLOY_VERSION__  will be removed in 6.0
+     * @deprecated  4.4.0  will be removed in 6.0
      *              Use the non-static method getArticles
      *              Example: Factory::getApplication()->bootModule('mod_articles_category', 'site')
      *                           ->getHelper('ArticlesCategoryHelper')
diff --git a/modules/mod_breadcrumbs/mod_breadcrumbs.php b/modules/mod_breadcrumbs/mod_breadcrumbs.php
deleted file mode 100644
index 26e7672ccc31f..0000000000000
--- a/modules/mod_breadcrumbs/mod_breadcrumbs.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Site
- * @subpackage  mod_breadcrumbs
- *
- * @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\Helper\ModuleHelper;
-use Joomla\Module\Breadcrumbs\Site\Helper\BreadcrumbsHelper;
-
-// Get the breadcrumbs
-$list  = BreadcrumbsHelper::getList($params, $app);
-$count = count($list);
-
-// Get the home fallback for json+ld
-if (!$params->get('showHome', 1)) {
-    $homeCrumb = BreadcrumbsHelper::getHome($params, $app);
-}
-
-require ModuleHelper::getLayoutPath('mod_breadcrumbs', $params->get('layout', 'default'));
diff --git a/modules/mod_breadcrumbs/mod_breadcrumbs.xml b/modules/mod_breadcrumbs/mod_breadcrumbs.xml
index 6babc5283efb6..36a5a4a3a09fe 100644
--- a/modules/mod_breadcrumbs/mod_breadcrumbs.xml
+++ b/modules/mod_breadcrumbs/mod_breadcrumbs.xml
@@ -11,7 +11,7 @@
 	<description>MOD_BREADCRUMBS_XML_DESCRIPTION</description>
 	<namespace path="src">Joomla\Module\Breadcrumbs</namespace>
 	<files>
-		<filename module="mod_breadcrumbs">mod_breadcrumbs.php</filename>
+		<folder module="mod_breadcrumbs">services</folder>
 		<folder>src</folder>
 		<folder>tmpl</folder>
 	</files>
diff --git a/modules/mod_breadcrumbs/services/provider.php b/modules/mod_breadcrumbs/services/provider.php
new file mode 100644
index 0000000000000..b749986cad7f1
--- /dev/null
+++ b/modules/mod_breadcrumbs/services/provider.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_breadcrumbs
+ *
+ * @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\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 breadcrumbs module service provider.
+ *
+ * @since  4.4.0
+ */
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->registerServiceProvider(new ModuleDispatcherFactory('\\Joomla\\Module\\Breadcrumbs'));
+        $container->registerServiceProvider(new HelperFactory('\\Joomla\\Module\\Breadcrumbs\\Site\\Helper'));
+
+        $container->registerServiceProvider(new Module());
+    }
+};
diff --git a/modules/mod_breadcrumbs/src/Dispatcher/Dispatcher.php b/modules/mod_breadcrumbs/src/Dispatcher/Dispatcher.php
new file mode 100644
index 0000000000000..b6d8dd0cb7a38
--- /dev/null
+++ b/modules/mod_breadcrumbs/src/Dispatcher/Dispatcher.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_breadcrumbs
+ *
+ * @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\Module\Breadcrumbs\Site\Dispatcher;
+
+use Joomla\CMS\Dispatcher\AbstractModuleDispatcher;
+use Joomla\CMS\Helper\HelperFactoryAwareInterface;
+use Joomla\CMS\Helper\HelperFactoryAwareTrait;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Dispatcher class for mod_breadcrumbs
+ *
+ * @since  4.4.0
+ */
+class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareInterface
+{
+    use HelperFactoryAwareTrait;
+
+    /**
+     * Returns the layout data.
+     *
+     * @return  array
+     *
+     * @since   4.4.0
+     */
+    protected function getLayoutData(): array
+    {
+        $data = parent::getLayoutData();
+
+        $data['list']  = $this->getHelperFactory()->getHelper('BreadcrumbsHelper')->getBreadcrumbs($data['params'], $data['app']);
+        $data['count'] = count($data['list']);
+
+        if (!$data['params']->get('showHome', 1)) {
+            $data['homeCrumb'] = $this->getHelperFactory()->getHelper('BreadcrumbsHelper')->getHomeItem($data['params'], $data['app']);
+        }
+
+        return $data;
+    }
+}
diff --git a/modules/mod_breadcrumbs/src/Helper/BreadcrumbsHelper.php b/modules/mod_breadcrumbs/src/Helper/BreadcrumbsHelper.php
index 6057494289001..b493df83dc292 100644
--- a/modules/mod_breadcrumbs/src/Helper/BreadcrumbsHelper.php
+++ b/modules/mod_breadcrumbs/src/Helper/BreadcrumbsHelper.php
@@ -11,10 +11,10 @@
 namespace Joomla\Module\Breadcrumbs\Site\Helper;
 
 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\CMS\Language\Text;
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -31,12 +31,14 @@ class BreadcrumbsHelper
     /**
      * Retrieve breadcrumb items
      *
-     * @param   Registry        $params  The module parameters
-     * @param   CMSApplication  $app     The application
+     * @param   Registry         $params  The module parameters
+     * @param   SiteApplication  $app     The application
      *
      * @return  array
+     *
+     * @since   4.4.0
      */
-    public static function getList(Registry $params, CMSApplication $app)
+    public function getBreadcrumbs(Registry $params, SiteApplication $app): array
     {
         // Get the PathWay object from the application
         $pathway = $app->getPathway();
@@ -53,7 +55,7 @@ public static function getList(Registry $params, CMSApplication $app)
         }
 
         if ($params->get('showHome', 1)) {
-            array_unshift($crumbs, self::getHome($params, $app));
+            array_unshift($crumbs, $this->getHomeItem($params, $app));
         }
 
         return $crumbs;
@@ -62,14 +64,14 @@ public static function getList(Registry $params, CMSApplication $app)
     /**
      * Retrieve home item (start page)
      *
-     * @param   Registry        $params  The module parameters
-     * @param   CMSApplication  $app     The application
+     * @param   Registry         $params  The module parameters
+     * @param   SiteApplication  $app     The application
      *
      * @return  object
      *
-     * @since  4.2.0
+     * @since   4.4.0
      */
-    public static function getHome(Registry $params, CMSApplication $app)
+    public function getHomeItem(Registry $params, SiteApplication $app): object
     {
         $menu = $app->getMenu();
 
@@ -80,7 +82,7 @@ public static function getHome(Registry $params, CMSApplication $app)
         }
 
         $item       = new \stdClass();
-        $item->name = htmlspecialchars($params->get('homeText', Text::_('MOD_BREADCRUMBS_HOME')), ENT_COMPAT, 'UTF-8');
+        $item->name = htmlspecialchars($params->get('homeText', $app->getLanguage()->_('MOD_BREADCRUMBS_HOME')), ENT_COMPAT, 'UTF-8');
         $item->link = 'index.php?Itemid=' . $home->id;
 
         return $item;
@@ -94,6 +96,8 @@ public static function getHome(Registry $params, CMSApplication $app)
      * @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)
     {
@@ -113,4 +117,46 @@ public static function setSeparator($custom = null)
 
         return $_separator;
     }
+
+    /**
+     * Retrieve breadcrumb items
+     *
+     * @param   Registry        $params  The module parameters
+     * @param   CMSApplication  $app     The application
+     *
+     * @return  array
+     *
+     * @since   1.5
+     *
+     * @deprecated 4.4.0 will be removed in 6.0
+     *             Use the non-static method getBreadcrumbs
+     *             Example: Factory::getApplication()->bootModule('mod_breadcrumbs', 'site')
+     *                          ->getHelper('BreadcrumbsHelper')
+     *                          ->getBreadcrumbs($params, Factory::getApplication())
+     */
+    public static function getList(Registry $params, CMSApplication $app)
+    {
+        return (new self())->getBreadcrumbs($params, Factory::getApplication());
+    }
+
+    /**
+     * Retrieve home item (start page)
+     *
+     * @param   Registry        $params  The module parameters
+     * @param   CMSApplication  $app     The application
+     *
+     * @return  object
+     *
+     * @since   4.2.0
+     *
+     * @deprecated 4.4.0 will be removed in 6.0
+     *             Use the non-static method getHomeItem
+     *             Example: Factory::getApplication()->bootModule('mod_breadcrumbs', 'site')
+     *                          ->getHelper('BreadcrumbsHelper')
+     *                          ->getHomeItem($params, Factory::getApplication())
+     */
+    public static function getHome(Registry $params, CMSApplication $app)
+    {
+        return (new self())->getHomeItem($params, Factory::getApplication());
+    }
 }
diff --git a/modules/mod_breadcrumbs/tmpl/default.php b/modules/mod_breadcrumbs/tmpl/default.php
index 6a237ef4c3611..ead29dc39023f 100644
--- a/modules/mod_breadcrumbs/tmpl/default.php
+++ b/modules/mod_breadcrumbs/tmpl/default.php
@@ -13,6 +13,7 @@
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
+use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\WebAsset\WebAssetManager;
 
 ?>
@@ -68,9 +69,10 @@
 
     // Structured data as JSON
     $data = [
-            '@context'        => 'https://schema.org',
-            '@type'           => 'BreadcrumbList',
-            'itemListElement' => []
+        '@context'        => 'https://schema.org',
+        '@type'           => 'BreadcrumbList',
+        '@id'             => Uri::root() . '#/schema/BreadcrumbList/' . (int) $module->id,
+        'itemListElement' => []
     ];
 
     // Use an independent counter for positions. E.g. if Heading items in pathway.
@@ -115,7 +117,8 @@
     if ($itemsCounter) {
         /** @var WebAssetManager $wa */
         $wa = $app->getDocument()->getWebAssetManager();
-        $wa->addInline('script', json_encode($data, JSON_UNESCAPED_UNICODE), [], ['type' => 'application/ld+json']);
+        $prettyPrint = JDEBUG ? JSON_PRETTY_PRINT : 0;
+        $wa->addInline('script', json_encode($data, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | $prettyPrint), [], ['type' => 'application/ld+json']);
     }
     ?>
 </nav>
diff --git a/modules/mod_custom/mod_custom.php b/modules/mod_custom/mod_custom.php
deleted file mode 100644
index f32a6ef30eadd..0000000000000
--- a/modules/mod_custom/mod_custom.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Site
- * @subpackage  mod_custom
- *
- * @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\Helper\ModuleHelper;
-use Joomla\CMS\HTML\HTMLHelper;
-use Joomla\CMS\Plugin\PluginHelper;
-
-if ($params->def('prepare_content', 1)) {
-    PluginHelper::importPlugin('content');
-    $module->content = HTMLHelper::_('content.prepare', $module->content, '', 'mod_custom.content');
-}
-
-require ModuleHelper::getLayoutPath('mod_custom', $params->get('layout', 'default'));
diff --git a/modules/mod_custom/mod_custom.xml b/modules/mod_custom/mod_custom.xml
index 8f52abf231a22..8dc3ad2d2d10c 100644
--- a/modules/mod_custom/mod_custom.xml
+++ b/modules/mod_custom/mod_custom.xml
@@ -9,18 +9,17 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>3.0.0</version>
 	<description>MOD_CUSTOM_XML_DESCRIPTION</description>
-
+	<namespace path="src">Joomla\Module\Custom</namespace>
 	<customContent />
-
 	<files>
-		<filename module="mod_custom">mod_custom.php</filename>
+		<folder module="mod_custom">services</folder>
+		<folder>src</folder>
 		<folder>tmpl</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/mod_custom.ini</language>
 		<language tag="en-GB">language/en-GB/mod_custom.sys.ini</language>
 	</languages>
-
 	<help key="Site_Modules:_Custom" />
 	<config>
 		<fields name="params">
diff --git a/modules/mod_custom/services/provider.php b/modules/mod_custom/services/provider.php
new file mode 100644
index 0000000000000..be24af4af9372
--- /dev/null
+++ b/modules/mod_custom/services/provider.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_custom
+ *
+ * @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\Extension\Service\Provider\Module;
+use Joomla\CMS\Extension\Service\Provider\ModuleDispatcherFactory;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+
+/**
+ * The module Custom HTML service provider.
+ *
+ * @since  4.4.0
+ */
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->registerServiceProvider(new ModuleDispatcherFactory('\\Joomla\\Module\\Custom'));
+        $container->registerServiceProvider(new Module());
+    }
+};
diff --git a/modules/mod_custom/src/Dispatcher/Dispatcher.php b/modules/mod_custom/src/Dispatcher/Dispatcher.php
new file mode 100644
index 0000000000000..34d8284b74239
--- /dev/null
+++ b/modules/mod_custom/src/Dispatcher/Dispatcher.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_custom
+ *
+ * @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\Module\Custom\Site\Dispatcher;
+
+use Joomla\CMS\Dispatcher\AbstractModuleDispatcher;
+use Joomla\CMS\HTML\HTMLHelper;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Dispatcher class for mod_custom
+ *
+ * @since  4.4.0
+ */
+class Dispatcher extends AbstractModuleDispatcher
+{
+    /**
+     * Returns the layout data.
+     *
+     * @return  array
+     *
+     * @since   4.4.0
+     */
+    protected function getLayoutData()
+    {
+        $data = parent::getLayoutData();
+
+        if (($data['params'])->get('prepare_content', 1)) {
+            ($data['module'])->content = HTMLHelper::_('content.prepare', ($data['module'])->content, '', 'mod_custom.content');
+        }
+
+        return $data;
+    }
+}
diff --git a/modules/mod_feed/tmpl/default.php b/modules/mod_feed/tmpl/default.php
index 74d0f2051c700..a69af0b1deb6f 100644
--- a/modules/mod_feed/tmpl/default.php
+++ b/modules/mod_feed/tmpl/default.php
@@ -10,9 +10,9 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Filter\OutputFilter;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
+use Joomla\Filter\OutputFilter;
 
 // Check if feed URL has been set
 if (empty($rssurl)) {
diff --git a/modules/mod_footer/services/provider.php b/modules/mod_footer/services/provider.php
index faa1ad8165a16..0db22087a7b1d 100644
--- a/modules/mod_footer/services/provider.php
+++ b/modules/mod_footer/services/provider.php
@@ -18,7 +18,7 @@
 /**
  * The footer module service provider.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.4.0
  */
 return new class () implements ServiceProviderInterface {
     /**
@@ -28,7 +28,7 @@
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.4.0
      */
     public function register(Container $container): void
     {
diff --git a/modules/mod_footer/src/Dispatcher/Dispatcher.php b/modules/mod_footer/src/Dispatcher/Dispatcher.php
index d0cd715d9e408..71aea94856f61 100644
--- a/modules/mod_footer/src/Dispatcher/Dispatcher.php
+++ b/modules/mod_footer/src/Dispatcher/Dispatcher.php
@@ -20,7 +20,7 @@
 /**
  * Dispatcher class for mod_footer
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.4.0
  */
 class Dispatcher extends AbstractModuleDispatcher
 {
@@ -29,7 +29,7 @@ class Dispatcher extends AbstractModuleDispatcher
      *
      * @return  array
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.4.0
      */
     protected function getLayoutData(): array
     {
diff --git a/modules/mod_menu/tmpl/default.php b/modules/mod_menu/tmpl/default.php
index 1c1ca4c63e579..62045b9984585 100644
--- a/modules/mod_menu/tmpl/default.php
+++ b/modules/mod_menu/tmpl/default.php
@@ -15,7 +15,6 @@
 /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
 $wa = $app->getDocument()->getWebAssetManager();
 $wa->registerAndUseScript('mod_menu', 'mod_menu/menu.min.js', [], ['type' => 'module']);
-$wa->registerAndUseScript('mod_menu', 'mod_menu/menu-es5.min.js', [], ['nomodule' => true, 'defer' => true]);
 
 $id = '';
 
diff --git a/modules/mod_menu/tmpl/default_component.php b/modules/mod_menu/tmpl/default_component.php
index 6bfbc99e634df..e957daa52e81c 100644
--- a/modules/mod_menu/tmpl/default_component.php
+++ b/modules/mod_menu/tmpl/default_component.php
@@ -10,8 +10,8 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Filter\OutputFilter;
 use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\Filter\OutputFilter;
 
 $attributes = [];
 
diff --git a/modules/mod_menu/tmpl/default_url.php b/modules/mod_menu/tmpl/default_url.php
index 00d7532fb1901..23a14e3388f16 100644
--- a/modules/mod_menu/tmpl/default_url.php
+++ b/modules/mod_menu/tmpl/default_url.php
@@ -10,8 +10,8 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Filter\OutputFilter;
 use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\Filter\OutputFilter;
 
 $attributes = [];
 
diff --git a/modules/mod_related_items/mod_related_items.php b/modules/mod_related_items/mod_related_items.php
deleted file mode 100644
index e76dfe8c84824..0000000000000
--- a/modules/mod_related_items/mod_related_items.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Site
- * @subpackage  mod_related_items
- *
- * @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\Helper\ModuleHelper;
-use Joomla\Module\RelatedItems\Site\Helper\RelatedItemsHelper;
-
-$cacheparams               = new \stdClass();
-$cacheparams->cachemode    = 'safeuri';
-$cacheparams->class        = RelatedItemsHelper::class;
-$cacheparams->method       = 'getList';
-$cacheparams->methodparams = $params;
-$cacheparams->modeparams   = ['id' => 'int', 'Itemid' => 'int'];
-
-$list = ModuleHelper::moduleCache($module, $params, $cacheparams);
-
-if (!count($list)) {
-    return;
-}
-
-$showDate = $params->get('showDate', 0);
-
-require ModuleHelper::getLayoutPath('mod_related_items', $params->get('layout', 'default'));
diff --git a/modules/mod_related_items/mod_related_items.xml b/modules/mod_related_items/mod_related_items.xml
index 97666d4cc7e1f..e8809149bef8a 100644
--- a/modules/mod_related_items/mod_related_items.xml
+++ b/modules/mod_related_items/mod_related_items.xml
@@ -11,7 +11,7 @@
 	<description>MOD_RELATED_XML_DESCRIPTION</description>
 	<namespace path="src">Joomla\Module\RelatedItems</namespace>
 	<files>
-		<filename module="mod_related_items">mod_related_items.php</filename>
+		<folder module="mod_related_items">services</folder>
 		<folder>src</folder>
 		<folder>tmpl</folder>
 	</files>
diff --git a/modules/mod_related_items/services/provider.php b/modules/mod_related_items/services/provider.php
new file mode 100644
index 0000000000000..1066e3c3785b8
--- /dev/null
+++ b/modules/mod_related_items/services/provider.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_related_items
+ *
+ * @copyright   (C) 2022 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 articles related module service provider.
+ *
+ * @since  4.4.0
+ */
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container)
+    {
+        $container->registerServiceProvider(new ModuleDispatcherFactory('\\Joomla\\Module\\RelatedItems'));
+        $container->registerServiceProvider(new HelperFactory('\\Joomla\\Module\\RelatedItems\\Site\\Helper'));
+
+        $container->registerServiceProvider(new Module());
+    }
+};
diff --git a/modules/mod_related_items/src/Dispatcher/Dispatcher.php b/modules/mod_related_items/src/Dispatcher/Dispatcher.php
new file mode 100644
index 0000000000000..e5424569329ba
--- /dev/null
+++ b/modules/mod_related_items/src/Dispatcher/Dispatcher.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_related_items
+ *
+ * @copyright   (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Module\RelatedItems\Site\Dispatcher;
+
+use Joomla\CMS\Dispatcher\AbstractModuleDispatcher;
+use Joomla\CMS\Helper\HelperFactoryAwareInterface;
+use Joomla\CMS\Helper\HelperFactoryAwareTrait;
+use Joomla\CMS\Helper\ModuleHelper;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Dispatcher class for mod_articles_popular
+ *
+ * @since  4.4.0
+ */
+class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareInterface
+{
+    use HelperFactoryAwareTrait;
+
+    /**
+     * Returns the layout data.
+     *
+     * @return  array
+     *
+     * @since   4.4.0
+     */
+    protected function getLayoutData(): array
+    {
+        $data   = parent::getLayoutData();
+        $params = $data['params'];
+
+        $cacheParams               = new \stdClass();
+        $cacheParams->cachemode    = 'safeuri';
+        $cacheParams->class        = $this->getHelperFactory()->getHelper('RelatedItemsHelper');
+        $cacheParams->method       = 'getRelatedArticles';
+        $cacheParams->methodparams = [$params, $data['app']];
+        $cacheParams->modeparams   = ['id' => 'int', 'Itemid' => 'int'];
+
+        $data['list']     = ModuleHelper::moduleCache($this->module, $params, $cacheParams);
+        $data['showDate'] = $params->get('showDate', 0);
+
+        return $data;
+    }
+}
diff --git a/modules/mod_related_items/src/Helper/RelatedItemsHelper.php b/modules/mod_related_items/src/Helper/RelatedItemsHelper.php
index 50db72a84a27e..1bbb6cac033ae 100644
--- a/modules/mod_related_items/src/Helper/RelatedItemsHelper.php
+++ b/modules/mod_related_items/src/Helper/RelatedItemsHelper.php
@@ -10,13 +10,18 @@
 
 namespace Joomla\Module\RelatedItems\Site\Helper;
 
+use Joomla\CMS\Application\SiteApplication;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 use Joomla\Component\Content\Administrator\Extension\ContentComponent;
 use Joomla\Component\Content\Site\Helper\RouteHelper;
+use Joomla\Component\Content\Site\Model\ArticlesModel;
+use Joomla\Database\DatabaseAwareInterface;
+use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Database\ParameterType;
+use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -27,26 +32,30 @@
  *
  * @since  1.5
  */
-abstract class RelatedItemsHelper
+class RelatedItemsHelper implements DatabaseAwareInterface
 {
+    use DatabaseAwareTrait;
+
     /**
-     * Get a list of related articles
+     * Retrieve a list of related articles based on the metakey field
      *
-     * @param   \Joomla\Registry\Registry  &$params  module parameters
+     * @param   Registry         $params  The module parameters.
+     * @param   SiteApplication  $app     The current application.
      *
-     * @return  array
+     * @return  \stdClass[]
+     *
+     * @since   4.4.0
      */
-    public static function getList(&$params)
+    public function getRelatedArticles(Registry $params, SiteApplication $app): array
     {
-        $db        = Factory::getDbo();
-        $app       = Factory::getApplication();
+        $db        = $this->getDatabase();
         $input     = $app->getInput();
-        $groups    = Factory::getUser()->getAuthorisedViewLevels();
+        $groups    = $app->getIdentity()->getAuthorisedViewLevels();
         $maximum   = (int) $params->get('maximum', 5);
         $factory   = $app->bootComponent('com_content')->getMVCFactory();
 
         // Get an instance of the generic articles model
-        /** @var \Joomla\Component\Content\Site\Model\ArticlesModel $articles */
+        /** @var ArticlesModel $articles */
         $articles = $factory->createModel('Articles', 'Site', ['ignore_request' => true]);
 
         // Set application parameters in model
@@ -133,7 +142,7 @@ public static function getList(&$params)
 
                 // Filter by language
                 if (Multilanguage::isEnabled()) {
-                    $query->whereIn($db->quoteName('a.language'), [Factory::getLanguage()->getTag(), '*'], ParameterType::STRING);
+                    $query->whereIn($db->quoteName('a.language'), [$app->getLanguage()->getTag(), '*'], ParameterType::STRING);
                 }
 
                 $query->setLimit($maximum);
@@ -167,4 +176,27 @@ public static function getList(&$params)
 
         return $related;
     }
+
+    /**
+     * Get a list of related articles
+     *
+     * @param   Registry  &$params  module parameters
+     *
+     * @return  array
+     *
+     * @since   1.6
+     *
+     * @deprecated  4.4.0  will be removed in 6.0
+     *              Use the non-static method getRelatedArticles
+     *              Example: Factory::getApplication()->bootModule('mod_related_items', 'site')
+     *                           ->getHelper('RelatedItemsHelper')
+     *                           ->getRelatedArticles($params, Factory::getApplication())
+     */
+    public static function getList(&$params)
+    {
+        /** @var SiteApplication $app */
+        $app = Factory::getApplication();
+
+        return (new self())->getRelatedArticles($params, $app);
+    }
 }
diff --git a/modules/mod_users_latest/services/provider.php b/modules/mod_users_latest/services/provider.php
index 5f25766b1b754..6473a90d83083 100644
--- a/modules/mod_users_latest/services/provider.php
+++ b/modules/mod_users_latest/services/provider.php
@@ -19,7 +19,7 @@
 /**
  * The users latest module service provider.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.4.0
  */
 return new class () implements ServiceProviderInterface {
     /**
@@ -29,7 +29,7 @@
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.4.0
      */
     public function register(Container $container): void
     {
diff --git a/modules/mod_users_latest/src/Dispatcher/Dispatcher.php b/modules/mod_users_latest/src/Dispatcher/Dispatcher.php
index 6350fba6fb575..6b6c0168ae6c6 100644
--- a/modules/mod_users_latest/src/Dispatcher/Dispatcher.php
+++ b/modules/mod_users_latest/src/Dispatcher/Dispatcher.php
@@ -21,7 +21,7 @@
 /**
  * Dispatcher class for mod_users_latest
  *
- * @since  __DEPLOY_VERSION__
+ * @since  4.4.0
  */
 class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareInterface
 {
@@ -32,7 +32,7 @@ class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareI
      *
      * @return  array
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.4.0
      */
     protected function getLayoutData(): array
     {
diff --git a/modules/mod_users_latest/src/Helper/UsersLatestHelper.php b/modules/mod_users_latest/src/Helper/UsersLatestHelper.php
index b8219d4f23eff..84eb29738056a 100644
--- a/modules/mod_users_latest/src/Helper/UsersLatestHelper.php
+++ b/modules/mod_users_latest/src/Helper/UsersLatestHelper.php
@@ -38,7 +38,7 @@ class UsersLatestHelper implements DatabaseAwareInterface
      *
      * @return  array  The array of users
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.4.0
      */
     public function getLatestUsers(Registry $params, SiteApplication $app): array
     {
@@ -85,7 +85,7 @@ public function getLatestUsers(Registry $params, SiteApplication $app): array
      *
      * @since   1.6
      *
-     * @deprecated __DEPLOY_VERSION__ will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 6.0
      *             Use the non-static method getLatestUsers
      *             Example: Factory::getApplication()->bootModule('mod_users_latest', 'site')
      *                          ->getHelper('UsersLatestHelper')
diff --git a/package-lock.json b/package-lock.json
index 6d0287927c8f9..27503057df830 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,24 +11,37 @@
       "license": "GPL-2.0-or-later",
       "dependencies": {
         "@claviska/jquery-minicolors": "^2.3.6",
-        "@fortawesome/fontawesome-free": "^5.15.4",
+        "@codemirror/autocomplete": "^6.9.0",
+        "@codemirror/commands": "^6.2.4",
+        "@codemirror/lang-css": "^6.2.1",
+        "@codemirror/lang-html": "^6.4.5",
+        "@codemirror/lang-javascript": "^6.1.9",
+        "@codemirror/lang-json": "^6.0.1",
+        "@codemirror/lang-php": "^6.0.1",
+        "@codemirror/lang-xml": "^6.0.2",
+        "@codemirror/language": "^6.9.0",
+        "@codemirror/lint": "^6.4.0",
+        "@codemirror/search": "^6.5.1",
+        "@codemirror/state": "^6.2.1",
+        "@codemirror/view": "^6.16.0",
+        "@fortawesome/fontawesome-free": "^6.4.2",
         "@joomla/joomla-a11y-checker": "^1.0.0",
-        "@popperjs/core": "^2.11.6",
-        "@webcomponents/webcomponentsjs": "^2.7.0",
+        "@popperjs/core": "^2.11.8",
+        "@webcomponents/webcomponentsjs": "^2.8.0",
         "accessibility": "^3.0.17",
         "awesomplete": "^1.1.5",
-        "bootstrap": "~5.2.3",
+        "bootstrap": "~5.3.0",
         "choices.js": "^9.1.0",
         "chosen-js": "^1.8.7",
-        "codemirror": "^5.65.12",
         "cropperjs": "^1.5.13",
         "diff": "^5.1.0",
-        "dotenv": "^16.0.3",
+        "dotenv": "^16.3.1",
         "dragula": "^3.7.3",
+        "es-module-shims": "^1.8.0",
         "focus-visible": "^5.2.0",
-        "hotkeys-js": "^3.10.1",
+        "hotkeys-js": "^3.12.0",
         "joomla-ui-custom-elements": "^0.2.0",
-        "jquery": "^3.6.4",
+        "jquery": "^3.7.0",
         "jquery-migrate": "^3.4.1",
         "mark.js": "^8.11.1",
         "mediaelement": "^5.1.1",
@@ -36,66 +49,77 @@
         "punycode": "^2.3.0",
         "qrcode-generator": "^1.4.4",
         "roboto-fontface": "^0.10.0",
-        "shepherd.js": "^11.0.1",
+        "shepherd.js": "^11.1.1",
         "short-and-sweet": "^1.0.4",
         "skipto": "^4.1.7",
-        "tinymce": "^6.1.2",
+        "tinymce": "^6.6.2",
         "vue": "3.2.45",
         "vue-focus-lock": "^2.0.5",
         "vuex": "^4.1.0",
         "vuex-persist": "^3.1.3"
       },
       "devDependencies": {
-        "@babel/core": "^7.21.3",
-        "@babel/preset-env": "^7.20.2",
+        "@babel/core": "^7.22.10",
+        "@babel/preset-env": "^7.22.10",
         "@dgrammatiko/compress": "^1.0.4",
         "@rollup/plugin-babel": "^5.3.1",
         "@rollup/plugin-commonjs": "^21.1.0",
         "@rollup/plugin-node-resolve": "^13.3.0",
         "@rollup/plugin-replace": "^3.1.0",
-        "@vue/compiler-sfc": "^3.2.47",
-        "autoprefixer": "^10.4.14",
+        "@vue/compiler-sfc": "^3.3.4",
+        "autoprefixer": "^10.4.15",
         "chokidar": "^3.5.3",
+        "cli-progress": "^3.12.0",
         "commander": "^8.3.0",
-        "core-js": "^3.29.1",
+        "core-js": "^3.32.1",
         "cssnano": "^5.1.15",
-        "cypress": "^12.8.1",
-        "eslint": "^8.36.0",
+        "cypress": "^12.17.4",
+        "eslint": "^8.47.0",
         "eslint-config-airbnb-base": "^15.0.0",
-        "eslint-plugin-import": "^2.27.5",
+        "eslint-plugin-import": "^2.28.1",
         "eslint-plugin-vue": "^8.7.1",
         "fs-extra": "^10.1.0",
         "ini": "^2.0.0",
         "jasmine-core": "^3.99.1",
         "joomla-cypress": "^0.0.16",
         "mysql": "^2.18.1",
-        "postcss": "^8.4.21",
-        "postcss-scss": "^4.0.6",
-        "postgres": "^3.3.4",
+        "postcss": "^8.4.28",
+        "postcss-scss": "^4.0.7",
+        "postgres": "^3.3.5",
         "recursive-readdir": "^2.2.3",
         "rimraf": "^3.0.2",
         "rollup": "^2.79.1",
         "rollup-plugin-vue": "^6.0.0",
         "rtlcss": "^3.5.0",
-        "sass-embedded": "^1.59.3",
+        "sass-embedded": "^1.66.1",
+        "smtp-tester": "^2.1.0",
         "stylelint": "^14.16.1",
         "stylelint-config-standard": "^24.0.0",
         "stylelint-order": "^5.0.0",
-        "stylelint-scss": "^4.5.0",
-        "terser": "^5.16.6"
+        "stylelint-scss": "^4.7.0",
+        "terser": "^5.19.2"
       },
       "engines": {
         "node": ">=16",
         "npm": ">=8.5.5"
       }
     },
+    "node_modules/@aashutoshrathi/word-wrap": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
+      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/@ampproject/remapping": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
-      "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
+      "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
       "dev": true,
       "dependencies": {
-        "@jridgewell/gen-mapping": "^0.1.0",
+        "@jridgewell/gen-mapping": "^0.3.0",
         "@jridgewell/trace-mapping": "^0.3.9"
       },
       "engines": {
@@ -103,47 +127,48 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
-      "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.10.tgz",
+      "integrity": "sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA==",
       "dev": true,
       "dependencies": {
-        "@babel/highlight": "^7.18.6"
+        "@babel/highlight": "^7.22.10",
+        "chalk": "^2.4.2"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.0.tgz",
-      "integrity": "sha512-gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz",
+      "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.21.3",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.3.tgz",
-      "integrity": "sha512-qIJONzoa/qiHghnm0l1n4i/6IIziDpzqc36FBs4pzMhDUraHqponwJLiAKm1hGLP3OSB/TVNz6rMwVGpwxxySw==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz",
+      "integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==",
       "dev": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.21.3",
-        "@babel/helper-compilation-targets": "^7.20.7",
-        "@babel/helper-module-transforms": "^7.21.2",
-        "@babel/helpers": "^7.21.0",
-        "@babel/parser": "^7.21.3",
-        "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.21.3",
-        "@babel/types": "^7.21.3",
+        "@babel/code-frame": "^7.22.10",
+        "@babel/generator": "^7.22.10",
+        "@babel/helper-compilation-targets": "^7.22.10",
+        "@babel/helper-module-transforms": "^7.22.9",
+        "@babel/helpers": "^7.22.10",
+        "@babel/parser": "^7.22.10",
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.10",
+        "@babel/types": "^7.22.10",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
         "json5": "^2.2.2",
-        "semver": "^6.3.0"
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -154,12 +179,12 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.21.3",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.3.tgz",
-      "integrity": "sha512-QS3iR1GYC/YGUnW7IdggFeN5c1poPUurnGttOV/bZgPGV+izC/D8HnD6DLwod0fsatNyVn1G3EVWMYIF0nHbeA==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.10.tgz",
+      "integrity": "sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.21.3",
+        "@babel/types": "^7.22.10",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -168,78 +193,61 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-      "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/set-array": "^1.0.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
     "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz",
-      "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
+      "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz",
-      "integrity": "sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.10.tgz",
+      "integrity": "sha512-Av0qubwDQxC56DoUReVDeLfMEjYYSN1nZrTUrWkXd7hpU73ymRANkbuDm3yni9npkn+RXy9nNbEJZEzXr7xrfQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-explode-assignable-expression": "^7.18.6",
-        "@babel/types": "^7.18.9"
+        "@babel/types": "^7.22.10"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz",
-      "integrity": "sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.10.tgz",
+      "integrity": "sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.20.5",
-        "@babel/helper-validator-option": "^7.18.6",
-        "browserslist": "^4.21.3",
+        "@babel/compat-data": "^7.22.9",
+        "@babel/helper-validator-option": "^7.22.5",
+        "browserslist": "^4.21.9",
         "lru-cache": "^5.1.1",
-        "semver": "^6.3.0"
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.0.tgz",
-      "integrity": "sha512-Q8wNiMIdwsv5la5SPxNYzzkPnjgC0Sy0i7jLkVOCdllu/xcVNkr3TeZzbHBJrj+XXRqzX5uCyCoV9eu6xUG7KQ==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.10.tgz",
+      "integrity": "sha512-5IBb77txKYQPpOEdUdIhBx8VrZyDCQ+H82H0+5dX1TmuscP5vJKEE3cKurjtIw/vFwzbVH48VweE78kVDBrqjA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.21.0",
-        "@babel/helper-member-expression-to-functions": "^7.21.0",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/helper-replace-supers": "^7.20.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
-        "@babel/helper-split-export-declaration": "^7.18.6"
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-member-expression-to-functions": "^7.22.5",
+        "@babel/helper-optimise-call-expression": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -249,13 +257,14 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.0.tgz",
-      "integrity": "sha512-N+LaFW/auRSWdx7SHD/HiARwXQju1vXTW4fKr4u5SgBUTm51OKEjKgj+cs00ggW3kEvNqwErnlwuq7Y3xBe4eg==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.9.tgz",
+      "integrity": "sha512-+svjVa/tFwsNSG4NEy1h85+HQ5imbT92Q5/bgtS7P0GTQlP8WuFdqsiABmQouhiFGyV66oGxZFpeYHza1rNsKw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "regexpu-core": "^5.3.1"
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "regexpu-core": "^5.3.1",
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -265,142 +274,128 @@
       }
     },
     "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz",
-      "integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==",
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz",
+      "integrity": "sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.17.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-compilation-targets": "^7.22.6",
+        "@babel/helper-plugin-utils": "^7.22.5",
         "debug": "^4.1.1",
         "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2",
-        "semver": "^6.1.2"
+        "resolve": "^1.14.2"
       },
       "peerDependencies": {
-        "@babel/core": "^7.4.0-0"
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
     "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
-      "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
+      "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-explode-assignable-expression": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz",
-      "integrity": "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-function-name": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz",
-      "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
+      "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
       "dev": true,
       "dependencies": {
-        "@babel/template": "^7.20.7",
-        "@babel/types": "^7.21.0"
+        "@babel/template": "^7.22.5",
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
-      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz",
-      "integrity": "sha512-Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz",
+      "integrity": "sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.21.0"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
-      "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz",
+      "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.21.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz",
-      "integrity": "sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz",
+      "integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-simple-access": "^7.20.2",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/helper-validator-identifier": "^7.19.1",
-        "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.21.2",
-        "@babel/types": "^7.21.2"
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-simple-access": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/helper-validator-identifier": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz",
-      "integrity": "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz",
+      "integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz",
-      "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
+      "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz",
-      "integrity": "sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.9.tgz",
+      "integrity": "sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-wrap-function": "^7.18.9",
-        "@babel/types": "^7.18.9"
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-wrap-function": "^7.22.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -410,122 +405,121 @@
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz",
-      "integrity": "sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz",
+      "integrity": "sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-member-expression-to-functions": "^7.20.7",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.20.7",
-        "@babel/types": "^7.20.7"
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-member-expression-to-functions": "^7.22.5",
+        "@babel/helper-optimise-call-expression": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/helper-simple-access": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz",
-      "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
+      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.20.2"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz",
-      "integrity": "sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz",
+      "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.20.0"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
-      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
-      "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
+      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
-      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
+      "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz",
-      "integrity": "sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz",
+      "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-wrap-function": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz",
-      "integrity": "sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.10.tgz",
+      "integrity": "sha512-OnMhjWjuGYtdoO3FmsEFWvBStBAe2QOgwOLsLNDjN+aaiMD8InJk1/O3HSD8lkqTjCgg5YI34Tz15KNNA3p+nQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.20.5",
-        "@babel/types": "^7.20.5"
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/template": "^7.22.5",
+        "@babel/types": "^7.22.10"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.0.tgz",
-      "integrity": "sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.10.tgz",
+      "integrity": "sha512-a41J4NW8HyZa1I1vAndrraTlPZ/eZoga2ZgS7fEr0tZJGVU4xqdE80CEm0CcNjha5EZ8fTBYLKHF0kqDUuAwQw==",
       "dev": true,
       "dependencies": {
-        "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.21.0",
-        "@babel/types": "^7.21.0"
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.10",
+        "@babel/types": "^7.22.10"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
-      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.10.tgz",
+      "integrity": "sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.18.6",
-        "chalk": "^2.0.0",
+        "@babel/helper-validator-identifier": "^7.22.5",
+        "chalk": "^2.4.2",
         "js-tokens": "^4.0.0"
       },
       "engines": {
@@ -533,9 +527,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.21.3",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.3.tgz",
-      "integrity": "sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.10.tgz",
+      "integrity": "sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -544,12 +538,12 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.18.6",
-      "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.18.6.tgz",
-      "integrity": "sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==",
+      "version": "7.22.5",
+      "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.22.5.tgz",
+      "integrity": "sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -559,14 +553,14 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz",
-      "integrity": "sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz",
+      "integrity": "sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
-        "@babel/plugin-proposal-optional-chaining": "^7.20.7"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
+        "@babel/plugin-transform-optional-chaining": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -575,17 +569,11 @@
         "@babel/core": "^7.13.0"
       }
     },
-    "node_modules/@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz",
-      "integrity": "sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==",
+    "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,
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-remap-async-to-generator": "^7.18.9",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
-      },
       "engines": {
         "node": ">=6.9.0"
       },
@@ -593,47 +581,37 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-class-properties": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
-      "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
+    "node_modules/@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.8.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-class-static-block": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz",
-      "integrity": "sha512-XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw==",
+    "node_modules/@babel/plugin-syntax-class-properties": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.21.0",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.12.13"
       },
       "peerDependencies": {
-        "@babel/core": "^7.12.0"
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-dynamic-import": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz",
-      "integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==",
+    "node_modules/@babel/plugin-syntax-class-static-block": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.14.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -642,46 +620,37 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz",
-      "integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==",
+    "node_modules/@babel/plugin-syntax-dynamic-import": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
+      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.8.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-json-strings": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz",
-      "integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==",
+    "node_modules/@babel/plugin-syntax-export-namespace-from": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
+      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.8.3"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz",
-      "integrity": "sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==",
+    "node_modules/@babel/plugin-syntax-import-assertions": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz",
+      "integrity": "sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -690,14 +659,13 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
-      "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
+    "node_modules/@babel/plugin-syntax-import-attributes": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz",
+      "integrity": "sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -706,82 +674,109 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-numeric-separator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz",
-      "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==",
+    "node_modules/@babel/plugin-syntax-import-meta": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-json-strings": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz",
-      "integrity": "sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==",
+    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.20.5",
-        "@babel/helper-compilation-targets": "^7.20.7",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.20.7"
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz",
-      "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==",
+    "node_modules/@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-optional-chaining": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz",
-      "integrity": "sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==",
+    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.8.0"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-private-methods": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz",
-      "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==",
+    "node_modules/@babel/plugin-syntax-private-property-in-object": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.14.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -790,16 +785,13 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0.tgz",
-      "integrity": "sha512-ha4zfehbJjc5MmXBlHec1igel5TJXXLDDRbuJ4+XT2TJcyD9/V1919BA8gMvsdHcNMBy4WBUBiRb3nw/EQUtBw==",
+    "node_modules/@babel/plugin-syntax-top-level-await": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-create-class-features-plugin": "^7.21.0",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.14.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -808,53 +800,47 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-unicode-property-regex": {
+    "node_modules/@babel/plugin-syntax-unicode-sets-regex": {
       "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
-      "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
+      "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,
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.18.6",
         "@babel/helper-plugin-utils": "^7.18.6"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/plugin-syntax-async-generators": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+    "node_modules/@babel/plugin-transform-arrow-functions": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz",
+      "integrity": "sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-class-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-class-static-block": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
-      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+    "node_modules/@babel/plugin-transform-async-generator-functions": {
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.10.tgz",
+      "integrity": "sha512-eueE8lvKVzq5wIObKK/7dvoeKJ+xc6TvRn6aysIjS6pSCeLy7S/eVi7pEQknZqyqvzaNKdDtem8nUNTBgDVR2g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-remap-async-to-generator": "^7.22.9",
+        "@babel/plugin-syntax-async-generators": "^7.8.4"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -863,37 +849,45 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-dynamic-import": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
+    "node_modules/@babel/plugin-transform-async-to-generator": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz",
+      "integrity": "sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-remap-async-to-generator": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-export-namespace-from": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
+    "node_modules/@babel/plugin-transform-block-scoped-functions": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz",
+      "integrity": "sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-import-assertions": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz",
-      "integrity": "sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==",
+    "node_modules/@babel/plugin-transform-block-scoping": {
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.10.tgz",
+      "integrity": "sha512-1+kVpGAOOI1Albt6Vse7c8pHzcZQdQKW+wJH+g8mCaszOdDVwRXa/slHPqIw+oJAJANTKDMuM2cBdV0Dg618Vg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.19.0"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -902,97 +896,132 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-json-strings": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+    "node_modules/@babel/plugin-transform-class-properties": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz",
+      "integrity": "sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+    "node_modules/@babel/plugin-transform-class-static-block": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.5.tgz",
+      "integrity": "sha512-SPToJ5eYZLxlnp1UzdARpOGeC2GbHvr9d/UV0EukuVx8atktg194oe+C5BqQ8jRTkgLRVOPYeXRSBg1IlMoVRA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.12.0"
       }
     },
-    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+    "node_modules/@babel/plugin-transform-classes": {
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.6.tgz",
+      "integrity": "sha512-58EgM6nuPNG6Py4Z3zSuu0xWu2VfodiMi72Jt5Kj2FECmaYk1RrTXA45z6KBFsu9tRgwQDwIiY4FXTt+YsSFAQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.6",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-optimise-call-expression": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-numeric-separator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+    "node_modules/@babel/plugin-transform-computed-properties": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz",
+      "integrity": "sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/template": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+    "node_modules/@babel/plugin-transform-destructuring": {
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.10.tgz",
+      "integrity": "sha512-dPJrL0VOyxqLM9sritNbMSGx/teueHF/htMKrPT7DNxccXxRDPYqlgPFFdr8u+F+qUZOkZoXue/6rL5O5GduEw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+    "node_modules/@babel/plugin-transform-dotall-regex": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz",
+      "integrity": "sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-optional-chaining": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+    "node_modules/@babel/plugin-transform-duplicate-keys": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz",
+      "integrity": "sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-private-property-in-object": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
-      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
+    "node_modules/@babel/plugin-transform-dynamic-import": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.5.tgz",
+      "integrity": "sha512-0MC3ppTB1AMxd8fXjSrbPa7LT9hrImt+/fcj+Pg5YMD7UQyWp/02+JWpdnCymmsXwIx5Z+sYn1bwCn4ZJNvhqQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1001,13 +1030,14 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-top-level-await": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+    "node_modules/@babel/plugin-transform-exponentiation-operator": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz",
+      "integrity": "sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1016,13 +1046,14 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz",
-      "integrity": "sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ==",
+    "node_modules/@babel/plugin-transform-export-namespace-from": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.5.tgz",
+      "integrity": "sha512-X4hhm7FRnPgd4nDA4b/5V280xCx6oL7Oob5+9qVS5C13Zq4bh1qq7LU0GgRU6b5dBWBvhGaXYVB4AcN6+ol6vg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.20.2"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1031,15 +1062,13 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz",
-      "integrity": "sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q==",
+    "node_modules/@babel/plugin-transform-for-of": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz",
+      "integrity": "sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-remap-async-to-generator": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1048,13 +1077,15 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz",
-      "integrity": "sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==",
+    "node_modules/@babel/plugin-transform-function-name": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz",
+      "integrity": "sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1063,13 +1094,14 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.21.0.tgz",
-      "integrity": "sha512-Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ==",
+    "node_modules/@babel/plugin-transform-json-strings": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.5.tgz",
+      "integrity": "sha512-DuCRB7fu8MyTLbEQd1ew3R85nx/88yMoqo2uPSjevMj3yoN7CDM8jkgrY0wmVxfJZyJ/B9fE1iq7EQppWQmR5A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.20.2"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-json-strings": "^7.8.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1078,21 +1110,13 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz",
-      "integrity": "sha512-RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-compilation-targets": "^7.20.7",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.21.0",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-replace-supers": "^7.20.7",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "globals": "^11.1.0"
+    "node_modules/@babel/plugin-transform-literals": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz",
+      "integrity": "sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1101,14 +1125,14 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz",
-      "integrity": "sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ==",
+    "node_modules/@babel/plugin-transform-logical-assignment-operators": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.5.tgz",
+      "integrity": "sha512-MQQOUW1KL8X0cDWfbwYP+TbVbZm16QmQXJQ+vndPtH/BoO0lOKpVoEDMI7+PskYxH+IiE0tS8xZye0qr1lGzSA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/template": "^7.20.7"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1117,13 +1141,13 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.21.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.21.3.tgz",
-      "integrity": "sha512-bp6hwMFzuiE4HqYEyoGJ/V2LeIWn+hLVKc4pnj++E5XQptwhtcGmSayM029d/j2X1bPKGTlsyPwAubuU22KhMA==",
+    "node_modules/@babel/plugin-transform-member-expression-literals": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz",
+      "integrity": "sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.20.2"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1132,14 +1156,14 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz",
-      "integrity": "sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==",
+    "node_modules/@babel/plugin-transform-modules-amd": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz",
+      "integrity": "sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1148,13 +1172,15 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz",
-      "integrity": "sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==",
+    "node_modules/@babel/plugin-transform-modules-commonjs": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz",
+      "integrity": "sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-simple-access": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1163,14 +1189,16 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz",
-      "integrity": "sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==",
+    "node_modules/@babel/plugin-transform-modules-systemjs": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz",
+      "integrity": "sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-hoist-variables": "^7.22.5",
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1179,13 +1207,14 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.0.tgz",
-      "integrity": "sha512-LlUYlydgDkKpIY7mcBWvyPPmMcOphEyYA27Ef4xpbh1IiDNLr0kZsos2nf92vz3IccvJI25QUwp86Eo5s6HmBQ==",
+    "node_modules/@babel/plugin-transform-modules-umd": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz",
+      "integrity": "sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.20.2"
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1194,30 +1223,29 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz",
-      "integrity": "sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==",
+    "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz",
+      "integrity": "sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.18.9",
-        "@babel/helper-function-name": "^7.18.9",
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz",
-      "integrity": "sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==",
+    "node_modules/@babel/plugin-transform-new-target": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz",
+      "integrity": "sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1226,13 +1254,14 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz",
-      "integrity": "sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==",
+    "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.5.tgz",
+      "integrity": "sha512-6CF8g6z1dNYZ/VXok5uYkkBBICHZPiGEl7oDnAx2Mt1hlHVHOSIKWJaXHjQJA5VB43KZnXZDIexMchY4y2PGdA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1241,14 +1270,14 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.20.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz",
-      "integrity": "sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g==",
+    "node_modules/@babel/plugin-transform-numeric-separator": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.5.tgz",
+      "integrity": "sha512-NbslED1/6M+sXiwwtcAB/nieypGw02Ejf4KtDeMkCEpP6gWFMX1wI9WKYua+4oBneCCEmulOkRpwywypVZzs/g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.20.11",
-        "@babel/helper-plugin-utils": "^7.20.2"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1257,15 +1286,17 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.21.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.2.tgz",
-      "integrity": "sha512-Cln+Yy04Gxua7iPdj6nOV96smLGjpElir5YwzF0LBPKoPlLDNJePNlrGGaybAJkd0zKRnOVXOgizSqPYMNYkzA==",
+    "node_modules/@babel/plugin-transform-object-rest-spread": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz",
+      "integrity": "sha512-Kk3lyDmEslH9DnvCDA1s1kkd3YWQITiBOHngOtDL9Pt6BZjzqb6hiOlb8VfjiiQJ2unmegBqZu0rx5RxJb5vmQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.21.2",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-simple-access": "^7.20.2"
+        "@babel/compat-data": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1274,16 +1305,14 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.20.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz",
-      "integrity": "sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw==",
+    "node_modules/@babel/plugin-transform-object-super": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz",
+      "integrity": "sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-module-transforms": "^7.20.11",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-validator-identifier": "^7.19.1"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1292,14 +1321,14 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz",
-      "integrity": "sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==",
+    "node_modules/@babel/plugin-transform-optional-catch-binding": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.5.tgz",
+      "integrity": "sha512-pH8orJahy+hzZje5b8e2QIlBWQvGpelS76C63Z+jhZKsmzfNaPQ+LaW6dcJ9bxTpo1mtXbgHwy765Ro3jftmUg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1308,29 +1337,30 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz",
-      "integrity": "sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==",
+    "node_modules/@babel/plugin-transform-optional-chaining": {
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.10.tgz",
+      "integrity": "sha512-MMkQqZAZ+MGj+jGTG3OTuhKeBpNcO+0oCEbrGNEaOmiEn+1MzRyQlYsruGiU8RTK3zV6XwrVJTmwiDOyYK6J9g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.20.5",
-        "@babel/helper-plugin-utils": "^7.20.2"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
       },
       "engines": {
         "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz",
-      "integrity": "sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==",
+    "node_modules/@babel/plugin-transform-parameters": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz",
+      "integrity": "sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1339,14 +1369,14 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz",
-      "integrity": "sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==",
+    "node_modules/@babel/plugin-transform-private-methods": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz",
+      "integrity": "sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/helper-replace-supers": "^7.18.6"
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1355,13 +1385,16 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.21.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.21.3.tgz",
-      "integrity": "sha512-Wxc+TvppQG9xWFYatvCGPvZ6+SIUxQ2ZdiBP+PHYMIjnPXD+uThCshaz4NZOnODAtBjjcVQQ/3OKs9LW28purQ==",
+    "node_modules/@babel/plugin-transform-private-property-in-object": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.5.tgz",
+      "integrity": "sha512-/9xnaTTJcVoBtSSmrVyhtSvO3kbqS2ODoh2juEU72c3aYonNF0OMGiaz2gjukyKM2wBBYJP38S4JiE0Wfb5VMQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.20.2"
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1371,12 +1404,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz",
-      "integrity": "sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz",
+      "integrity": "sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1386,13 +1419,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz",
-      "integrity": "sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz",
+      "integrity": "sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "regenerator-transform": "^0.15.1"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "regenerator-transform": "^0.15.2"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1402,12 +1435,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz",
-      "integrity": "sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz",
+      "integrity": "sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1417,12 +1450,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz",
-      "integrity": "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz",
+      "integrity": "sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1432,13 +1465,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz",
-      "integrity": "sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz",
+      "integrity": "sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1448,12 +1481,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz",
-      "integrity": "sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz",
+      "integrity": "sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1463,12 +1496,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz",
-      "integrity": "sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz",
+      "integrity": "sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1478,12 +1511,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz",
-      "integrity": "sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz",
+      "integrity": "sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1493,12 +1526,28 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.18.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz",
-      "integrity": "sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz",
+      "integrity": "sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-unicode-property-regex": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz",
+      "integrity": "sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1508,13 +1557,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz",
-      "integrity": "sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz",
+      "integrity": "sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1523,39 +1572,43 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-transform-unicode-sets-regex": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz",
+      "integrity": "sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
     "node_modules/@babel/preset-env": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.20.2.tgz",
-      "integrity": "sha512-1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.20.1",
-        "@babel/helper-compilation-targets": "^7.20.0",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-validator-option": "^7.18.6",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9",
-        "@babel/plugin-proposal-async-generator-functions": "^7.20.1",
-        "@babel/plugin-proposal-class-properties": "^7.18.6",
-        "@babel/plugin-proposal-class-static-block": "^7.18.6",
-        "@babel/plugin-proposal-dynamic-import": "^7.18.6",
-        "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
-        "@babel/plugin-proposal-json-strings": "^7.18.6",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.18.9",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
-        "@babel/plugin-proposal-numeric-separator": "^7.18.6",
-        "@babel/plugin-proposal-object-rest-spread": "^7.20.2",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.18.6",
-        "@babel/plugin-proposal-optional-chaining": "^7.18.9",
-        "@babel/plugin-proposal-private-methods": "^7.18.6",
-        "@babel/plugin-proposal-private-property-in-object": "^7.18.6",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.18.6",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.10.tgz",
+      "integrity": "sha512-riHpLb1drNkpLlocmSyEg4oYJIQFeXAK/d7rI6mbD0XsvoTOOweXDmQPG/ErxsEhWk3rl3Q/3F6RFQlVFS8m0A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.22.9",
+        "@babel/helper-compilation-targets": "^7.22.10",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-validator-option": "^7.22.5",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.5",
+        "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
         "@babel/plugin-syntax-class-static-block": "^7.14.5",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-import-assertions": "^7.20.0",
+        "@babel/plugin-syntax-import-assertions": "^7.22.5",
+        "@babel/plugin-syntax-import-attributes": "^7.22.5",
+        "@babel/plugin-syntax-import-meta": "^7.10.4",
         "@babel/plugin-syntax-json-strings": "^7.8.3",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
@@ -1565,45 +1618,62 @@
         "@babel/plugin-syntax-optional-chaining": "^7.8.3",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
-        "@babel/plugin-transform-arrow-functions": "^7.18.6",
-        "@babel/plugin-transform-async-to-generator": "^7.18.6",
-        "@babel/plugin-transform-block-scoped-functions": "^7.18.6",
-        "@babel/plugin-transform-block-scoping": "^7.20.2",
-        "@babel/plugin-transform-classes": "^7.20.2",
-        "@babel/plugin-transform-computed-properties": "^7.18.9",
-        "@babel/plugin-transform-destructuring": "^7.20.2",
-        "@babel/plugin-transform-dotall-regex": "^7.18.6",
-        "@babel/plugin-transform-duplicate-keys": "^7.18.9",
-        "@babel/plugin-transform-exponentiation-operator": "^7.18.6",
-        "@babel/plugin-transform-for-of": "^7.18.8",
-        "@babel/plugin-transform-function-name": "^7.18.9",
-        "@babel/plugin-transform-literals": "^7.18.9",
-        "@babel/plugin-transform-member-expression-literals": "^7.18.6",
-        "@babel/plugin-transform-modules-amd": "^7.19.6",
-        "@babel/plugin-transform-modules-commonjs": "^7.19.6",
-        "@babel/plugin-transform-modules-systemjs": "^7.19.6",
-        "@babel/plugin-transform-modules-umd": "^7.18.6",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.19.1",
-        "@babel/plugin-transform-new-target": "^7.18.6",
-        "@babel/plugin-transform-object-super": "^7.18.6",
-        "@babel/plugin-transform-parameters": "^7.20.1",
-        "@babel/plugin-transform-property-literals": "^7.18.6",
-        "@babel/plugin-transform-regenerator": "^7.18.6",
-        "@babel/plugin-transform-reserved-words": "^7.18.6",
-        "@babel/plugin-transform-shorthand-properties": "^7.18.6",
-        "@babel/plugin-transform-spread": "^7.19.0",
-        "@babel/plugin-transform-sticky-regex": "^7.18.6",
-        "@babel/plugin-transform-template-literals": "^7.18.9",
-        "@babel/plugin-transform-typeof-symbol": "^7.18.9",
-        "@babel/plugin-transform-unicode-escapes": "^7.18.10",
-        "@babel/plugin-transform-unicode-regex": "^7.18.6",
-        "@babel/preset-modules": "^0.1.5",
-        "@babel/types": "^7.20.2",
-        "babel-plugin-polyfill-corejs2": "^0.3.3",
-        "babel-plugin-polyfill-corejs3": "^0.6.0",
-        "babel-plugin-polyfill-regenerator": "^0.4.1",
-        "core-js-compat": "^3.25.1",
-        "semver": "^6.3.0"
+        "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
+        "@babel/plugin-transform-arrow-functions": "^7.22.5",
+        "@babel/plugin-transform-async-generator-functions": "^7.22.10",
+        "@babel/plugin-transform-async-to-generator": "^7.22.5",
+        "@babel/plugin-transform-block-scoped-functions": "^7.22.5",
+        "@babel/plugin-transform-block-scoping": "^7.22.10",
+        "@babel/plugin-transform-class-properties": "^7.22.5",
+        "@babel/plugin-transform-class-static-block": "^7.22.5",
+        "@babel/plugin-transform-classes": "^7.22.6",
+        "@babel/plugin-transform-computed-properties": "^7.22.5",
+        "@babel/plugin-transform-destructuring": "^7.22.10",
+        "@babel/plugin-transform-dotall-regex": "^7.22.5",
+        "@babel/plugin-transform-duplicate-keys": "^7.22.5",
+        "@babel/plugin-transform-dynamic-import": "^7.22.5",
+        "@babel/plugin-transform-exponentiation-operator": "^7.22.5",
+        "@babel/plugin-transform-export-namespace-from": "^7.22.5",
+        "@babel/plugin-transform-for-of": "^7.22.5",
+        "@babel/plugin-transform-function-name": "^7.22.5",
+        "@babel/plugin-transform-json-strings": "^7.22.5",
+        "@babel/plugin-transform-literals": "^7.22.5",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.22.5",
+        "@babel/plugin-transform-member-expression-literals": "^7.22.5",
+        "@babel/plugin-transform-modules-amd": "^7.22.5",
+        "@babel/plugin-transform-modules-commonjs": "^7.22.5",
+        "@babel/plugin-transform-modules-systemjs": "^7.22.5",
+        "@babel/plugin-transform-modules-umd": "^7.22.5",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
+        "@babel/plugin-transform-new-target": "^7.22.5",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.5",
+        "@babel/plugin-transform-numeric-separator": "^7.22.5",
+        "@babel/plugin-transform-object-rest-spread": "^7.22.5",
+        "@babel/plugin-transform-object-super": "^7.22.5",
+        "@babel/plugin-transform-optional-catch-binding": "^7.22.5",
+        "@babel/plugin-transform-optional-chaining": "^7.22.10",
+        "@babel/plugin-transform-parameters": "^7.22.5",
+        "@babel/plugin-transform-private-methods": "^7.22.5",
+        "@babel/plugin-transform-private-property-in-object": "^7.22.5",
+        "@babel/plugin-transform-property-literals": "^7.22.5",
+        "@babel/plugin-transform-regenerator": "^7.22.10",
+        "@babel/plugin-transform-reserved-words": "^7.22.5",
+        "@babel/plugin-transform-shorthand-properties": "^7.22.5",
+        "@babel/plugin-transform-spread": "^7.22.5",
+        "@babel/plugin-transform-sticky-regex": "^7.22.5",
+        "@babel/plugin-transform-template-literals": "^7.22.5",
+        "@babel/plugin-transform-typeof-symbol": "^7.22.5",
+        "@babel/plugin-transform-unicode-escapes": "^7.22.10",
+        "@babel/plugin-transform-unicode-property-regex": "^7.22.5",
+        "@babel/plugin-transform-unicode-regex": "^7.22.5",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
+        "@babel/preset-modules": "0.1.6-no-external-plugins",
+        "@babel/types": "^7.22.10",
+        "babel-plugin-polyfill-corejs2": "^0.4.5",
+        "babel-plugin-polyfill-corejs3": "^0.8.3",
+        "babel-plugin-polyfill-regenerator": "^0.5.2",
+        "core-js-compat": "^3.31.0",
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1613,19 +1683,17 @@
       }
     },
     "node_modules/@babel/preset-modules": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
-      "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
+      "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,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-        "@babel/plugin-transform-dotall-regex": "^7.4.4",
         "@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/regjsgen": {
@@ -1635,44 +1703,44 @@
       "dev": true
     },
     "node_modules/@babel/runtime": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.0.tgz",
-      "integrity": "sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.10.tgz",
+      "integrity": "sha512-21t/fkKLMZI4pqP2wlmsQAWnYW1PDyKyyUV4vCi+B25ydmdaYTKXPwCj0BzSUnZf4seIiYvSA3jcZ3gdsMFkLQ==",
       "dependencies": {
-        "regenerator-runtime": "^0.13.11"
+        "regenerator-runtime": "^0.14.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz",
-      "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz",
+      "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/parser": "^7.20.7",
-        "@babel/types": "^7.20.7"
+        "@babel/code-frame": "^7.22.5",
+        "@babel/parser": "^7.22.5",
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.21.3",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.3.tgz",
-      "integrity": "sha512-XLyopNeaTancVitYZe2MlUEvgKb6YVVPXzofHgqHijCImG33b/uTurMS488ht/Hbsb2XK3U2BnSTxKVNGV3nGQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.21.3",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.21.0",
-        "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/parser": "^7.21.3",
-        "@babel/types": "^7.21.3",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
+      "integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.22.10",
+        "@babel/generator": "^7.22.10",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-hoist-variables": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/parser": "^7.22.10",
+        "@babel/types": "^7.22.10",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -1681,13 +1749,13 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.21.3",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.3.tgz",
-      "integrity": "sha512-sBGdETxC+/M4o/zKC0sl6sjWv62WFR/uzxrJ6uYyMLZOUlPnwzw0tKgVHOXxaAd5l2g8pEDM5RZ495GPQI77kg==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz",
+      "integrity": "sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-string-parser": "^7.19.4",
-        "@babel/helper-validator-identifier": "^7.19.1",
+        "@babel/helper-string-parser": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.5",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {
@@ -1695,9 +1763,9 @@
       }
     },
     "node_modules/@bufbuild/protobuf": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-1.1.1.tgz",
-      "integrity": "sha512-1dS2m3jabfW2XL2K6//41wZkO4XJOZtpe0bKLuta0BvK5LxNRyUBSSN5835n3bIFiNJKFWhDnzZEMrV7QVGFfQ==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-1.3.0.tgz",
+      "integrity": "sha512-G372ods0pLt46yxVRsnP/e2btVPuuzArcMPFpIDeIwiGPuuglEs9y75iG0HMvZgncsj5TvbYRWqbVyOe3PLCWQ==",
       "dev": true
     },
     "node_modules/@claviska/jquery-minicolors": {
@@ -1708,6 +1776,157 @@
         "jquery": ">= 1.7.x"
       }
     },
+    "node_modules/@codemirror/autocomplete": {
+      "version": "6.9.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.9.0.tgz",
+      "integrity": "sha512-Fbwm0V/Wn3BkEJZRhr0hi5BhCo5a7eBL6LYaliPjOSwCyfOpnjXY59HruSxOUNV+1OYer0Tgx1zRNQttjXyDog==",
+      "dependencies": {
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.6.0",
+        "@lezer/common": "^1.0.0"
+      },
+      "peerDependencies": {
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.0.0",
+        "@lezer/common": "^1.0.0"
+      }
+    },
+    "node_modules/@codemirror/commands": {
+      "version": "6.2.4",
+      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.2.4.tgz",
+      "integrity": "sha512-42lmDqVH0ttfilLShReLXsDfASKLXzfyC36bzwcqzox9PlHulMcsUOfHXNo2X2aFMVNUoQ7j+d4q5bnfseYoOA==",
+      "dependencies": {
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/state": "^6.2.0",
+        "@codemirror/view": "^6.0.0",
+        "@lezer/common": "^1.0.0"
+      }
+    },
+    "node_modules/@codemirror/lang-css": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.2.1.tgz",
+      "integrity": "sha512-/UNWDNV5Viwi/1lpr/dIXJNWiwDxpw13I4pTUAsNxZdg6E0mI2kTQb0P2iHczg1Tu+H4EBgJR+hYhKiHKko7qg==",
+      "dependencies": {
+        "@codemirror/autocomplete": "^6.0.0",
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/state": "^6.0.0",
+        "@lezer/common": "^1.0.2",
+        "@lezer/css": "^1.0.0"
+      }
+    },
+    "node_modules/@codemirror/lang-html": {
+      "version": "6.4.5",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.5.tgz",
+      "integrity": "sha512-dUCSxkIw2G+chaUfw3Gfu5kkN83vJQN8gfQDp9iEHsIZluMJA0YJveT12zg/28BJx+uPsbQ6VimKCgx3oJrZxA==",
+      "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.2.2",
+        "@lezer/common": "^1.0.0",
+        "@lezer/css": "^1.1.0",
+        "@lezer/html": "^1.3.0"
+      }
+    },
+    "node_modules/@codemirror/lang-javascript": {
+      "version": "6.1.9",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.1.9.tgz",
+      "integrity": "sha512-z3jdkcqOEBT2txn2a87A0jSy6Te3679wg/U8QzMeftFt+4KA6QooMwfdFzJiuC3L6fXKfTXZcDocoaxMYfGz0w==",
+      "dependencies": {
+        "@codemirror/autocomplete": "^6.0.0",
+        "@codemirror/language": "^6.6.0",
+        "@codemirror/lint": "^6.0.0",
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.0.0",
+        "@lezer/common": "^1.0.0",
+        "@lezer/javascript": "^1.0.0"
+      }
+    },
+    "node_modules/@codemirror/lang-json": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-json/-/lang-json-6.0.1.tgz",
+      "integrity": "sha512-+T1flHdgpqDDlJZ2Lkil/rLiRy684WMLc74xUnjJH48GQdfJo/pudlTRreZmKwzP8/tGdKf83wlbAdOCzlJOGQ==",
+      "dependencies": {
+        "@codemirror/language": "^6.0.0",
+        "@lezer/json": "^1.0.0"
+      }
+    },
+    "node_modules/@codemirror/lang-php": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-php/-/lang-php-6.0.1.tgz",
+      "integrity": "sha512-ublojMdw/PNWa7qdN5TMsjmqkNuTBD3k6ndZ4Z0S25SBAiweFGyY68AS3xNcIOlb6DDFDvKlinLQ40vSLqf8xA==",
+      "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"
+      }
+    },
+    "node_modules/@codemirror/lang-xml": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-xml/-/lang-xml-6.0.2.tgz",
+      "integrity": "sha512-JQYZjHL2LAfpiZI2/qZ/qzDuSqmGKMwyApYmEUUCTxLM4MWS7sATUEfIguZQr9Zjx/7gcdnewb039smF6nC2zw==",
+      "dependencies": {
+        "@codemirror/autocomplete": "^6.0.0",
+        "@codemirror/language": "^6.4.0",
+        "@codemirror/state": "^6.0.0",
+        "@lezer/common": "^1.0.0",
+        "@lezer/xml": "^1.0.0"
+      }
+    },
+    "node_modules/@codemirror/language": {
+      "version": "6.9.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.9.0.tgz",
+      "integrity": "sha512-nFu311/0ne/qGuGCL3oKuktBgzVOaxCHZPZv1tLSZkNjPYxxvkjSbzno3MlErG2tgw1Yw1yF8BxMCegeMXqpiw==",
+      "dependencies": {
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.0.0",
+        "@lezer/common": "^1.0.0",
+        "@lezer/highlight": "^1.0.0",
+        "@lezer/lr": "^1.0.0",
+        "style-mod": "^4.0.0"
+      }
+    },
+    "node_modules/@codemirror/lint": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.4.0.tgz",
+      "integrity": "sha512-6VZ44Ysh/Zn07xrGkdtNfmHCbGSHZzFBdzWi0pbd7chAQ/iUcpLGX99NYRZTa7Ugqg4kEHCqiHhcZnH0gLIgSg==",
+      "dependencies": {
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.0.0",
+        "crelt": "^1.0.5"
+      }
+    },
+    "node_modules/@codemirror/search": {
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.1.tgz",
+      "integrity": "sha512-4jupk4JwkeVbrN2pStY74q6OJEYqwosB4koA66nyLeVedadtX9MHI38j2vbYmnfDGurDApP3OZO46MrWalcjiQ==",
+      "dependencies": {
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.0.0",
+        "crelt": "^1.0.5"
+      }
+    },
+    "node_modules/@codemirror/state": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.2.1.tgz",
+      "integrity": "sha512-RupHSZ8+OjNT38zU9fKH2sv+Dnlr8Eb8sl4NOnnqz95mCFTZUaiRP8Xv5MeeaG0px2b8Bnfe7YGwCV3nsBhbuw=="
+    },
+    "node_modules/@codemirror/view": {
+      "version": "6.16.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.16.0.tgz",
+      "integrity": "sha512-1Z2HkvkC3KR/oEZVuW9Ivmp8TWLzGEd8T8TA04TTwPvqogfkHBdYSlflytDOqmkUxM2d1ywTg7X2dU5mC+SXvg==",
+      "dependencies": {
+        "@codemirror/state": "^6.1.4",
+        "style-mod": "^4.0.0",
+        "w3c-keyname": "^2.2.4"
+      }
+    },
     "node_modules/@colors/colors": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
@@ -1735,9 +1954,9 @@
       }
     },
     "node_modules/@cypress/request": {
-      "version": "2.88.11",
-      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.11.tgz",
-      "integrity": "sha512-M83/wfQ1EkspjkE2lNWNV5ui2Cv7UCv1swW1DqljahbzLVWltcsexQh8jYtuS/vzFXP+HySntGM83ZXA9fn17w==",
+      "version": "2.88.12",
+      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.12.tgz",
+      "integrity": "sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==",
       "dev": true,
       "dependencies": {
         "aws-sign2": "~0.7.0",
@@ -1755,7 +1974,7 @@
         "performance-now": "^2.1.0",
         "qs": "~6.10.3",
         "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.5.0",
+        "tough-cookie": "^4.1.3",
         "tunnel-agent": "^0.6.0",
         "uuid": "^8.3.2"
       },
@@ -1795,9 +2014,9 @@
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.3.0.tgz",
-      "integrity": "sha512-v3oplH6FYCULtFuCeqyuTd9D2WKO937Dxdq+GmHOLL72TTRriLxz2VLlNfkZRsvj6PKnOPAtuT6dwrs/pA5DvA==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
       "dev": true,
       "dependencies": {
         "eslint-visitor-keys": "^3.3.0"
@@ -1810,23 +2029,23 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.4.1.tgz",
-      "integrity": "sha512-BISJ6ZE4xQsuL/FmsyRaiffpq977bMlsKfGHTQrOGFErfByxIe6iZTxPf/00Zon9b9a7iUykfQwejN3s2ZW/Bw==",
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz",
+      "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==",
       "dev": true,
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.1.tgz",
-      "integrity": "sha512-eFRmABvW2E5Ho6f5fHLqgena46rOj7r7OKHYfLElqcBfGFHHpjBhivyi5+jOEQuSpdc/1phIZJlbC2te+tZNIw==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz",
+      "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
-        "espree": "^9.5.0",
+        "espree": "^9.6.0",
         "globals": "^13.19.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
@@ -1842,9 +2061,9 @@
       }
     },
     "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.20.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
-      "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+      "version": "13.21.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz",
+      "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -1869,40 +2088,49 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.36.0.tgz",
-      "integrity": "sha512-lxJ9R5ygVm8ZWgYdUweoq5ownDlJ4upvoWmO4eLxBYHdMo+vZ/Rx0EN6MbKWDJOSUGrqJy2Gt+Dyv/VKml0fjg==",
+      "version": "8.47.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.47.0.tgz",
+      "integrity": "sha512-P6omY1zv5MItm93kLM8s2vr1HICJH8v0dvddDhysbIuZ+vcjOHg5Zbkf1mTkcmi2JA9oBG2anOkRnW8WJTS8Og==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
     "node_modules/@floating-ui/core": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.2.4.tgz",
-      "integrity": "sha512-SQOeVbMwb1di+mVWWJLpsUTToKfqVNioXys011beCAhyOIFtS+GQoW4EQSneuxzmQKddExDwQ+X0hLl4lJJaSQ=="
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.4.1.tgz",
+      "integrity": "sha512-jk3WqquEJRlcyu7997NtR5PibI+y5bi+LS3hPmguVClypenMsCY3CBa3LAQnozRCtCrYWSEtAdiskpamuJRFOQ==",
+      "dependencies": {
+        "@floating-ui/utils": "^0.1.1"
+      }
     },
     "node_modules/@floating-ui/dom": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.2.5.tgz",
-      "integrity": "sha512-+sAUfpQ3Frz+VCbPCqj+cZzvEESy3fjSeT/pDWkYCWOBXYNNKZfuVsHuv8/JO2zze8+Eb/Q7a6hZVgzS81fLbQ==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.5.1.tgz",
+      "integrity": "sha512-KwvVcPSXg6mQygvA1TjbN/gh///36kKtllIF8SUm0qpFj8+rvYrpvlYdL1JoA71SHpDqgSSdGOSoQ0Mp3uY5aw==",
       "dependencies": {
-        "@floating-ui/core": "^1.2.4"
+        "@floating-ui/core": "^1.4.1",
+        "@floating-ui/utils": "^0.1.1"
       }
     },
+    "node_modules/@floating-ui/utils": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.1.tgz",
+      "integrity": "sha512-m0G6wlnhm/AX0H12IOWtK8gASEMffnX08RtKkCgTdHb9JpHKGloI7icFfLg9ZmQeavcvR0PKmzxClyuFPSjKWw=="
+    },
     "node_modules/@fortawesome/fontawesome-free": {
-      "version": "5.15.4",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz",
-      "integrity": "sha512-eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg==",
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.2.tgz",
+      "integrity": "sha512-m5cPn3e2+FDCOgi1mz0RexTUvvQibBebOUlUlW0+YrMjDTPkiJ6VTKukA1GRsvRw+12KyJndNjj0O4AgTxm2Pg==",
       "hasInstallScript": true,
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.8",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
-      "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==",
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz",
+      "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==",
       "dev": true,
       "dependencies": {
         "@humanwhocodes/object-schema": "^1.2.1",
@@ -1941,22 +2169,23 @@
       }
     },
     "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
-      "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
+      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
       "dev": true,
       "dependencies": {
-        "@jridgewell/set-array": "^1.0.0",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
       },
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
+      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
       "dev": true,
       "engines": {
         "node": ">=6.0.0"
@@ -1972,43 +2201,105 @@
       }
     },
     "node_modules/@jridgewell/source-map": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz",
-      "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz",
+      "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==",
       "dev": true,
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.0",
         "@jridgewell/trace-mapping": "^0.3.9"
       }
     },
-    "node_modules/@jridgewell/source-map/node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-      "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/set-array": "^1.0.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.14",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
       "dev": true
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.17",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz",
-      "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==",
+      "version": "0.3.19",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz",
+      "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==",
       "dev": true,
       "dependencies": {
-        "@jridgewell/resolve-uri": "3.1.0",
-        "@jridgewell/sourcemap-codec": "1.4.14"
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
+    "node_modules/@lezer/common": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.0.4.tgz",
+      "integrity": "sha512-lZHlk8p67x4aIDtJl6UQrXSOP6oi7dQR3W/geFVrENdA1JDaAJWldnVqVjPMJupbTKbzDfFcePfKttqVidS/dg=="
+    },
+    "node_modules/@lezer/css": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.1.3.tgz",
+      "integrity": "sha512-SjSM4pkQnQdJDVc80LYzEaMiNy9txsFbI7HsMgeVF28NdLaAdHNtQ+kB/QqDUzRBV/75NTXjJ/R5IdC8QQGxMg==",
+      "dependencies": {
+        "@lezer/highlight": "^1.0.0",
+        "@lezer/lr": "^1.0.0"
+      }
+    },
+    "node_modules/@lezer/highlight": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.1.6.tgz",
+      "integrity": "sha512-cmSJYa2us+r3SePpRCjN5ymCqCPv+zyXmDl0ciWtVaNiORT/MxM7ZgOMQZADD0o51qOaOg24qc/zBViOIwAjJg==",
+      "dependencies": {
+        "@lezer/common": "^1.0.0"
+      }
+    },
+    "node_modules/@lezer/html": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/@lezer/html/-/html-1.3.6.tgz",
+      "integrity": "sha512-Kk9HJARZTc0bAnMQUqbtuhFVsB4AnteR2BFUWfZV7L/x1H0aAKz6YabrfJ2gk/BEgjh9L3hg5O4y2IDZRBdzuQ==",
+      "dependencies": {
+        "@lezer/common": "^1.0.0",
+        "@lezer/highlight": "^1.0.0",
+        "@lezer/lr": "^1.0.0"
+      }
+    },
+    "node_modules/@lezer/javascript": {
+      "version": "1.4.5",
+      "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.5.tgz",
+      "integrity": "sha512-FmBUHz8K1V22DgjTd6SrIG9owbzOYZ1t3rY6vGEmw+e2RVBd7sqjM8uXEVRFmfxKFn1Mx2ABJehHjrN3G2ZpmA==",
+      "dependencies": {
+        "@lezer/highlight": "^1.1.3",
+        "@lezer/lr": "^1.3.0"
+      }
+    },
+    "node_modules/@lezer/json": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@lezer/json/-/json-1.0.1.tgz",
+      "integrity": "sha512-nkVC27qiEZEjySbi6gQRuMwa2sDu2PtfjSgz0A4QF81QyRGm3kb2YRzLcOPcTEtmcwvrX/cej7mlhbwViA4WJw==",
+      "dependencies": {
+        "@lezer/highlight": "^1.0.0",
+        "@lezer/lr": "^1.0.0"
+      }
+    },
+    "node_modules/@lezer/lr": {
+      "version": "1.3.10",
+      "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.10.tgz",
+      "integrity": "sha512-BZfVvf7Re5BIwJHlZXbJn9L8lus5EonxQghyn+ih8Wl36XMFBPTXC0KM0IdUtj9w/diPHsKlXVgL+AlX2jYJ0Q==",
+      "dependencies": {
+        "@lezer/common": "^1.0.0"
+      }
+    },
+    "node_modules/@lezer/php": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@lezer/php/-/php-1.0.1.tgz",
+      "integrity": "sha512-aqdCQJOXJ66De22vzdwnuC502hIaG9EnPK2rSi+ebXyUd+j7GAX1mRjWZOVOmf3GST1YUfUCu6WXDiEgDGOVwA==",
+      "dependencies": {
+        "@lezer/highlight": "^1.0.0",
+        "@lezer/lr": "^1.1.0"
+      }
+    },
+    "node_modules/@lezer/xml": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@lezer/xml/-/xml-1.0.2.tgz",
+      "integrity": "sha512-dlngsWceOtQBMuBPw5wtHpaxdPJ71aVntqjbpGkFtWsp4WtQmCnuTjQGocviymydN6M18fhj6UQX3oiEtSuY7w==",
+      "dependencies": {
+        "@lezer/highlight": "^1.0.0",
+        "@lezer/lr": "^1.0.0"
       }
     },
     "node_modules/@nodelib/fs.scandir": {
@@ -2047,9 +2338,9 @@
       }
     },
     "node_modules/@popperjs/core": {
-      "version": "2.11.6",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz",
-      "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==",
+      "version": "2.11.8",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
+      "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/popperjs"
@@ -2155,6 +2446,19 @@
       "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==",
       "dev": true
     },
+    "node_modules/@selderee/plugin-htmlparser2": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@selderee/plugin-htmlparser2/-/plugin-htmlparser2-0.11.0.tgz",
+      "integrity": "sha512-P33hHGdldxGabLFjPPpaTxVolMrzrcegejx+0GxjrIb9Zv48D8yAIA/QTDR2dFl7Uz7urX8aX6+5bCZslr+gWQ==",
+      "dev": true,
+      "dependencies": {
+        "domhandler": "^5.0.3",
+        "selderee": "^0.11.0"
+      },
+      "funding": {
+        "url": "https://ko-fi.com/killymxi"
+      }
+    },
     "node_modules/@trysound/sax": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
@@ -2176,6 +2480,16 @@
       "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
       "dev": true
     },
+    "node_modules/@types/mailparser": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/@types/mailparser/-/mailparser-3.4.0.tgz",
+      "integrity": "sha512-MotFinA1sT2nPFtQw1WpaF3X6I1OdbEloaixMmk924BOYqwHmlZkoi7XcVUXHI+7i0to8JguHqYj5k/E6c9Chw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "iconv-lite": "^0.6.3"
+      }
+    },
     "node_modules/@types/minimist": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
@@ -2183,11 +2497,20 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "18.15.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.5.tgz",
-      "integrity": "sha512-Ark2WDjjZO7GmvsyFFf81MXuGTA/d6oP38anyxWOL6EREyBKAxKoFHwBhaZxCfLRLpO8JgVXwqOwSwa7jRcjew==",
+      "version": "20.5.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.1.tgz",
+      "integrity": "sha512-4tT2UrL5LBqDwoed9wZ6N3umC4Yhz3W3FloMmiiG4JwmUJWpie0c7lcnUNd4gtMKuDEO4wRVS8B6Xa0uMRsMKg==",
       "dev": true
     },
+    "node_modules/@types/nodemailer": {
+      "version": "6.4.9",
+      "resolved": "https://registry.npmjs.org/@types/nodemailer/-/nodemailer-6.4.9.tgz",
+      "integrity": "sha512-XYG8Gv+sHjaOtUpiuytahMy2mM3rectgroNbs6R3djZEKmPNiIJwe9KqOJBGzKKnNZNKvnuvmugBgpq3w/S0ig==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/normalize-package-data": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
@@ -2221,6 +2544,16 @@
       "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==",
       "dev": true
     },
+    "node_modules/@types/smtp-server": {
+      "version": "3.5.7",
+      "resolved": "https://registry.npmjs.org/@types/smtp-server/-/smtp-server-3.5.7.tgz",
+      "integrity": "sha512-8HtcCeN1DCu3P3D4unfRlwRT2sM54PQSBnfwCf6HZl4CH234lTvTJxKXvZtcJajg8mCgiSLkJ6rratEhxgvhqQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "@types/nodemailer": "*"
+      }
+    },
     "node_modules/@types/yauzl": {
       "version": "2.10.0",
       "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
@@ -2232,53 +2565,65 @@
       }
     },
     "node_modules/@vue/compiler-core": {
-      "version": "3.2.47",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.47.tgz",
-      "integrity": "sha512-p4D7FDnQb7+YJmO2iPEv0SQNeNzcbHdGByJDsT4lynf63AFkOTFN07HsiRSvjGo0QrxR/o3d0hUyNCUnBU2Tig==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.3.4.tgz",
+      "integrity": "sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==",
       "dev": true,
       "dependencies": {
-        "@babel/parser": "^7.16.4",
-        "@vue/shared": "3.2.47",
+        "@babel/parser": "^7.21.3",
+        "@vue/shared": "3.3.4",
         "estree-walker": "^2.0.2",
-        "source-map": "^0.6.1"
+        "source-map-js": "^1.0.2"
       }
     },
     "node_modules/@vue/compiler-dom": {
-      "version": "3.2.47",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.47.tgz",
-      "integrity": "sha512-dBBnEHEPoftUiS03a4ggEig74J2YBZ2UIeyfpcRM2tavgMWo4bsEfgCGsu+uJIL/vax9S+JztH8NmQerUo7shQ==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.3.4.tgz",
+      "integrity": "sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w==",
       "dev": true,
       "dependencies": {
-        "@vue/compiler-core": "3.2.47",
-        "@vue/shared": "3.2.47"
+        "@vue/compiler-core": "3.3.4",
+        "@vue/shared": "3.3.4"
       }
     },
     "node_modules/@vue/compiler-sfc": {
-      "version": "3.2.47",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.47.tgz",
-      "integrity": "sha512-rog05W+2IFfxjMcFw10tM9+f7i/+FFpZJJ5XHX72NP9eC2uRD+42M3pYcQqDXVYoj74kHMSEdQ/WmCjt8JFksQ==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.3.4.tgz",
+      "integrity": "sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ==",
       "dev": true,
       "dependencies": {
-        "@babel/parser": "^7.16.4",
-        "@vue/compiler-core": "3.2.47",
-        "@vue/compiler-dom": "3.2.47",
-        "@vue/compiler-ssr": "3.2.47",
-        "@vue/reactivity-transform": "3.2.47",
-        "@vue/shared": "3.2.47",
+        "@babel/parser": "^7.20.15",
+        "@vue/compiler-core": "3.3.4",
+        "@vue/compiler-dom": "3.3.4",
+        "@vue/compiler-ssr": "3.3.4",
+        "@vue/reactivity-transform": "3.3.4",
+        "@vue/shared": "3.3.4",
         "estree-walker": "^2.0.2",
-        "magic-string": "^0.25.7",
+        "magic-string": "^0.30.0",
         "postcss": "^8.1.10",
-        "source-map": "^0.6.1"
+        "source-map-js": "^1.0.2"
+      }
+    },
+    "node_modules/@vue/compiler-sfc/node_modules/magic-string": {
+      "version": "0.30.2",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.2.tgz",
+      "integrity": "sha512-lNZdu7pewtq/ZvWUp9Wpf/x7WzMTsR26TWV03BRZrXFsv+BI6dy8RAiKgm1uM/kyR0rCfUcqvOlXKG66KhIGug==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.4.15"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/@vue/compiler-ssr": {
-      "version": "3.2.47",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.47.tgz",
-      "integrity": "sha512-wVXC+gszhulcMD8wpxMsqSOpvDZ6xKXSVWkf50Guf/S+28hTAXPDYRTbLQ3EDkOP5Xz/+SY37YiwDquKbJOgZw==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.3.4.tgz",
+      "integrity": "sha512-m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ==",
       "dev": true,
       "dependencies": {
-        "@vue/compiler-dom": "3.2.47",
-        "@vue/shared": "3.2.47"
+        "@vue/compiler-dom": "3.3.4",
+        "@vue/shared": "3.3.4"
       }
     },
     "node_modules/@vue/devtools-api": {
@@ -2295,16 +2640,28 @@
       }
     },
     "node_modules/@vue/reactivity-transform": {
-      "version": "3.2.47",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.47.tgz",
-      "integrity": "sha512-m8lGXw8rdnPVVIdIFhf0LeQ/ixyHkH5plYuS83yop5n7ggVJU+z5v0zecwEnX7fa7HNLBhh2qngJJkxpwEEmYA==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.3.4.tgz",
+      "integrity": "sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw==",
       "dev": true,
       "dependencies": {
-        "@babel/parser": "^7.16.4",
-        "@vue/compiler-core": "3.2.47",
-        "@vue/shared": "3.2.47",
+        "@babel/parser": "^7.20.15",
+        "@vue/compiler-core": "3.3.4",
+        "@vue/shared": "3.3.4",
         "estree-walker": "^2.0.2",
-        "magic-string": "^0.25.7"
+        "magic-string": "^0.30.0"
+      }
+    },
+    "node_modules/@vue/reactivity-transform/node_modules/magic-string": {
+      "version": "0.30.2",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.2.tgz",
+      "integrity": "sha512-lNZdu7pewtq/ZvWUp9Wpf/x7WzMTsR26TWV03BRZrXFsv+BI6dy8RAiKgm1uM/kyR0rCfUcqvOlXKG66KhIGug==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.4.15"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/@vue/reactivity/node_modules/@vue/shared": {
@@ -2388,15 +2745,15 @@
       "integrity": "sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg=="
     },
     "node_modules/@vue/shared": {
-      "version": "3.2.47",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.47.tgz",
-      "integrity": "sha512-BHGyyGN3Q97EZx0taMQ+OLNuZcW3d37ZEVmEAyeoA9ERdGvm9Irc/0Fua8SNyOtV1w6BS4q25wbMzJujO9HIfQ==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz",
+      "integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==",
       "dev": true
     },
     "node_modules/@webcomponents/webcomponentsjs": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.7.0.tgz",
-      "integrity": "sha512-j161Z9oiy8k74vchdrQGihfSp7QulrTclCUiPo0D7JF6/RjpXAmB0ThlTAFlSElkgqg0vdFgNAXaX9ZHZy25wQ=="
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.8.0.tgz",
+      "integrity": "sha512-loGD63sacRzOzSJgQnB9ZAhaQGkN7wl2Zuw7tsphI5Isa0irijrRo6EnJii/GgjGefIFO8AIO7UivzRhFaEk9w=="
     },
     "node_modules/accessibility": {
       "version": "3.0.17",
@@ -2404,9 +2761,9 @@
       "integrity": "sha512-rQx2I1FE4Vd4Ejzd/PvXkSFYqQ0agUa26m9iSXcDkbQUmR81J7De/EmjYCh7dfcMVKbII1fsA7weQI4yJrE5QA=="
     },
     "node_modules/acorn": {
-      "version": "8.8.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
-      "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
+      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -2578,6 +2935,25 @@
         "node": ">=8"
       }
     },
+    "node_modules/array.prototype.findlastindex": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.2.tgz",
+      "integrity": "sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0",
+        "get-intrinsic": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/array.prototype.flat": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
@@ -2614,6 +2990,26 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/arraybuffer.prototype.slice": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz",
+      "integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==",
+      "dev": true,
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.0",
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "get-intrinsic": "^1.2.1",
+        "is-array-buffer": "^3.0.2",
+        "is-shared-array-buffer": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/arrify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
@@ -2677,9 +3073,9 @@
       "integrity": "sha512-VVE1H6cc4ai+ZXo/CRWoJiHXrA1qfA31DPnx6D20+kSI547hQN5Greh51LQ1baMRMfxO5K5M4ImMtZbZt2DODQ=="
     },
     "node_modules/autoprefixer": {
-      "version": "10.4.14",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz",
-      "integrity": "sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==",
+      "version": "10.4.15",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.15.tgz",
+      "integrity": "sha512-KCuPB8ZCIqFdA4HwKXsvz7j6gvSDNhDP7WnUjBleRkKjPdvCmHFuQ77ocavI8FT6NdvlBnE2UFr2H4Mycn8Vew==",
       "dev": true,
       "funding": [
         {
@@ -2689,11 +3085,15 @@
         {
           "type": "tidelift",
           "url": "https://tidelift.com/funding/github/npm/autoprefixer"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
         }
       ],
       "dependencies": {
-        "browserslist": "^4.21.5",
-        "caniuse-lite": "^1.0.30001464",
+        "browserslist": "^4.21.10",
+        "caniuse-lite": "^1.0.30001520",
         "fraction.js": "^4.2.0",
         "normalize-range": "^0.1.2",
         "picocolors": "^1.0.0",
@@ -2742,42 +3142,42 @@
       "dev": true
     },
     "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz",
-      "integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==",
+      "version": "0.4.5",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.5.tgz",
+      "integrity": "sha512-19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.17.7",
-        "@babel/helper-define-polyfill-provider": "^0.3.3",
-        "semver": "^6.1.1"
+        "@babel/compat-data": "^7.22.6",
+        "@babel/helper-define-polyfill-provider": "^0.4.2",
+        "semver": "^6.3.1"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
     "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz",
-      "integrity": "sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==",
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.3.tgz",
+      "integrity": "sha512-z41XaniZL26WLrvjy7soabMXrfPWARN25PZoriDEiLMxAp50AUW3t35BGQUMg5xK3UrpVTtagIDklxYa+MhiNA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.3.3",
-        "core-js-compat": "^3.25.1"
+        "@babel/helper-define-polyfill-provider": "^0.4.2",
+        "core-js-compat": "^3.31.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
     "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz",
-      "integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.2.tgz",
+      "integrity": "sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.3.3"
+        "@babel/helper-define-polyfill-provider": "^0.4.2"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
     "node_modules/balanced-match": {
@@ -2786,6 +3186,15 @@
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true
     },
+    "node_modules/base32.js": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/base32.js/-/base32.js-0.1.0.tgz",
+      "integrity": "sha512-n3TkB02ixgBOhTvANakDb4xaMXnYUVkNoRFJjQflcqMQhyEKxEHdj3E6N8t8sUQ0mjH/3/JxzlXuz3ul/J90pQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
     "node_modules/base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
@@ -2852,9 +3261,9 @@
       "dev": true
     },
     "node_modules/bootstrap": {
-      "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.3.tgz",
-      "integrity": "sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.1.tgz",
+      "integrity": "sha512-jzwza3Yagduci2x0rr9MeFSORjcHpt0lRZukZPZQJT1Dth5qzV7XcgGqYzi39KGAVYR8QEDVoO0ubFKOxzMG+g==",
       "funding": [
         {
           "type": "github",
@@ -2866,7 +3275,7 @@
         }
       ],
       "peerDependencies": {
-        "@popperjs/core": "^2.11.6"
+        "@popperjs/core": "^2.11.8"
       }
     },
     "node_modules/brace-expansion": {
@@ -2892,9 +3301,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.21.5",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz",
-      "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==",
+      "version": "4.21.10",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz",
+      "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==",
       "dev": true,
       "funding": [
         {
@@ -2904,13 +3313,17 @@
         {
           "type": "tidelift",
           "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
         }
       ],
       "dependencies": {
-        "caniuse-lite": "^1.0.30001449",
-        "electron-to-chromium": "^1.4.284",
-        "node-releases": "^2.0.8",
-        "update-browserslist-db": "^1.0.10"
+        "caniuse-lite": "^1.0.30001517",
+        "electron-to-chromium": "^1.4.477",
+        "node-releases": "^2.0.13",
+        "update-browserslist-db": "^1.0.11"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -2977,9 +3390,9 @@
       }
     },
     "node_modules/cachedir": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.3.0.tgz",
-      "integrity": "sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.4.0.tgz",
+      "integrity": "sha512-9EtFOZR8g22CL7BWjJ9BUx1+A/djkofnyW3aOXZORNW2kxoUpx2h+uN2cOqwPmFhnpVmxg+KW2OjOSgChTEvsQ==",
       "dev": true,
       "engines": {
         "node": ">=6"
@@ -3046,9 +3459,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001469",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001469.tgz",
-      "integrity": "sha512-Rcp7221ScNqQPP3W+lVOYDyjdR6dC+neEQCttoNr5bAyz54AboB4iwpnWgyi8P4YUsPybVzT4LgWiBbI3drL4g==",
+      "version": "1.0.30001522",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001522.tgz",
+      "integrity": "sha512-TKiyTVZxJGhsTszLuzb+6vUZSjVOAhClszBr2Ta2k9IwtNBT/4dzmL6aywt0HCgEZlmwJzXJd8yNiob6HgwTRg==",
       "dev": true,
       "funding": [
         {
@@ -3058,6 +3471,10 @@
         {
           "type": "tidelift",
           "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
         }
       ]
     },
@@ -3168,6 +3585,18 @@
         "node": ">=8"
       }
     },
+    "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,
+      "dependencies": {
+        "string-width": "^4.2.3"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/cli-table3": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.3.tgz",
@@ -3199,11 +3628,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/codemirror": {
-      "version": "5.65.12",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.12.tgz",
-      "integrity": "sha512-z2jlHBocElRnPYysN2HAuhXbO3DNB0bcSKmNz3hcWR2Js2Dkhc1bEOxG93Z3DeUrnm+qx56XOY5wQmbP5KY0sw=="
-    },
     "node_modules/color-convert": {
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
@@ -3226,9 +3650,9 @@
       "dev": true
     },
     "node_modules/colorette": {
-      "version": "2.0.19",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
-      "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==",
+      "version": "2.0.20",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
       "dev": true
     },
     "node_modules/combined-stream": {
@@ -3295,9 +3719,9 @@
       "dev": true
     },
     "node_modules/core-js": {
-      "version": "3.29.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.29.1.tgz",
-      "integrity": "sha512-+jwgnhg6cQxKYIIjGtAHq2nwUOolo9eoFZ4sHfUH09BLXBgxnH4gA0zEd+t+BO2cNB8idaBtZFcFTRjQJRJmAw==",
+      "version": "3.32.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.32.1.tgz",
+      "integrity": "sha512-lqufgNn9NLnESg5mQeYsxQP5w7wrViSj0jr/kv6ECQiByzQkrn1MKvV0L3acttpDqfQrHLwr2KCMgX5b8X+lyQ==",
       "dev": true,
       "hasInstallScript": true,
       "funding": {
@@ -3306,12 +3730,12 @@
       }
     },
     "node_modules/core-js-compat": {
-      "version": "3.29.1",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.29.1.tgz",
-      "integrity": "sha512-QmchCua884D8wWskMX8tW5ydINzd8oSJVx38lx/pVkFGqztxt73GYre3pm/hyYq8bPf+MW5In4I/uRShFDsbrA==",
+      "version": "3.32.1",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.32.1.tgz",
+      "integrity": "sha512-GSvKDv4wE0bPnQtjklV101juQ85g6H3rm5PDP20mqlS5j0kXF3pP97YvAu5hl+uFHqMictp3b2VxOHljWMAtuA==",
       "dev": true,
       "dependencies": {
-        "browserslist": "^4.21.5"
+        "browserslist": "^4.21.10"
       },
       "funding": {
         "type": "opencollective",
@@ -3340,6 +3764,11 @@
         "node": ">=10"
       }
     },
+    "node_modules/crelt": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz",
+      "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g=="
+    },
     "node_modules/cropperjs": {
       "version": "1.5.13",
       "resolved": "https://registry.npmjs.org/cropperjs/-/cropperjs-1.5.13.tgz",
@@ -3368,9 +3797,9 @@
       }
     },
     "node_modules/css-declaration-sorter": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz",
-      "integrity": "sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz",
+      "integrity": "sha512-rtdthzxKuyq6IzqX6jEcIzQF/YqccluefyCYheovBOLhFT/drQA9zj/UbRAa9J7C0o6EG6u3E6g+vKkay7/k3g==",
       "dev": true,
       "engines": {
         "node": "^10 || ^12 || >=14"
@@ -3380,9 +3809,9 @@
       }
     },
     "node_modules/css-functions-list": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.1.0.tgz",
-      "integrity": "sha512-/9lCvYZaUbBGvYUgYGFJ4dcYiyqdhSjG7IPVluoV8A1ILjkF7ilmhp1OGUz8n+nmBcu0RNrQAzgD8B6FJbrt2w==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.0.tgz",
+      "integrity": "sha512-d/jBMPyYybkkLVypgtGv12R+pIFw4/f/IHtCTxWpZc8ofTYOPigIgmA6vu5rMHartZC+WuXhBUHfnyNUIQSYrg==",
       "dev": true,
       "engines": {
         "node": ">=12.22"
@@ -3404,6 +3833,58 @@
         "url": "https://github.com/sponsors/fb55"
       }
     },
+    "node_modules/css-select/node_modules/dom-serializer": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.2.0",
+        "entities": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+      }
+    },
+    "node_modules/css-select/node_modules/domhandler": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.2.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
+      }
+    },
+    "node_modules/css-select/node_modules/domutils": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+      "dev": true,
+      "dependencies": {
+        "dom-serializer": "^1.0.1",
+        "domelementtype": "^2.2.0",
+        "domhandler": "^4.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
+      }
+    },
+    "node_modules/css-select/node_modules/entities": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
     "node_modules/css-tree": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
@@ -3540,15 +4021,15 @@
       "integrity": "sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg=="
     },
     "node_modules/cypress": {
-      "version": "12.8.1",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.8.1.tgz",
-      "integrity": "sha512-lIFbKdaSYAOarNLHNFa2aPZu6YSF+8UY4VRXMxJrFUnk6RvfG0AWsZ7/qle/aIz30TNUD4aOihz2ZgS4vuQVSA==",
+      "version": "12.17.4",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.4.tgz",
+      "integrity": "sha512-gAN8Pmns9MA5eCDFSDJXWKUpaL3IDd89N9TtIupjYnzLSmlpVr+ZR+vb4U/qaMp+lB6tBvAmt7504c3Z4RU5KQ==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
-        "@cypress/request": "^2.88.10",
+        "@cypress/request": "2.88.12",
         "@cypress/xvfb": "^1.2.4",
-        "@types/node": "^14.14.31",
+        "@types/node": "^16.18.39",
         "@types/sinonjs__fake-timers": "8.1.1",
         "@types/sizzle": "^2.3.2",
         "arch": "^2.2.0",
@@ -3560,7 +4041,7 @@
         "check-more-types": "^2.24.0",
         "cli-cursor": "^3.1.0",
         "cli-table3": "~0.6.1",
-        "commander": "^5.1.0",
+        "commander": "^6.2.1",
         "common-tags": "^1.8.0",
         "dayjs": "^1.10.4",
         "debug": "^4.3.4",
@@ -3578,12 +4059,13 @@
         "listr2": "^3.8.3",
         "lodash": "^4.17.21",
         "log-symbols": "^4.0.0",
-        "minimist": "^1.2.6",
+        "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.3.2",
+        "semver": "^7.5.3",
         "supports-color": "^8.1.1",
         "tmp": "~0.2.1",
         "untildify": "^4.0.0",
@@ -3597,9 +4079,9 @@
       }
     },
     "node_modules/cypress/node_modules/@types/node": {
-      "version": "14.18.40",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.40.tgz",
-      "integrity": "sha512-pGteXO/JQX7wPxGR8lyT+doqjMa7XvlVowwrDwLfX92k5SdLkk4cwC7CYSLBxrenw/R5oQwKioVIak7ZgplM3g==",
+      "version": "16.18.41",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.41.tgz",
+      "integrity": "sha512-YZJjn+Aaw0xihnpdImxI22jqGbp0DCgTFKRycygjGx/Y27NnWFJa5FJ7P+MRT3u07dogEeMVh70pWpbIQollTA==",
       "dev": true
     },
     "node_modules/cypress/node_modules/ansi-styles": {
@@ -3664,9 +4146,9 @@
       "dev": true
     },
     "node_modules/cypress/node_modules/commander": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
-      "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
+      "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
       "dev": true,
       "engines": {
         "node": ">= 6"
@@ -3709,9 +4191,9 @@
       }
     },
     "node_modules/cypress/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -3757,9 +4239,9 @@
       }
     },
     "node_modules/dayjs": {
-      "version": "1.11.7",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz",
-      "integrity": "sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==",
+      "version": "1.11.9",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.9.tgz",
+      "integrity": "sha512-QvzAURSbQ0pKdIye2txOzNaHmxtUBXerpY0FJsFXUMKbIZeFm5ht1LS/jFsrncjnmtv8HsG0W2g6c0zUjZWmpA==",
       "dev": true
     },
     "node_modules/debug": {
@@ -3885,14 +4367,14 @@
       }
     },
     "node_modules/dom-serializer": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
+      "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
       "dev": true,
       "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.0",
-        "entities": "^2.0.0"
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.2",
+        "entities": "^4.2.0"
       },
       "funding": {
         "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
@@ -3916,12 +4398,12 @@
       ]
     },
     "node_modules/domhandler": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
-      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
+      "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
       "dev": true,
       "dependencies": {
-        "domelementtype": "^2.2.0"
+        "domelementtype": "^2.3.0"
       },
       "engines": {
         "node": ">= 4"
@@ -3931,25 +4413,28 @@
       }
     },
     "node_modules/domutils": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
+      "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
       "dev": true,
       "dependencies": {
-        "dom-serializer": "^1.0.1",
-        "domelementtype": "^2.2.0",
-        "domhandler": "^4.2.0"
+        "dom-serializer": "^2.0.0",
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3"
       },
       "funding": {
         "url": "https://github.com/fb55/domutils?sponsor=1"
       }
     },
     "node_modules/dotenv": {
-      "version": "16.0.3",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.3.tgz",
-      "integrity": "sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==",
+      "version": "16.3.1",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz",
+      "integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==",
       "engines": {
         "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/motdotla/dotenv?sponsor=1"
       }
     },
     "node_modules/dragula": {
@@ -3972,9 +4457,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.337",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.337.tgz",
-      "integrity": "sha512-W8gdzXG86mVPoc56eM8YA+QiLxaAxJ8cmDjxZgfhLLWVvZQxyA918w5tX2JEWApZta45T1/sYcmFHTsTOUE3nw==",
+      "version": "1.4.496",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.496.tgz",
+      "integrity": "sha512-qeXC3Zbykq44RCrBa4kr8v/dWzYJA8rAwpyh9Qd+NKWoJfjG5vvJqy9XOJ9H4P/lqulZBCgUWAYi+FeK5AuJ8g==",
       "dev": true
     },
     "node_modules/emoji-regex": {
@@ -3983,6 +4468,15 @@
       "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
       "dev": true
     },
+    "node_modules/encoding-japanese": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/encoding-japanese/-/encoding-japanese-2.0.0.tgz",
+      "integrity": "sha512-++P0RhebUC8MJAwJOsT93dT+5oc5oPImp1HubZpAuCZ5kTLnhuuBhKHj2jJeO/Gj93idPBWmIuQ9QWMe5rX3pQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
     "node_modules/end-of-stream": {
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
@@ -3993,22 +4487,26 @@
       }
     },
     "node_modules/enquirer": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz",
+      "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==",
       "dev": true,
       "dependencies": {
-        "ansi-colors": "^4.1.1"
+        "ansi-colors": "^4.1.1",
+        "strip-ansi": "^6.0.1"
       },
       "engines": {
         "node": ">=8.6"
       }
     },
     "node_modules/entities": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
       "dev": true,
+      "engines": {
+        "node": ">=0.12"
+      },
       "funding": {
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
@@ -4023,18 +4521,19 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.21.2",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz",
-      "integrity": "sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==",
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz",
+      "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==",
       "dev": true,
       "dependencies": {
         "array-buffer-byte-length": "^1.0.0",
+        "arraybuffer.prototype.slice": "^1.0.1",
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
         "es-set-tostringtag": "^2.0.1",
         "es-to-primitive": "^1.2.1",
         "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.2.0",
+        "get-intrinsic": "^1.2.1",
         "get-symbol-description": "^1.0.0",
         "globalthis": "^1.0.3",
         "gopd": "^1.0.1",
@@ -4054,14 +4553,18 @@
         "object-inspect": "^1.12.3",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.4.3",
+        "regexp.prototype.flags": "^1.5.0",
+        "safe-array-concat": "^1.0.0",
         "safe-regex-test": "^1.0.0",
         "string.prototype.trim": "^1.2.7",
         "string.prototype.trimend": "^1.0.6",
         "string.prototype.trimstart": "^1.0.6",
+        "typed-array-buffer": "^1.0.0",
+        "typed-array-byte-length": "^1.0.0",
+        "typed-array-byte-offset": "^1.0.0",
         "typed-array-length": "^1.0.4",
         "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.9"
+        "which-typed-array": "^1.1.10"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4070,6 +4573,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/es-module-shims": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/es-module-shims/-/es-module-shims-1.8.0.tgz",
+      "integrity": "sha512-5l/AqgnWvYFF38qkK8VNoQ8BL3LkJ8bAJuxhOKA/JqoLC4bcaeJeLwMkhEcrDsf5IUCDdwZ6eEG40+Xuh/APcQ=="
+    },
     "node_modules/es-set-tostringtag": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
@@ -4129,27 +4637,27 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.36.0.tgz",
-      "integrity": "sha512-Y956lmS7vDqomxlaaQAHVmeb4tNMp2FWIvU/RnU5BD3IKMD/MJPr76xdyr68P8tV1iNMvN2mRK0yy3c+UjL+bw==",
+      "version": "8.47.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.47.0.tgz",
+      "integrity": "sha512-spUQWrdPt+pRVP1TTJLmfRNJJHHZryFmptzcafwSvHsceV81djHOdnEeDmkdotZyLNjDhrOasNK8nikkoG1O8Q==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.4.0",
-        "@eslint/eslintrc": "^2.0.1",
-        "@eslint/js": "8.36.0",
-        "@humanwhocodes/config-array": "^0.11.8",
+        "@eslint-community/regexpp": "^4.6.1",
+        "@eslint/eslintrc": "^2.1.2",
+        "@eslint/js": "^8.47.0",
+        "@humanwhocodes/config-array": "^0.11.10",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
-        "ajv": "^6.10.0",
+        "ajv": "^6.12.4",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
         "debug": "^4.3.2",
         "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.1.1",
-        "eslint-visitor-keys": "^3.3.0",
-        "espree": "^9.5.0",
+        "eslint-scope": "^7.2.2",
+        "eslint-visitor-keys": "^3.4.3",
+        "espree": "^9.6.1",
         "esquery": "^1.4.2",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
@@ -4157,22 +4665,19 @@
         "find-up": "^5.0.0",
         "glob-parent": "^6.0.2",
         "globals": "^13.19.0",
-        "grapheme-splitter": "^1.0.4",
+        "graphemer": "^1.4.0",
         "ignore": "^5.2.0",
-        "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
         "is-path-inside": "^3.0.3",
-        "js-sdsl": "^4.1.4",
         "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.4.1",
         "lodash.merge": "^4.6.2",
         "minimatch": "^3.1.2",
         "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
+        "optionator": "^0.9.3",
         "strip-ansi": "^6.0.1",
-        "strip-json-comments": "^3.1.0",
         "text-table": "^0.2.0"
       },
       "bin": {
@@ -4205,14 +4710,14 @@
       }
     },
     "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.7",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz",
-      "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==",
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
+      "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
       "dev": true,
       "dependencies": {
         "debug": "^3.2.7",
-        "is-core-module": "^2.11.0",
-        "resolve": "^1.22.1"
+        "is-core-module": "^2.13.0",
+        "resolve": "^1.22.4"
       }
     },
     "node_modules/eslint-import-resolver-node/node_modules/debug": {
@@ -4225,9 +4730,9 @@
       }
     },
     "node_modules/eslint-module-utils": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
-      "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz",
+      "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==",
       "dev": true,
       "dependencies": {
         "debug": "^3.2.7"
@@ -4251,26 +4756,28 @@
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.27.5",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz",
-      "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==",
+      "version": "2.28.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.1.tgz",
+      "integrity": "sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==",
       "dev": true,
       "dependencies": {
         "array-includes": "^3.1.6",
+        "array.prototype.findlastindex": "^1.2.2",
         "array.prototype.flat": "^1.3.1",
         "array.prototype.flatmap": "^1.3.1",
         "debug": "^3.2.7",
         "doctrine": "^2.1.0",
         "eslint-import-resolver-node": "^0.3.7",
-        "eslint-module-utils": "^2.7.4",
+        "eslint-module-utils": "^2.8.0",
         "has": "^1.0.3",
-        "is-core-module": "^2.11.0",
+        "is-core-module": "^2.13.0",
         "is-glob": "^4.0.3",
         "minimatch": "^3.1.2",
+        "object.fromentries": "^2.0.6",
+        "object.groupby": "^1.0.0",
         "object.values": "^1.1.6",
-        "resolve": "^1.22.1",
-        "semver": "^6.3.0",
-        "tsconfig-paths": "^3.14.1"
+        "semver": "^6.3.1",
+        "tsconfig-paths": "^3.14.2"
       },
       "engines": {
         "node": ">=4"
@@ -4333,9 +4840,9 @@
       }
     },
     "node_modules/eslint-plugin-vue/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -4354,9 +4861,9 @@
       "dev": true
     },
     "node_modules/eslint-scope": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
       "dev": true,
       "dependencies": {
         "esrecurse": "^4.3.0",
@@ -4364,6 +4871,9 @@
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
     "node_modules/eslint-utils": {
@@ -4394,12 +4904,15 @@
       }
     },
     "node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
     "node_modules/eslint/node_modules/ansi-styles": {
@@ -4476,9 +4989,9 @@
       }
     },
     "node_modules/eslint/node_modules/globals": {
-      "version": "13.20.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
-      "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+      "version": "13.21.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz",
+      "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -4524,14 +5037,14 @@
       }
     },
     "node_modules/espree": {
-      "version": "9.5.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.0.tgz",
-      "integrity": "sha512-JPbJGhKc47++oo4JkEoTe2wjy4fmMwvFpgJT9cQzmfXKp22Dr6Hf1tdCteLz1h0P3t+mGvWZ+4Uankvh8+c6zw==",
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
       "dev": true,
       "dependencies": {
-        "acorn": "^8.8.0",
+        "acorn": "^8.9.0",
         "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.3.0"
+        "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -4670,9 +5183,9 @@
       "dev": true
     },
     "node_modules/fast-glob": {
-      "version": "3.2.12",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
-      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
+      "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
       "dev": true,
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
@@ -4846,9 +5359,9 @@
       }
     },
     "node_modules/fraction.js": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
-      "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.1.tgz",
+      "integrity": "sha512-/KxoyCnPM0GwYI4NN0Iag38Tqt+od3/mLuguepLgCAKPn0ZhC544nssAW0tG2/00zXEYl9W+7hwAIpLHo6Oc7Q==",
       "dev": true,
       "engines": {
         "node": "*"
@@ -4943,13 +5456,14 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz",
-      "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
+      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
       "dev": true,
       "dependencies": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
+        "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3"
       },
       "funding": {
@@ -5173,10 +5687,10 @@
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
       "dev": true
     },
-    "node_modules/grapheme-splitter": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
+    "node_modules/graphemer": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
       "dev": true
     },
     "node_modules/hard-rejection": {
@@ -5275,6 +5789,15 @@
       "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
       "dev": true
     },
+    "node_modules/he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "dev": true,
+      "bin": {
+        "he": "bin/he"
+      }
+    },
     "node_modules/hosted-git-info": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
@@ -5306,14 +5829,14 @@
       "dev": true
     },
     "node_modules/hotkeys-js": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/hotkeys-js/-/hotkeys-js-3.10.1.tgz",
-      "integrity": "sha512-mshqjgTqx8ee0qryHvRgZaZDxTwxam/2yTQmQlqAWS3+twnq1jsY9Yng9zB7lWq6WRrjTbTOc7knNwccXQiAjQ=="
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/hotkeys-js/-/hotkeys-js-3.12.0.tgz",
+      "integrity": "sha512-Z+N573ycUKIGwFYS3ID1RzMJiGmtWMGKMiaNLyJS8B1ei+MllF4ZYmKS2T0kMWBktOz+WZLVNikftEgnukOrXg=="
     },
     "node_modules/html-tags": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.2.0.tgz",
-      "integrity": "sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.3.1.tgz",
+      "integrity": "sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
@@ -5322,6 +5845,41 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/html-to-text": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/html-to-text/-/html-to-text-9.0.5.tgz",
+      "integrity": "sha512-qY60FjREgVZL03vJU6IfMV4GDjGBIoOyvuFdpBDIX9yTlDw0TjxVBQp+P8NvpdIXNJvfWBTNul7fsAQJq2FNpg==",
+      "dev": true,
+      "dependencies": {
+        "@selderee/plugin-htmlparser2": "^0.11.0",
+        "deepmerge": "^4.3.1",
+        "dom-serializer": "^2.0.0",
+        "htmlparser2": "^8.0.2",
+        "selderee": "^0.11.0"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/htmlparser2": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz",
+      "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==",
+      "dev": true,
+      "funding": [
+        "https://github.com/fb55/htmlparser2?sponsor=1",
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "dependencies": {
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3",
+        "domutils": "^3.0.1",
+        "entities": "^4.4.0"
+      }
+    },
     "node_modules/http-signature": {
       "version": "1.3.6",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz",
@@ -5345,6 +5903,18 @@
         "node": ">=8.12.0"
       }
     },
+    "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,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/ieee754": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
@@ -5375,9 +5945,9 @@
       }
     },
     "node_modules/immutable": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.0.tgz",
-      "integrity": "sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg==",
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.2.tgz",
+      "integrity": "sha512-oGXzbEDem9OOpDWZu88jGiYCvIsLHMvGw+8OXlpsvTFvIQplQbjg1B1cvKg8f7Hoch6+NGjpPsH1Fr+Mc2D1aA==",
       "dev": true
     },
     "node_modules/import-fresh": {
@@ -5462,6 +6032,12 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/ipv6-normalize": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ipv6-normalize/-/ipv6-normalize-1.0.1.tgz",
+      "integrity": "sha512-Bm6H79i01DjgGTCWjUuCjJ6QDo1HB96PT/xCYuyJUP9WFbVDrLSbG4EZCvOCun2rNswZb0c3e4Jt/ws795esHA==",
+      "dev": true
+    },
     "node_modules/is-array-buffer": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
@@ -5562,9 +6138,9 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz",
+      "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
       "dev": true,
       "dependencies": {
         "has": "^1.0.3"
@@ -5783,16 +6359,12 @@
       }
     },
     "node_modules/is-typed-array": {
-      "version": "1.1.10",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz",
-      "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
+      "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
       "dev": true,
       "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0"
+        "which-typed-array": "^1.1.11"
       },
       "engines": {
         "node": ">= 0.4"
@@ -5867,9 +6439,9 @@
       "integrity": "sha512-Rgm5yjvYn3C9juR9QMU/8H4mBXtpayb6zfgA5uIx7EHgGjGQzk3njCykatC7mrcrIjp3Fei5hghP5nHpQxlbGg=="
     },
     "node_modules/jquery": {
-      "version": "3.6.4",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.4.tgz",
-      "integrity": "sha512-v28EW9DWDFpzcD9O5iyJXg3R3+q+mET5JhnjJzQUZMHOv67bpSIHq81GEYpPNZHG+XXHsfSme3nxp/hndKEcsQ=="
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.0.tgz",
+      "integrity": "sha512-umpJ0/k8X0MvD1ds0P9SfowREz2LenHsQaxSohMZ5OMNEU2r0tf8pdeEFTHMFxWVxKNyU9rTtK3CWzUCTKJUeQ=="
     },
     "node_modules/jquery-migrate": {
       "version": "3.4.1",
@@ -5879,16 +6451,6 @@
         "jquery": ">=3 <4"
       }
     },
-    "node_modules/js-sdsl": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.4.0.tgz",
-      "integrity": "sha512-FfVSdx6pJ41Oa+CF7RDaFmTnCaFhua+SNYQX74riGOpl96x+2jQCqEfQ2bnXu/5DPCqlRuiqyvTJM0Qjz26IVg==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/js-sdsl"
-      }
-    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -6018,6 +6580,15 @@
         "node": "> 0.8"
       }
     },
+    "node_modules/leac": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/leac/-/leac-0.6.0.tgz",
+      "integrity": "sha512-y+SqErxb8h7nE/fiEX07jsbuhrpO9lL8eca7/Y1nuWV2moNlXhyd59iDGcRf6moVyDMbmTNzL40SUyrFU/yDpg==",
+      "dev": true,
+      "funding": {
+        "url": "https://ko-fi.com/killymxi"
+      }
+    },
     "node_modules/levn": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
@@ -6031,6 +6602,30 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/libbase64": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/libbase64/-/libbase64-1.2.1.tgz",
+      "integrity": "sha512-l+nePcPbIG1fNlqMzrh68MLkX/gTxk/+vdvAb388Ssi7UuUN31MI44w4Yf33mM3Cm4xDfw48mdf3rkdHszLNew==",
+      "dev": true
+    },
+    "node_modules/libmime": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/libmime/-/libmime-5.2.1.tgz",
+      "integrity": "sha512-A0z9O4+5q+ZTj7QwNe/Juy1KARNb4WaviO4mYeFC4b8dBT2EEqK2pkM+GC8MVnkOjqhl5nYQxRgnPYRRTNmuSQ==",
+      "dev": true,
+      "dependencies": {
+        "encoding-japanese": "2.0.0",
+        "iconv-lite": "0.6.3",
+        "libbase64": "1.2.1",
+        "libqp": "2.0.1"
+      }
+    },
+    "node_modules/libqp": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/libqp/-/libqp-2.0.1.tgz",
+      "integrity": "sha512-Ka0eC5LkF3IPNQHJmYBWljJsw0UvM6j+QdKRbWyCdTmYwvIDE6a7bCm0UkTAL/K+3KXK5qXT/ClcInU01OpdLg==",
+      "dev": true
+    },
     "node_modules/lilconfig": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
@@ -6046,6 +6641,15 @@
       "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
       "dev": true
     },
+    "node_modules/linkify-it": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz",
+      "integrity": "sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==",
+      "dev": true,
+      "dependencies": {
+        "uc.micro": "^1.0.1"
+      }
+    },
     "node_modules/listr2": {
       "version": "3.14.0",
       "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz",
@@ -6315,6 +6919,46 @@
         "sourcemap-codec": "^1.4.8"
       }
     },
+    "node_modules/mailparser": {
+      "version": "3.6.5",
+      "resolved": "https://registry.npmjs.org/mailparser/-/mailparser-3.6.5.tgz",
+      "integrity": "sha512-nteTpF0Khm5JLOnt4sigmzNdUH/6mO7PZ4KEnvxf4mckyXYFFhrtAWZzbq/V5aQMH+049gA7ZjfLdh+QiX2Uqg==",
+      "dev": true,
+      "dependencies": {
+        "encoding-japanese": "2.0.0",
+        "he": "1.2.0",
+        "html-to-text": "9.0.5",
+        "iconv-lite": "0.6.3",
+        "libmime": "5.2.1",
+        "linkify-it": "4.0.1",
+        "mailsplit": "5.4.0",
+        "nodemailer": "6.9.3",
+        "tlds": "1.240.0"
+      }
+    },
+    "node_modules/mailsplit": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/mailsplit/-/mailsplit-5.4.0.tgz",
+      "integrity": "sha512-wnYxX5D5qymGIPYLwnp6h8n1+6P6vz/MJn5AzGjZ8pwICWssL+CCQjWBIToOVHASmATot4ktvlLo6CyLfOXWYA==",
+      "dev": true,
+      "dependencies": {
+        "libbase64": "1.2.1",
+        "libmime": "5.2.0",
+        "libqp": "2.0.1"
+      }
+    },
+    "node_modules/mailsplit/node_modules/libmime": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/libmime/-/libmime-5.2.0.tgz",
+      "integrity": "sha512-X2U5Wx0YmK0rXFbk67ASMeqYIkZ6E5vY7pNWRKtnNzqjvdYYG8xtPDpCnuUEnPU9vlgNev+JoSrcaKSUaNvfsw==",
+      "dev": true,
+      "dependencies": {
+        "encoding-japanese": "2.0.0",
+        "iconv-lite": "0.6.3",
+        "libbase64": "1.2.1",
+        "libqp": "2.0.1"
+      }
+    },
     "node_modules/map-obj": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
@@ -6538,9 +7182,15 @@
       "dev": true
     },
     "node_modules/nanoid": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
+      "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -6555,11 +7205,20 @@
       "dev": true
     },
     "node_modules/node-releases": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz",
-      "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==",
+      "version": "2.0.13",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
+      "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==",
       "dev": true
     },
+    "node_modules/nodemailer": {
+      "version": "6.9.3",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.3.tgz",
+      "integrity": "sha512-fy9v3NgTzBngrMFkDsKEj0r02U7jm6XfC3b52eoNV+GCrGj+s8pt5OqhiJdWKuw51zCTdiNR/IUD1z33LIIGpg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
     "node_modules/normalize-package-data": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
@@ -6588,9 +7247,9 @@
       }
     },
     "node_modules/normalize-package-data/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -6712,6 +7371,35 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/object.fromentries": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
+      "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.groupby": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.0.tgz",
+      "integrity": "sha512-70MWG6NfRH9GnbZOikuhPPYzpUpof9iW2J9E4dW7FXTqPNb6rllE6u39SKwwiNh8lCwX3DDb5OgcKGiEBrTTyw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.21.2",
+        "get-intrinsic": "^1.2.1"
+      }
+    },
     "node_modules/object.values": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
@@ -6754,17 +7442,17 @@
       }
     },
     "node_modules/optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
+      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
       "dev": true,
       "dependencies": {
+        "@aashutoshrathi/word-wrap": "^1.2.3",
         "deep-is": "^0.1.3",
         "fast-levenshtein": "^2.0.6",
         "levn": "^0.4.1",
         "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
+        "type-check": "^0.4.0"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -6860,6 +7548,19 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/parseley": {
+      "version": "0.12.1",
+      "resolved": "https://registry.npmjs.org/parseley/-/parseley-0.12.1.tgz",
+      "integrity": "sha512-e6qHKe3a9HWr0oMRVDTRhKce+bRO8VGQR3NyVwcjwrbhMmFCX9KszEV35+rn4AdilFAq9VPxP/Fe1wC9Qjd2lw==",
+      "dev": true,
+      "dependencies": {
+        "leac": "^0.6.0",
+        "peberminta": "^0.9.0"
+      },
+      "funding": {
+        "url": "https://ko-fi.com/killymxi"
+      }
+    },
     "node_modules/path-exists": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -6902,6 +7603,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/peberminta": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/peberminta/-/peberminta-0.9.0.tgz",
+      "integrity": "sha512-XIxfHpEuSJbITd1H3EeQwpcZbTLHc+VVr8ANI9t5sit565tsI4/xK3KWTUFE2e6QiangUkh3B0jihzmGnNrRsQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://ko-fi.com/killymxi"
+      }
+    },
     "node_modules/pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
@@ -6941,9 +7651,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.21",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz",
-      "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==",
+      "version": "8.4.28",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.28.tgz",
+      "integrity": "sha512-Z7V5j0cq8oEKyejIKfpD8b4eBy9cwW2JWPk0+fB1HOAMsfHbnAXLLS+PfVWlzMSLQaWttKDt607I0XHmpE67Vw==",
       "funding": [
         {
           "type": "opencollective",
@@ -6952,10 +7662,14 @@
         {
           "type": "tidelift",
           "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
         }
       ],
       "dependencies": {
-        "nanoid": "^3.3.4",
+        "nanoid": "^3.3.6",
         "picocolors": "^1.0.0",
         "source-map-js": "^1.0.2"
       },
@@ -7366,9 +8080,9 @@
       }
     },
     "node_modules/postcss-scss": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.6.tgz",
-      "integrity": "sha512-rLDPhJY4z/i4nVFZ27j9GqLxj1pwxE80eAzUNRMXtcpipFYIeowerzBgG3yJhMtObGEXidtIgbUpQ3eLDsf5OQ==",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.7.tgz",
+      "integrity": "sha512-xPv2GseoyXPa58Nro7M73ZntttusuCmZdeOojUFR5PZDz2BR62vfYx1w9TyOnp1+nYFowgOMipsCBhxzVkAEPw==",
       "dev": true,
       "funding": [
         {
@@ -7378,6 +8092,10 @@
         {
           "type": "tidelift",
           "url": "https://tidelift.com/funding/github/npm/postcss-scss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
         }
       ],
       "engines": {
@@ -7388,9 +8106,9 @@
       }
     },
     "node_modules/postcss-selector-parser": {
-      "version": "6.0.11",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz",
-      "integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==",
+      "version": "6.0.13",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
+      "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
       "dev": true,
       "dependencies": {
         "cssesc": "^3.0.0",
@@ -7447,9 +8165,9 @@
       "dev": true
     },
     "node_modules/postgres": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/postgres/-/postgres-3.3.4.tgz",
-      "integrity": "sha512-XVu0+d/Y56pl2lSaf0c7V19AhAEfpVrhID1IENWN8nf0xch6hFq6dAov5dtUX6ZD46wfr1TxvLhxLtV8WnNsOg==",
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/postgres/-/postgres-3.3.5.tgz",
+      "integrity": "sha512-+JD93VELV9gHkqpV5gdL5/70HdGtEw4/XE1S4BC8f1mcPmdib3K5XsKVbnR1XcAyC41zOnifJ+9YRKxdIsXiUw==",
       "dev": true,
       "funding": {
         "type": "individual",
@@ -7541,6 +8259,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+      "dev": true
+    },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
@@ -7682,9 +8406,9 @@
       }
     },
     "node_modules/read-pkg/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
       "dev": true,
       "bin": {
         "semver": "bin/semver"
@@ -7784,28 +8508,28 @@
       }
     },
     "node_modules/regenerator-runtime": {
-      "version": "0.13.11",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
+      "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
     },
     "node_modules/regenerator-transform": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz",
-      "integrity": "sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==",
+      "version": "0.15.2",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
+      "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
       "dev": true,
       "dependencies": {
         "@babel/runtime": "^7.8.4"
       }
     },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
+      "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
+        "define-properties": "^1.2.0",
+        "functions-have-names": "^1.2.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7870,13 +8594,19 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+      "dev": true
+    },
     "node_modules/resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+      "version": "1.22.4",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz",
+      "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==",
       "dev": true,
       "dependencies": {
-        "is-core-module": "^2.9.0",
+        "is-core-module": "^2.13.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
@@ -8028,14 +8758,38 @@
       }
     },
     "node_modules/rxjs": {
-      "version": "7.8.0",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz",
-      "integrity": "sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==",
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
       "dev": true,
       "dependencies": {
         "tslib": "^2.1.0"
       }
     },
+    "node_modules/safe-array-concat": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz",
+      "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.0",
+        "has-symbols": "^1.0.3",
+        "isarray": "^2.0.5"
+      },
+      "engines": {
+        "node": ">=0.4"
+      },
+      "funding": {
+        "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
+    },
     "node_modules/safe-buffer": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -8077,35 +8831,36 @@
       "dev": true
     },
     "node_modules/sass-embedded": {
-      "version": "1.59.3",
-      "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.59.3.tgz",
-      "integrity": "sha512-HLyVxBCPzd4Z9EXrX11w3auKaajF3JWWETxagiGCxKKAsmA6SXDnXAkvU3gGhZQMFfDq6CiI5S7ISRn1dp2DCA==",
+      "version": "1.66.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.66.1.tgz",
+      "integrity": "sha512-bHTFMSpcIJxrCav9ac69dMMYoiWIhiw/88eApojX7j1gsCAAx3nQMkTKr7FKIVVofWla8sE1KM9qtFya2k8svw==",
       "dev": true,
       "dependencies": {
         "@bufbuild/protobuf": "^1.0.0",
         "buffer-builder": "^0.2.0",
         "immutable": "^4.0.0",
         "rxjs": "^7.4.0",
-        "supports-color": "^8.1.1"
+        "supports-color": "^8.1.1",
+        "varint": "^6.0.0"
       },
       "engines": {
         "node": ">=14.0.0"
       },
       "optionalDependencies": {
-        "sass-embedded-darwin-arm64": "1.59.3",
-        "sass-embedded-darwin-x64": "1.59.3",
-        "sass-embedded-linux-arm": "1.59.3",
-        "sass-embedded-linux-arm64": "1.59.3",
-        "sass-embedded-linux-ia32": "1.59.3",
-        "sass-embedded-linux-x64": "1.59.3",
-        "sass-embedded-win32-ia32": "1.59.3",
-        "sass-embedded-win32-x64": "1.59.3"
+        "sass-embedded-darwin-arm64": "1.66.1",
+        "sass-embedded-darwin-x64": "1.66.1",
+        "sass-embedded-linux-arm": "1.66.1",
+        "sass-embedded-linux-arm64": "1.66.1",
+        "sass-embedded-linux-ia32": "1.66.1",
+        "sass-embedded-linux-x64": "1.66.1",
+        "sass-embedded-win32-ia32": "1.66.1",
+        "sass-embedded-win32-x64": "1.66.1"
       }
     },
     "node_modules/sass-embedded-darwin-arm64": {
-      "version": "1.59.3",
-      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.59.3.tgz",
-      "integrity": "sha512-Cu9AaYVOFhA5WO4YucYXhIytOPL2eID6deoT4woKO+u+dta8MHOTK0HZz3mh3BJcuwTTVLAtgJsJyyRmik6TEw==",
+      "version": "1.66.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.66.1.tgz",
+      "integrity": "sha512-XdvA4KThDRLvUweMGWEsEd3swOSeiGuLelNUKbvB4H3Peh+O0m9XfKwWxh1FJZP0gVK3moMXPyVflYrUWVHGCA==",
       "cpu": [
         "arm64"
       ],
@@ -8114,14 +8869,17 @@
       "os": [
         "darwin"
       ],
+      "bin": {
+        "sass": "dart-sass/sass"
+      },
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/sass-embedded-darwin-x64": {
-      "version": "1.59.3",
-      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.59.3.tgz",
-      "integrity": "sha512-ZRW6vzH8GOpMIrBZ3ooa5i2JO/Vmll0NaFKuvIV8TmqSR1gihYQ41tYzJMTiVcpGrK1/M04lJo2T+ozikEOFaQ==",
+      "version": "1.66.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.66.1.tgz",
+      "integrity": "sha512-y3kLVhFPFUvN+uZwNhl0wZ4V7ghPzXxOwoTC1n6LHUe/xRcDP5Nl+7zBHpwhW94lLgjDhEd1+mnpz8HGVHdIAw==",
       "cpu": [
         "x64"
       ],
@@ -8130,14 +8888,17 @@
       "os": [
         "darwin"
       ],
+      "bin": {
+        "sass": "dart-sass/sass"
+      },
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/sass-embedded-linux-arm": {
-      "version": "1.59.3",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.59.3.tgz",
-      "integrity": "sha512-oaxTjBnknTymeOJaKOzcbcgdDe2pQ+fKgu2zFwM+dA0ZAiDPIQyTooSo+UNxNfbQgYlvUQphpyPGnJqfZ1PwuQ==",
+      "version": "1.66.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.66.1.tgz",
+      "integrity": "sha512-lPkMTR0Wwc9NTuvWsKo4a+/slHFcEypPpjfL+HFKaoq4NqMkX/DBewD5wl9rA45KCfJ47wf47H4aJ0Qcd82Iyg==",
       "cpu": [
         "arm"
       ],
@@ -8146,14 +8907,17 @@
       "os": [
         "linux"
       ],
+      "bin": {
+        "sass": "dart-sass/sass"
+      },
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/sass-embedded-linux-arm64": {
-      "version": "1.59.3",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.59.3.tgz",
-      "integrity": "sha512-d4PdJ8OvuSJNzSHCEC3Jxd3trx1nV/er41W8O9jH4FXd4CBPJG/+4igL/GCI4W9lxRvw64Qq0lHuKYAyTV8B1Q==",
+      "version": "1.66.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.66.1.tgz",
+      "integrity": "sha512-HPy8ScfUMSdG5TjRSsr6rnGQjG/PzyslwVGL0UB+8LTkj2PyDEu35jmHBgWggSCmIqvu7phw4OgiWEUuaxwXgg==",
       "cpu": [
         "arm64"
       ],
@@ -8162,14 +8926,17 @@
       "os": [
         "linux"
       ],
+      "bin": {
+        "sass": "dart-sass/sass"
+      },
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/sass-embedded-linux-ia32": {
-      "version": "1.59.3",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-ia32/-/sass-embedded-linux-ia32-1.59.3.tgz",
-      "integrity": "sha512-E/gXl/i309IjLizStZxKlQGhvDmQvOy7AFyYuix03xJ8IwynAp9Jt+3TcZPksKdmADkPIQk46EV90f3i1qv/CQ==",
+      "version": "1.66.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-ia32/-/sass-embedded-linux-ia32-1.66.1.tgz",
+      "integrity": "sha512-DhxaQpWNpPrvSCFqgWUWv0dlnB6PzLBeMaA87pILCgJGnJs2vaPYr5JgVBK+nFQYaKVZ3PC5K0OfcY8ruQVdPw==",
       "cpu": [
         "ia32"
       ],
@@ -8178,14 +8945,17 @@
       "os": [
         "linux"
       ],
+      "bin": {
+        "sass": "dart-sass/sass"
+      },
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/sass-embedded-linux-x64": {
-      "version": "1.59.3",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.59.3.tgz",
-      "integrity": "sha512-VMvcQ8K4Z9ofD4wYJBdqPgXN5nkGinoKOuZCoKgtGX75qqmtledtWkeF+BQGlzZv+esbklop8y2lAzXvuhUprQ==",
+      "version": "1.66.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.66.1.tgz",
+      "integrity": "sha512-tIRa/fn34x4NrbSEmfekAcQSHPKheNJ+/uqCGmxeBSr7Yw7S4CoP1/yvtY/geKmx4uSmgSJhdEYB9X1f+MoSQw==",
       "cpu": [
         "x64"
       ],
@@ -8194,14 +8964,17 @@
       "os": [
         "linux"
       ],
+      "bin": {
+        "sass": "dart-sass/sass"
+      },
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/sass-embedded-win32-ia32": {
-      "version": "1.59.3",
-      "resolved": "https://registry.npmjs.org/sass-embedded-win32-ia32/-/sass-embedded-win32-ia32-1.59.3.tgz",
-      "integrity": "sha512-OFF8ujeR2flkPG+MLSTTRk78pE8TPxaBfmszx8+4syu10HV4UDg9fFHuYw2bpbGAPqOsJPLrMFpl4zmqQLY7/g==",
+      "version": "1.66.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-win32-ia32/-/sass-embedded-win32-ia32-1.66.1.tgz",
+      "integrity": "sha512-h9uNhQbJN6rP5+MXZZj4vL9phTsjLj/8PH/fyhKdUvJP7+5+k6qmCttkJX8Xvws2veFhgRW+mt/erdGGkc4nFA==",
       "cpu": [
         "ia32"
       ],
@@ -8210,14 +8983,17 @@
       "os": [
         "win32"
       ],
+      "bin": {
+        "sass": "dart-sass/sass.bat"
+      },
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/sass-embedded-win32-x64": {
-      "version": "1.59.3",
-      "resolved": "https://registry.npmjs.org/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.59.3.tgz",
-      "integrity": "sha512-L2efHr9czYgZNZ6GPw20kqTuX3gpi37c29vx7DODfZaKAB08nd0XVeWpC/GjZEpQ8Ti4bE2KLPuwdD+22f7QjQ==",
+      "version": "1.66.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.66.1.tgz",
+      "integrity": "sha512-TdZilrwiDBMYUjFSnaoQdRtm5QYV+73bsMKN+JYd1KFI56KM8XHcCeMTUH37+uKw2O8pR17O/JRFSNWBJTl5kw==",
       "cpu": [
         "x64"
       ],
@@ -8226,6 +9002,9 @@
       "os": [
         "win32"
       ],
+      "bin": {
+        "sass": "dart-sass/sass.bat"
+      },
       "engines": {
         "node": ">=14.0.0"
       }
@@ -8254,10 +9033,22 @@
         "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
+    "node_modules/selderee": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/selderee/-/selderee-0.11.0.tgz",
+      "integrity": "sha512-5TF+l7p4+OsnP8BCCvSyZiSPc4x4//p5uPwK8TCnVPJYRmU2aYKMpOXvw8zM5a5JvuuCGN1jmsMwuU2W02ukfA==",
+      "dev": true,
+      "dependencies": {
+        "parseley": "^0.12.0"
+      },
+      "funding": {
+        "url": "https://ko-fi.com/killymxi"
+      }
+    },
     "node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
       "bin": {
         "semver": "bin/semver.js"
@@ -8285,19 +9076,19 @@
       }
     },
     "node_modules/shepherd.js": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/shepherd.js/-/shepherd.js-11.0.1.tgz",
-      "integrity": "sha512-K387AM8A0IbEje9ZRHIGOQHLzFkMoNtQlxZp5Rgw4FGnfReq8C4mPJHX6qA5OFKg+1atI7VjGonbJDzYEghd6Q==",
+      "version": "11.1.1",
+      "resolved": "https://registry.npmjs.org/shepherd.js/-/shepherd.js-11.1.1.tgz",
+      "integrity": "sha512-7nVEgLTZUu5qQCKTlzQeKL1AQd2rG9Y9iqzZUgGvCFwMUZZhfwtZ6eEyMWMYw0zl8qKjSrjgzxFOe+SpfO43aA==",
       "dependencies": {
-        "@floating-ui/dom": "^1.0.10",
-        "deepmerge": "^4.2.2"
+        "@floating-ui/dom": "^1.2.5",
+        "deepmerge": "^4.3.1"
       },
       "engines": {
-        "node": "12.* || 14.* || >= 16"
+        "node": "16.* || >= 18"
       },
       "funding": {
         "type": "individual",
-        "url": "https://github.com/sponsors/rwwagner90"
+        "url": "https://github.com/sponsors/RobbieTheWagner"
       }
     },
     "node_modules/short-and-sweet": {
@@ -8389,6 +9180,44 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
+    "node_modules/smtp-server": {
+      "version": "3.13.0",
+      "resolved": "https://registry.npmjs.org/smtp-server/-/smtp-server-3.13.0.tgz",
+      "integrity": "sha512-thVFqpwrHIJ25rXjXA6RYFUO35el2O+X7WJ006qMVAyFs5Ss6XGPJASg7Fh1QvT28ADIv9hGGXmgR+kaSEikwQ==",
+      "dev": true,
+      "dependencies": {
+        "base32.js": "0.1.0",
+        "ipv6-normalize": "1.0.1",
+        "nodemailer": "6.9.4"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/smtp-server/node_modules/nodemailer": {
+      "version": "6.9.4",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.4.tgz",
+      "integrity": "sha512-CXjQvrQZV4+6X5wP6ZIgdehJamI63MFoYFGGPtHudWym9qaEHDNdPzaj5bfMCvxG1vhAileSWW90q7nL0N36mA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/smtp-tester": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/smtp-tester/-/smtp-tester-2.1.0.tgz",
+      "integrity": "sha512-HfOBdHkdwoBO+Qb06H8ShVEc08nnvDbtYWzdT5iQMIeInBdLKu17XOhuaC79uM24zPApRfN3JAg627TIy3y/Ww==",
+      "dev": true,
+      "dependencies": {
+        "@types/mailparser": "^3.4.0",
+        "@types/smtp-server": "^3.5.7",
+        "mailparser": "^3.5.0",
+        "smtp-server": "^3.11.0"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
     "node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -8622,6 +9451,11 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/style-mod": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.0.3.tgz",
+      "integrity": "sha512-78Jv8kYJdjbvRwwijtCevYADfsI0lGzYJe4mMFdceO8l75DFFDoqBhR1jVDicDRRaX4//g1u9wKeo+ztc2h1Rw=="
+    },
     "node_modules/style-search": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
@@ -8735,16 +9569,15 @@
       }
     },
     "node_modules/stylelint-scss": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-4.5.0.tgz",
-      "integrity": "sha512-/+rQ8FePOiwT5xblOHkujYzRYfSjmE6HYhLpqJShL+9wH6/HaAVj4mWpXlpEsM3ZgIpOblG9Y+/BycSJzWgjNw==",
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-4.7.0.tgz",
+      "integrity": "sha512-TSUgIeS0H3jqDZnby1UO1Qv3poi1N8wUYIJY6D1tuUq2MN3lwp/rITVo0wD+1SWTmRm0tNmGO0b7nKInnqF6Hg==",
       "dev": true,
       "dependencies": {
-        "lodash": "^4.17.21",
         "postcss-media-query-parser": "^0.2.3",
         "postcss-resolve-nested-selector": "^0.1.1",
-        "postcss-selector-parser": "^6.0.6",
-        "postcss-value-parser": "^4.1.0"
+        "postcss-selector-parser": "^6.0.11",
+        "postcss-value-parser": "^4.2.0"
       },
       "peerDependencies": {
         "stylelint": "^14.5.1 || ^15.0.0"
@@ -8956,13 +9789,13 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.16.6",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.6.tgz",
-      "integrity": "sha512-IBZ+ZQIA9sMaXmRZCUMDjNH0D5AQQfdn4WUjHL0+1lF4TP1IHRJbrhb6fNaXWikrYQTSkb7SLxkeXAiy1p7mbg==",
+      "version": "5.19.2",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz",
+      "integrity": "sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==",
       "dev": true,
       "dependencies": {
-        "@jridgewell/source-map": "^0.3.2",
-        "acorn": "^8.5.0",
+        "@jridgewell/source-map": "^0.3.3",
+        "acorn": "^8.8.2",
         "commander": "^2.20.0",
         "source-map-support": "~0.5.20"
       },
@@ -9003,9 +9836,9 @@
       "integrity": "sha512-RX35iq/D+lrsqhcPWIazM9ELkjOe30MSeoBHQHSsRwd1YuhJO5ui1K1/R0r7N3mFvbLBs33idw+eR6j+w6i/DA=="
     },
     "node_modules/tinymce": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-6.4.0.tgz",
-      "integrity": "sha512-A1IZKhEM7sS/je7M+SjKqa1UM59GzOxi2M5me8sYx9/VoSzCaAXOgTo1M1wQsu8dFbThbBgz9vZqBFqukhYyhg=="
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-6.7.0.tgz",
+      "integrity": "sha512-Wf2RSobIXQ7XNw3/v4z1lPGiH3Pjsmc/6/7fG28aIS6uVWj/7IhvOPuwfJJDeOx0o0D3nSnoLHgR2KU8JAdE+w=="
     },
     "node_modules/tippy.js": {
       "version": "6.3.7",
@@ -9015,6 +9848,15 @@
         "@popperjs/core": "^2.9.0"
       }
     },
+    "node_modules/tlds": {
+      "version": "1.240.0",
+      "resolved": "https://registry.npmjs.org/tlds/-/tlds-1.240.0.tgz",
+      "integrity": "sha512-1OYJQenswGZSOdRw7Bql5Qu7uf75b+F3HFBXbqnG/ifHa0fev1XcG+3pJf3pA/KC6RtHQzfKgIf1vkMlMG7mtQ==",
+      "dev": true,
+      "bin": {
+        "tlds": "bin.js"
+      }
+    },
     "node_modules/tmp": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
@@ -9049,16 +9891,27 @@
       }
     },
     "node_modules/tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
+      "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
       "dev": true,
       "dependencies": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
       },
       "engines": {
-        "node": ">=0.8"
+        "node": ">=6"
+      }
+    },
+    "node_modules/tough-cookie/node_modules/universalify": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
       }
     },
     "node_modules/trim-newlines": {
@@ -9095,9 +9948,9 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
-      "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/tunnel-agent": {
       "version": "0.6.0",
@@ -9123,22 +9976,73 @@
       "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
       "dev": true,
       "dependencies": {
-        "prelude-ls": "^1.2.1"
+        "prelude-ls": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "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,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/typed-array-buffer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
+      "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.1",
+        "is-typed-array": "^1.1.10"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/typed-array-byte-length": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
+      "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "has-proto": "^1.0.1",
+        "is-typed-array": "^1.1.10"
       },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "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==",
+    "node_modules/typed-array-byte-offset": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
+      "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
       "dev": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "has-proto": "^1.0.1",
+        "is-typed-array": "^1.1.10"
+      },
       "engines": {
-        "node": ">=10"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/typed-array-length": {
@@ -9155,6 +10059,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/uc.micro": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
+      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
+      "dev": true
+    },
     "node_modules/unbox-primitive": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
@@ -9229,9 +10139,9 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
-      "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
+      "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
       "dev": true,
       "funding": [
         {
@@ -9241,6 +10151,10 @@
         {
           "type": "tidelift",
           "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
         }
       ],
       "dependencies": {
@@ -9248,7 +10162,7 @@
         "picocolors": "^1.0.0"
       },
       "bin": {
-        "browserslist-lint": "cli.js"
+        "update-browserslist-db": "cli.js"
       },
       "peerDependencies": {
         "browserslist": ">= 4.21.0"
@@ -9263,6 +10177,16 @@
         "punycode": "^2.1.0"
       }
     },
+    "node_modules/url-parse": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "dev": true,
+      "dependencies": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -9279,9 +10203,9 @@
       }
     },
     "node_modules/v8-compile-cache": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz",
+      "integrity": "sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw==",
       "dev": true
     },
     "node_modules/validate-npm-package-license": {
@@ -9294,6 +10218,12 @@
         "spdx-expression-parse": "^3.0.0"
       }
     },
+    "node_modules/varint": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/varint/-/varint-6.0.0.tgz",
+      "integrity": "sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg==",
+      "dev": true
+    },
     "node_modules/verror": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
@@ -9363,9 +10293,9 @@
       }
     },
     "node_modules/vue-eslint-parser/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -9512,6 +10442,11 @@
         "vuex": ">=2.5"
       }
     },
+    "node_modules/w3c-keyname": {
+      "version": "2.2.8",
+      "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
+      "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ=="
+    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -9544,17 +10479,16 @@
       }
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz",
-      "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==",
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
+      "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
       "dev": true,
       "dependencies": {
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
         "for-each": "^0.3.3",
         "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0",
-        "is-typed-array": "^1.1.10"
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9563,15 +10497,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/wrap-ansi": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
@@ -9689,522 +10614,347 @@
     }
   },
   "dependencies": {
+    "@aashutoshrathi/word-wrap": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
+      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
+      "dev": true
+    },
     "@ampproject/remapping": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
-      "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
+      "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
       "dev": true,
       "requires": {
-        "@jridgewell/gen-mapping": "^0.1.0",
+        "@jridgewell/gen-mapping": "^0.3.0",
         "@jridgewell/trace-mapping": "^0.3.9"
       }
     },
     "@babel/code-frame": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
-      "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.10.tgz",
+      "integrity": "sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA==",
       "dev": true,
       "requires": {
-        "@babel/highlight": "^7.18.6"
+        "@babel/highlight": "^7.22.10",
+        "chalk": "^2.4.2"
       }
     },
     "@babel/compat-data": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.0.tgz",
-      "integrity": "sha512-gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz",
+      "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==",
       "dev": true
     },
     "@babel/core": {
-      "version": "7.21.3",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.3.tgz",
-      "integrity": "sha512-qIJONzoa/qiHghnm0l1n4i/6IIziDpzqc36FBs4pzMhDUraHqponwJLiAKm1hGLP3OSB/TVNz6rMwVGpwxxySw==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz",
+      "integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==",
       "dev": true,
       "requires": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.21.3",
-        "@babel/helper-compilation-targets": "^7.20.7",
-        "@babel/helper-module-transforms": "^7.21.2",
-        "@babel/helpers": "^7.21.0",
-        "@babel/parser": "^7.21.3",
-        "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.21.3",
-        "@babel/types": "^7.21.3",
+        "@babel/code-frame": "^7.22.10",
+        "@babel/generator": "^7.22.10",
+        "@babel/helper-compilation-targets": "^7.22.10",
+        "@babel/helper-module-transforms": "^7.22.9",
+        "@babel/helpers": "^7.22.10",
+        "@babel/parser": "^7.22.10",
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.10",
+        "@babel/types": "^7.22.10",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
         "json5": "^2.2.2",
-        "semver": "^6.3.0"
+        "semver": "^6.3.1"
       }
     },
     "@babel/generator": {
-      "version": "7.21.3",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.3.tgz",
-      "integrity": "sha512-QS3iR1GYC/YGUnW7IdggFeN5c1poPUurnGttOV/bZgPGV+izC/D8HnD6DLwod0fsatNyVn1G3EVWMYIF0nHbeA==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.10.tgz",
+      "integrity": "sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.21.3",
+        "@babel/types": "^7.22.10",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
-      },
-      "dependencies": {
-        "@jridgewell/gen-mapping": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-          "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-          "dev": true,
-          "requires": {
-            "@jridgewell/set-array": "^1.0.1",
-            "@jridgewell/sourcemap-codec": "^1.4.10",
-            "@jridgewell/trace-mapping": "^0.3.9"
-          }
-        }
       }
     },
     "@babel/helper-annotate-as-pure": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz",
-      "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
+      "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz",
-      "integrity": "sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.10.tgz",
+      "integrity": "sha512-Av0qubwDQxC56DoUReVDeLfMEjYYSN1nZrTUrWkXd7hpU73ymRANkbuDm3yni9npkn+RXy9nNbEJZEzXr7xrfQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-explode-assignable-expression": "^7.18.6",
-        "@babel/types": "^7.18.9"
+        "@babel/types": "^7.22.10"
       }
     },
     "@babel/helper-compilation-targets": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz",
-      "integrity": "sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.10.tgz",
+      "integrity": "sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.20.5",
-        "@babel/helper-validator-option": "^7.18.6",
-        "browserslist": "^4.21.3",
+        "@babel/compat-data": "^7.22.9",
+        "@babel/helper-validator-option": "^7.22.5",
+        "browserslist": "^4.21.9",
         "lru-cache": "^5.1.1",
-        "semver": "^6.3.0"
+        "semver": "^6.3.1"
       }
     },
     "@babel/helper-create-class-features-plugin": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.0.tgz",
-      "integrity": "sha512-Q8wNiMIdwsv5la5SPxNYzzkPnjgC0Sy0i7jLkVOCdllu/xcVNkr3TeZzbHBJrj+XXRqzX5uCyCoV9eu6xUG7KQ==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.10.tgz",
+      "integrity": "sha512-5IBb77txKYQPpOEdUdIhBx8VrZyDCQ+H82H0+5dX1TmuscP5vJKEE3cKurjtIw/vFwzbVH48VweE78kVDBrqjA==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.21.0",
-        "@babel/helper-member-expression-to-functions": "^7.21.0",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/helper-replace-supers": "^7.20.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
-        "@babel/helper-split-export-declaration": "^7.18.6"
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-member-expression-to-functions": "^7.22.5",
+        "@babel/helper-optimise-call-expression": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "semver": "^6.3.1"
       }
     },
     "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.0.tgz",
-      "integrity": "sha512-N+LaFW/auRSWdx7SHD/HiARwXQju1vXTW4fKr4u5SgBUTm51OKEjKgj+cs00ggW3kEvNqwErnlwuq7Y3xBe4eg==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.9.tgz",
+      "integrity": "sha512-+svjVa/tFwsNSG4NEy1h85+HQ5imbT92Q5/bgtS7P0GTQlP8WuFdqsiABmQouhiFGyV66oGxZFpeYHza1rNsKw==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "regexpu-core": "^5.3.1"
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "regexpu-core": "^5.3.1",
+        "semver": "^6.3.1"
       }
     },
     "@babel/helper-define-polyfill-provider": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz",
-      "integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==",
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz",
+      "integrity": "sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==",
       "dev": true,
       "requires": {
-        "@babel/helper-compilation-targets": "^7.17.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-compilation-targets": "^7.22.6",
+        "@babel/helper-plugin-utils": "^7.22.5",
         "debug": "^4.1.1",
         "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2",
-        "semver": "^6.1.2"
+        "resolve": "^1.14.2"
       }
     },
     "@babel/helper-environment-visitor": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
-      "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
+      "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==",
       "dev": true
     },
-    "@babel/helper-explode-assignable-expression": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz",
-      "integrity": "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.18.6"
-      }
-    },
     "@babel/helper-function-name": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz",
-      "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
+      "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.20.7",
-        "@babel/types": "^7.21.0"
+        "@babel/template": "^7.22.5",
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-hoist-variables": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
-      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-member-expression-to-functions": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz",
-      "integrity": "sha512-Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz",
+      "integrity": "sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.21.0"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-module-imports": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
-      "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz",
+      "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.21.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz",
-      "integrity": "sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz",
+      "integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-simple-access": "^7.20.2",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/helper-validator-identifier": "^7.19.1",
-        "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.21.2",
-        "@babel/types": "^7.21.2"
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-simple-access": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/helper-validator-identifier": "^7.22.5"
       }
     },
     "@babel/helper-optimise-call-expression": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz",
-      "integrity": "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz",
+      "integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-plugin-utils": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz",
-      "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
+      "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==",
       "dev": true
     },
     "@babel/helper-remap-async-to-generator": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz",
-      "integrity": "sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.9.tgz",
+      "integrity": "sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-wrap-function": "^7.18.9",
-        "@babel/types": "^7.18.9"
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-wrap-function": "^7.22.9"
       }
     },
     "@babel/helper-replace-supers": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz",
-      "integrity": "sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz",
+      "integrity": "sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==",
       "dev": true,
       "requires": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-member-expression-to-functions": "^7.20.7",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.20.7",
-        "@babel/types": "^7.20.7"
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-member-expression-to-functions": "^7.22.5",
+        "@babel/helper-optimise-call-expression": "^7.22.5"
       }
     },
     "@babel/helper-simple-access": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz",
-      "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
+      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.20.2"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz",
-      "integrity": "sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz",
+      "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.20.0"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-split-export-declaration": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
-      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-string-parser": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
-      "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
+      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
       "dev": true
     },
     "@babel/helper-validator-identifier": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
-      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
+      "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==",
       "dev": true
     },
     "@babel/helper-validator-option": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz",
-      "integrity": "sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz",
+      "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==",
       "dev": true
     },
     "@babel/helper-wrap-function": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz",
-      "integrity": "sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.10.tgz",
+      "integrity": "sha512-OnMhjWjuGYtdoO3FmsEFWvBStBAe2QOgwOLsLNDjN+aaiMD8InJk1/O3HSD8lkqTjCgg5YI34Tz15KNNA3p+nQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.20.5",
-        "@babel/types": "^7.20.5"
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/template": "^7.22.5",
+        "@babel/types": "^7.22.10"
       }
     },
     "@babel/helpers": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.0.tgz",
-      "integrity": "sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.10.tgz",
+      "integrity": "sha512-a41J4NW8HyZa1I1vAndrraTlPZ/eZoga2ZgS7fEr0tZJGVU4xqdE80CEm0CcNjha5EZ8fTBYLKHF0kqDUuAwQw==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.21.0",
-        "@babel/types": "^7.21.0"
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.10",
+        "@babel/types": "^7.22.10"
       }
     },
     "@babel/highlight": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
-      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.10.tgz",
+      "integrity": "sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-validator-identifier": "^7.18.6",
-        "chalk": "^2.0.0",
+        "@babel/helper-validator-identifier": "^7.22.5",
+        "chalk": "^2.4.2",
         "js-tokens": "^4.0.0"
       }
     },
     "@babel/parser": {
-      "version": "7.21.3",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.3.tgz",
-      "integrity": "sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ=="
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.10.tgz",
+      "integrity": "sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ=="
     },
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.18.6",
-      "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.18.6.tgz",
-      "integrity": "sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==",
+      "version": "7.22.5",
+      "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.22.5.tgz",
+      "integrity": "sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz",
-      "integrity": "sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
-        "@babel/plugin-proposal-optional-chaining": "^7.20.7"
-      }
-    },
-    "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz",
-      "integrity": "sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-remap-async-to-generator": "^7.18.9",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
-      }
-    },
-    "@babel/plugin-proposal-class-properties": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
-      "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      }
-    },
-    "@babel/plugin-proposal-class-static-block": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz",
-      "integrity": "sha512-XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.21.0",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
-      }
-    },
-    "@babel/plugin-proposal-dynamic-import": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz",
-      "integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz",
-      "integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-json-strings": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz",
-      "integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz",
-      "integrity": "sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
-      }
-    },
-    "@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
-      "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-numeric-separator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz",
-      "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
-      }
-    },
-    "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz",
-      "integrity": "sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.20.5",
-        "@babel/helper-compilation-targets": "^7.20.7",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.20.7"
-      }
-    },
-    "@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz",
-      "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-optional-chaining": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz",
-      "integrity": "sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-private-methods": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz",
-      "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz",
+      "integrity": "sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
+        "@babel/plugin-transform-optional-chaining": "^7.22.5"
       }
     },
     "@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0.tgz",
-      "integrity": "sha512-ha4zfehbJjc5MmXBlHec1igel5TJXXLDDRbuJ4+XT2TJcyD9/V1919BA8gMvsdHcNMBy4WBUBiRb3nw/EQUtBw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-create-class-features-plugin": "^7.21.0",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
-      }
-    },
-    "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
-      "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
+      "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,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      }
+      "requires": {}
     },
     "@babel/plugin-syntax-async-generators": {
       "version": "7.8.4",
@@ -10252,12 +11002,30 @@
       }
     },
     "@babel/plugin-syntax-import-assertions": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz",
-      "integrity": "sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz",
+      "integrity": "sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-syntax-import-attributes": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz",
+      "integrity": "sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-syntax-import-meta": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.19.0"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-syntax-json-strings": {
@@ -10341,354 +11109,521 @@
         "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
+    "@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,
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
+      }
+    },
     "@babel/plugin-transform-arrow-functions": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz",
-      "integrity": "sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz",
+      "integrity": "sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-async-generator-functions": {
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.10.tgz",
+      "integrity": "sha512-eueE8lvKVzq5wIObKK/7dvoeKJ+xc6TvRn6aysIjS6pSCeLy7S/eVi7pEQknZqyqvzaNKdDtem8nUNTBgDVR2g==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.20.2"
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-remap-async-to-generator": "^7.22.9",
+        "@babel/plugin-syntax-async-generators": "^7.8.4"
       }
     },
     "@babel/plugin-transform-async-to-generator": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz",
-      "integrity": "sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz",
+      "integrity": "sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-remap-async-to-generator": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-block-scoped-functions": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz",
+      "integrity": "sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-block-scoping": {
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.10.tgz",
+      "integrity": "sha512-1+kVpGAOOI1Albt6Vse7c8pHzcZQdQKW+wJH+g8mCaszOdDVwRXa/slHPqIw+oJAJANTKDMuM2cBdV0Dg618Vg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-class-properties": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz",
+      "integrity": "sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-class-static-block": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.5.tgz",
+      "integrity": "sha512-SPToJ5eYZLxlnp1UzdARpOGeC2GbHvr9d/UV0EukuVx8atktg194oe+C5BqQ8jRTkgLRVOPYeXRSBg1IlMoVRA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-classes": {
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.6.tgz",
+      "integrity": "sha512-58EgM6nuPNG6Py4Z3zSuu0xWu2VfodiMi72Jt5Kj2FECmaYk1RrTXA45z6KBFsu9tRgwQDwIiY4FXTt+YsSFAQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.6",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-optimise-call-expression": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "globals": "^11.1.0"
+      }
+    },
+    "@babel/plugin-transform-computed-properties": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz",
+      "integrity": "sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/template": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-destructuring": {
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.10.tgz",
+      "integrity": "sha512-dPJrL0VOyxqLM9sritNbMSGx/teueHF/htMKrPT7DNxccXxRDPYqlgPFFdr8u+F+qUZOkZoXue/6rL5O5GduEw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-dotall-regex": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz",
+      "integrity": "sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-duplicate-keys": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz",
+      "integrity": "sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-dynamic-import": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.5.tgz",
+      "integrity": "sha512-0MC3ppTB1AMxd8fXjSrbPa7LT9hrImt+/fcj+Pg5YMD7UQyWp/02+JWpdnCymmsXwIx5Z+sYn1bwCn4ZJNvhqQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-exponentiation-operator": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz",
+      "integrity": "sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-export-namespace-from": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.5.tgz",
+      "integrity": "sha512-X4hhm7FRnPgd4nDA4b/5V280xCx6oL7Oob5+9qVS5C13Zq4bh1qq7LU0GgRU6b5dBWBvhGaXYVB4AcN6+ol6vg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-for-of": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz",
+      "integrity": "sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-function-name": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz",
+      "integrity": "sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-remap-async-to-generator": "^7.18.9"
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
-    "@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz",
-      "integrity": "sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==",
+    "@babel/plugin-transform-json-strings": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.5.tgz",
+      "integrity": "sha512-DuCRB7fu8MyTLbEQd1ew3R85nx/88yMoqo2uPSjevMj3yoN7CDM8jkgrY0wmVxfJZyJ/B9fE1iq7EQppWQmR5A==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-json-strings": "^7.8.3"
       }
     },
-    "@babel/plugin-transform-block-scoping": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.21.0.tgz",
-      "integrity": "sha512-Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ==",
+    "@babel/plugin-transform-literals": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz",
+      "integrity": "sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.20.2"
-      }
-    },
-    "@babel/plugin-transform-classes": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz",
-      "integrity": "sha512-RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-compilation-targets": "^7.20.7",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.21.0",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-replace-supers": "^7.20.7",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "globals": "^11.1.0"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
-    "@babel/plugin-transform-computed-properties": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz",
-      "integrity": "sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ==",
+    "@babel/plugin-transform-logical-assignment-operators": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.5.tgz",
+      "integrity": "sha512-MQQOUW1KL8X0cDWfbwYP+TbVbZm16QmQXJQ+vndPtH/BoO0lOKpVoEDMI7+PskYxH+IiE0tS8xZye0qr1lGzSA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/template": "^7.20.7"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
       }
     },
-    "@babel/plugin-transform-destructuring": {
-      "version": "7.21.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.21.3.tgz",
-      "integrity": "sha512-bp6hwMFzuiE4HqYEyoGJ/V2LeIWn+hLVKc4pnj++E5XQptwhtcGmSayM029d/j2X1bPKGTlsyPwAubuU22KhMA==",
+    "@babel/plugin-transform-member-expression-literals": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz",
+      "integrity": "sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.20.2"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
-    "@babel/plugin-transform-dotall-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz",
-      "integrity": "sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==",
+    "@babel/plugin-transform-modules-amd": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz",
+      "integrity": "sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
-    "@babel/plugin-transform-duplicate-keys": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz",
-      "integrity": "sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==",
+    "@babel/plugin-transform-modules-commonjs": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz",
+      "integrity": "sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-simple-access": "^7.22.5"
       }
     },
-    "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz",
-      "integrity": "sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==",
+    "@babel/plugin-transform-modules-systemjs": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz",
+      "integrity": "sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-hoist-variables": "^7.22.5",
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.5"
       }
     },
-    "@babel/plugin-transform-for-of": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.0.tgz",
-      "integrity": "sha512-LlUYlydgDkKpIY7mcBWvyPPmMcOphEyYA27Ef4xpbh1IiDNLr0kZsos2nf92vz3IccvJI25QUwp86Eo5s6HmBQ==",
+    "@babel/plugin-transform-modules-umd": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz",
+      "integrity": "sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.20.2"
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
-    "@babel/plugin-transform-function-name": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz",
-      "integrity": "sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==",
+    "@babel/plugin-transform-named-capturing-groups-regex": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz",
+      "integrity": "sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-compilation-targets": "^7.18.9",
-        "@babel/helper-function-name": "^7.18.9",
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
-    "@babel/plugin-transform-literals": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz",
-      "integrity": "sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==",
+    "@babel/plugin-transform-new-target": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz",
+      "integrity": "sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
-    "@babel/plugin-transform-member-expression-literals": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz",
-      "integrity": "sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==",
+    "@babel/plugin-transform-nullish-coalescing-operator": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.5.tgz",
+      "integrity": "sha512-6CF8g6z1dNYZ/VXok5uYkkBBICHZPiGEl7oDnAx2Mt1hlHVHOSIKWJaXHjQJA5VB43KZnXZDIexMchY4y2PGdA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
       }
     },
-    "@babel/plugin-transform-modules-amd": {
-      "version": "7.20.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz",
-      "integrity": "sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g==",
+    "@babel/plugin-transform-numeric-separator": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.5.tgz",
+      "integrity": "sha512-NbslED1/6M+sXiwwtcAB/nieypGw02Ejf4KtDeMkCEpP6gWFMX1wI9WKYua+4oBneCCEmulOkRpwywypVZzs/g==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.20.11",
-        "@babel/helper-plugin-utils": "^7.20.2"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
       }
     },
-    "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.21.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.2.tgz",
-      "integrity": "sha512-Cln+Yy04Gxua7iPdj6nOV96smLGjpElir5YwzF0LBPKoPlLDNJePNlrGGaybAJkd0zKRnOVXOgizSqPYMNYkzA==",
+    "@babel/plugin-transform-object-rest-spread": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz",
+      "integrity": "sha512-Kk3lyDmEslH9DnvCDA1s1kkd3YWQITiBOHngOtDL9Pt6BZjzqb6hiOlb8VfjiiQJ2unmegBqZu0rx5RxJb5vmQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.21.2",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-simple-access": "^7.20.2"
+        "@babel/compat-data": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.22.5"
       }
     },
-    "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.20.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz",
-      "integrity": "sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw==",
+    "@babel/plugin-transform-object-super": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz",
+      "integrity": "sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==",
       "dev": true,
       "requires": {
-        "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-module-transforms": "^7.20.11",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-validator-identifier": "^7.19.1"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.5"
       }
     },
-    "@babel/plugin-transform-modules-umd": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz",
-      "integrity": "sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==",
+    "@babel/plugin-transform-optional-catch-binding": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.5.tgz",
+      "integrity": "sha512-pH8orJahy+hzZje5b8e2QIlBWQvGpelS76C63Z+jhZKsmzfNaPQ+LaW6dcJ9bxTpo1mtXbgHwy765Ro3jftmUg==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
       }
     },
-    "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz",
-      "integrity": "sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==",
+    "@babel/plugin-transform-optional-chaining": {
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.10.tgz",
+      "integrity": "sha512-MMkQqZAZ+MGj+jGTG3OTuhKeBpNcO+0oCEbrGNEaOmiEn+1MzRyQlYsruGiU8RTK3zV6XwrVJTmwiDOyYK6J9g==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.20.5",
-        "@babel/helper-plugin-utils": "^7.20.2"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
       }
     },
-    "@babel/plugin-transform-new-target": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz",
-      "integrity": "sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==",
+    "@babel/plugin-transform-parameters": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz",
+      "integrity": "sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
-    "@babel/plugin-transform-object-super": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz",
-      "integrity": "sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==",
+    "@babel/plugin-transform-private-methods": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz",
+      "integrity": "sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/helper-replace-supers": "^7.18.6"
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
-    "@babel/plugin-transform-parameters": {
-      "version": "7.21.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.21.3.tgz",
-      "integrity": "sha512-Wxc+TvppQG9xWFYatvCGPvZ6+SIUxQ2ZdiBP+PHYMIjnPXD+uThCshaz4NZOnODAtBjjcVQQ/3OKs9LW28purQ==",
+    "@babel/plugin-transform-private-property-in-object": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.5.tgz",
+      "integrity": "sha512-/9xnaTTJcVoBtSSmrVyhtSvO3kbqS2ODoh2juEU72c3aYonNF0OMGiaz2gjukyKM2wBBYJP38S4JiE0Wfb5VMQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.20.2"
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       }
     },
     "@babel/plugin-transform-property-literals": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz",
-      "integrity": "sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz",
+      "integrity": "sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-regenerator": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz",
-      "integrity": "sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz",
+      "integrity": "sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "regenerator-transform": "^0.15.1"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "regenerator-transform": "^0.15.2"
       }
     },
     "@babel/plugin-transform-reserved-words": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz",
-      "integrity": "sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz",
+      "integrity": "sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz",
-      "integrity": "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz",
+      "integrity": "sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-spread": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz",
-      "integrity": "sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz",
+      "integrity": "sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
       }
     },
     "@babel/plugin-transform-sticky-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz",
-      "integrity": "sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz",
+      "integrity": "sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-template-literals": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz",
-      "integrity": "sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz",
+      "integrity": "sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz",
-      "integrity": "sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz",
+      "integrity": "sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-unicode-escapes": {
-      "version": "7.18.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz",
-      "integrity": "sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz",
+      "integrity": "sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-unicode-property-regex": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz",
+      "integrity": "sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-unicode-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz",
-      "integrity": "sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz",
+      "integrity": "sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-unicode-sets-regex": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz",
+      "integrity": "sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/preset-env": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.20.2.tgz",
-      "integrity": "sha512-1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.20.1",
-        "@babel/helper-compilation-targets": "^7.20.0",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-validator-option": "^7.18.6",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9",
-        "@babel/plugin-proposal-async-generator-functions": "^7.20.1",
-        "@babel/plugin-proposal-class-properties": "^7.18.6",
-        "@babel/plugin-proposal-class-static-block": "^7.18.6",
-        "@babel/plugin-proposal-dynamic-import": "^7.18.6",
-        "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
-        "@babel/plugin-proposal-json-strings": "^7.18.6",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.18.9",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
-        "@babel/plugin-proposal-numeric-separator": "^7.18.6",
-        "@babel/plugin-proposal-object-rest-spread": "^7.20.2",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.18.6",
-        "@babel/plugin-proposal-optional-chaining": "^7.18.9",
-        "@babel/plugin-proposal-private-methods": "^7.18.6",
-        "@babel/plugin-proposal-private-property-in-object": "^7.18.6",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.18.6",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.10.tgz",
+      "integrity": "sha512-riHpLb1drNkpLlocmSyEg4oYJIQFeXAK/d7rI6mbD0XsvoTOOweXDmQPG/ErxsEhWk3rl3Q/3F6RFQlVFS8m0A==",
+      "dev": true,
+      "requires": {
+        "@babel/compat-data": "^7.22.9",
+        "@babel/helper-compilation-targets": "^7.22.10",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-validator-option": "^7.22.5",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.5",
+        "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
         "@babel/plugin-syntax-class-static-block": "^7.14.5",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-import-assertions": "^7.20.0",
+        "@babel/plugin-syntax-import-assertions": "^7.22.5",
+        "@babel/plugin-syntax-import-attributes": "^7.22.5",
+        "@babel/plugin-syntax-import-meta": "^7.10.4",
         "@babel/plugin-syntax-json-strings": "^7.8.3",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
@@ -10698,56 +11633,71 @@
         "@babel/plugin-syntax-optional-chaining": "^7.8.3",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
-        "@babel/plugin-transform-arrow-functions": "^7.18.6",
-        "@babel/plugin-transform-async-to-generator": "^7.18.6",
-        "@babel/plugin-transform-block-scoped-functions": "^7.18.6",
-        "@babel/plugin-transform-block-scoping": "^7.20.2",
-        "@babel/plugin-transform-classes": "^7.20.2",
-        "@babel/plugin-transform-computed-properties": "^7.18.9",
-        "@babel/plugin-transform-destructuring": "^7.20.2",
-        "@babel/plugin-transform-dotall-regex": "^7.18.6",
-        "@babel/plugin-transform-duplicate-keys": "^7.18.9",
-        "@babel/plugin-transform-exponentiation-operator": "^7.18.6",
-        "@babel/plugin-transform-for-of": "^7.18.8",
-        "@babel/plugin-transform-function-name": "^7.18.9",
-        "@babel/plugin-transform-literals": "^7.18.9",
-        "@babel/plugin-transform-member-expression-literals": "^7.18.6",
-        "@babel/plugin-transform-modules-amd": "^7.19.6",
-        "@babel/plugin-transform-modules-commonjs": "^7.19.6",
-        "@babel/plugin-transform-modules-systemjs": "^7.19.6",
-        "@babel/plugin-transform-modules-umd": "^7.18.6",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.19.1",
-        "@babel/plugin-transform-new-target": "^7.18.6",
-        "@babel/plugin-transform-object-super": "^7.18.6",
-        "@babel/plugin-transform-parameters": "^7.20.1",
-        "@babel/plugin-transform-property-literals": "^7.18.6",
-        "@babel/plugin-transform-regenerator": "^7.18.6",
-        "@babel/plugin-transform-reserved-words": "^7.18.6",
-        "@babel/plugin-transform-shorthand-properties": "^7.18.6",
-        "@babel/plugin-transform-spread": "^7.19.0",
-        "@babel/plugin-transform-sticky-regex": "^7.18.6",
-        "@babel/plugin-transform-template-literals": "^7.18.9",
-        "@babel/plugin-transform-typeof-symbol": "^7.18.9",
-        "@babel/plugin-transform-unicode-escapes": "^7.18.10",
-        "@babel/plugin-transform-unicode-regex": "^7.18.6",
-        "@babel/preset-modules": "^0.1.5",
-        "@babel/types": "^7.20.2",
-        "babel-plugin-polyfill-corejs2": "^0.3.3",
-        "babel-plugin-polyfill-corejs3": "^0.6.0",
-        "babel-plugin-polyfill-regenerator": "^0.4.1",
-        "core-js-compat": "^3.25.1",
-        "semver": "^6.3.0"
+        "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
+        "@babel/plugin-transform-arrow-functions": "^7.22.5",
+        "@babel/plugin-transform-async-generator-functions": "^7.22.10",
+        "@babel/plugin-transform-async-to-generator": "^7.22.5",
+        "@babel/plugin-transform-block-scoped-functions": "^7.22.5",
+        "@babel/plugin-transform-block-scoping": "^7.22.10",
+        "@babel/plugin-transform-class-properties": "^7.22.5",
+        "@babel/plugin-transform-class-static-block": "^7.22.5",
+        "@babel/plugin-transform-classes": "^7.22.6",
+        "@babel/plugin-transform-computed-properties": "^7.22.5",
+        "@babel/plugin-transform-destructuring": "^7.22.10",
+        "@babel/plugin-transform-dotall-regex": "^7.22.5",
+        "@babel/plugin-transform-duplicate-keys": "^7.22.5",
+        "@babel/plugin-transform-dynamic-import": "^7.22.5",
+        "@babel/plugin-transform-exponentiation-operator": "^7.22.5",
+        "@babel/plugin-transform-export-namespace-from": "^7.22.5",
+        "@babel/plugin-transform-for-of": "^7.22.5",
+        "@babel/plugin-transform-function-name": "^7.22.5",
+        "@babel/plugin-transform-json-strings": "^7.22.5",
+        "@babel/plugin-transform-literals": "^7.22.5",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.22.5",
+        "@babel/plugin-transform-member-expression-literals": "^7.22.5",
+        "@babel/plugin-transform-modules-amd": "^7.22.5",
+        "@babel/plugin-transform-modules-commonjs": "^7.22.5",
+        "@babel/plugin-transform-modules-systemjs": "^7.22.5",
+        "@babel/plugin-transform-modules-umd": "^7.22.5",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
+        "@babel/plugin-transform-new-target": "^7.22.5",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.5",
+        "@babel/plugin-transform-numeric-separator": "^7.22.5",
+        "@babel/plugin-transform-object-rest-spread": "^7.22.5",
+        "@babel/plugin-transform-object-super": "^7.22.5",
+        "@babel/plugin-transform-optional-catch-binding": "^7.22.5",
+        "@babel/plugin-transform-optional-chaining": "^7.22.10",
+        "@babel/plugin-transform-parameters": "^7.22.5",
+        "@babel/plugin-transform-private-methods": "^7.22.5",
+        "@babel/plugin-transform-private-property-in-object": "^7.22.5",
+        "@babel/plugin-transform-property-literals": "^7.22.5",
+        "@babel/plugin-transform-regenerator": "^7.22.10",
+        "@babel/plugin-transform-reserved-words": "^7.22.5",
+        "@babel/plugin-transform-shorthand-properties": "^7.22.5",
+        "@babel/plugin-transform-spread": "^7.22.5",
+        "@babel/plugin-transform-sticky-regex": "^7.22.5",
+        "@babel/plugin-transform-template-literals": "^7.22.5",
+        "@babel/plugin-transform-typeof-symbol": "^7.22.5",
+        "@babel/plugin-transform-unicode-escapes": "^7.22.10",
+        "@babel/plugin-transform-unicode-property-regex": "^7.22.5",
+        "@babel/plugin-transform-unicode-regex": "^7.22.5",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
+        "@babel/preset-modules": "0.1.6-no-external-plugins",
+        "@babel/types": "^7.22.10",
+        "babel-plugin-polyfill-corejs2": "^0.4.5",
+        "babel-plugin-polyfill-corejs3": "^0.8.3",
+        "babel-plugin-polyfill-regenerator": "^0.5.2",
+        "core-js-compat": "^3.31.0",
+        "semver": "^6.3.1"
       }
     },
     "@babel/preset-modules": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
-      "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
+      "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,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-        "@babel/plugin-transform-dotall-regex": "^7.4.4",
         "@babel/types": "^7.4.4",
         "esutils": "^2.0.2"
       }
@@ -10759,57 +11709,57 @@
       "dev": true
     },
     "@babel/runtime": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.0.tgz",
-      "integrity": "sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.10.tgz",
+      "integrity": "sha512-21t/fkKLMZI4pqP2wlmsQAWnYW1PDyKyyUV4vCi+B25ydmdaYTKXPwCj0BzSUnZf4seIiYvSA3jcZ3gdsMFkLQ==",
       "requires": {
-        "regenerator-runtime": "^0.13.11"
+        "regenerator-runtime": "^0.14.0"
       }
     },
     "@babel/template": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz",
-      "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz",
+      "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/parser": "^7.20.7",
-        "@babel/types": "^7.20.7"
+        "@babel/code-frame": "^7.22.5",
+        "@babel/parser": "^7.22.5",
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/traverse": {
-      "version": "7.21.3",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.3.tgz",
-      "integrity": "sha512-XLyopNeaTancVitYZe2MlUEvgKb6YVVPXzofHgqHijCImG33b/uTurMS488ht/Hbsb2XK3U2BnSTxKVNGV3nGQ==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.21.3",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.21.0",
-        "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/parser": "^7.21.3",
-        "@babel/types": "^7.21.3",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
+      "integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.22.10",
+        "@babel/generator": "^7.22.10",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-hoist-variables": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/parser": "^7.22.10",
+        "@babel/types": "^7.22.10",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       }
     },
     "@babel/types": {
-      "version": "7.21.3",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.3.tgz",
-      "integrity": "sha512-sBGdETxC+/M4o/zKC0sl6sjWv62WFR/uzxrJ6uYyMLZOUlPnwzw0tKgVHOXxaAd5l2g8pEDM5RZ495GPQI77kg==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz",
+      "integrity": "sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==",
       "dev": true,
       "requires": {
-        "@babel/helper-string-parser": "^7.19.4",
-        "@babel/helper-validator-identifier": "^7.19.1",
+        "@babel/helper-string-parser": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.5",
         "to-fast-properties": "^2.0.0"
       }
     },
     "@bufbuild/protobuf": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-1.1.1.tgz",
-      "integrity": "sha512-1dS2m3jabfW2XL2K6//41wZkO4XJOZtpe0bKLuta0BvK5LxNRyUBSSN5835n3bIFiNJKFWhDnzZEMrV7QVGFfQ==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-1.3.0.tgz",
+      "integrity": "sha512-G372ods0pLt46yxVRsnP/e2btVPuuzArcMPFpIDeIwiGPuuglEs9y75iG0HMvZgncsj5TvbYRWqbVyOe3PLCWQ==",
       "dev": true
     },
     "@claviska/jquery-minicolors": {
@@ -10818,6 +11768,151 @@
       "integrity": "sha512-8Ro6D4GCrmOl41+6w4NFhEOpx8vjxwVRI69bulXsFDt49uVRKhLU5TnzEV7AmOJrylkVq+ugnYNMiGHBieeKUQ==",
       "requires": {}
     },
+    "@codemirror/autocomplete": {
+      "version": "6.9.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.9.0.tgz",
+      "integrity": "sha512-Fbwm0V/Wn3BkEJZRhr0hi5BhCo5a7eBL6LYaliPjOSwCyfOpnjXY59HruSxOUNV+1OYer0Tgx1zRNQttjXyDog==",
+      "requires": {
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.6.0",
+        "@lezer/common": "^1.0.0"
+      }
+    },
+    "@codemirror/commands": {
+      "version": "6.2.4",
+      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.2.4.tgz",
+      "integrity": "sha512-42lmDqVH0ttfilLShReLXsDfASKLXzfyC36bzwcqzox9PlHulMcsUOfHXNo2X2aFMVNUoQ7j+d4q5bnfseYoOA==",
+      "requires": {
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/state": "^6.2.0",
+        "@codemirror/view": "^6.0.0",
+        "@lezer/common": "^1.0.0"
+      }
+    },
+    "@codemirror/lang-css": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.2.1.tgz",
+      "integrity": "sha512-/UNWDNV5Viwi/1lpr/dIXJNWiwDxpw13I4pTUAsNxZdg6E0mI2kTQb0P2iHczg1Tu+H4EBgJR+hYhKiHKko7qg==",
+      "requires": {
+        "@codemirror/autocomplete": "^6.0.0",
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/state": "^6.0.0",
+        "@lezer/common": "^1.0.2",
+        "@lezer/css": "^1.0.0"
+      }
+    },
+    "@codemirror/lang-html": {
+      "version": "6.4.5",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.5.tgz",
+      "integrity": "sha512-dUCSxkIw2G+chaUfw3Gfu5kkN83vJQN8gfQDp9iEHsIZluMJA0YJveT12zg/28BJx+uPsbQ6VimKCgx3oJrZxA==",
+      "requires": {
+        "@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.2.2",
+        "@lezer/common": "^1.0.0",
+        "@lezer/css": "^1.1.0",
+        "@lezer/html": "^1.3.0"
+      }
+    },
+    "@codemirror/lang-javascript": {
+      "version": "6.1.9",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.1.9.tgz",
+      "integrity": "sha512-z3jdkcqOEBT2txn2a87A0jSy6Te3679wg/U8QzMeftFt+4KA6QooMwfdFzJiuC3L6fXKfTXZcDocoaxMYfGz0w==",
+      "requires": {
+        "@codemirror/autocomplete": "^6.0.0",
+        "@codemirror/language": "^6.6.0",
+        "@codemirror/lint": "^6.0.0",
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.0.0",
+        "@lezer/common": "^1.0.0",
+        "@lezer/javascript": "^1.0.0"
+      }
+    },
+    "@codemirror/lang-json": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-json/-/lang-json-6.0.1.tgz",
+      "integrity": "sha512-+T1flHdgpqDDlJZ2Lkil/rLiRy684WMLc74xUnjJH48GQdfJo/pudlTRreZmKwzP8/tGdKf83wlbAdOCzlJOGQ==",
+      "requires": {
+        "@codemirror/language": "^6.0.0",
+        "@lezer/json": "^1.0.0"
+      }
+    },
+    "@codemirror/lang-php": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-php/-/lang-php-6.0.1.tgz",
+      "integrity": "sha512-ublojMdw/PNWa7qdN5TMsjmqkNuTBD3k6ndZ4Z0S25SBAiweFGyY68AS3xNcIOlb6DDFDvKlinLQ40vSLqf8xA==",
+      "requires": {
+        "@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"
+      }
+    },
+    "@codemirror/lang-xml": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-xml/-/lang-xml-6.0.2.tgz",
+      "integrity": "sha512-JQYZjHL2LAfpiZI2/qZ/qzDuSqmGKMwyApYmEUUCTxLM4MWS7sATUEfIguZQr9Zjx/7gcdnewb039smF6nC2zw==",
+      "requires": {
+        "@codemirror/autocomplete": "^6.0.0",
+        "@codemirror/language": "^6.4.0",
+        "@codemirror/state": "^6.0.0",
+        "@lezer/common": "^1.0.0",
+        "@lezer/xml": "^1.0.0"
+      }
+    },
+    "@codemirror/language": {
+      "version": "6.9.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.9.0.tgz",
+      "integrity": "sha512-nFu311/0ne/qGuGCL3oKuktBgzVOaxCHZPZv1tLSZkNjPYxxvkjSbzno3MlErG2tgw1Yw1yF8BxMCegeMXqpiw==",
+      "requires": {
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.0.0",
+        "@lezer/common": "^1.0.0",
+        "@lezer/highlight": "^1.0.0",
+        "@lezer/lr": "^1.0.0",
+        "style-mod": "^4.0.0"
+      }
+    },
+    "@codemirror/lint": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.4.0.tgz",
+      "integrity": "sha512-6VZ44Ysh/Zn07xrGkdtNfmHCbGSHZzFBdzWi0pbd7chAQ/iUcpLGX99NYRZTa7Ugqg4kEHCqiHhcZnH0gLIgSg==",
+      "requires": {
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.0.0",
+        "crelt": "^1.0.5"
+      }
+    },
+    "@codemirror/search": {
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.1.tgz",
+      "integrity": "sha512-4jupk4JwkeVbrN2pStY74q6OJEYqwosB4koA66nyLeVedadtX9MHI38j2vbYmnfDGurDApP3OZO46MrWalcjiQ==",
+      "requires": {
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.0.0",
+        "crelt": "^1.0.5"
+      }
+    },
+    "@codemirror/state": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.2.1.tgz",
+      "integrity": "sha512-RupHSZ8+OjNT38zU9fKH2sv+Dnlr8Eb8sl4NOnnqz95mCFTZUaiRP8Xv5MeeaG0px2b8Bnfe7YGwCV3nsBhbuw=="
+    },
+    "@codemirror/view": {
+      "version": "6.16.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.16.0.tgz",
+      "integrity": "sha512-1Z2HkvkC3KR/oEZVuW9Ivmp8TWLzGEd8T8TA04TTwPvqogfkHBdYSlflytDOqmkUxM2d1ywTg7X2dU5mC+SXvg==",
+      "requires": {
+        "@codemirror/state": "^6.1.4",
+        "style-mod": "^4.0.0",
+        "w3c-keyname": "^2.2.4"
+      }
+    },
     "@colors/colors": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
@@ -10833,9 +11928,9 @@
       "requires": {}
     },
     "@cypress/request": {
-      "version": "2.88.11",
-      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.11.tgz",
-      "integrity": "sha512-M83/wfQ1EkspjkE2lNWNV5ui2Cv7UCv1swW1DqljahbzLVWltcsexQh8jYtuS/vzFXP+HySntGM83ZXA9fn17w==",
+      "version": "2.88.12",
+      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.12.tgz",
+      "integrity": "sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==",
       "dev": true,
       "requires": {
         "aws-sign2": "~0.7.0",
@@ -10853,7 +11948,7 @@
         "performance-now": "^2.1.0",
         "qs": "~6.10.3",
         "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.5.0",
+        "tough-cookie": "^4.1.3",
         "tunnel-agent": "^0.6.0",
         "uuid": "^8.3.2"
       }
@@ -10886,29 +11981,29 @@
       "dev": true
     },
     "@eslint-community/eslint-utils": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.3.0.tgz",
-      "integrity": "sha512-v3oplH6FYCULtFuCeqyuTd9D2WKO937Dxdq+GmHOLL72TTRriLxz2VLlNfkZRsvj6PKnOPAtuT6dwrs/pA5DvA==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
       "dev": true,
       "requires": {
         "eslint-visitor-keys": "^3.3.0"
       }
     },
     "@eslint-community/regexpp": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.4.1.tgz",
-      "integrity": "sha512-BISJ6ZE4xQsuL/FmsyRaiffpq977bMlsKfGHTQrOGFErfByxIe6iZTxPf/00Zon9b9a7iUykfQwejN3s2ZW/Bw==",
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz",
+      "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==",
       "dev": true
     },
     "@eslint/eslintrc": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.1.tgz",
-      "integrity": "sha512-eFRmABvW2E5Ho6f5fHLqgena46rOj7r7OKHYfLElqcBfGFHHpjBhivyi5+jOEQuSpdc/1phIZJlbC2te+tZNIw==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz",
+      "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==",
       "dev": true,
       "requires": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
-        "espree": "^9.5.0",
+        "espree": "^9.6.0",
         "globals": "^13.19.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
@@ -10918,9 +12013,9 @@
       },
       "dependencies": {
         "globals": {
-          "version": "13.20.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
-          "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+          "version": "13.21.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz",
+          "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==",
           "dev": true,
           "requires": {
             "type-fest": "^0.20.2"
@@ -10935,33 +12030,42 @@
       }
     },
     "@eslint/js": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.36.0.tgz",
-      "integrity": "sha512-lxJ9R5ygVm8ZWgYdUweoq5ownDlJ4upvoWmO4eLxBYHdMo+vZ/Rx0EN6MbKWDJOSUGrqJy2Gt+Dyv/VKml0fjg==",
+      "version": "8.47.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.47.0.tgz",
+      "integrity": "sha512-P6omY1zv5MItm93kLM8s2vr1HICJH8v0dvddDhysbIuZ+vcjOHg5Zbkf1mTkcmi2JA9oBG2anOkRnW8WJTS8Og==",
       "dev": true
     },
     "@floating-ui/core": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.2.4.tgz",
-      "integrity": "sha512-SQOeVbMwb1di+mVWWJLpsUTToKfqVNioXys011beCAhyOIFtS+GQoW4EQSneuxzmQKddExDwQ+X0hLl4lJJaSQ=="
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.4.1.tgz",
+      "integrity": "sha512-jk3WqquEJRlcyu7997NtR5PibI+y5bi+LS3hPmguVClypenMsCY3CBa3LAQnozRCtCrYWSEtAdiskpamuJRFOQ==",
+      "requires": {
+        "@floating-ui/utils": "^0.1.1"
+      }
     },
     "@floating-ui/dom": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.2.5.tgz",
-      "integrity": "sha512-+sAUfpQ3Frz+VCbPCqj+cZzvEESy3fjSeT/pDWkYCWOBXYNNKZfuVsHuv8/JO2zze8+Eb/Q7a6hZVgzS81fLbQ==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.5.1.tgz",
+      "integrity": "sha512-KwvVcPSXg6mQygvA1TjbN/gh///36kKtllIF8SUm0qpFj8+rvYrpvlYdL1JoA71SHpDqgSSdGOSoQ0Mp3uY5aw==",
       "requires": {
-        "@floating-ui/core": "^1.2.4"
+        "@floating-ui/core": "^1.4.1",
+        "@floating-ui/utils": "^0.1.1"
       }
     },
+    "@floating-ui/utils": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.1.tgz",
+      "integrity": "sha512-m0G6wlnhm/AX0H12IOWtK8gASEMffnX08RtKkCgTdHb9JpHKGloI7icFfLg9ZmQeavcvR0PKmzxClyuFPSjKWw=="
+    },
     "@fortawesome/fontawesome-free": {
-      "version": "5.15.4",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz",
-      "integrity": "sha512-eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg=="
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.2.tgz",
+      "integrity": "sha512-m5cPn3e2+FDCOgi1mz0RexTUvvQibBebOUlUlW0+YrMjDTPkiJ6VTKukA1GRsvRw+12KyJndNjj0O4AgTxm2Pg=="
     },
     "@humanwhocodes/config-array": {
-      "version": "0.11.8",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
-      "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==",
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz",
+      "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==",
       "dev": true,
       "requires": {
         "@humanwhocodes/object-schema": "^1.2.1",
@@ -10990,19 +12094,20 @@
       }
     },
     "@jridgewell/gen-mapping": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
-      "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
+      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
       "dev": true,
       "requires": {
-        "@jridgewell/set-array": "^1.0.0",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
       }
     },
     "@jridgewell/resolve-uri": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
+      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
       "dev": true
     },
     "@jridgewell/set-array": {
@@ -11012,42 +12117,105 @@
       "dev": true
     },
     "@jridgewell/source-map": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz",
-      "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz",
+      "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==",
       "dev": true,
       "requires": {
         "@jridgewell/gen-mapping": "^0.3.0",
         "@jridgewell/trace-mapping": "^0.3.9"
-      },
-      "dependencies": {
-        "@jridgewell/gen-mapping": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-          "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-          "dev": true,
-          "requires": {
-            "@jridgewell/set-array": "^1.0.1",
-            "@jridgewell/sourcemap-codec": "^1.4.10",
-            "@jridgewell/trace-mapping": "^0.3.9"
-          }
-        }
       }
     },
     "@jridgewell/sourcemap-codec": {
-      "version": "1.4.14",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
       "dev": true
     },
     "@jridgewell/trace-mapping": {
-      "version": "0.3.17",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz",
-      "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==",
+      "version": "0.3.19",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz",
+      "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==",
       "dev": true,
       "requires": {
-        "@jridgewell/resolve-uri": "3.1.0",
-        "@jridgewell/sourcemap-codec": "1.4.14"
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
+    "@lezer/common": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.0.4.tgz",
+      "integrity": "sha512-lZHlk8p67x4aIDtJl6UQrXSOP6oi7dQR3W/geFVrENdA1JDaAJWldnVqVjPMJupbTKbzDfFcePfKttqVidS/dg=="
+    },
+    "@lezer/css": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.1.3.tgz",
+      "integrity": "sha512-SjSM4pkQnQdJDVc80LYzEaMiNy9txsFbI7HsMgeVF28NdLaAdHNtQ+kB/QqDUzRBV/75NTXjJ/R5IdC8QQGxMg==",
+      "requires": {
+        "@lezer/highlight": "^1.0.0",
+        "@lezer/lr": "^1.0.0"
+      }
+    },
+    "@lezer/highlight": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.1.6.tgz",
+      "integrity": "sha512-cmSJYa2us+r3SePpRCjN5ymCqCPv+zyXmDl0ciWtVaNiORT/MxM7ZgOMQZADD0o51qOaOg24qc/zBViOIwAjJg==",
+      "requires": {
+        "@lezer/common": "^1.0.0"
+      }
+    },
+    "@lezer/html": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/@lezer/html/-/html-1.3.6.tgz",
+      "integrity": "sha512-Kk9HJARZTc0bAnMQUqbtuhFVsB4AnteR2BFUWfZV7L/x1H0aAKz6YabrfJ2gk/BEgjh9L3hg5O4y2IDZRBdzuQ==",
+      "requires": {
+        "@lezer/common": "^1.0.0",
+        "@lezer/highlight": "^1.0.0",
+        "@lezer/lr": "^1.0.0"
+      }
+    },
+    "@lezer/javascript": {
+      "version": "1.4.5",
+      "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.5.tgz",
+      "integrity": "sha512-FmBUHz8K1V22DgjTd6SrIG9owbzOYZ1t3rY6vGEmw+e2RVBd7sqjM8uXEVRFmfxKFn1Mx2ABJehHjrN3G2ZpmA==",
+      "requires": {
+        "@lezer/highlight": "^1.1.3",
+        "@lezer/lr": "^1.3.0"
+      }
+    },
+    "@lezer/json": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@lezer/json/-/json-1.0.1.tgz",
+      "integrity": "sha512-nkVC27qiEZEjySbi6gQRuMwa2sDu2PtfjSgz0A4QF81QyRGm3kb2YRzLcOPcTEtmcwvrX/cej7mlhbwViA4WJw==",
+      "requires": {
+        "@lezer/highlight": "^1.0.0",
+        "@lezer/lr": "^1.0.0"
+      }
+    },
+    "@lezer/lr": {
+      "version": "1.3.10",
+      "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.10.tgz",
+      "integrity": "sha512-BZfVvf7Re5BIwJHlZXbJn9L8lus5EonxQghyn+ih8Wl36XMFBPTXC0KM0IdUtj9w/diPHsKlXVgL+AlX2jYJ0Q==",
+      "requires": {
+        "@lezer/common": "^1.0.0"
+      }
+    },
+    "@lezer/php": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@lezer/php/-/php-1.0.1.tgz",
+      "integrity": "sha512-aqdCQJOXJ66De22vzdwnuC502hIaG9EnPK2rSi+ebXyUd+j7GAX1mRjWZOVOmf3GST1YUfUCu6WXDiEgDGOVwA==",
+      "requires": {
+        "@lezer/highlight": "^1.0.0",
+        "@lezer/lr": "^1.1.0"
+      }
+    },
+    "@lezer/xml": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@lezer/xml/-/xml-1.0.2.tgz",
+      "integrity": "sha512-dlngsWceOtQBMuBPw5wtHpaxdPJ71aVntqjbpGkFtWsp4WtQmCnuTjQGocviymydN6M18fhj6UQX3oiEtSuY7w==",
+      "requires": {
+        "@lezer/highlight": "^1.0.0",
+        "@lezer/lr": "^1.0.0"
       }
     },
     "@nodelib/fs.scandir": {
@@ -11077,9 +12245,9 @@
       }
     },
     "@popperjs/core": {
-      "version": "2.11.6",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz",
-      "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw=="
+      "version": "2.11.8",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
+      "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A=="
     },
     "@rollup/plugin-babel": {
       "version": "5.3.1",
@@ -11149,6 +12317,16 @@
         }
       }
     },
+    "@selderee/plugin-htmlparser2": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@selderee/plugin-htmlparser2/-/plugin-htmlparser2-0.11.0.tgz",
+      "integrity": "sha512-P33hHGdldxGabLFjPPpaTxVolMrzrcegejx+0GxjrIb9Zv48D8yAIA/QTDR2dFl7Uz7urX8aX6+5bCZslr+gWQ==",
+      "dev": true,
+      "requires": {
+        "domhandler": "^5.0.3",
+        "selderee": "^0.11.0"
+      }
+    },
     "@trysound/sax": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
@@ -11167,6 +12345,16 @@
       "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
       "dev": true
     },
+    "@types/mailparser": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/@types/mailparser/-/mailparser-3.4.0.tgz",
+      "integrity": "sha512-MotFinA1sT2nPFtQw1WpaF3X6I1OdbEloaixMmk924BOYqwHmlZkoi7XcVUXHI+7i0to8JguHqYj5k/E6c9Chw==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*",
+        "iconv-lite": "^0.6.3"
+      }
+    },
     "@types/minimist": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
@@ -11174,11 +12362,20 @@
       "dev": true
     },
     "@types/node": {
-      "version": "18.15.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.5.tgz",
-      "integrity": "sha512-Ark2WDjjZO7GmvsyFFf81MXuGTA/d6oP38anyxWOL6EREyBKAxKoFHwBhaZxCfLRLpO8JgVXwqOwSwa7jRcjew==",
+      "version": "20.5.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.1.tgz",
+      "integrity": "sha512-4tT2UrL5LBqDwoed9wZ6N3umC4Yhz3W3FloMmiiG4JwmUJWpie0c7lcnUNd4gtMKuDEO4wRVS8B6Xa0uMRsMKg==",
       "dev": true
     },
+    "@types/nodemailer": {
+      "version": "6.4.9",
+      "resolved": "https://registry.npmjs.org/@types/nodemailer/-/nodemailer-6.4.9.tgz",
+      "integrity": "sha512-XYG8Gv+sHjaOtUpiuytahMy2mM3rectgroNbs6R3djZEKmPNiIJwe9KqOJBGzKKnNZNKvnuvmugBgpq3w/S0ig==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
     "@types/normalize-package-data": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
@@ -11212,6 +12409,16 @@
       "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==",
       "dev": true
     },
+    "@types/smtp-server": {
+      "version": "3.5.7",
+      "resolved": "https://registry.npmjs.org/@types/smtp-server/-/smtp-server-3.5.7.tgz",
+      "integrity": "sha512-8HtcCeN1DCu3P3D4unfRlwRT2sM54PQSBnfwCf6HZl4CH234lTvTJxKXvZtcJajg8mCgiSLkJ6rratEhxgvhqQ==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*",
+        "@types/nodemailer": "*"
+      }
+    },
     "@types/yauzl": {
       "version": "2.10.0",
       "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
@@ -11223,53 +12430,64 @@
       }
     },
     "@vue/compiler-core": {
-      "version": "3.2.47",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.47.tgz",
-      "integrity": "sha512-p4D7FDnQb7+YJmO2iPEv0SQNeNzcbHdGByJDsT4lynf63AFkOTFN07HsiRSvjGo0QrxR/o3d0hUyNCUnBU2Tig==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.3.4.tgz",
+      "integrity": "sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==",
       "dev": true,
       "requires": {
-        "@babel/parser": "^7.16.4",
-        "@vue/shared": "3.2.47",
+        "@babel/parser": "^7.21.3",
+        "@vue/shared": "3.3.4",
         "estree-walker": "^2.0.2",
-        "source-map": "^0.6.1"
+        "source-map-js": "^1.0.2"
       }
     },
     "@vue/compiler-dom": {
-      "version": "3.2.47",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.47.tgz",
-      "integrity": "sha512-dBBnEHEPoftUiS03a4ggEig74J2YBZ2UIeyfpcRM2tavgMWo4bsEfgCGsu+uJIL/vax9S+JztH8NmQerUo7shQ==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.3.4.tgz",
+      "integrity": "sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w==",
       "dev": true,
       "requires": {
-        "@vue/compiler-core": "3.2.47",
-        "@vue/shared": "3.2.47"
+        "@vue/compiler-core": "3.3.4",
+        "@vue/shared": "3.3.4"
       }
     },
     "@vue/compiler-sfc": {
-      "version": "3.2.47",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.47.tgz",
-      "integrity": "sha512-rog05W+2IFfxjMcFw10tM9+f7i/+FFpZJJ5XHX72NP9eC2uRD+42M3pYcQqDXVYoj74kHMSEdQ/WmCjt8JFksQ==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.3.4.tgz",
+      "integrity": "sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ==",
       "dev": true,
       "requires": {
-        "@babel/parser": "^7.16.4",
-        "@vue/compiler-core": "3.2.47",
-        "@vue/compiler-dom": "3.2.47",
-        "@vue/compiler-ssr": "3.2.47",
-        "@vue/reactivity-transform": "3.2.47",
-        "@vue/shared": "3.2.47",
+        "@babel/parser": "^7.20.15",
+        "@vue/compiler-core": "3.3.4",
+        "@vue/compiler-dom": "3.3.4",
+        "@vue/compiler-ssr": "3.3.4",
+        "@vue/reactivity-transform": "3.3.4",
+        "@vue/shared": "3.3.4",
         "estree-walker": "^2.0.2",
-        "magic-string": "^0.25.7",
+        "magic-string": "^0.30.0",
         "postcss": "^8.1.10",
-        "source-map": "^0.6.1"
+        "source-map-js": "^1.0.2"
+      },
+      "dependencies": {
+        "magic-string": {
+          "version": "0.30.2",
+          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.2.tgz",
+          "integrity": "sha512-lNZdu7pewtq/ZvWUp9Wpf/x7WzMTsR26TWV03BRZrXFsv+BI6dy8RAiKgm1uM/kyR0rCfUcqvOlXKG66KhIGug==",
+          "dev": true,
+          "requires": {
+            "@jridgewell/sourcemap-codec": "^1.4.15"
+          }
+        }
       }
     },
     "@vue/compiler-ssr": {
-      "version": "3.2.47",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.47.tgz",
-      "integrity": "sha512-wVXC+gszhulcMD8wpxMsqSOpvDZ6xKXSVWkf50Guf/S+28hTAXPDYRTbLQ3EDkOP5Xz/+SY37YiwDquKbJOgZw==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.3.4.tgz",
+      "integrity": "sha512-m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ==",
       "dev": true,
       "requires": {
-        "@vue/compiler-dom": "3.2.47",
-        "@vue/shared": "3.2.47"
+        "@vue/compiler-dom": "3.3.4",
+        "@vue/shared": "3.3.4"
       }
     },
     "@vue/devtools-api": {
@@ -11293,16 +12511,27 @@
       }
     },
     "@vue/reactivity-transform": {
-      "version": "3.2.47",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.47.tgz",
-      "integrity": "sha512-m8lGXw8rdnPVVIdIFhf0LeQ/ixyHkH5plYuS83yop5n7ggVJU+z5v0zecwEnX7fa7HNLBhh2qngJJkxpwEEmYA==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.3.4.tgz",
+      "integrity": "sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw==",
       "dev": true,
       "requires": {
-        "@babel/parser": "^7.16.4",
-        "@vue/compiler-core": "3.2.47",
-        "@vue/shared": "3.2.47",
+        "@babel/parser": "^7.20.15",
+        "@vue/compiler-core": "3.3.4",
+        "@vue/shared": "3.3.4",
         "estree-walker": "^2.0.2",
-        "magic-string": "^0.25.7"
+        "magic-string": "^0.30.0"
+      },
+      "dependencies": {
+        "magic-string": {
+          "version": "0.30.2",
+          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.2.tgz",
+          "integrity": "sha512-lNZdu7pewtq/ZvWUp9Wpf/x7WzMTsR26TWV03BRZrXFsv+BI6dy8RAiKgm1uM/kyR0rCfUcqvOlXKG66KhIGug==",
+          "dev": true,
+          "requires": {
+            "@jridgewell/sourcemap-codec": "^1.4.15"
+          }
+        }
       }
     },
     "@vue/runtime-core": {
@@ -11384,15 +12613,15 @@
       }
     },
     "@vue/shared": {
-      "version": "3.2.47",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.47.tgz",
-      "integrity": "sha512-BHGyyGN3Q97EZx0taMQ+OLNuZcW3d37ZEVmEAyeoA9ERdGvm9Irc/0Fua8SNyOtV1w6BS4q25wbMzJujO9HIfQ==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz",
+      "integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==",
       "dev": true
     },
     "@webcomponents/webcomponentsjs": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.7.0.tgz",
-      "integrity": "sha512-j161Z9oiy8k74vchdrQGihfSp7QulrTclCUiPo0D7JF6/RjpXAmB0ThlTAFlSElkgqg0vdFgNAXaX9ZHZy25wQ=="
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.8.0.tgz",
+      "integrity": "sha512-loGD63sacRzOzSJgQnB9ZAhaQGkN7wl2Zuw7tsphI5Isa0irijrRo6EnJii/GgjGefIFO8AIO7UivzRhFaEk9w=="
     },
     "accessibility": {
       "version": "3.0.17",
@@ -11400,9 +12629,9 @@
       "integrity": "sha512-rQx2I1FE4Vd4Ejzd/PvXkSFYqQ0agUa26m9iSXcDkbQUmR81J7De/EmjYCh7dfcMVKbII1fsA7weQI4yJrE5QA=="
     },
     "acorn": {
-      "version": "8.8.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
-      "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
+      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
       "dev": true
     },
     "acorn-jsx": {
@@ -11515,6 +12744,19 @@
       "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
       "dev": true
     },
+    "array.prototype.findlastindex": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.2.tgz",
+      "integrity": "sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0",
+        "get-intrinsic": "^1.1.3"
+      }
+    },
     "array.prototype.flat": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
@@ -11539,6 +12781,20 @@
         "es-shim-unscopables": "^1.0.0"
       }
     },
+    "arraybuffer.prototype.slice": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz",
+      "integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==",
+      "dev": true,
+      "requires": {
+        "array-buffer-byte-length": "^1.0.0",
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "get-intrinsic": "^1.2.1",
+        "is-array-buffer": "^3.0.2",
+        "is-shared-array-buffer": "^1.0.2"
+      }
+    },
     "arrify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
@@ -11590,13 +12846,13 @@
       "integrity": "sha512-VVE1H6cc4ai+ZXo/CRWoJiHXrA1qfA31DPnx6D20+kSI547hQN5Greh51LQ1baMRMfxO5K5M4ImMtZbZt2DODQ=="
     },
     "autoprefixer": {
-      "version": "10.4.14",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz",
-      "integrity": "sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==",
+      "version": "10.4.15",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.15.tgz",
+      "integrity": "sha512-KCuPB8ZCIqFdA4HwKXsvz7j6gvSDNhDP7WnUjBleRkKjPdvCmHFuQ77ocavI8FT6NdvlBnE2UFr2H4Mycn8Vew==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.21.5",
-        "caniuse-lite": "^1.0.30001464",
+        "browserslist": "^4.21.10",
+        "caniuse-lite": "^1.0.30001520",
         "fraction.js": "^4.2.0",
         "normalize-range": "^0.1.2",
         "picocolors": "^1.0.0",
@@ -11627,33 +12883,33 @@
       "dev": true
     },
     "babel-plugin-polyfill-corejs2": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz",
-      "integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==",
+      "version": "0.4.5",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.5.tgz",
+      "integrity": "sha512-19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.17.7",
-        "@babel/helper-define-polyfill-provider": "^0.3.3",
-        "semver": "^6.1.1"
+        "@babel/compat-data": "^7.22.6",
+        "@babel/helper-define-polyfill-provider": "^0.4.2",
+        "semver": "^6.3.1"
       }
     },
     "babel-plugin-polyfill-corejs3": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz",
-      "integrity": "sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==",
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.3.tgz",
+      "integrity": "sha512-z41XaniZL26WLrvjy7soabMXrfPWARN25PZoriDEiLMxAp50AUW3t35BGQUMg5xK3UrpVTtagIDklxYa+MhiNA==",
       "dev": true,
       "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.3.3",
-        "core-js-compat": "^3.25.1"
+        "@babel/helper-define-polyfill-provider": "^0.4.2",
+        "core-js-compat": "^3.31.0"
       }
     },
     "babel-plugin-polyfill-regenerator": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz",
-      "integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.2.tgz",
+      "integrity": "sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA==",
       "dev": true,
       "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.3.3"
+        "@babel/helper-define-polyfill-provider": "^0.4.2"
       }
     },
     "balanced-match": {
@@ -11662,6 +12918,12 @@
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true
     },
+    "base32.js": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/base32.js/-/base32.js-0.1.0.tgz",
+      "integrity": "sha512-n3TkB02ixgBOhTvANakDb4xaMXnYUVkNoRFJjQflcqMQhyEKxEHdj3E6N8t8sUQ0mjH/3/JxzlXuz3ul/J90pQ==",
+      "dev": true
+    },
     "base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
@@ -11708,9 +12970,9 @@
       "dev": true
     },
     "bootstrap": {
-      "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.3.tgz",
-      "integrity": "sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.1.tgz",
+      "integrity": "sha512-jzwza3Yagduci2x0rr9MeFSORjcHpt0lRZukZPZQJT1Dth5qzV7XcgGqYzi39KGAVYR8QEDVoO0ubFKOxzMG+g==",
       "requires": {}
     },
     "brace-expansion": {
@@ -11733,15 +12995,15 @@
       }
     },
     "browserslist": {
-      "version": "4.21.5",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz",
-      "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==",
+      "version": "4.21.10",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz",
+      "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30001449",
-        "electron-to-chromium": "^1.4.284",
-        "node-releases": "^2.0.8",
-        "update-browserslist-db": "^1.0.10"
+        "caniuse-lite": "^1.0.30001517",
+        "electron-to-chromium": "^1.4.477",
+        "node-releases": "^2.0.13",
+        "update-browserslist-db": "^1.0.11"
       }
     },
     "buffer": {
@@ -11779,9 +13041,9 @@
       "dev": true
     },
     "cachedir": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.3.0.tgz",
-      "integrity": "sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.4.0.tgz",
+      "integrity": "sha512-9EtFOZR8g22CL7BWjJ9BUx1+A/djkofnyW3aOXZORNW2kxoUpx2h+uN2cOqwPmFhnpVmxg+KW2OjOSgChTEvsQ==",
       "dev": true
     },
     "call-bind": {
@@ -11830,9 +13092,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001469",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001469.tgz",
-      "integrity": "sha512-Rcp7221ScNqQPP3W+lVOYDyjdR6dC+neEQCttoNr5bAyz54AboB4iwpnWgyi8P4YUsPybVzT4LgWiBbI3drL4g==",
+      "version": "1.0.30001522",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001522.tgz",
+      "integrity": "sha512-TKiyTVZxJGhsTszLuzb+6vUZSjVOAhClszBr2Ta2k9IwtNBT/4dzmL6aywt0HCgEZlmwJzXJd8yNiob6HgwTRg==",
       "dev": true
     },
     "caseless": {
@@ -11907,7 +13169,16 @@
       "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
       "dev": true,
       "requires": {
-        "restore-cursor": "^3.1.0"
+        "restore-cursor": "^3.1.0"
+      }
+    },
+    "cli-progress": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/cli-progress/-/cli-progress-3.12.0.tgz",
+      "integrity": "sha512-tRkV3HJ1ASwm19THiiLIXLO7Im7wlTuKnvkYaTkyoAPefqjNg7W7DHKUlGRxy9vxDvbyCYQkQozvptuMkGCg8A==",
+      "dev": true,
+      "requires": {
+        "string-width": "^4.2.3"
       }
     },
     "cli-table3": {
@@ -11930,11 +13201,6 @@
         "string-width": "^4.2.0"
       }
     },
-    "codemirror": {
-      "version": "5.65.12",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.12.tgz",
-      "integrity": "sha512-z2jlHBocElRnPYysN2HAuhXbO3DNB0bcSKmNz3hcWR2Js2Dkhc1bEOxG93Z3DeUrnm+qx56XOY5wQmbP5KY0sw=="
-    },
     "color-convert": {
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
@@ -11957,9 +13223,9 @@
       "dev": true
     },
     "colorette": {
-      "version": "2.0.19",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
-      "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==",
+      "version": "2.0.20",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
       "dev": true
     },
     "combined-stream": {
@@ -12017,18 +13283,18 @@
       "dev": true
     },
     "core-js": {
-      "version": "3.29.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.29.1.tgz",
-      "integrity": "sha512-+jwgnhg6cQxKYIIjGtAHq2nwUOolo9eoFZ4sHfUH09BLXBgxnH4gA0zEd+t+BO2cNB8idaBtZFcFTRjQJRJmAw==",
+      "version": "3.32.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.32.1.tgz",
+      "integrity": "sha512-lqufgNn9NLnESg5mQeYsxQP5w7wrViSj0jr/kv6ECQiByzQkrn1MKvV0L3acttpDqfQrHLwr2KCMgX5b8X+lyQ==",
       "dev": true
     },
     "core-js-compat": {
-      "version": "3.29.1",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.29.1.tgz",
-      "integrity": "sha512-QmchCua884D8wWskMX8tW5ydINzd8oSJVx38lx/pVkFGqztxt73GYre3pm/hyYq8bPf+MW5In4I/uRShFDsbrA==",
+      "version": "3.32.1",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.32.1.tgz",
+      "integrity": "sha512-GSvKDv4wE0bPnQtjklV101juQ85g6H3rm5PDP20mqlS5j0kXF3pP97YvAu5hl+uFHqMictp3b2VxOHljWMAtuA==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.21.5"
+        "browserslist": "^4.21.10"
       }
     },
     "core-util-is": {
@@ -12050,6 +13316,11 @@
         "yaml": "^1.10.0"
       }
     },
+    "crelt": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz",
+      "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g=="
+    },
     "cropperjs": {
       "version": "1.5.13",
       "resolved": "https://registry.npmjs.org/cropperjs/-/cropperjs-1.5.13.tgz",
@@ -12075,16 +13346,16 @@
       }
     },
     "css-declaration-sorter": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz",
-      "integrity": "sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz",
+      "integrity": "sha512-rtdthzxKuyq6IzqX6jEcIzQF/YqccluefyCYheovBOLhFT/drQA9zj/UbRAa9J7C0o6EG6u3E6g+vKkay7/k3g==",
       "dev": true,
       "requires": {}
     },
     "css-functions-list": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.1.0.tgz",
-      "integrity": "sha512-/9lCvYZaUbBGvYUgYGFJ4dcYiyqdhSjG7IPVluoV8A1ILjkF7ilmhp1OGUz8n+nmBcu0RNrQAzgD8B6FJbrt2w==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.0.tgz",
+      "integrity": "sha512-d/jBMPyYybkkLVypgtGv12R+pIFw4/f/IHtCTxWpZc8ofTYOPigIgmA6vu5rMHartZC+WuXhBUHfnyNUIQSYrg==",
       "dev": true
     },
     "css-select": {
@@ -12098,6 +13369,45 @@
         "domhandler": "^4.3.1",
         "domutils": "^2.8.0",
         "nth-check": "^2.0.1"
+      },
+      "dependencies": {
+        "dom-serializer": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+          "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
+          "dev": true,
+          "requires": {
+            "domelementtype": "^2.0.1",
+            "domhandler": "^4.2.0",
+            "entities": "^2.0.0"
+          }
+        },
+        "domhandler": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+          "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+          "dev": true,
+          "requires": {
+            "domelementtype": "^2.2.0"
+          }
+        },
+        "domutils": {
+          "version": "2.8.0",
+          "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+          "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+          "dev": true,
+          "requires": {
+            "dom-serializer": "^1.0.1",
+            "domelementtype": "^2.2.0",
+            "domhandler": "^4.2.0"
+          }
+        },
+        "entities": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+          "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+          "dev": true
+        }
       }
     },
     "css-tree": {
@@ -12197,14 +13507,14 @@
       "integrity": "sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg=="
     },
     "cypress": {
-      "version": "12.8.1",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.8.1.tgz",
-      "integrity": "sha512-lIFbKdaSYAOarNLHNFa2aPZu6YSF+8UY4VRXMxJrFUnk6RvfG0AWsZ7/qle/aIz30TNUD4aOihz2ZgS4vuQVSA==",
+      "version": "12.17.4",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.4.tgz",
+      "integrity": "sha512-gAN8Pmns9MA5eCDFSDJXWKUpaL3IDd89N9TtIupjYnzLSmlpVr+ZR+vb4U/qaMp+lB6tBvAmt7504c3Z4RU5KQ==",
       "dev": true,
       "requires": {
-        "@cypress/request": "^2.88.10",
+        "@cypress/request": "2.88.12",
         "@cypress/xvfb": "^1.2.4",
-        "@types/node": "^14.14.31",
+        "@types/node": "^16.18.39",
         "@types/sinonjs__fake-timers": "8.1.1",
         "@types/sizzle": "^2.3.2",
         "arch": "^2.2.0",
@@ -12216,7 +13526,7 @@
         "check-more-types": "^2.24.0",
         "cli-cursor": "^3.1.0",
         "cli-table3": "~0.6.1",
-        "commander": "^5.1.0",
+        "commander": "^6.2.1",
         "common-tags": "^1.8.0",
         "dayjs": "^1.10.4",
         "debug": "^4.3.4",
@@ -12234,12 +13544,13 @@
         "listr2": "^3.8.3",
         "lodash": "^4.17.21",
         "log-symbols": "^4.0.0",
-        "minimist": "^1.2.6",
+        "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.3.2",
+        "semver": "^7.5.3",
         "supports-color": "^8.1.1",
         "tmp": "~0.2.1",
         "untildify": "^4.0.0",
@@ -12247,9 +13558,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "14.18.40",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.40.tgz",
-          "integrity": "sha512-pGteXO/JQX7wPxGR8lyT+doqjMa7XvlVowwrDwLfX92k5SdLkk4cwC7CYSLBxrenw/R5oQwKioVIak7ZgplM3g==",
+          "version": "16.18.41",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.41.tgz",
+          "integrity": "sha512-YZJjn+Aaw0xihnpdImxI22jqGbp0DCgTFKRycygjGx/Y27NnWFJa5FJ7P+MRT3u07dogEeMVh70pWpbIQollTA==",
           "dev": true
         },
         "ansi-styles": {
@@ -12298,9 +13609,9 @@
           "dev": true
         },
         "commander": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
-          "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
+          "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
           "dev": true
         },
         "fs-extra": {
@@ -12331,9 +13642,9 @@
           }
         },
         "semver": {
-          "version": "7.3.8",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+          "version": "7.5.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
@@ -12366,9 +13677,9 @@
       }
     },
     "dayjs": {
-      "version": "1.11.7",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz",
-      "integrity": "sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==",
+      "version": "1.11.9",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.9.tgz",
+      "integrity": "sha512-QvzAURSbQ0pKdIye2txOzNaHmxtUBXerpY0FJsFXUMKbIZeFm5ht1LS/jFsrncjnmtv8HsG0W2g6c0zUjZWmpA==",
       "dev": true
     },
     "debug": {
@@ -12455,14 +13766,14 @@
       }
     },
     "dom-serializer": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
+      "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
       "dev": true,
       "requires": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.0",
-        "entities": "^2.0.0"
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.2",
+        "entities": "^4.2.0"
       }
     },
     "dom-walk": {
@@ -12477,29 +13788,29 @@
       "dev": true
     },
     "domhandler": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
-      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
+      "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
       "dev": true,
       "requires": {
-        "domelementtype": "^2.2.0"
+        "domelementtype": "^2.3.0"
       }
     },
     "domutils": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
+      "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
       "dev": true,
       "requires": {
-        "dom-serializer": "^1.0.1",
-        "domelementtype": "^2.2.0",
-        "domhandler": "^4.2.0"
+        "dom-serializer": "^2.0.0",
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3"
       }
     },
     "dotenv": {
-      "version": "16.0.3",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.3.tgz",
-      "integrity": "sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ=="
+      "version": "16.3.1",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz",
+      "integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ=="
     },
     "dragula": {
       "version": "3.7.3",
@@ -12521,9 +13832,9 @@
       }
     },
     "electron-to-chromium": {
-      "version": "1.4.337",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.337.tgz",
-      "integrity": "sha512-W8gdzXG86mVPoc56eM8YA+QiLxaAxJ8cmDjxZgfhLLWVvZQxyA918w5tX2JEWApZta45T1/sYcmFHTsTOUE3nw==",
+      "version": "1.4.496",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.496.tgz",
+      "integrity": "sha512-qeXC3Zbykq44RCrBa4kr8v/dWzYJA8rAwpyh9Qd+NKWoJfjG5vvJqy9XOJ9H4P/lqulZBCgUWAYi+FeK5AuJ8g==",
       "dev": true
     },
     "emoji-regex": {
@@ -12532,6 +13843,12 @@
       "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
       "dev": true
     },
+    "encoding-japanese": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/encoding-japanese/-/encoding-japanese-2.0.0.tgz",
+      "integrity": "sha512-++P0RhebUC8MJAwJOsT93dT+5oc5oPImp1HubZpAuCZ5kTLnhuuBhKHj2jJeO/Gj93idPBWmIuQ9QWMe5rX3pQ==",
+      "dev": true
+    },
     "end-of-stream": {
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
@@ -12542,18 +13859,19 @@
       }
     },
     "enquirer": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz",
+      "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==",
       "dev": true,
       "requires": {
-        "ansi-colors": "^4.1.1"
+        "ansi-colors": "^4.1.1",
+        "strip-ansi": "^6.0.1"
       }
     },
     "entities": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
       "dev": true
     },
     "error-ex": {
@@ -12566,18 +13884,19 @@
       }
     },
     "es-abstract": {
-      "version": "1.21.2",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz",
-      "integrity": "sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==",
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz",
+      "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==",
       "dev": true,
       "requires": {
         "array-buffer-byte-length": "^1.0.0",
+        "arraybuffer.prototype.slice": "^1.0.1",
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
         "es-set-tostringtag": "^2.0.1",
         "es-to-primitive": "^1.2.1",
         "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.2.0",
+        "get-intrinsic": "^1.2.1",
         "get-symbol-description": "^1.0.0",
         "globalthis": "^1.0.3",
         "gopd": "^1.0.1",
@@ -12597,16 +13916,25 @@
         "object-inspect": "^1.12.3",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.4.3",
+        "regexp.prototype.flags": "^1.5.0",
+        "safe-array-concat": "^1.0.0",
         "safe-regex-test": "^1.0.0",
         "string.prototype.trim": "^1.2.7",
         "string.prototype.trimend": "^1.0.6",
         "string.prototype.trimstart": "^1.0.6",
+        "typed-array-buffer": "^1.0.0",
+        "typed-array-byte-length": "^1.0.0",
+        "typed-array-byte-offset": "^1.0.0",
         "typed-array-length": "^1.0.4",
         "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.9"
+        "which-typed-array": "^1.1.10"
       }
     },
+    "es-module-shims": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/es-module-shims/-/es-module-shims-1.8.0.tgz",
+      "integrity": "sha512-5l/AqgnWvYFF38qkK8VNoQ8BL3LkJ8bAJuxhOKA/JqoLC4bcaeJeLwMkhEcrDsf5IUCDdwZ6eEG40+Xuh/APcQ=="
+    },
     "es-set-tostringtag": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
@@ -12651,27 +13979,27 @@
       "dev": true
     },
     "eslint": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.36.0.tgz",
-      "integrity": "sha512-Y956lmS7vDqomxlaaQAHVmeb4tNMp2FWIvU/RnU5BD3IKMD/MJPr76xdyr68P8tV1iNMvN2mRK0yy3c+UjL+bw==",
+      "version": "8.47.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.47.0.tgz",
+      "integrity": "sha512-spUQWrdPt+pRVP1TTJLmfRNJJHHZryFmptzcafwSvHsceV81djHOdnEeDmkdotZyLNjDhrOasNK8nikkoG1O8Q==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.4.0",
-        "@eslint/eslintrc": "^2.0.1",
-        "@eslint/js": "8.36.0",
-        "@humanwhocodes/config-array": "^0.11.8",
+        "@eslint-community/regexpp": "^4.6.1",
+        "@eslint/eslintrc": "^2.1.2",
+        "@eslint/js": "^8.47.0",
+        "@humanwhocodes/config-array": "^0.11.10",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
-        "ajv": "^6.10.0",
+        "ajv": "^6.12.4",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
         "debug": "^4.3.2",
         "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.1.1",
-        "eslint-visitor-keys": "^3.3.0",
-        "espree": "^9.5.0",
+        "eslint-scope": "^7.2.2",
+        "eslint-visitor-keys": "^3.4.3",
+        "espree": "^9.6.1",
         "esquery": "^1.4.2",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
@@ -12679,22 +14007,19 @@
         "find-up": "^5.0.0",
         "glob-parent": "^6.0.2",
         "globals": "^13.19.0",
-        "grapheme-splitter": "^1.0.4",
+        "graphemer": "^1.4.0",
         "ignore": "^5.2.0",
-        "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
         "is-path-inside": "^3.0.3",
-        "js-sdsl": "^4.1.4",
         "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.4.1",
         "lodash.merge": "^4.6.2",
         "minimatch": "^3.1.2",
         "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
+        "optionator": "^0.9.3",
         "strip-ansi": "^6.0.1",
-        "strip-json-comments": "^3.1.0",
         "text-table": "^0.2.0"
       },
       "dependencies": {
@@ -12748,9 +14073,9 @@
           }
         },
         "globals": {
-          "version": "13.20.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
-          "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+          "version": "13.21.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz",
+          "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==",
           "dev": true,
           "requires": {
             "type-fest": "^0.20.2"
@@ -12792,14 +14117,14 @@
       }
     },
     "eslint-import-resolver-node": {
-      "version": "0.3.7",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz",
-      "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==",
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
+      "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
       "dev": true,
       "requires": {
         "debug": "^3.2.7",
-        "is-core-module": "^2.11.0",
-        "resolve": "^1.22.1"
+        "is-core-module": "^2.13.0",
+        "resolve": "^1.22.4"
       },
       "dependencies": {
         "debug": {
@@ -12814,9 +14139,9 @@
       }
     },
     "eslint-module-utils": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
-      "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz",
+      "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==",
       "dev": true,
       "requires": {
         "debug": "^3.2.7"
@@ -12834,26 +14159,28 @@
       }
     },
     "eslint-plugin-import": {
-      "version": "2.27.5",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz",
-      "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==",
+      "version": "2.28.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.1.tgz",
+      "integrity": "sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==",
       "dev": true,
       "requires": {
         "array-includes": "^3.1.6",
+        "array.prototype.findlastindex": "^1.2.2",
         "array.prototype.flat": "^1.3.1",
         "array.prototype.flatmap": "^1.3.1",
         "debug": "^3.2.7",
         "doctrine": "^2.1.0",
         "eslint-import-resolver-node": "^0.3.7",
-        "eslint-module-utils": "^2.7.4",
+        "eslint-module-utils": "^2.8.0",
         "has": "^1.0.3",
-        "is-core-module": "^2.11.0",
+        "is-core-module": "^2.13.0",
         "is-glob": "^4.0.3",
         "minimatch": "^3.1.2",
+        "object.fromentries": "^2.0.6",
+        "object.groupby": "^1.0.0",
         "object.values": "^1.1.6",
-        "resolve": "^1.22.1",
-        "semver": "^6.3.0",
-        "tsconfig-paths": "^3.14.1"
+        "semver": "^6.3.1",
+        "tsconfig-paths": "^3.14.2"
       },
       "dependencies": {
         "debug": {
@@ -12900,9 +14227,9 @@
           }
         },
         "semver": {
-          "version": "7.3.8",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+          "version": "7.5.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
@@ -12917,9 +14244,9 @@
       }
     },
     "eslint-scope": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
       "dev": true,
       "requires": {
         "esrecurse": "^4.3.0",
@@ -12944,20 +14271,20 @@
       }
     },
     "eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
       "dev": true
     },
     "espree": {
-      "version": "9.5.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.0.tgz",
-      "integrity": "sha512-JPbJGhKc47++oo4JkEoTe2wjy4fmMwvFpgJT9cQzmfXKp22Dr6Hf1tdCteLz1h0P3t+mGvWZ+4Uankvh8+c6zw==",
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
       "dev": true,
       "requires": {
-        "acorn": "^8.8.0",
+        "acorn": "^8.9.0",
         "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.3.0"
+        "eslint-visitor-keys": "^3.4.1"
       }
     },
     "esquery": {
@@ -13058,9 +14385,9 @@
       "dev": true
     },
     "fast-glob": {
-      "version": "3.2.12",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
-      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
+      "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
       "dev": true,
       "requires": {
         "@nodelib/fs.stat": "^2.0.2",
@@ -13198,9 +14525,9 @@
       }
     },
     "fraction.js": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
-      "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.1.tgz",
+      "integrity": "sha512-/KxoyCnPM0GwYI4NN0Iag38Tqt+od3/mLuguepLgCAKPn0ZhC544nssAW0tG2/00zXEYl9W+7hwAIpLHo6Oc7Q==",
       "dev": true
     },
     "fs-extra": {
@@ -13263,13 +14590,14 @@
       "dev": true
     },
     "get-intrinsic": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz",
-      "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
+      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
       "dev": true,
       "requires": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
+        "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3"
       }
     },
@@ -13438,10 +14766,10 @@
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
       "dev": true
     },
-    "grapheme-splitter": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
+    "graphemer": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
       "dev": true
     },
     "hard-rejection": {
@@ -13507,6 +14835,12 @@
       "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
       "dev": true
     },
+    "he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "dev": true
+    },
     "hosted-git-info": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
@@ -13534,16 +14868,41 @@
       }
     },
     "hotkeys-js": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/hotkeys-js/-/hotkeys-js-3.10.1.tgz",
-      "integrity": "sha512-mshqjgTqx8ee0qryHvRgZaZDxTwxam/2yTQmQlqAWS3+twnq1jsY9Yng9zB7lWq6WRrjTbTOc7knNwccXQiAjQ=="
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/hotkeys-js/-/hotkeys-js-3.12.0.tgz",
+      "integrity": "sha512-Z+N573ycUKIGwFYS3ID1RzMJiGmtWMGKMiaNLyJS8B1ei+MllF4ZYmKS2T0kMWBktOz+WZLVNikftEgnukOrXg=="
     },
     "html-tags": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.2.0.tgz",
-      "integrity": "sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.3.1.tgz",
+      "integrity": "sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==",
       "dev": true
     },
+    "html-to-text": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/html-to-text/-/html-to-text-9.0.5.tgz",
+      "integrity": "sha512-qY60FjREgVZL03vJU6IfMV4GDjGBIoOyvuFdpBDIX9yTlDw0TjxVBQp+P8NvpdIXNJvfWBTNul7fsAQJq2FNpg==",
+      "dev": true,
+      "requires": {
+        "@selderee/plugin-htmlparser2": "^0.11.0",
+        "deepmerge": "^4.3.1",
+        "dom-serializer": "^2.0.0",
+        "htmlparser2": "^8.0.2",
+        "selderee": "^0.11.0"
+      }
+    },
+    "htmlparser2": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz",
+      "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==",
+      "dev": true,
+      "requires": {
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3",
+        "domutils": "^3.0.1",
+        "entities": "^4.4.0"
+      }
+    },
     "http-signature": {
       "version": "1.3.6",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz",
@@ -13561,6 +14920,15 @@
       "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
       "dev": true
     },
+    "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,
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      }
+    },
     "ieee754": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
@@ -13574,9 +14942,9 @@
       "dev": true
     },
     "immutable": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.0.tgz",
-      "integrity": "sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg==",
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.2.tgz",
+      "integrity": "sha512-oGXzbEDem9OOpDWZu88jGiYCvIsLHMvGw+8OXlpsvTFvIQplQbjg1B1cvKg8f7Hoch6+NGjpPsH1Fr+Mc2D1aA==",
       "dev": true
     },
     "import-fresh": {
@@ -13640,6 +15008,12 @@
         "side-channel": "^1.0.4"
       }
     },
+    "ipv6-normalize": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ipv6-normalize/-/ipv6-normalize-1.0.1.tgz",
+      "integrity": "sha512-Bm6H79i01DjgGTCWjUuCjJ6QDo1HB96PT/xCYuyJUP9WFbVDrLSbG4EZCvOCun2rNswZb0c3e4Jt/ws795esHA==",
+      "dev": true
+    },
     "is-array-buffer": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
@@ -13710,9 +15084,9 @@
       }
     },
     "is-core-module": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz",
+      "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
       "dev": true,
       "requires": {
         "has": "^1.0.3"
@@ -13856,16 +15230,12 @@
       }
     },
     "is-typed-array": {
-      "version": "1.1.10",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz",
-      "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
+      "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
       "dev": true,
       "requires": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0"
+        "which-typed-array": "^1.1.11"
       }
     },
     "is-typedarray": {
@@ -13925,9 +15295,9 @@
       "integrity": "sha512-Rgm5yjvYn3C9juR9QMU/8H4mBXtpayb6zfgA5uIx7EHgGjGQzk3njCykatC7mrcrIjp3Fei5hghP5nHpQxlbGg=="
     },
     "jquery": {
-      "version": "3.6.4",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.4.tgz",
-      "integrity": "sha512-v28EW9DWDFpzcD9O5iyJXg3R3+q+mET5JhnjJzQUZMHOv67bpSIHq81GEYpPNZHG+XXHsfSme3nxp/hndKEcsQ=="
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.0.tgz",
+      "integrity": "sha512-umpJ0/k8X0MvD1ds0P9SfowREz2LenHsQaxSohMZ5OMNEU2r0tf8pdeEFTHMFxWVxKNyU9rTtK3CWzUCTKJUeQ=="
     },
     "jquery-migrate": {
       "version": "3.4.1",
@@ -13935,12 +15305,6 @@
       "integrity": "sha512-6RaV23lLAYccu8MtLfy2sIxOvx+bulnWHm/pvffAi7KOzPk1sN9IYglpkl1ZNCj1FSgSNDPS2fSZ1hWsXc200Q==",
       "requires": {}
     },
-    "js-sdsl": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.4.0.tgz",
-      "integrity": "sha512-FfVSdx6pJ41Oa+CF7RDaFmTnCaFhua+SNYQX74riGOpl96x+2jQCqEfQ2bnXu/5DPCqlRuiqyvTJM0Qjz26IVg==",
-      "dev": true
-    },
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -14044,6 +15408,12 @@
       "integrity": "sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==",
       "dev": true
     },
+    "leac": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/leac/-/leac-0.6.0.tgz",
+      "integrity": "sha512-y+SqErxb8h7nE/fiEX07jsbuhrpO9lL8eca7/Y1nuWV2moNlXhyd59iDGcRf6moVyDMbmTNzL40SUyrFU/yDpg==",
+      "dev": true
+    },
     "levn": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
@@ -14054,6 +15424,30 @@
         "type-check": "~0.4.0"
       }
     },
+    "libbase64": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/libbase64/-/libbase64-1.2.1.tgz",
+      "integrity": "sha512-l+nePcPbIG1fNlqMzrh68MLkX/gTxk/+vdvAb388Ssi7UuUN31MI44w4Yf33mM3Cm4xDfw48mdf3rkdHszLNew==",
+      "dev": true
+    },
+    "libmime": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/libmime/-/libmime-5.2.1.tgz",
+      "integrity": "sha512-A0z9O4+5q+ZTj7QwNe/Juy1KARNb4WaviO4mYeFC4b8dBT2EEqK2pkM+GC8MVnkOjqhl5nYQxRgnPYRRTNmuSQ==",
+      "dev": true,
+      "requires": {
+        "encoding-japanese": "2.0.0",
+        "iconv-lite": "0.6.3",
+        "libbase64": "1.2.1",
+        "libqp": "2.0.1"
+      }
+    },
+    "libqp": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/libqp/-/libqp-2.0.1.tgz",
+      "integrity": "sha512-Ka0eC5LkF3IPNQHJmYBWljJsw0UvM6j+QdKRbWyCdTmYwvIDE6a7bCm0UkTAL/K+3KXK5qXT/ClcInU01OpdLg==",
+      "dev": true
+    },
     "lilconfig": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
@@ -14066,6 +15460,15 @@
       "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
       "dev": true
     },
+    "linkify-it": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz",
+      "integrity": "sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==",
+      "dev": true,
+      "requires": {
+        "uc.micro": "^1.0.1"
+      }
+    },
     "listr2": {
       "version": "3.14.0",
       "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz",
@@ -14271,6 +15674,48 @@
         "sourcemap-codec": "^1.4.8"
       }
     },
+    "mailparser": {
+      "version": "3.6.5",
+      "resolved": "https://registry.npmjs.org/mailparser/-/mailparser-3.6.5.tgz",
+      "integrity": "sha512-nteTpF0Khm5JLOnt4sigmzNdUH/6mO7PZ4KEnvxf4mckyXYFFhrtAWZzbq/V5aQMH+049gA7ZjfLdh+QiX2Uqg==",
+      "dev": true,
+      "requires": {
+        "encoding-japanese": "2.0.0",
+        "he": "1.2.0",
+        "html-to-text": "9.0.5",
+        "iconv-lite": "0.6.3",
+        "libmime": "5.2.1",
+        "linkify-it": "4.0.1",
+        "mailsplit": "5.4.0",
+        "nodemailer": "6.9.3",
+        "tlds": "1.240.0"
+      }
+    },
+    "mailsplit": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/mailsplit/-/mailsplit-5.4.0.tgz",
+      "integrity": "sha512-wnYxX5D5qymGIPYLwnp6h8n1+6P6vz/MJn5AzGjZ8pwICWssL+CCQjWBIToOVHASmATot4ktvlLo6CyLfOXWYA==",
+      "dev": true,
+      "requires": {
+        "libbase64": "1.2.1",
+        "libmime": "5.2.0",
+        "libqp": "2.0.1"
+      },
+      "dependencies": {
+        "libmime": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/libmime/-/libmime-5.2.0.tgz",
+          "integrity": "sha512-X2U5Wx0YmK0rXFbk67ASMeqYIkZ6E5vY7pNWRKtnNzqjvdYYG8xtPDpCnuUEnPU9vlgNev+JoSrcaKSUaNvfsw==",
+          "dev": true,
+          "requires": {
+            "encoding-japanese": "2.0.0",
+            "iconv-lite": "0.6.3",
+            "libbase64": "1.2.1",
+            "libqp": "2.0.1"
+          }
+        }
+      }
+    },
     "map-obj": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
@@ -14446,9 +15891,9 @@
       }
     },
     "nanoid": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
+      "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA=="
     },
     "natural-compare": {
       "version": "1.4.0",
@@ -14457,9 +15902,15 @@
       "dev": true
     },
     "node-releases": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz",
-      "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==",
+      "version": "2.0.13",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
+      "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==",
+      "dev": true
+    },
+    "nodemailer": {
+      "version": "6.9.3",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.3.tgz",
+      "integrity": "sha512-fy9v3NgTzBngrMFkDsKEj0r02U7jm6XfC3b52eoNV+GCrGj+s8pt5OqhiJdWKuw51zCTdiNR/IUD1z33LIIGpg==",
       "dev": true
     },
     "normalize-package-data": {
@@ -14484,9 +15935,9 @@
           }
         },
         "semver": {
-          "version": "7.3.8",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+          "version": "7.5.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
@@ -14571,6 +16022,29 @@
         "es-abstract": "^1.20.4"
       }
     },
+    "object.fromentries": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
+      "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
+    },
+    "object.groupby": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.0.tgz",
+      "integrity": "sha512-70MWG6NfRH9GnbZOikuhPPYzpUpof9iW2J9E4dW7FXTqPNb6rllE6u39SKwwiNh8lCwX3DDb5OgcKGiEBrTTyw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.21.2",
+        "get-intrinsic": "^1.2.1"
+      }
+    },
     "object.values": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
@@ -14601,17 +16075,17 @@
       }
     },
     "optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
+      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
       "dev": true,
       "requires": {
+        "@aashutoshrathi/word-wrap": "^1.2.3",
         "deep-is": "^0.1.3",
         "fast-levenshtein": "^2.0.6",
         "levn": "^0.4.1",
         "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
+        "type-check": "^0.4.0"
       }
     },
     "ospath": {
@@ -14674,6 +16148,16 @@
         "lines-and-columns": "^1.1.6"
       }
     },
+    "parseley": {
+      "version": "0.12.1",
+      "resolved": "https://registry.npmjs.org/parseley/-/parseley-0.12.1.tgz",
+      "integrity": "sha512-e6qHKe3a9HWr0oMRVDTRhKce+bRO8VGQR3NyVwcjwrbhMmFCX9KszEV35+rn4AdilFAq9VPxP/Fe1wC9Qjd2lw==",
+      "dev": true,
+      "requires": {
+        "leac": "^0.6.0",
+        "peberminta": "^0.9.0"
+      }
+    },
     "path-exists": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -14704,6 +16188,12 @@
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
       "dev": true
     },
+    "peberminta": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/peberminta/-/peberminta-0.9.0.tgz",
+      "integrity": "sha512-XIxfHpEuSJbITd1H3EeQwpcZbTLHc+VVr8ANI9t5sit565tsI4/xK3KWTUFE2e6QiangUkh3B0jihzmGnNrRsQ==",
+      "dev": true
+    },
     "pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
@@ -14734,11 +16224,11 @@
       "dev": true
     },
     "postcss": {
-      "version": "8.4.21",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz",
-      "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==",
+      "version": "8.4.28",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.28.tgz",
+      "integrity": "sha512-Z7V5j0cq8oEKyejIKfpD8b4eBy9cwW2JWPk0+fB1HOAMsfHbnAXLLS+PfVWlzMSLQaWttKDt607I0XHmpE67Vw==",
       "requires": {
-        "nanoid": "^3.3.4",
+        "nanoid": "^3.3.6",
         "picocolors": "^1.0.0",
         "source-map-js": "^1.0.2"
       }
@@ -14995,16 +16485,16 @@
       "requires": {}
     },
     "postcss-scss": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.6.tgz",
-      "integrity": "sha512-rLDPhJY4z/i4nVFZ27j9GqLxj1pwxE80eAzUNRMXtcpipFYIeowerzBgG3yJhMtObGEXidtIgbUpQ3eLDsf5OQ==",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.7.tgz",
+      "integrity": "sha512-xPv2GseoyXPa58Nro7M73ZntttusuCmZdeOojUFR5PZDz2BR62vfYx1w9TyOnp1+nYFowgOMipsCBhxzVkAEPw==",
       "dev": true,
       "requires": {}
     },
     "postcss-selector-parser": {
-      "version": "6.0.11",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz",
-      "integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==",
+      "version": "6.0.13",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
+      "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
       "dev": true,
       "requires": {
         "cssesc": "^3.0.0",
@@ -15044,9 +16534,9 @@
       "dev": true
     },
     "postgres": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/postgres/-/postgres-3.3.4.tgz",
-      "integrity": "sha512-XVu0+d/Y56pl2lSaf0c7V19AhAEfpVrhID1IENWN8nf0xch6hFq6dAov5dtUX6ZD46wfr1TxvLhxLtV8WnNsOg==",
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/postgres/-/postgres-3.3.5.tgz",
+      "integrity": "sha512-+JD93VELV9gHkqpV5gdL5/70HdGtEw4/XE1S4BC8f1mcPmdib3K5XsKVbnR1XcAyC41zOnifJ+9YRKxdIsXiUw==",
       "dev": true
     },
     "prelude-ls": {
@@ -15113,6 +16603,12 @@
         "side-channel": "^1.0.4"
       }
     },
+    "querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+      "dev": true
+    },
     "queue-microtask": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
@@ -15156,9 +16652,9 @@
           }
         },
         "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "version": "5.7.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+          "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
           "dev": true
         },
         "type-fest": {
@@ -15300,28 +16796,28 @@
       }
     },
     "regenerator-runtime": {
-      "version": "0.13.11",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
+      "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
     },
     "regenerator-transform": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz",
-      "integrity": "sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==",
+      "version": "0.15.2",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
+      "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.8.4"
       }
     },
     "regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
+      "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
+        "define-properties": "^1.2.0",
+        "functions-have-names": "^1.2.3"
       }
     },
     "regexpu-core": {
@@ -15370,13 +16866,19 @@
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
       "dev": true
     },
+    "requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+      "dev": true
+    },
     "resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+      "version": "1.22.4",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz",
+      "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==",
       "dev": true,
       "requires": {
-        "is-core-module": "^2.9.0",
+        "is-core-module": "^2.13.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       }
@@ -15482,14 +16984,34 @@
       }
     },
     "rxjs": {
-      "version": "7.8.0",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz",
-      "integrity": "sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==",
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
       "dev": true,
       "requires": {
         "tslib": "^2.1.0"
       }
     },
+    "safe-array-concat": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz",
+      "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.0",
+        "has-symbols": "^1.0.3",
+        "isarray": "^2.0.5"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+          "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+          "dev": true
+        }
+      }
+    },
     "safe-buffer": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -15514,24 +17036,25 @@
       "dev": true
     },
     "sass-embedded": {
-      "version": "1.59.3",
-      "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.59.3.tgz",
-      "integrity": "sha512-HLyVxBCPzd4Z9EXrX11w3auKaajF3JWWETxagiGCxKKAsmA6SXDnXAkvU3gGhZQMFfDq6CiI5S7ISRn1dp2DCA==",
+      "version": "1.66.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.66.1.tgz",
+      "integrity": "sha512-bHTFMSpcIJxrCav9ac69dMMYoiWIhiw/88eApojX7j1gsCAAx3nQMkTKr7FKIVVofWla8sE1KM9qtFya2k8svw==",
       "dev": true,
       "requires": {
         "@bufbuild/protobuf": "^1.0.0",
         "buffer-builder": "^0.2.0",
         "immutable": "^4.0.0",
         "rxjs": "^7.4.0",
-        "sass-embedded-darwin-arm64": "1.59.3",
-        "sass-embedded-darwin-x64": "1.59.3",
-        "sass-embedded-linux-arm": "1.59.3",
-        "sass-embedded-linux-arm64": "1.59.3",
-        "sass-embedded-linux-ia32": "1.59.3",
-        "sass-embedded-linux-x64": "1.59.3",
-        "sass-embedded-win32-ia32": "1.59.3",
-        "sass-embedded-win32-x64": "1.59.3",
-        "supports-color": "^8.1.1"
+        "sass-embedded-darwin-arm64": "1.66.1",
+        "sass-embedded-darwin-x64": "1.66.1",
+        "sass-embedded-linux-arm": "1.66.1",
+        "sass-embedded-linux-arm64": "1.66.1",
+        "sass-embedded-linux-ia32": "1.66.1",
+        "sass-embedded-linux-x64": "1.66.1",
+        "sass-embedded-win32-ia32": "1.66.1",
+        "sass-embedded-win32-x64": "1.66.1",
+        "supports-color": "^8.1.1",
+        "varint": "^6.0.0"
       },
       "dependencies": {
         "has-flag": {
@@ -15552,65 +17075,74 @@
       }
     },
     "sass-embedded-darwin-arm64": {
-      "version": "1.59.3",
-      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.59.3.tgz",
-      "integrity": "sha512-Cu9AaYVOFhA5WO4YucYXhIytOPL2eID6deoT4woKO+u+dta8MHOTK0HZz3mh3BJcuwTTVLAtgJsJyyRmik6TEw==",
+      "version": "1.66.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.66.1.tgz",
+      "integrity": "sha512-XdvA4KThDRLvUweMGWEsEd3swOSeiGuLelNUKbvB4H3Peh+O0m9XfKwWxh1FJZP0gVK3moMXPyVflYrUWVHGCA==",
       "dev": true,
       "optional": true
     },
     "sass-embedded-darwin-x64": {
-      "version": "1.59.3",
-      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.59.3.tgz",
-      "integrity": "sha512-ZRW6vzH8GOpMIrBZ3ooa5i2JO/Vmll0NaFKuvIV8TmqSR1gihYQ41tYzJMTiVcpGrK1/M04lJo2T+ozikEOFaQ==",
+      "version": "1.66.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.66.1.tgz",
+      "integrity": "sha512-y3kLVhFPFUvN+uZwNhl0wZ4V7ghPzXxOwoTC1n6LHUe/xRcDP5Nl+7zBHpwhW94lLgjDhEd1+mnpz8HGVHdIAw==",
       "dev": true,
       "optional": true
     },
     "sass-embedded-linux-arm": {
-      "version": "1.59.3",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.59.3.tgz",
-      "integrity": "sha512-oaxTjBnknTymeOJaKOzcbcgdDe2pQ+fKgu2zFwM+dA0ZAiDPIQyTooSo+UNxNfbQgYlvUQphpyPGnJqfZ1PwuQ==",
+      "version": "1.66.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.66.1.tgz",
+      "integrity": "sha512-lPkMTR0Wwc9NTuvWsKo4a+/slHFcEypPpjfL+HFKaoq4NqMkX/DBewD5wl9rA45KCfJ47wf47H4aJ0Qcd82Iyg==",
       "dev": true,
       "optional": true
     },
     "sass-embedded-linux-arm64": {
-      "version": "1.59.3",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.59.3.tgz",
-      "integrity": "sha512-d4PdJ8OvuSJNzSHCEC3Jxd3trx1nV/er41W8O9jH4FXd4CBPJG/+4igL/GCI4W9lxRvw64Qq0lHuKYAyTV8B1Q==",
+      "version": "1.66.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.66.1.tgz",
+      "integrity": "sha512-HPy8ScfUMSdG5TjRSsr6rnGQjG/PzyslwVGL0UB+8LTkj2PyDEu35jmHBgWggSCmIqvu7phw4OgiWEUuaxwXgg==",
       "dev": true,
       "optional": true
     },
     "sass-embedded-linux-ia32": {
-      "version": "1.59.3",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-ia32/-/sass-embedded-linux-ia32-1.59.3.tgz",
-      "integrity": "sha512-E/gXl/i309IjLizStZxKlQGhvDmQvOy7AFyYuix03xJ8IwynAp9Jt+3TcZPksKdmADkPIQk46EV90f3i1qv/CQ==",
+      "version": "1.66.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-ia32/-/sass-embedded-linux-ia32-1.66.1.tgz",
+      "integrity": "sha512-DhxaQpWNpPrvSCFqgWUWv0dlnB6PzLBeMaA87pILCgJGnJs2vaPYr5JgVBK+nFQYaKVZ3PC5K0OfcY8ruQVdPw==",
       "dev": true,
       "optional": true
     },
     "sass-embedded-linux-x64": {
-      "version": "1.59.3",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.59.3.tgz",
-      "integrity": "sha512-VMvcQ8K4Z9ofD4wYJBdqPgXN5nkGinoKOuZCoKgtGX75qqmtledtWkeF+BQGlzZv+esbklop8y2lAzXvuhUprQ==",
+      "version": "1.66.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.66.1.tgz",
+      "integrity": "sha512-tIRa/fn34x4NrbSEmfekAcQSHPKheNJ+/uqCGmxeBSr7Yw7S4CoP1/yvtY/geKmx4uSmgSJhdEYB9X1f+MoSQw==",
       "dev": true,
       "optional": true
     },
     "sass-embedded-win32-ia32": {
-      "version": "1.59.3",
-      "resolved": "https://registry.npmjs.org/sass-embedded-win32-ia32/-/sass-embedded-win32-ia32-1.59.3.tgz",
-      "integrity": "sha512-OFF8ujeR2flkPG+MLSTTRk78pE8TPxaBfmszx8+4syu10HV4UDg9fFHuYw2bpbGAPqOsJPLrMFpl4zmqQLY7/g==",
+      "version": "1.66.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-win32-ia32/-/sass-embedded-win32-ia32-1.66.1.tgz",
+      "integrity": "sha512-h9uNhQbJN6rP5+MXZZj4vL9phTsjLj/8PH/fyhKdUvJP7+5+k6qmCttkJX8Xvws2veFhgRW+mt/erdGGkc4nFA==",
       "dev": true,
       "optional": true
     },
     "sass-embedded-win32-x64": {
-      "version": "1.59.3",
-      "resolved": "https://registry.npmjs.org/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.59.3.tgz",
-      "integrity": "sha512-L2efHr9czYgZNZ6GPw20kqTuX3gpi37c29vx7DODfZaKAB08nd0XVeWpC/GjZEpQ8Ti4bE2KLPuwdD+22f7QjQ==",
+      "version": "1.66.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.66.1.tgz",
+      "integrity": "sha512-TdZilrwiDBMYUjFSnaoQdRtm5QYV+73bsMKN+JYd1KFI56KM8XHcCeMTUH37+uKw2O8pR17O/JRFSNWBJTl5kw==",
       "dev": true,
       "optional": true
     },
+    "selderee": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/selderee/-/selderee-0.11.0.tgz",
+      "integrity": "sha512-5TF+l7p4+OsnP8BCCvSyZiSPc4x4//p5uPwK8TCnVPJYRmU2aYKMpOXvw8zM5a5JvuuCGN1jmsMwuU2W02ukfA==",
+      "dev": true,
+      "requires": {
+        "parseley": "^0.12.0"
+      }
+    },
     "semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true
     },
     "shebang-command": {
@@ -15629,12 +17161,12 @@
       "dev": true
     },
     "shepherd.js": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/shepherd.js/-/shepherd.js-11.0.1.tgz",
-      "integrity": "sha512-K387AM8A0IbEje9ZRHIGOQHLzFkMoNtQlxZp5Rgw4FGnfReq8C4mPJHX6qA5OFKg+1atI7VjGonbJDzYEghd6Q==",
+      "version": "11.1.1",
+      "resolved": "https://registry.npmjs.org/shepherd.js/-/shepherd.js-11.1.1.tgz",
+      "integrity": "sha512-7nVEgLTZUu5qQCKTlzQeKL1AQd2rG9Y9iqzZUgGvCFwMUZZhfwtZ6eEyMWMYw0zl8qKjSrjgzxFOe+SpfO43aA==",
       "requires": {
-        "@floating-ui/dom": "^1.0.10",
-        "deepmerge": "^4.2.2"
+        "@floating-ui/dom": "^1.2.5",
+        "deepmerge": "^4.3.1"
       }
     },
     "short-and-sweet": {
@@ -15707,6 +17239,37 @@
         }
       }
     },
+    "smtp-server": {
+      "version": "3.13.0",
+      "resolved": "https://registry.npmjs.org/smtp-server/-/smtp-server-3.13.0.tgz",
+      "integrity": "sha512-thVFqpwrHIJ25rXjXA6RYFUO35el2O+X7WJ006qMVAyFs5Ss6XGPJASg7Fh1QvT28ADIv9hGGXmgR+kaSEikwQ==",
+      "dev": true,
+      "requires": {
+        "base32.js": "0.1.0",
+        "ipv6-normalize": "1.0.1",
+        "nodemailer": "6.9.4"
+      },
+      "dependencies": {
+        "nodemailer": {
+          "version": "6.9.4",
+          "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.4.tgz",
+          "integrity": "sha512-CXjQvrQZV4+6X5wP6ZIgdehJamI63MFoYFGGPtHudWym9qaEHDNdPzaj5bfMCvxG1vhAileSWW90q7nL0N36mA==",
+          "dev": true
+        }
+      }
+    },
+    "smtp-tester": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/smtp-tester/-/smtp-tester-2.1.0.tgz",
+      "integrity": "sha512-HfOBdHkdwoBO+Qb06H8ShVEc08nnvDbtYWzdT5iQMIeInBdLKu17XOhuaC79uM24zPApRfN3JAg627TIy3y/Ww==",
+      "dev": true,
+      "requires": {
+        "@types/mailparser": "^3.4.0",
+        "@types/smtp-server": "^3.5.7",
+        "mailparser": "^3.5.0",
+        "smtp-server": "^3.11.0"
+      }
+    },
     "source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -15890,6 +17453,11 @@
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
       "dev": true
     },
+    "style-mod": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.0.3.tgz",
+      "integrity": "sha512-78Jv8kYJdjbvRwwijtCevYADfsI0lGzYJe4mMFdceO8l75DFFDoqBhR1jVDicDRRaX4//g1u9wKeo+ztc2h1Rw=="
+    },
     "style-search": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
@@ -15993,16 +17561,15 @@
       }
     },
     "stylelint-scss": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-4.5.0.tgz",
-      "integrity": "sha512-/+rQ8FePOiwT5xblOHkujYzRYfSjmE6HYhLpqJShL+9wH6/HaAVj4mWpXlpEsM3ZgIpOblG9Y+/BycSJzWgjNw==",
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-4.7.0.tgz",
+      "integrity": "sha512-TSUgIeS0H3jqDZnby1UO1Qv3poi1N8wUYIJY6D1tuUq2MN3lwp/rITVo0wD+1SWTmRm0tNmGO0b7nKInnqF6Hg==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.21",
         "postcss-media-query-parser": "^0.2.3",
         "postcss-resolve-nested-selector": "^0.1.1",
-        "postcss-selector-parser": "^6.0.6",
-        "postcss-value-parser": "^4.1.0"
+        "postcss-selector-parser": "^6.0.11",
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "supports-color": {
@@ -16150,13 +17717,13 @@
       }
     },
     "terser": {
-      "version": "5.16.6",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.6.tgz",
-      "integrity": "sha512-IBZ+ZQIA9sMaXmRZCUMDjNH0D5AQQfdn4WUjHL0+1lF4TP1IHRJbrhb6fNaXWikrYQTSkb7SLxkeXAiy1p7mbg==",
+      "version": "5.19.2",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz",
+      "integrity": "sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==",
       "dev": true,
       "requires": {
-        "@jridgewell/source-map": "^0.3.2",
-        "acorn": "^8.5.0",
+        "@jridgewell/source-map": "^0.3.3",
+        "acorn": "^8.8.2",
         "commander": "^2.20.0",
         "source-map-support": "~0.5.20"
       },
@@ -16193,9 +17760,9 @@
       "integrity": "sha512-RX35iq/D+lrsqhcPWIazM9ELkjOe30MSeoBHQHSsRwd1YuhJO5ui1K1/R0r7N3mFvbLBs33idw+eR6j+w6i/DA=="
     },
     "tinymce": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-6.4.0.tgz",
-      "integrity": "sha512-A1IZKhEM7sS/je7M+SjKqa1UM59GzOxi2M5me8sYx9/VoSzCaAXOgTo1M1wQsu8dFbThbBgz9vZqBFqukhYyhg=="
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-6.7.0.tgz",
+      "integrity": "sha512-Wf2RSobIXQ7XNw3/v4z1lPGiH3Pjsmc/6/7fG28aIS6uVWj/7IhvOPuwfJJDeOx0o0D3nSnoLHgR2KU8JAdE+w=="
     },
     "tippy.js": {
       "version": "6.3.7",
@@ -16205,6 +17772,12 @@
         "@popperjs/core": "^2.9.0"
       }
     },
+    "tlds": {
+      "version": "1.240.0",
+      "resolved": "https://registry.npmjs.org/tlds/-/tlds-1.240.0.tgz",
+      "integrity": "sha512-1OYJQenswGZSOdRw7Bql5Qu7uf75b+F3HFBXbqnG/ifHa0fev1XcG+3pJf3pA/KC6RtHQzfKgIf1vkMlMG7mtQ==",
+      "dev": true
+    },
     "tmp": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
@@ -16230,13 +17803,23 @@
       }
     },
     "tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
+      "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
       "dev": true,
       "requires": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
+      },
+      "dependencies": {
+        "universalify": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+          "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+          "dev": true
+        }
       }
     },
     "trim-newlines": {
@@ -16269,9 +17852,9 @@
       }
     },
     "tslib": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
-      "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "tunnel-agent": {
       "version": "0.6.0",
@@ -16303,6 +17886,42 @@
       "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
       "dev": true
     },
+    "typed-array-buffer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
+      "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.1",
+        "is-typed-array": "^1.1.10"
+      }
+    },
+    "typed-array-byte-length": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
+      "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "has-proto": "^1.0.1",
+        "is-typed-array": "^1.1.10"
+      }
+    },
+    "typed-array-byte-offset": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
+      "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
+      "dev": true,
+      "requires": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "has-proto": "^1.0.1",
+        "is-typed-array": "^1.1.10"
+      }
+    },
     "typed-array-length": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
@@ -16314,6 +17933,12 @@
         "is-typed-array": "^1.1.9"
       }
     },
+    "uc.micro": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
+      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
+      "dev": true
+    },
     "unbox-primitive": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
@@ -16367,9 +17992,9 @@
       "dev": true
     },
     "update-browserslist-db": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
-      "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
+      "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
       "dev": true,
       "requires": {
         "escalade": "^3.1.1",
@@ -16385,6 +18010,16 @@
         "punycode": "^2.1.0"
       }
     },
+    "url-parse": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "dev": true,
+      "requires": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -16398,9 +18033,9 @@
       "dev": true
     },
     "v8-compile-cache": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz",
+      "integrity": "sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw==",
       "dev": true
     },
     "validate-npm-package-license": {
@@ -16413,6 +18048,12 @@
         "spdx-expression-parse": "^3.0.0"
       }
     },
+    "varint": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/varint/-/varint-6.0.0.tgz",
+      "integrity": "sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg==",
+      "dev": true
+    },
     "verror": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
@@ -16534,9 +18175,9 @@
           }
         },
         "semver": {
-          "version": "7.3.8",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+          "version": "7.5.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
@@ -16584,6 +18225,11 @@
         "flatted": "^3.0.5"
       }
     },
+    "w3c-keyname": {
+      "version": "2.2.8",
+      "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
+      "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ=="
+    },
     "which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -16607,25 +18253,18 @@
       }
     },
     "which-typed-array": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz",
-      "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==",
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
+      "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
       "dev": true,
       "requires": {
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
         "for-each": "^0.3.3",
         "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0",
-        "is-typed-array": "^1.1.10"
+        "has-tostringtag": "^1.0.0"
       }
     },
-    "word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-      "dev": true
-    },
     "wrap-ansi": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
diff --git a/package.json b/package.json
index ce2bc148de728..e5babb9eec648 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "build:com_media:dev": "set NODE_ENV=DEVELOPMENT && node build/build.js --com-media",
     "watch": "node build/build.js --watch",
     "watch:com_media": "node build/build.js --watch-com-media",
-    "lint:js": "eslint --config build/.eslintrc --ignore-pattern '/media/' --ext .es6.js,.es6,.vue,.cy.js .",
+    "lint:js": "eslint --config build/.eslintrc --ignore-pattern '/media/' --ext .es6.js,.es6,.vue .",
     "lint:testjs": "eslint --config build/.eslintrc --ext .js tests/System",
     "lint:css": "stylelint --config build/.stylelintrc.json \"administrator/components/com_media/resources/**/*.scss\" \"administrator/templates/**/*.scss\" \"build/media_source/**/*.scss\" \"templates/**/*.scss\" \"installation/template/**/*.scss\"",
     "install": "node build/build.js --prepare",
@@ -38,24 +38,37 @@
   ],
   "dependencies": {
     "@claviska/jquery-minicolors": "^2.3.6",
-    "@fortawesome/fontawesome-free": "^5.15.4",
+    "@codemirror/autocomplete": "^6.9.0",
+    "@codemirror/commands": "^6.2.4",
+    "@codemirror/lang-css": "^6.2.1",
+    "@codemirror/lang-html": "^6.4.5",
+    "@codemirror/lang-javascript": "^6.1.9",
+    "@codemirror/lang-json": "^6.0.1",
+    "@codemirror/lang-php": "^6.0.1",
+    "@codemirror/lang-xml": "^6.0.2",
+    "@codemirror/language": "^6.9.0",
+    "@codemirror/lint": "^6.4.0",
+    "@codemirror/search": "^6.5.1",
+    "@codemirror/state": "^6.2.1",
+    "@codemirror/view": "^6.16.0",
+    "@fortawesome/fontawesome-free": "^6.4.2",
     "@joomla/joomla-a11y-checker": "^1.0.0",
-    "@popperjs/core": "^2.11.6",
-    "@webcomponents/webcomponentsjs": "^2.7.0",
+    "@popperjs/core": "^2.11.8",
+    "@webcomponents/webcomponentsjs": "^2.8.0",
     "accessibility": "^3.0.17",
     "awesomplete": "^1.1.5",
-    "bootstrap": "~5.2.3",
+    "bootstrap": "~5.3.0",
     "choices.js": "^9.1.0",
     "chosen-js": "^1.8.7",
-    "codemirror": "^5.65.12",
     "cropperjs": "^1.5.13",
     "diff": "^5.1.0",
-    "dotenv": "^16.0.3",
+    "dotenv": "^16.3.1",
     "dragula": "^3.7.3",
+    "es-module-shims": "^1.8.0",
     "focus-visible": "^5.2.0",
-    "hotkeys-js": "^3.10.1",
+    "hotkeys-js": "^3.12.0",
     "joomla-ui-custom-elements": "^0.2.0",
-    "jquery": "^3.6.4",
+    "jquery": "^3.7.0",
     "jquery-migrate": "^3.4.1",
     "mark.js": "^8.11.1",
     "mediaelement": "^5.1.1",
@@ -63,52 +76,54 @@
     "punycode": "^2.3.0",
     "qrcode-generator": "^1.4.4",
     "roboto-fontface": "^0.10.0",
-    "shepherd.js": "^11.0.1",
+    "shepherd.js": "^11.1.1",
     "short-and-sweet": "^1.0.4",
     "skipto": "^4.1.7",
-    "tinymce": "^6.1.2",
+    "tinymce": "^6.6.2",
     "vue": "3.2.45",
     "vue-focus-lock": "^2.0.5",
     "vuex": "^4.1.0",
     "vuex-persist": "^3.1.3"
   },
   "devDependencies": {
-    "@babel/core": "^7.21.3",
-    "@babel/preset-env": "^7.20.2",
+    "@babel/core": "^7.22.10",
+    "@babel/preset-env": "^7.22.10",
     "@dgrammatiko/compress": "^1.0.4",
     "@rollup/plugin-babel": "^5.3.1",
     "@rollup/plugin-commonjs": "^21.1.0",
     "@rollup/plugin-node-resolve": "^13.3.0",
     "@rollup/plugin-replace": "^3.1.0",
-    "@vue/compiler-sfc": "^3.2.47",
-    "autoprefixer": "^10.4.14",
+    "@vue/compiler-sfc": "^3.3.4",
+    "autoprefixer": "^10.4.15",
     "chokidar": "^3.5.3",
+    "cli-progress": "^3.12.0",
     "commander": "^8.3.0",
-    "core-js": "^3.29.1",
+    "core-js": "^3.32.1",
     "cssnano": "^5.1.15",
-    "cypress": "^12.8.1",
-    "eslint": "^8.36.0",
+    "cypress": "^12.17.4",
+    "eslint": "^8.47.0",
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-vue": "^8.7.1",
     "fs-extra": "^10.1.0",
     "ini": "^2.0.0",
     "jasmine-core": "^3.99.1",
     "joomla-cypress": "^0.0.16",
     "mysql": "^2.18.1",
-    "postcss": "^8.4.21",
-    "postcss-scss": "^4.0.6",
-    "postgres": "^3.3.4",
+    "postcss": "^8.4.28",
+    "postcss-scss": "^4.0.7",
+    "postgres": "^3.3.5",
     "recursive-readdir": "^2.2.3",
     "rimraf": "^3.0.2",
     "rollup": "^2.79.1",
     "rollup-plugin-vue": "^6.0.0",
     "rtlcss": "^3.5.0",
-    "sass-embedded": "^1.59.3",
+    "sass-embedded": "^1.66.1",
+    "smtp-tester": "^2.1.0",
     "stylelint": "^14.16.1",
     "stylelint-config-standard": "^24.0.0",
     "stylelint-order": "^5.0.0",
-    "stylelint-scss": "^4.5.0",
-    "terser": "^5.16.6"
+    "stylelint-scss": "^4.7.0",
+    "terser": "^5.19.2"
   }
 }
diff --git a/plugins/actionlog/joomla/services/provider.php b/plugins/actionlog/joomla/services/provider.php
index 091b18783135b..586f7350ad29f 100644
--- a/plugins/actionlog/joomla/services/provider.php
+++ b/plugins/actionlog/joomla/services/provider.php
@@ -13,6 +13,7 @@
 use Joomla\CMS\Extension\PluginInterface;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\User\UserFactoryInterface;
 use Joomla\Database\DatabaseInterface;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
@@ -40,6 +41,7 @@ function (Container $container) {
                 );
                 $plugin->setApplication(Factory::getApplication());
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
+                $plugin->setUserFactory($container->get(UserFactoryInterface::class));
 
                 return $plugin;
             }
diff --git a/plugins/actionlog/joomla/src/Extension/Joomla.php b/plugins/actionlog/joomla/src/Extension/Joomla.php
index 874a18defd10f..1dae8e99f9739 100644
--- a/plugins/actionlog/joomla/src/Extension/Joomla.php
+++ b/plugins/actionlog/joomla/src/Extension/Joomla.php
@@ -11,19 +11,16 @@
 namespace Joomla\Plugin\Actionlog\Joomla\Extension;
 
 use Joomla\CMS\Component\ComponentHelper;
-use Joomla\CMS\Factory;
 use Joomla\CMS\Installer\Installer;
 use Joomla\CMS\MVC\Factory\MVCFactoryServiceInterface;
 use Joomla\CMS\Table\Table;
-use Joomla\CMS\User\User;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\Component\Actionlogs\Administrator\Helper\ActionlogsHelper;
 use Joomla\Component\Actionlogs\Administrator\Plugin\ActionLogPlugin;
 use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Database\Exception\ExecutionFailureException;
 use Joomla\Event\DispatcherInterface;
 use Joomla\Utilities\ArrayHelper;
-use RuntimeException;
-use stdClass;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -37,6 +34,7 @@
 final class Joomla extends ActionLogPlugin
 {
     use DatabaseAwareTrait;
+    use UserFactoryAwareTrait;
 
     /**
      * Array of loggable extensions.
@@ -97,7 +95,7 @@ public function __construct(DispatcherInterface $dispatcher, array $config)
      * Method is called right after the content is saved
      *
      * @param   string   $context  The context of the content passed to the plugin
-     * @param   object   $article  A JTableContent object
+     * @param   object   $article  A \Joomla\CMS\Table\Table object
      * @param   boolean  $isNew    If the content is just about to be created
      *
      * @return  void
@@ -155,7 +153,7 @@ public function onContentAfterSave($context, $article, $isNew): void
      * Method is called right after the content is deleted
      *
      * @param   string  $context  The context of the content passed to the plugin
-     * @param   object  $article  A JTableContent object
+     * @param   object  $article  A \Joomla\CMS\Table\Table object
      *
      * @return  void
      *
@@ -267,7 +265,7 @@ public function onContentChangeState($context, $pks, $value)
 
         try {
             $items = $db->loadObjectList($params->id_holder);
-        } catch (RuntimeException $e) {
+        } catch (\RuntimeException $e) {
             $items = [];
         }
 
@@ -588,7 +586,7 @@ public function onUserAfterSave($user, $isnew, $success, $msg): void
             return;
         }
 
-        $jUser = Factory::getUser();
+        $jUser = $this->getApplication()->getIdentity();
 
         if (!$jUser->id) {
             $messageLanguageKey = 'PLG_ACTIONLOG_JOOMLA_USER_REGISTERED';
@@ -835,7 +833,7 @@ public function onUserLogout($user, $options = [])
             return;
         }
 
-        $loggedOutUser = User::getInstance($user['id']);
+        $loggedOutUser = $this->getUserFactory()->loadUserById($user['id']);
 
         if ($loggedOutUser->block) {
             return;
@@ -916,7 +914,7 @@ public function onUserAfterRemind($user)
     public function onAfterCheckin($table)
     {
         $context = 'com_checkin';
-        $user    = Factory::getUser();
+        $user    = $this->getApplication()->getIdentity();
 
         if (!$this->checkLoggable($context)) {
             return;
@@ -942,16 +940,14 @@ public function onAfterCheckin($table)
      *
      * Method is called after user request to clean action log items.
      *
-     * @param   array  $group  Holds the group name.
-     *
      * @return  void
      *
      * @since   3.9.4
      */
-    public function onAfterLogPurge($group = '')
+    public function onAfterLogPurge()
     {
         $context = $this->getApplication()->getInput()->get('option');
-        $user    = Factory::getUser();
+        $user    = $this->getApplication()->getIdentity();
         $message = [
             'action'      => 'actionlogs',
             'type'        => 'PLG_ACTIONLOG_JOOMLA_TYPE_USER',
@@ -970,16 +966,14 @@ public function onAfterLogPurge($group = '')
      *
      * Method is called after user request to export action log items.
      *
-     * @param   array  $group  Holds the group name.
-     *
      * @return  void
      *
      * @since   3.9.4
      */
-    public function onAfterLogExport($group = '')
+    public function onAfterLogExport()
     {
         $context = $this->getApplication()->getInput()->get('option');
-        $user    = Factory::getUser();
+        $user    = $this->getApplication()->getIdentity();
         $message = [
             'action'      => 'actionlogs',
             'type'        => 'PLG_ACTIONLOG_JOOMLA_TYPE_USER',
@@ -1007,7 +1001,7 @@ public function onAfterLogExport($group = '')
     public function onAfterPurge($group = 'all')
     {
         $context = $this->getApplication()->getInput()->get('option');
-        $user    = Factory::getUser();
+        $user    = $this->getApplication()->getIdentity();
 
         if (!$this->checkLoggable($context)) {
             return;
@@ -1083,7 +1077,7 @@ public function onAfterDispatch()
     public function onJoomlaAfterUpdate($oldVersion = null)
     {
         $context = $this->getApplication()->getInput()->get('option');
-        $user    = Factory::getUser();
+        $user    = $this->getApplication()->getIdentity();
 
         if (empty($oldVersion)) {
             $oldVersion = $this->getApplication()->getLanguage()->_('JLIB_UNKNOWN');
@@ -1109,11 +1103,11 @@ public function onJoomlaAfterUpdate($oldVersion = null)
      *
      * @param   string  $context  The context of the action log
      *
-     * @return  stdClass  The params
+     * @return  \stdClass  The params
      *
      * @since   4.2.0
      */
-    private function getActionLogParams($context): ?stdClass
+    private function getActionLogParams($context): ?\stdClass
     {
         $component = $this->getApplication()->bootComponent('actionlogs');
 
@@ -1137,7 +1131,7 @@ private function getActionLogParams($context): ?stdClass
      */
     public function onUserAfterResetRequest($user)
     {
-        $context = $this->getApplication()->input->get('option');
+        $context = $this->getApplication()->getInput()->get('option');
 
         if (!$this->checkLoggable($context)) {
             return;
@@ -1170,7 +1164,7 @@ public function onUserAfterResetRequest($user)
      */
     public function onUserAfterResetComplete($user)
     {
-        $context = $this->getApplication()->input->get('option');
+        $context = $this->getApplication()->getInput()->get('option');
 
         if (!$this->checkLoggable($context)) {
             return;
diff --git a/plugins/api-authentication/basic/services/provider.php b/plugins/api-authentication/basic/services/provider.php
index 27a57fbf38fe2..36146c5d15c7e 100644
--- a/plugins/api-authentication/basic/services/provider.php
+++ b/plugins/api-authentication/basic/services/provider.php
@@ -35,13 +35,13 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $plugin = new Basic(
+                $plugin     = new Basic(
                     $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('api-authentication', 'basic'),
-                    $container->get(UserFactoryInterface::class)
                 );
                 $plugin->setApplication(Factory::getApplication());
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
+                $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 544f7e82b1e68..0434c6d8dbfbc 100644
--- a/plugins/api-authentication/basic/src/Extension/Basic.php
+++ b/plugins/api-authentication/basic/src/Extension/Basic.php
@@ -12,10 +12,9 @@
 
 use Joomla\CMS\Authentication\Authentication;
 use Joomla\CMS\Plugin\CMSPlugin;
-use Joomla\CMS\User\UserFactoryInterface;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\CMS\User\UserHelper;
 use Joomla\Database\DatabaseAwareTrait;
-use Joomla\Event\DispatcherInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -29,30 +28,7 @@
 final class Basic extends CMSPlugin
 {
     use DatabaseAwareTrait;
-
-    /**
-     * The user factory
-     *
-     * @var    UserFactoryInterface
-     * @since  4.2.0
-     */
-    private $userFactory;
-
-    /**
-     * Constructor.
-     *
-     * @param   DispatcherInterface   $dispatcher   The dispatcher
-     * @param   array                 $config       An optional associative array of configuration settings
-     * @param   UserFactoryInterface  $userFactory  The user factory
-     *
-     * @since   4.2.0
-     */
-    public function __construct(DispatcherInterface $dispatcher, array $config, UserFactoryInterface $userFactory)
-    {
-        parent::__construct($dispatcher, $config);
-
-        $this->userFactory = $userFactory;
-    }
+    use UserFactoryAwareTrait;
 
     /**
      * This method should handle any authentication and report back to the subject
@@ -94,7 +70,7 @@ public function onUserAuthenticate($credentials, $options, &$response)
 
             if ($match === true) {
                 // Bring this in line with the rest of the system
-                $user               = $this->userFactory->loadUserById($result->id);
+                $user               = $this->getUserFactory()->loadUserById($result->id);
                 $response->email    = $user->email;
                 $response->fullname = $user->name;
                 $response->username = $username;
diff --git a/plugins/api-authentication/token/services/provider.php b/plugins/api-authentication/token/services/provider.php
index a727674c476ec..00d600ff4e52d 100644
--- a/plugins/api-authentication/token/services/provider.php
+++ b/plugins/api-authentication/token/services/provider.php
@@ -39,11 +39,11 @@ function (Container $container) {
                 $plugin = new Token(
                     $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('api-authentication', 'token'),
-                    $container->get(UserFactoryInterface::class),
                     new InputFilter()
                 );
                 $plugin->setApplication(Factory::getApplication());
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
+                $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 f439002638bd7..6d71524fd3572 100644
--- a/plugins/api-authentication/token/src/Extension/Token.php
+++ b/plugins/api-authentication/token/src/Extension/Token.php
@@ -12,12 +12,14 @@
 
 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\UserFactoryInterface;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\Component\Plugins\Administrator\Model\PluginModel;
 use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Database\ParameterType;
 use Joomla\Event\DispatcherInterface;
+use Joomla\Event\SubscriberInterface;
 use Joomla\Filter\InputFilter;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -29,9 +31,10 @@
  *
  * @since  4.0.0
  */
-final class Token extends CMSPlugin
+final class Token extends CMSPlugin implements SubscriberInterface
 {
     use DatabaseAwareTrait;
+    use UserFactoryAwareTrait;
 
     /**
      * The prefix of the user profile keys, without the dot.
@@ -50,52 +53,54 @@ final class Token extends CMSPlugin
     private $allowedAlgos = ['sha256', 'sha512'];
 
     /**
-     * The user factory
+     * The input filter
      *
-     * @var    UserFactoryInterface
+     * @var    InputFilter
      * @since  4.2.0
      */
-    private $userFactory;
+    private $filter;
 
     /**
-     * The input filter
+     * Returns an array of events this subscriber will listen to.
      *
-     * @var    InputFilter
-     * @since  4.2.0
+     * @return  array
+     *
+     * @since   __DEPLOY_VERSION__
      */
-    private $filter;
+    public static function getSubscribedEvents(): array
+    {
+        return ['onUserAuthenticate' => 'onUserAuthenticate'];
+    }
 
     /**
      * Constructor.
      *
      * @param   DispatcherInterface   $dispatcher   The dispatcher
      * @param   array                 $config       An optional associative array of configuration settings
-     * @param   UserFactoryInterface  $userFactory  The user factory
      * @param   InputFilter           $filter       The input filter
      *
      * @since   4.2.0
      */
-    public function __construct(DispatcherInterface $dispatcher, array $config, UserFactoryInterface $userFactory, InputFilter $filter)
+    public function __construct(DispatcherInterface $dispatcher, array $config, InputFilter $filter)
     {
         parent::__construct($dispatcher, $config);
 
-        $this->userFactory = $userFactory;
-        $this->filter      = $filter;
+        $this->filter = $filter;
     }
 
     /**
      * This method should handle any authentication and report back to the subject
      *
-     * @param   array   $credentials  Array holding the user credentials
-     * @param   array   $options      Array of extra options
-     * @param   object  $response     Authentication response object
+     * @param   AuthenticationEvent  $event    Authentication event
      *
      * @return  void
      *
      * @since   4.0.0
      */
-    public function onUserAuthenticate($credentials, $options, &$response): void
+    public function onUserAuthenticate(AuthenticationEvent $event): void
     {
+        $response = $event->getAuthenticationResponse();
+
         // Default response is authentication failure.
         $response->type          = 'Token';
         $response->status        = Authentication::STATUS_FAILURE;
@@ -228,7 +233,7 @@ public function onUserAuthenticate($credentials, $options, &$response): void
         }
 
         // Get the actual user record
-        $user = $this->userFactory->loadUserById($userId);
+        $user = $this->getUserFactory()->loadUserById($userId);
 
         // Disallow login for blocked, inactive or password reset required users
         if ($user->block || !empty(trim($user->activation)) || $user->requireReset) {
@@ -245,6 +250,9 @@ public function onUserAuthenticate($credentials, $options, &$response): void
         $response->fullname      = $user->name;
         $response->timezone      = $user->get('timezone');
         $response->language      = $user->get('language');
+
+        // Stop event propagation when status is STATUS_SUCCESS
+        $event->stopPropagation();
     }
 
     /**
@@ -365,7 +373,7 @@ private function isInAllowedUserGroup($userId)
     {
         $allowedUserGroups = $this->getAllowedUserGroups();
 
-        $user = $this->userFactory->loadUserById($userId);
+        $user = $this->getUserFactory()->loadUserById($userId);
 
         if ($user->id != $userId) {
             return false;
diff --git a/plugins/authentication/cookie/services/provider.php b/plugins/authentication/cookie/services/provider.php
index 746090821ff9b..2332fa3b433a2 100644
--- a/plugins/authentication/cookie/services/provider.php
+++ b/plugins/authentication/cookie/services/provider.php
@@ -13,6 +13,7 @@
 use Joomla\CMS\Extension\PluginInterface;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\User\UserFactoryInterface;
 use Joomla\Database\DatabaseInterface;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
@@ -34,14 +35,13 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
-
                 $plugin = new Cookie(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('authentication', 'cookie')
                 );
                 $plugin->setApplication(Factory::getApplication());
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
+                $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 debae4106a458..910fdb1742bc1 100644
--- a/plugins/authentication/cookie/src/Extension/Cookie.php
+++ b/plugins/authentication/cookie/src/Extension/Cookie.php
@@ -15,10 +15,9 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Plugin\CMSPlugin;
-use Joomla\CMS\User\User;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\CMS\User\UserHelper;
 use Joomla\Database\DatabaseAwareTrait;
-use RuntimeException;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -34,6 +33,7 @@
 final class Cookie extends CMSPlugin
 {
     use DatabaseAwareTrait;
+    use UserFactoryAwareTrait;
 
     /**
      * Reports the privacy related capabilities for this plugin to site administrators.
@@ -114,7 +114,7 @@ public function onUserAuthenticate($credentials, $options, &$response)
 
         try {
             $db->setQuery($query)->execute();
-        } catch (RuntimeException $e) {
+        } catch (\RuntimeException $e) {
             // We aren't concerned with errors from this query, carry on
         }
 
@@ -130,7 +130,7 @@ public function onUserAuthenticate($credentials, $options, &$response)
 
         try {
             $results = $db->setQuery($query)->loadObjectList();
-        } catch (RuntimeException $e) {
+        } catch (\RuntimeException $e) {
             $response->status = Authentication::STATUS_FAILURE;
 
             return false;
@@ -158,7 +158,7 @@ public function onUserAuthenticate($credentials, $options, &$response)
 
             try {
                 $db->setQuery($query)->execute();
-            } catch (RuntimeException $e) {
+            } catch (\RuntimeException $e) {
                 // Log an alert for the site admin
                 Log::add(
                     sprintf('Failed to delete cookie token for user %s with the following error: %s', $results[0]->user_id, $e->getMessage()),
@@ -187,7 +187,7 @@ public function onUserAuthenticate($credentials, $options, &$response)
 
         try {
             $result = $db->setQuery($query)->loadObject();
-        } catch (RuntimeException $e) {
+        } catch (\RuntimeException $e) {
             $response->status = Authentication::STATUS_FAILURE;
 
             return false;
@@ -195,7 +195,7 @@ public function onUserAuthenticate($credentials, $options, &$response)
 
         if ($result) {
             // Bring this in line with the rest of the system
-            $user = User::getInstance($result->id);
+            $user = $this->getUserFactory()->loadUserById($result->id);
 
             // Set response data.
             $response->username = $result->username;
@@ -277,7 +277,7 @@ public function onUserAfterLogin($options)
                     if ($results === null) {
                         $unique = true;
                     }
-                } catch (RuntimeException $e) {
+                } catch (\RuntimeException $e) {
                     $errorCount++;
 
                     // We'll let this query fail up to 5 times before giving up, there's probably a bigger issue at this point
@@ -344,7 +344,7 @@ public function onUserAfterLogin($options)
 
         try {
             $db->setQuery($query)->execute();
-        } catch (RuntimeException $e) {
+        } catch (\RuntimeException $e) {
             return false;
         }
 
@@ -392,7 +392,7 @@ public function onUserAfterLogout($options)
 
         try {
             $db->setQuery($query)->execute();
-        } catch (RuntimeException $e) {
+        } catch (\RuntimeException $e) {
             // We aren't concerned with errors from this query, carry on
         }
 
diff --git a/plugins/authentication/joomla/services/provider.php b/plugins/authentication/joomla/services/provider.php
index 2f242949a00d8..dc2465ef632bb 100644
--- a/plugins/authentication/joomla/services/provider.php
+++ b/plugins/authentication/joomla/services/provider.php
@@ -13,6 +13,7 @@
 use Joomla\CMS\Extension\PluginInterface;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\User\UserFactoryInterface;
 use Joomla\Database\DatabaseInterface;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
@@ -34,14 +35,13 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
-
                 $plugin = new Joomla(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('authentication', 'joomla')
                 );
                 $plugin->setApplication(Factory::getApplication());
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
+                $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 2faebf68a4c08..fc143c70bf879 100644
--- a/plugins/authentication/joomla/src/Extension/Joomla.php
+++ b/plugins/authentication/joomla/src/Extension/Joomla.php
@@ -11,10 +11,12 @@
 namespace Joomla\Plugin\Authentication\Joomla\Extension;
 
 use Joomla\CMS\Authentication\Authentication;
+use Joomla\CMS\Event\User\AuthenticationEvent;
 use Joomla\CMS\Plugin\CMSPlugin;
-use Joomla\CMS\User\User;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\CMS\User\UserHelper;
 use Joomla\Database\DatabaseAwareTrait;
+use Joomla\Event\SubscriberInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -25,23 +27,37 @@
  *
  * @since  1.5
  */
-final class Joomla extends CMSPlugin
+final class Joomla extends CMSPlugin implements SubscriberInterface
 {
     use DatabaseAwareTrait;
+    use UserFactoryAwareTrait;
+
+    /**
+     * Returns an array of events this subscriber will listen to.
+     *
+     * @return  array
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public static function getSubscribedEvents(): array
+    {
+        return ['onUserAuthenticate' => 'onUserAuthenticate'];
+    }
 
     /**
      * This method should handle any authentication and report back to the subject
      *
-     * @param   array   $credentials  Array holding the user credentials
-     * @param   array   $options      Array of extra options
-     * @param   object  &$response    Authentication response object
+     * @param   AuthenticationEvent  $event    Authentication event
      *
      * @return  void
      *
      * @since   1.5
      */
-    public function onUserAuthenticate($credentials, $options, &$response)
+    public function onUserAuthenticate(AuthenticationEvent $event)
     {
+        $credentials = $event->getCredentials();
+        $response    = $event->getAuthenticationResponse();
+
         $response->type = 'Joomla';
 
         // Joomla does not like blank passwords
@@ -67,7 +83,7 @@ public function onUserAuthenticate($credentials, $options, &$response)
 
             if ($match === true) {
                 // Bring this in line with the rest of the system
-                $user               = User::getInstance($result->id);
+                $user               = $this->getUserFactory()->loadUserById($result->id);
                 $response->email    = $user->email;
                 $response->fullname = $user->name;
 
@@ -83,12 +99,17 @@ public function onUserAuthenticate($credentials, $options, &$response)
                     if ($this->getApplication()->get('offline') && !$user->authorise('core.login.offline')) {
                         // User do not have access in offline mode
                         $_status       = Authentication::STATUS_FAILURE;
-                        $_errorMessage = Text::_('JLIB_LOGIN_DENIED');
+                        $_errorMessage = $this->getApplication()->getLanguage()->_('JLIB_LOGIN_DENIED');
                     }
                 }
 
                 $response->status        = $_status;
                 $response->error_message = $_errorMessage;
+
+                // Stop event propagation when status is STATUS_SUCCESS
+                if ($response->status === Authentication::STATUS_SUCCESS) {
+                    $event->stopPropagation();
+                }
             } else {
                 // Invalid password
                 $response->status        = Authentication::STATUS_FAILURE;
diff --git a/plugins/authentication/ldap/services/provider.php b/plugins/authentication/ldap/services/provider.php
index 76c2ba6db725b..5022a8844da5c 100644
--- a/plugins/authentication/ldap/services/provider.php
+++ b/plugins/authentication/ldap/services/provider.php
@@ -34,11 +34,9 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
-
                 $plugin = new Ldap(
                     new LdapFactory(),
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('authentication', 'ldap')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/authentication/ldap/src/Extension/Ldap.php b/plugins/authentication/ldap/src/Extension/Ldap.php
index 5303d571cd0d9..07a75236322d3 100644
--- a/plugins/authentication/ldap/src/Extension/Ldap.php
+++ b/plugins/authentication/ldap/src/Extension/Ldap.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Authentication\Authentication;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Plugin\CMSPlugin;
-use Joomla\Event\Dispatcher;
+use Joomla\Event\DispatcherInterface;
 use Joomla\Plugin\Authentication\Ldap\Factory\LdapFactoryInterface;
 use Symfony\Component\Ldap\Entry;
 use Symfony\Component\Ldap\Exception\ConnectionException;
@@ -50,7 +50,7 @@ final class Ldap extends CMSPlugin
      *
      * @since   4.3.0
      */
-    public function __construct(LdapFactoryInterface $factory, Dispatcher $dispatcher, $config = [])
+    public function __construct(LdapFactoryInterface $factory, DispatcherInterface $dispatcher, array $config = [])
     {
         parent::__construct($dispatcher, $config);
 
diff --git a/plugins/authentication/ldap/src/Factory/LdapFactory.php b/plugins/authentication/ldap/src/Factory/LdapFactory.php
index 1397d7be3f55c..403a0e559d5d4 100644
--- a/plugins/authentication/ldap/src/Factory/LdapFactory.php
+++ b/plugins/authentication/ldap/src/Factory/LdapFactory.php
@@ -4,7 +4,7 @@
  * 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
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\Plugin\Authentication\Ldap\Factory;
diff --git a/plugins/authentication/ldap/src/Factory/LdapFactoryInterface.php b/plugins/authentication/ldap/src/Factory/LdapFactoryInterface.php
index efa282d0cf3e2..ad0b442d7a394 100644
--- a/plugins/authentication/ldap/src/Factory/LdapFactoryInterface.php
+++ b/plugins/authentication/ldap/src/Factory/LdapFactoryInterface.php
@@ -4,7 +4,7 @@
  * 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
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\Plugin\Authentication\Ldap\Factory;
diff --git a/plugins/behaviour/compat/compat.xml b/plugins/behaviour/compat/compat.xml
new file mode 100644
index 0000000000000..ddae98fd60b08
--- /dev/null
+++ b/plugins/behaviour/compat/compat.xml
@@ -0,0 +1,51 @@
+<?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-03</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>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/plugins/behaviour/compat/services/provider.php b/plugins/behaviour/compat/services/provider.php
new file mode 100644
index 0000000000000..f9139f6a374fc
--- /dev/null
+++ b/plugins/behaviour/compat/services/provider.php
@@ -0,0 +1,49 @@
+<?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
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\Profiler\Profiler;
+use Joomla\CMS\Router\SiteRouter;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\Behaviour\Compat\Extension\Compat;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     * @since   5.0.0
+     */
+    public function register(Container $container)
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = PluginHelper::getPlugin('behaviour', 'compat');
+                $dispatcher = $container->get(DispatcherInterface::class);
+                $profiler   = (defined('JDEBUG') && JDEBUG) ? Profiler::getInstance('Application') : null;
+                $router     = $container->has(SiteRouter::class) ? $container->get(SiteRouter::class) : null;
+
+                $plugin = new Compat($dispatcher, (array) $plugin, $profiler, $router);
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/behaviour/compat/src/Extension/Compat.php b/plugins/behaviour/compat/src/Extension/Compat.php
new file mode 100644
index 0000000000000..49c61a62039c7
--- /dev/null
+++ b/plugins/behaviour/compat/src/Extension/Compat.php
@@ -0,0 +1,102 @@
+<?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\DispatcherInterface;
+use Joomla\Event\Event;
+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  5.0.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  5.0.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   DispatcherInterface  $dispatcher  The event dispatcher
+     * @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(DispatcherInterface $dispatcher, array $config = [])
+    {
+        parent::__construct($dispatcher, $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')) {
+            require_once dirname(__DIR__) . '/classmap/classmap.php';
+        }
+    }
+
+    /**
+     * We run as early as possible, this should be the first event
+     *
+     * @param Event $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')) {
+            $event->getDocument()
+                ->getWebAssetManager()
+                ->getRegistry()
+                ->addRegistryFile('media/plg_behaviour_compat/es5.asset.json');
+        }
+    }
+}
diff --git a/libraries/classmap.php b/plugins/behaviour/compat/src/classmap/classmap.php
similarity index 98%
rename from libraries/classmap.php
rename to plugins/behaviour/compat/src/classmap/classmap.php
index 0cc7d167b35c3..2fc26c31ca94b 100644
--- a/libraries/classmap.php
+++ b/plugins/behaviour/compat/src/classmap/classmap.php
@@ -70,6 +70,13 @@
 JLoader::registerAlias('JTableMenuType', '\\Joomla\\CMS\\Table\\MenuType', '6.0');
 JLoader::registerAlias('JTableModule', '\\Joomla\\CMS\\Table\\Module', '6.0');
 
+// Special cases for renamed PascalCase table names which could not be autodetected by the new Table::getInstance function
+JLoader::registerAlias('\\Joomla\\CMS\\Table\\Updatesite', '\\Joomla\\CMS\\Table\\UpdateSite', '6.0');
+JLoader::registerAlias('\\Joomla\\CMS\\Table\\Viewlevel', '\\Joomla\\CMS\\Table\\ViewLevel', '6.0');
+JLoader::registerAlias('\\Joomla\\CMS\\Table\\Contenthistory', '\\Joomla\\CMS\\Table\\ContentHistory', '6.0');
+JLoader::registerAlias('\\Joomla\\CMS\\Table\\Contenttype', '\\Joomla\\CMS\\Table\\ContentType', '6.0');
+JLoader::registerAlias('\\Joomla\\CMS\\Table\\Corecontent', '\\Joomla\\CMS\\Table\\CoreContent', '6.0');
+
 JLoader::registerAlias('JAccess', '\\Joomla\\CMS\\Access\\Access', '6.0');
 JLoader::registerAlias('JAccessRule', '\\Joomla\\CMS\\Access\\Rule', '6.0');
 JLoader::registerAlias('JAccessRules', '\\Joomla\\CMS\\Access\\Rules', '6.0');
@@ -415,8 +422,6 @@
 JLoader::registerAlias('JClientHelper', '\\Joomla\\CMS\\Client\\ClientHelper', '6.0');
 JLoader::registerAlias('JClientFtp', '\\Joomla\\CMS\\Client\\FtpClient', '6.0');
 JLoader::registerAlias('JFTP', '\\Joomla\\CMS\\Client\\FtpClient', '4.0');
-JLoader::registerAlias('JClientLdap', '\\Joomla\\Ldap\\LdapClient', '6.0');
-JLoader::registerAlias('JLDAP', '\\Joomla\\Ldap\\LdapClient', '4.0');
 
 JLoader::registerAlias('JUpdate', '\\Joomla\\CMS\\Updater\\Update', '6.0');
 JLoader::registerAlias('JUpdateAdapter', '\\Joomla\\CMS\\Updater\\UpdateAdapter', '6.0');
diff --git a/libraries/extensions.classmap.php b/plugins/behaviour/compat/src/classmap/extensions.classmap.php
similarity index 99%
rename from libraries/extensions.classmap.php
rename to plugins/behaviour/compat/src/classmap/extensions.classmap.php
index efbd76a2526d8..9a55810214c2f 100644
--- a/libraries/extensions.classmap.php
+++ b/plugins/behaviour/compat/src/classmap/extensions.classmap.php
@@ -4,7 +4,7 @@
  * Joomla! Content Management System
  *
  * @copyright  (C) 2017 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 // No direct access.
diff --git a/plugins/behaviour/taggable/services/provider.php b/plugins/behaviour/taggable/services/provider.php
index cfd8044586e75..16656b4fdc2c9 100644
--- a/plugins/behaviour/taggable/services/provider.php
+++ b/plugins/behaviour/taggable/services/provider.php
@@ -32,9 +32,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Taggable(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('behaviour', 'taggable')
                 );
 
diff --git a/plugins/behaviour/taggable/src/Extension/Taggable.php b/plugins/behaviour/taggable/src/Extension/Taggable.php
index 24278722d493a..72afea349cf6f 100644
--- a/plugins/behaviour/taggable/src/Extension/Taggable.php
+++ b/plugins/behaviour/taggable/src/Extension/Taggable.php
@@ -23,7 +23,6 @@
 use Joomla\CMS\Table\TableInterface;
 use Joomla\CMS\Tag\TaggableTableInterface;
 use Joomla\Event\SubscriberInterface;
-use RuntimeException;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -249,7 +248,7 @@ public function onTableSetNewTags(SetNewTagsEvent $event)
         $tagsHelper->typeAlias = $table->getTypeAlias();
 
         if (!$tagsHelper->postStoreProcess($table, $newTags, $replaceTags)) {
-            throw new RuntimeException($table->getError());
+            throw new \RuntimeException($table->getError());
         }
     }
 
diff --git a/plugins/behaviour/versionable/services/provider.php b/plugins/behaviour/versionable/services/provider.php
index e384f7a6a24ce..66cdf88700da6 100644
--- a/plugins/behaviour/versionable/services/provider.php
+++ b/plugins/behaviour/versionable/services/provider.php
@@ -35,9 +35,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Versionable(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('behaviour', 'versionable'),
                     new InputFilter(),
                     new CMSHelper()
diff --git a/plugins/captcha/index.html b/plugins/captcha/index.html
new file mode 100644
index 0000000000000..2efb97f319a35
--- /dev/null
+++ b/plugins/captcha/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/plugins/captcha/recaptcha/recaptcha.xml b/plugins/captcha/recaptcha/recaptcha.xml
deleted file mode 100644
index 48859249ebdc8..0000000000000
--- a/plugins/captcha/recaptcha/recaptcha.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<extension type="plugin" group="captcha" method="upgrade">
-	<name>plg_captcha_recaptcha</name>
-	<version>3.4.0</version>
-	<creationDate>2011-12</creationDate>
-	<author>Joomla! Project</author>
-	<authorEmail>admin@joomla.org</authorEmail>
-	<authorUrl>www.joomla.org</authorUrl>
-	<copyright>(C) 2011 Open Source Matters, Inc.</copyright>
-	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<description>PLG_CAPTCHA_RECAPTCHA_XML_DESCRIPTION</description>
-	<namespace path="src">Joomla\Plugin\Captcha\ReCaptcha</namespace>
-	<files>
-		<folder plugin="recaptcha">services</folder>
-		<folder>src</folder>
-	</files>
-	<languages>
-		<language tag="en-GB">language/en-GB/plg_captcha_recaptcha.ini</language>
-		<language tag="en-GB">language/en-GB/plg_captcha_recaptcha.sys.ini</language>
-	</languages>
-	<config>
-		<fields name="params">
-			<fieldset name="basic">
-				<field
-					name="version"
-					type="list"
-					label="PLG_RECAPTCHA_VERSION_LABEL"
-					default="2.0"
-					validate="options"
-					>
-					<option value="2.0">PLG_RECAPTCHA_VERSION_V2</option>
-				</field>
-
-				<field
-					name="public_key"
-					type="text"
-					label="PLG_RECAPTCHA_PUBLIC_KEY_LABEL"
-					default=""
-					required="true"
-					filter="string"
-					class="input-xxlarge"
-				/>
-
-				<field
-					name="private_key"
-					type="text"
-					label="PLG_RECAPTCHA_PRIVATE_KEY_LABEL"
-					default=""
-					required="true"
-					filter="string"
-					class="input-xxlarge"
-				/>
-
-				<field
-					name="theme2"
-					type="list"
-					label="PLG_RECAPTCHA_THEME_LABEL"
-					default="light"
-					showon="version:2.0"
-					filter=""
-					validate="options"
-					>
-					<option value="light">PLG_RECAPTCHA_THEME_LIGHT</option>
-					<option value="dark">PLG_RECAPTCHA_THEME_DARK</option>
-				</field>
-
-				<field
-					name="size"
-					type="list"
-					label="PLG_RECAPTCHA_SIZE_LABEL"
-					default="normal"
-					showon="version:2.0"
-					filter=""
-					validate="options"
-					>
-					<option value="normal">PLG_RECAPTCHA_THEME_NORMAL</option>
-					<option value="compact">PLG_RECAPTCHA_THEME_COMPACT</option>
-				</field>
-
-				<field
-					name="tabindex"
-					type="number"
-					label="PLG_RECAPTCHA_TABINDEX_LABEL"
-					description="PLG_RECAPTCHA_TABINDEX_DESC"
-					filter="integer"
-					default="0"
-					showon="version:2.0"
-					min="0"
-				/>
-
-				<field
-					name="callback"
-					type="text"
-					label="PLG_RECAPTCHA_CALLBACK_LABEL"
-					description="PLG_RECAPTCHA_CALLBACK_DESC"
-					default=""
-					showon="version:2.0"
-					filter="string"
-				/>
-
-				<field
-					name="expired_callback"
-					type="text"
-					label="PLG_RECAPTCHA_EXPIRED_CALLBACK_LABEL"
-					description="PLG_RECAPTCHA_EXPIRED_CALLBACK_DESC"
-					default=""
-					showon="version:2.0"
-					filter="string"
-				/>
-
-				<field
-					name="error_callback"
-					type="text"
-					label="PLG_RECAPTCHA_ERROR_CALLBACK_LABEL"
-					description="PLG_RECAPTCHA_ERROR_CALLBACK_DESC"
-					default=""
-					showon="version:2.0"
-					filter="string"
-				/>
-			</fieldset>
-		</fields>
-	</config>
-</extension>
diff --git a/plugins/captcha/recaptcha/src/Extension/ReCaptcha.php b/plugins/captcha/recaptcha/src/Extension/ReCaptcha.php
deleted file mode 100644
index f1f661f74257a..0000000000000
--- a/plugins/captcha/recaptcha/src/Extension/ReCaptcha.php
+++ /dev/null
@@ -1,223 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Plugin
- * @subpackage  Captcha.recaptcha
- *
- * @copyright   (C) 2011 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-namespace Joomla\Plugin\Captcha\ReCaptcha\Extension;
-
-use Joomla\CMS\Application\CMSWebApplicationInterface;
-use Joomla\CMS\Plugin\CMSPlugin;
-use Joomla\Event\DispatcherInterface;
-use Joomla\Utilities\IpHelper;
-use ReCaptcha\ReCaptcha as Captcha;
-use ReCaptcha\RequestMethod;
-
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-
-/**
- * Recaptcha Plugin
- * Based on the official recaptcha library( https://packagist.org/packages/google/recaptcha )
- *
- * @since  2.5
- */
-final class ReCaptcha extends CMSPlugin
-{
-    /**
-     * Load the language file on instantiation.
-     *
-     * @var    boolean
-     * @since  3.1
-     */
-    protected $autoloadLanguage = true;
-
-    /**
-     * The http request method
-     *
-     * @var    RequestMethod
-     * @since  4.3.0
-     */
-    private $requestMethod;
-
-    /**
-     * Constructor.
-     *
-     * @param   DispatcherInterface  $dispatcher     The dispatcher
-     * @param   array                $config         An optional associative array of configuration settings
-     * @param   RequestMethod        $requestMethod  The http request method
-     *
-     * @since   4.3.0
-     */
-    public function __construct(DispatcherInterface $dispatcher, array $config, RequestMethod $requestMethod)
-    {
-        parent::__construct($dispatcher, $config);
-
-        $this->requestMethod = $requestMethod;
-    }
-
-    /**
-     * Reports the privacy related capabilities for this plugin to site administrators.
-     *
-     * @return  array
-     *
-     * @since   3.9.0
-     */
-    public function onPrivacyCollectAdminCapabilities()
-    {
-        return [
-            $this->getApplication()->getLanguage()->_('PLG_CAPTCHA_RECAPTCHA') => [
-                $this->getApplication()->getLanguage()->_('PLG_RECAPTCHA_PRIVACY_CAPABILITY_IP_ADDRESS'),
-            ],
-        ];
-    }
-
-    /**
-     * Initializes the captcha
-     *
-     * @param   string  $id  The id of the field.
-     *
-     * @return  Boolean True on success, false otherwise
-     *
-     * @since   2.5
-     * @throws  \RuntimeException
-     */
-    public function onInit($id = 'dynamic_recaptcha_1')
-    {
-        $app = $this->getApplication();
-
-        if (!$app instanceof CMSWebApplicationInterface) {
-            return false;
-        }
-
-        $pubkey = $this->params->get('public_key', '');
-
-        if ($pubkey === '') {
-            throw new \RuntimeException($app->getLanguage()->_('PLG_RECAPTCHA_ERROR_NO_PUBLIC_KEY'));
-        }
-
-        $apiSrc = 'https://www.google.com/recaptcha/api.js?onload=JoomlainitReCaptcha2&render=explicit&hl='
-            . $app->getLanguage()->getTag();
-
-        // Load assets, the callback should be first
-        $app->getDocument()->getWebAssetManager()
-            ->registerAndUseScript('plg_captcha_recaptcha', 'plg_captcha_recaptcha/recaptcha.min.js', [], ['defer' => true])
-            ->registerAndUseScript('plg_captcha_recaptcha.api', $apiSrc, [], ['defer' => true], ['plg_captcha_recaptcha']);
-
-        return true;
-    }
-
-    /**
-     * Gets the challenge HTML
-     *
-     * @param   string  $name   The name of the field. Not Used.
-     * @param   string  $id     The id of the field.
-     * @param   string  $class  The class of the field.
-     *
-     * @return  string  The HTML to be embedded in the form.
-     *
-     * @since  2.5
-     */
-    public function onDisplay($name = null, $id = 'dynamic_recaptcha_1', $class = '')
-    {
-        $dom = new \DOMDocument('1.0', 'UTF-8');
-        $ele = $dom->createElement('div');
-        $ele->setAttribute('id', $id);
-
-        $ele->setAttribute('class', ((trim($class) == '') ? 'g-recaptcha' : ($class . ' g-recaptcha')));
-        $ele->setAttribute('data-sitekey', $this->params->get('public_key', ''));
-        $ele->setAttribute('data-theme', $this->params->get('theme2', 'light'));
-        $ele->setAttribute('data-size', $this->params->get('size', 'normal'));
-        $ele->setAttribute('data-tabindex', $this->params->get('tabindex', '0'));
-        $ele->setAttribute('data-callback', $this->params->get('callback', ''));
-        $ele->setAttribute('data-expired-callback', $this->params->get('expired_callback', ''));
-        $ele->setAttribute('data-error-callback', $this->params->get('error_callback', ''));
-
-        $dom->appendChild($ele);
-
-        return $dom->saveHTML($ele);
-    }
-
-    /**
-     * Calls an HTTP POST function to verify if the user's guess was correct
-     *
-     * @param   string  $code  Answer provided by user. Not needed for the Recaptcha implementation
-     *
-     * @return  True if the answer is correct, false otherwise
-     *
-     * @since   2.5
-     * @throws  \RuntimeException
-     */
-    public function onCheckAnswer($code = null)
-    {
-        $input      = $this->getApplication()->getInput();
-        $privatekey = $this->params->get('private_key');
-        $version    = $this->params->get('version', '2.0');
-        $remoteip   = IpHelper::getIp();
-        $response   = null;
-        $spam       = false;
-
-        switch ($version) {
-            case '2.0':
-                $response  = $code ?: $input->get('g-recaptcha-response', '', 'string');
-                $spam      = ($response === '');
-                break;
-        }
-
-        // Check for Private Key
-        if (empty($privatekey)) {
-            throw new \RuntimeException($this->getApplication()->getLanguage()->_('PLG_RECAPTCHA_ERROR_NO_PRIVATE_KEY'), 500);
-        }
-
-        // Check for IP
-        if (empty($remoteip)) {
-            throw new \RuntimeException($this->getApplication()->getLanguage()->_('PLG_RECAPTCHA_ERROR_NO_IP'), 500);
-        }
-
-        // Discard spam submissions
-        if ($spam) {
-            throw new \RuntimeException($this->getApplication()->getLanguage()->_('PLG_RECAPTCHA_ERROR_EMPTY_SOLUTION'), 500);
-        }
-
-        return $this->getResponse($privatekey, $remoteip, $response);
-    }
-
-    /**
-     * Get the reCaptcha response.
-     *
-     * @param   string  $privatekey  The private key for authentication.
-     * @param   string  $remoteip    The remote IP of the visitor.
-     * @param   string  $response    The response received from Google.
-     *
-     * @return  bool True if response is good | False if response is bad.
-     *
-     * @since   3.4
-     * @throws  \RuntimeException
-     */
-    private function getResponse(string $privatekey, string $remoteip, string $response)
-    {
-        $version = $this->params->get('version', '2.0');
-
-        switch ($version) {
-            case '2.0':
-                $apiResponse = (new Captcha($privatekey, $this->requestMethod))->verify($response, $remoteip);
-
-                if (!$apiResponse->isSuccess()) {
-                    foreach ($apiResponse->getErrorCodes() as $error) {
-                        throw new \RuntimeException($error, 403);
-                    }
-
-                    return false;
-                }
-
-                break;
-        }
-
-        return true;
-    }
-}
diff --git a/plugins/captcha/recaptcha_invisible/recaptcha_invisible.xml b/plugins/captcha/recaptcha_invisible/recaptcha_invisible.xml
deleted file mode 100644
index d3480198a6d8d..0000000000000
--- a/plugins/captcha/recaptcha_invisible/recaptcha_invisible.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<extension type="plugin" group="captcha" method="upgrade">
-	<name>plg_captcha_recaptcha_invisible</name>
-	<version>3.8</version>
-	<creationDate>2017-11</creationDate>
-	<author>Joomla! Project</author>
-	<authorEmail>admin@joomla.org</authorEmail>
-	<authorUrl>www.joomla.org</authorUrl>
-	<copyright>(C) 2017 Open Source Matters, Inc.</copyright>
-	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<description>PLG_CAPTCHA_RECAPTCHA_INVISIBLE_XML_DESCRIPTION</description>
-	<namespace path="src">Joomla\Plugin\Captcha\InvisibleReCaptcha</namespace>
-	<files>
-		<folder plugin="recaptcha_invisible">services</folder>
-		<folder>src</folder>
-	</files>
-	<languages>
-		<language tag="en-GB">language/en-GB/plg_captcha_recaptcha_invisible.ini</language>
-		<language tag="en-GB">language/en-GB/plg_captcha_recaptcha_invisible.sys.ini</language>
-	</languages>
-	<config>
-		<fields name="params">
-			<fieldset name="basic">
-
-				<field
-					name="public_key"
-					type="text"
-					label="PLG_RECAPTCHA_INVISIBLE_PUBLIC_KEY_LABEL"
-					description="PLG_RECAPTCHA_INVISIBLE_PUBLIC_KEY_DESC"
-					default=""
-					required="true"
-					filter="string"
-					class="input-xxlarge"
-				/>
-
-				<field
-					name="private_key"
-					type="text"
-					label="PLG_RECAPTCHA_INVISIBLE_PRIVATE_KEY_LABEL"
-					description="PLG_RECAPTCHA_INVISIBLE_PRIVATE_KEY_DESC"
-					default=""
-					required="true"
-					filter="string"
-					class="input-xxlarge"
-				/>
-
-				<field
-					name="badge"
-					type="list"
-					label="PLG_RECAPTCHA_INVISIBLE_BADGE_LABEL"
-					description="PLG_RECAPTCHA_INVISIBLE_BADGE_DESC"
-					default="bottomright"
-					validate="options"
-					>
-					<option value="bottomright">PLG_RECAPTCHA_INVISIBLE_BADGE_BOTTOMRIGHT</option>
-					<option value="bottomleft">PLG_RECAPTCHA_INVISIBLE_BADGE_BOTTOMLEFT</option>
-					<option value="inline">PLG_RECAPTCHA_INVISIBLE_BADGE_INLINE</option>
-				</field>
-
-				<field
-					name="tabindex"
-					type="number"
-					label="PLG_RECAPTCHA_INVISIBLE_TABINDEX_LABEL"
-					description="PLG_RECAPTCHA_INVISIBLE_TABINDEX_DESC"
-					default="0"
-					min="0"
-					filter="integer"
-				/>
-
-				<field
-					name="callback"
-					type="text"
-					label="PLG_RECAPTCHA_INVISIBLE_CALLBACK_LABEL"
-					description="PLG_RECAPTCHA_INVISIBLE_CALLBACK_DESC"
-					default=""
-					filter="string"
-				/>
-
-				<field
-					name="expired_callback"
-					type="text"
-					label="PLG_RECAPTCHA_INVISIBLE_EXPIRED_CALLBACK_LABEL"
-					description="PLG_RECAPTCHA_INVISIBLE_EXPIRED_CALLBACK_DESC"
-					default=""
-					filter="string"
-				/>
-
-				<field
-					name="error_callback"
-					type="text"
-					label="PLG_RECAPTCHA_INVISIBLE_ERROR_CALLBACK_LABEL"
-					description="PLG_RECAPTCHA_INVISIBLE_ERROR_CALLBACK_DESC"
-					default=""
-					filter="string"
-				/>
-			</fieldset>
-		</fields>
-	</config>
-</extension>
diff --git a/plugins/captcha/recaptcha_invisible/src/Extension/InvisibleReCaptcha.php b/plugins/captcha/recaptcha_invisible/src/Extension/InvisibleReCaptcha.php
deleted file mode 100644
index 919c017c72192..0000000000000
--- a/plugins/captcha/recaptcha_invisible/src/Extension/InvisibleReCaptcha.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Plugin
- * @subpackage  Captcha.invisible_recaptcha
- *
- * @copyright   (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-namespace Joomla\Plugin\Captcha\InvisibleReCaptcha\Extension;
-
-use Joomla\CMS\Application\CMSWebApplicationInterface;
-use Joomla\CMS\Form\Field\CaptchaField;
-use Joomla\CMS\Plugin\CMSPlugin;
-use Joomla\Event\DispatcherInterface;
-use Joomla\Utilities\IpHelper;
-use ReCaptcha\ReCaptcha;
-use ReCaptcha\RequestMethod;
-
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-
-/**
- * Invisible reCAPTCHA Plugin.
- *
- * @since  3.9.0
- */
-final class InvisibleReCaptcha extends CMSPlugin
-{
-    /**
-     * Load the language file on instantiation.
-     *
-     * @var    boolean
-     * @since  3.9.0
-     */
-    protected $autoloadLanguage = true;
-
-    /**
-     * The http request method
-     *
-     * @var    RequestMethod
-     * @since  4.3.0
-     */
-    private $requestMethod;
-
-    /**
-     * Constructor.
-     *
-     * @param   DispatcherInterface  $dispatcher     The dispatcher
-     * @param   array                $config         An optional associative array of configuration settings
-     * @param   RequestMethod        $requestMethod  The http request method
-     *
-     * @since   4.3.0
-     */
-    public function __construct(DispatcherInterface $dispatcher, array $config, RequestMethod $requestMethod)
-    {
-        parent::__construct($dispatcher, $config);
-
-        $this->requestMethod = $requestMethod;
-    }
-
-    /**
-     * Reports the privacy related capabilities for this plugin to site administrators.
-     *
-     * @return  array
-     *
-     * @since   3.9.0
-     */
-    public function onPrivacyCollectAdminCapabilities()
-    {
-        $this->loadLanguage();
-
-        return [
-            $this->getApplication()->getLanguage()->_('PLG_CAPTCHA_RECAPTCHA_INVISIBLE') => [
-                $this->getApplication()->getLanguage()->_('PLG_RECAPTCHA_INVISIBLE_PRIVACY_CAPABILITY_IP_ADDRESS'),
-            ],
-        ];
-    }
-
-    /**
-     * Initializes the captcha
-     *
-     * @param   string  $id  The id of the field.
-     *
-     * @return  boolean True on success, false otherwise
-     *
-     * @since   3.9.0
-     * @throws  \RuntimeException
-     */
-    public function onInit($id = 'dynamic_recaptcha_invisible_1')
-    {
-        $app = $this->getApplication();
-
-        if (!$app instanceof CMSWebApplicationInterface) {
-            return false;
-        }
-
-        $pubkey = $this->params->get('public_key', '');
-
-        if ($pubkey === '') {
-            throw new \RuntimeException($app->getLanguage()->_('PLG_RECAPTCHA_INVISIBLE_ERROR_NO_PUBLIC_KEY'));
-        }
-
-        $apiSrc = 'https://www.google.com/recaptcha/api.js?onload=JoomlainitReCaptchaInvisible&render=explicit&hl='
-            . $app->getLanguage()->getTag();
-
-        // Load assets, the callback should be first
-        $app->getDocument()->getWebAssetManager()
-            ->registerAndUseScript('plg_captcha_recaptchainvisible', 'plg_captcha_recaptcha_invisible/recaptcha.min.js', [], ['defer' => true])
-            ->registerAndUseScript('plg_captcha_recaptchainvisible.api', $apiSrc, [], ['defer' => true], ['plg_captcha_recaptchainvisible'])
-            ->registerAndUseStyle('plg_captcha_recaptchainvisible', 'plg_captcha_recaptcha_invisible/recaptcha_invisible.css');
-
-        return true;
-    }
-
-    /**
-     * Gets the challenge HTML
-     *
-     * @param   string  $name   The name of the field. Not Used.
-     * @param   string  $id     The id of the field.
-     * @param   string  $class  The class of the field.
-     *
-     * @return  string  The HTML to be embedded in the form.
-     *
-     * @since  3.9.0
-     */
-    public function onDisplay($name = null, $id = 'dynamic_recaptcha_invisible_1', $class = '')
-    {
-        $dom = new \DOMDocument('1.0', 'UTF-8');
-        $ele = $dom->createElement('div');
-        $ele->setAttribute('id', $id);
-        $ele->setAttribute('class', ((trim($class) == '') ? 'g-recaptcha' : ($class . ' g-recaptcha')));
-        $ele->setAttribute('data-sitekey', $this->params->get('public_key', ''));
-        $ele->setAttribute('data-badge', $this->params->get('badge', 'bottomright'));
-        $ele->setAttribute('data-size', 'invisible');
-        $ele->setAttribute('data-tabindex', $this->params->get('tabindex', '0'));
-        $ele->setAttribute('data-callback', $this->params->get('callback', ''));
-        $ele->setAttribute('data-expired-callback', $this->params->get('expired_callback', ''));
-        $ele->setAttribute('data-error-callback', $this->params->get('error_callback', ''));
-        $dom->appendChild($ele);
-
-        return $dom->saveHTML($ele);
-    }
-
-    /**
-     * Calls an HTTP POST function to verify if the user's guess was correct
-     *
-     * @param   string  $code  Answer provided by user. Not needed for the Recaptcha implementation
-     *
-     * @return  boolean  True if the answer is correct, false otherwise
-     *
-     * @since   3.9.0
-     * @throws  \RuntimeException
-     */
-    public function onCheckAnswer($code = null)
-    {
-        $input      = $this->getApplication()->getInput();
-        $privatekey = $this->params->get('private_key');
-        $remoteip   = IpHelper::getIp();
-
-        $response  = $input->get('g-recaptcha-response', '', 'string');
-
-        // Check for Private Key
-        if (empty($privatekey)) {
-            throw new \RuntimeException($this->getApplication()->getLanguage()->_('PLG_RECAPTCHA_INVISIBLE_ERROR_NO_PRIVATE_KEY'));
-        }
-
-        // Check for IP
-        if (empty($remoteip)) {
-            throw new \RuntimeException($this->getApplication()->getLanguage()->_('PLG_RECAPTCHA_INVISIBLE_ERROR_NO_IP'));
-        }
-
-        // Discard spam submissions
-        if (trim($response) == '') {
-            throw new \RuntimeException($this->getApplication()->getLanguage()->_('PLG_RECAPTCHA_INVISIBLE_ERROR_EMPTY_SOLUTION'));
-        }
-
-        return $this->getResponse($privatekey, $remoteip, $response);
-    }
-
-    /**
-     * 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   CaptchaField       $field    Captcha field instance
-     * @param   \SimpleXMLElement  $element  XML form definition
-     *
-     * @return void
-     *
-     * @since 3.9.0
-     */
-    public function onSetupField(CaptchaField $field, \SimpleXMLElement $element)
-    {
-        // Hide the label for the invisible recaptcha type
-        $element['hiddenLabel'] = 'true';
-    }
-
-    /**
-     * Get the reCaptcha response.
-     *
-     * @param   string  $privatekey  The private key for authentication.
-     * @param   string  $remoteip    The remote IP of the visitor.
-     * @param   string  $response    The response received from Google.
-     *
-     * @return  boolean  True if response is good | False if response is bad.
-     *
-     * @since   3.9.0
-     * @throws  \RuntimeException
-     */
-    private function getResponse($privatekey, $remoteip, $response)
-    {
-        $reCaptcha = new ReCaptcha($privatekey, $this->requestMethod);
-        $response  = $reCaptcha->verify($response, $remoteip);
-
-        if (!$response->isSuccess()) {
-            foreach ($response->getErrorCodes() as $error) {
-                throw new \RuntimeException($error);
-            }
-
-            return false;
-        }
-
-        return true;
-    }
-}
diff --git a/plugins/content/confirmconsent/services/provider.php b/plugins/content/confirmconsent/services/provider.php
index f7ad6d7165ef6..61e50835a619f 100644
--- a/plugins/content/confirmconsent/services/provider.php
+++ b/plugins/content/confirmconsent/services/provider.php
@@ -33,9 +33,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new ConfirmConsent(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('content', 'confirmconsent')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/content/contact/services/provider.php b/plugins/content/contact/services/provider.php
index 790ecd2b3d749..74a8dc4c1dd12 100644
--- a/plugins/content/contact/services/provider.php
+++ b/plugins/content/contact/services/provider.php
@@ -34,9 +34,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Contact(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('content', 'contact')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/content/emailcloak/services/provider.php b/plugins/content/emailcloak/services/provider.php
index 9b7b932c576d6..7f8ed477ba47b 100644
--- a/plugins/content/emailcloak/services/provider.php
+++ b/plugins/content/emailcloak/services/provider.php
@@ -33,9 +33,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new EmailCloak(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('content', 'emailcloak')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/content/emailcloak/src/Extension/EmailCloak.php b/plugins/content/emailcloak/src/Extension/EmailCloak.php
index a03406ce04d1f..6658a16226a92 100644
--- a/plugins/content/emailcloak/src/Extension/EmailCloak.php
+++ b/plugins/content/emailcloak/src/Extension/EmailCloak.php
@@ -10,8 +10,10 @@
 
 namespace Joomla\Plugin\Content\EmailCloak\Extension;
 
+use Joomla\CMS\Event\Content\ContentPrepareEvent;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\Event\SubscriberInterface;
 use Joomla\String\StringHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -23,32 +25,48 @@
  *
  * @since  1.5
  */
-final class EmailCloak extends CMSPlugin
+final class EmailCloak extends CMSPlugin implements SubscriberInterface
 {
+    /**
+     * Returns an array of events this subscriber will listen to.
+     *
+     * @return  array
+     *
+     * @since   5.0.0
+     */
+    public static function getSubscribedEvents(): array
+    {
+        return ['onContentPrepare' => 'onContentPrepare'];
+    }
+
     /**
      * Plugin that cloaks all emails in content from spambots via Javascript.
      *
-     * @param   string   $context  The context of the content being passed to the plugin.
-     * @param   mixed    &$row     An object with a "text" property or the string to be cloaked.
-     * @param   mixed    &$params  Additional parameters.
-     * @param   integer  $page     Optional page number. Unused. Defaults to zero.
+     * @param   ContentPrepareEvent  $event  Event instance
      *
      * @return  void
      */
-    public function onContentPrepare($context, &$row, &$params, $page = 0)
+    public function onContentPrepare(ContentPrepareEvent $event)
     {
         // Don't run if in the API Application
         // Don't run this plugin when the content is being indexed
-        if ($this->getApplication()->isClient('api') || $context === 'com_finder.indexer') {
+        if ($this->getApplication()->isClient('api') || $event->getContext() === 'com_finder.indexer') {
             return;
         }
 
-        // If the row is not an object or does not have a text property there is nothing to do
-        if (!is_object($row) || !property_exists($row, 'text')) {
+        // Get content item
+        $item = $event->getItem();
+
+        // If the item does not have a text property there is nothing to do
+        if (!property_exists($item, 'text')) {
             return;
         }
 
-        $this->cloak($row->text, $params);
+        $text = $this->cloak($item->text);
+
+        if ($text) {
+            $item->text = $text;
+        }
     }
 
     /**
@@ -69,27 +87,23 @@ private function getPattern($link, $text)
     /**
      * Cloak all emails in text from spambots via Javascript.
      *
-     * @param   string  &$text    The string to be cloaked.
-     * @param   mixed   &$params  Additional parameters. Parameter "mode" (integer, default 1)
-     *                             replaces addresses with "mailto:" links if nonzero.
+     * @param   string  $text    The string to be cloaked.
      *
-     * @return  void
+     * @return  string
      */
-    private function cloak(&$text, &$params)
+    private function cloak($text)
     {
         /*
          * Check for presence of {emailcloak=off} which is explicits disables this
          * bot for the item.
          */
         if (StringHelper::strpos($text, '{emailcloak=off}') !== false) {
-            $text = StringHelper::str_ireplace('{emailcloak=off}', '', $text);
-
-            return;
+            return StringHelper::str_ireplace('{emailcloak=off}', '', $text);
         }
 
         // Simple performance check to determine whether bot should process further.
         if (StringHelper::strpos($text, '@') === false) {
-            return;
+            return '';
         }
 
         $mode = (int) $this->params->def('mode', 1);
@@ -474,5 +488,7 @@ private function cloak(&$text, &$params)
             // Replace the found address with the js cloaked email
             $text = substr_replace($text, $replacement, $regs[1][1], strlen($mail));
         }
+
+        return $text;
     }
 }
diff --git a/plugins/content/fields/services/provider.php b/plugins/content/fields/services/provider.php
index 21089762fbc5a..a29af5ab9bb7d 100644
--- a/plugins/content/fields/services/provider.php
+++ b/plugins/content/fields/services/provider.php
@@ -32,9 +32,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Fields(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('content', 'fields')
                 );
 
diff --git a/plugins/content/fields/src/Extension/Fields.php b/plugins/content/fields/src/Extension/Fields.php
index dfebe6c0185f1..517a880380baa 100644
--- a/plugins/content/fields/src/Extension/Fields.php
+++ b/plugins/content/fields/src/Extension/Fields.php
@@ -91,7 +91,7 @@ private function prepare($string, $context, $item)
 
         $parts = FieldsHelper::extract($context);
 
-        if (count($parts) < 2) {
+        if (!$parts || count($parts) < 2) {
             return $string;
         }
 
diff --git a/plugins/content/finder/finder.xml b/plugins/content/finder/finder.xml
index 1e6cf2ad55247..fd2b69748ff35 100644
--- a/plugins/content/finder/finder.xml
+++ b/plugins/content/finder/finder.xml
@@ -9,9 +9,10 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>3.0.0</version>
 	<description>PLG_CONTENT_FINDER_XML_DESCRIPTION</description>
-
+	<namespace path="src">Joomla\Plugin\Content\Finder</namespace>
 	<files>
-		<filename plugin="finder">finder.php</filename>
+		<folder plugin="finder">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_content_finder.ini</language>
diff --git a/plugins/content/finder/services/provider.php b/plugins/content/finder/services/provider.php
new file mode 100644
index 0000000000000..1db144de06be6
--- /dev/null
+++ b/plugins/content/finder/services/provider.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Content.finder
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\Content\Finder\Extension\Finder;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new Finder(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('content', 'finder')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/content/finder/finder.php b/plugins/content/finder/src/Extension/Finder.php
similarity index 60%
rename from plugins/content/finder/finder.php
rename to plugins/content/finder/src/Extension/Finder.php
index 7e0b5ff24a767..83f44d9dbe2b3 100644
--- a/plugins/content/finder/finder.php
+++ b/plugins/content/finder/src/Extension/Finder.php
@@ -6,11 +6,11 @@
  *
  * @copyright   (C) 2011 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
-use Joomla\CMS\Factory;
+namespace Joomla\Plugin\Content\Finder\Extension;
+
+use Joomla\CMS\Event\Finder as FinderEvent;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Plugin\PluginHelper;
 
@@ -23,15 +23,24 @@
  *
  * @since  2.5
  */
-class PlgContentFinder extends CMSPlugin
+final class Finder extends CMSPlugin
 {
+    /**
+     * Flag to check whether finder plugins already imported.
+     *
+     * @var bool
+     *
+     * @since  5.0.0
+     */
+    protected $pluginsImported = false;
+
     /**
      * Smart Search after save content method.
      * Content is passed by reference, but after the save, so no changes will be saved.
      * Method is called right after the content is saved.
      *
      * @param   string  $context  The context of the content passed to the plugin (added in 1.6)
-     * @param   object  $article  A JTableContent object
+     * @param   object  $article  A \Joomla\CMS\Table\Table\ object
      * @param   bool    $isNew    If the content has just been created
      *
      * @return  void
@@ -40,10 +49,14 @@ class PlgContentFinder extends CMSPlugin
      */
     public function onContentAfterSave($context, $article, $isNew): void
     {
-        PluginHelper::importPlugin('finder');
+        $this->importFinderPlugins();
 
         // Trigger the onFinderAfterSave event.
-        Factory::getApplication()->triggerEvent('onFinderAfterSave', [$context, $article, $isNew]);
+        $this->getDispatcher()->dispatch('onFinderAfterSave', new FinderEvent\AfterSaveEvent('onFinderAfterSave', [
+            'context' => $context,
+            'subject' => $article,
+            'isNew'   => $isNew,
+        ]));
     }
 
     /**
@@ -51,7 +64,7 @@ public function onContentAfterSave($context, $article, $isNew): void
      * Content is passed by reference. Method is called before the content is saved.
      *
      * @param   string  $context  The context of the content passed to the plugin (added in 1.6).
-     * @param   object  $article  A JTableContent object.
+     * @param   object  $article  A \Joomla\CMS\Table\Table\ object.
      * @param   bool    $isNew    If the content is just about to be created.
      *
      * @return  void
@@ -60,10 +73,14 @@ public function onContentAfterSave($context, $article, $isNew): void
      */
     public function onContentBeforeSave($context, $article, $isNew)
     {
-        PluginHelper::importPlugin('finder');
+        $this->importFinderPlugins();
 
         // Trigger the onFinderBeforeSave event.
-        Factory::getApplication()->triggerEvent('onFinderBeforeSave', [$context, $article, $isNew]);
+        $this->getDispatcher()->dispatch('onFinderBeforeSave', new FinderEvent\BeforeSaveEvent('onFinderBeforeSave', [
+            'context' => $context,
+            'subject' => $article,
+            'isNew'   => $isNew,
+        ]));
     }
 
     /**
@@ -71,7 +88,7 @@ public function onContentBeforeSave($context, $article, $isNew)
      * Content is passed by reference, but after the deletion.
      *
      * @param   string  $context  The context of the content passed to the plugin (added in 1.6).
-     * @param   object  $article  A JTableContent object.
+     * @param   object  $article  A \Joomla\CMS\Table\Table object.
      *
      * @return  void
      *
@@ -79,10 +96,13 @@ public function onContentBeforeSave($context, $article, $isNew)
      */
     public function onContentAfterDelete($context, $article): void
     {
-        PluginHelper::importPlugin('finder');
+        $this->importFinderPlugins();
 
         // Trigger the onFinderAfterDelete event.
-        Factory::getApplication()->triggerEvent('onFinderAfterDelete', [$context, $article]);
+        $this->getDispatcher()->dispatch('onFinderAfterDelete', new FinderEvent\AfterDeleteEvent('onFinderAfterDelete', [
+            'context' => $context,
+            'subject' => $article,
+        ]));
     }
 
     /**
@@ -101,10 +121,14 @@ public function onContentAfterDelete($context, $article): void
      */
     public function onContentChangeState($context, $pks, $value)
     {
-        PluginHelper::importPlugin('finder');
+        $this->importFinderPlugins();
 
         // Trigger the onFinderChangeState event.
-        Factory::getApplication()->triggerEvent('onFinderChangeState', [$context, $pks, $value]);
+        $this->getDispatcher()->dispatch('onFinderChangeState', new FinderEvent\AfterChangeStateEvent('onFinderChangeState', [
+            'context' => $context,
+            'subject' => $pks,
+            'value'   => $value,
+        ]));
     }
 
     /**
@@ -122,9 +146,31 @@ public function onContentChangeState($context, $pks, $value)
      */
     public function onCategoryChangeState($extension, $pks, $value)
     {
-        PluginHelper::importPlugin('finder');
+        $this->importFinderPlugins();
 
         // Trigger the onFinderCategoryChangeState event.
-        Factory::getApplication()->triggerEvent('onFinderCategoryChangeState', [$extension, $pks, $value]);
+        $this->getDispatcher()->dispatch('onFinderCategoryChangeState', new FinderEvent\AfterCategoryChangeStateEvent('onFinderCategoryChangeState', [
+            'context' => $extension,
+            'subject' => $pks,
+            'value'   => $value,
+        ]));
+    }
+
+    /**
+     * A helper method to import finder plugins.
+     *
+     * @return void
+     *
+     * @since  5.0.0
+     */
+    protected function importFinderPlugins()
+    {
+        if ($this->pluginsImported) {
+            return;
+        }
+
+        $this->pluginsImported = true;
+
+        PluginHelper::importPlugin('finder', null, true, $this->getDispatcher());
     }
 }
diff --git a/plugins/content/joomla/joomla.php b/plugins/content/joomla/joomla.php
deleted file mode 100644
index ba4deb8f58e02..0000000000000
--- a/plugins/content/joomla/joomla.php
+++ /dev/null
@@ -1,617 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Plugin
- * @subpackage  Content.joomla
- *
- * @copyright   (C) 2010 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
- */
-
-use Joomla\CMS\Application\CMSApplicationInterface;
-use Joomla\CMS\Component\ComponentHelper;
-use Joomla\CMS\Language\Language;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Plugin\CMSPlugin;
-use Joomla\CMS\Table\CoreContent;
-use Joomla\CMS\User\User;
-use Joomla\CMS\Workflow\WorkflowServiceInterface;
-use Joomla\Component\Workflow\Administrator\Table\StageTable;
-use Joomla\Component\Workflow\Administrator\Table\WorkflowTable;
-use Joomla\Database\DatabaseDriver;
-use Joomla\Database\ParameterType;
-use Joomla\Utilities\ArrayHelper;
-
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-
-/**
- * Example Content Plugin
- *
- * @since  1.6
- */
-class PlgContentJoomla extends CMSPlugin
-{
-    /**
-     * Application object
-     *
-     * @var    CMSApplicationInterface
-     * @since  4.0.0
-     */
-    protected $app;
-
-    /**
-     * Database Driver Instance
-     *
-     * @var    DatabaseDriver
-     * @since  4.0.0
-     */
-    protected $db;
-
-    /**
-     * The save event.
-     *
-     * @param   string   $context  The context
-     * @param   object   $table    The item
-     * @param   boolean  $isNew    Is new item
-     * @param   array    $data     The validated data
-     *
-     * @return  boolean
-     *
-     * @since   4.0.0
-     */
-    public function onContentBeforeSave($context, $table, $isNew, $data)
-    {
-        if ($context === 'com_menus.item') {
-            return $this->checkMenuItemBeforeSave($context, $table, $isNew, $data);
-        }
-
-        // Check we are handling the frontend edit form.
-        if (!in_array($context, ['com_workflow.stage', 'com_workflow.workflow']) || $isNew || !$table->hasField('published')) {
-            return true;
-        }
-
-        $item = clone $table;
-
-        $item->load($table->id);
-
-        $publishedField = $item->getColumnAlias('published');
-
-        if ($item->$publishedField > 0 && isset($data[$publishedField]) && $data[$publishedField] < 1) {
-            switch ($context) {
-                case 'com_workflow.workflow':
-                    return $this->_workflowNotUsed($item->id);
-
-                case 'com_workflow.stage':
-                    return $this->_stageNotUsed($item->id);
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Example after save content method
-     * Article is passed by reference, but after the save, so no changes will be saved.
-     * Method is called right after the content is saved
-     *
-     * @param   string   $context  The context of the content passed to the plugin (added in 1.6)
-     * @param   object   $article  A JTableContent object
-     * @param   boolean  $isNew    If the content is just about to be created
-     *
-     * @return  void
-     *
-     * @since   1.6
-     */
-    public function onContentAfterSave($context, $article, $isNew): void
-    {
-        // Check we are handling the frontend edit form.
-        if ($context !== 'com_content.form') {
-            return;
-        }
-
-        // Check if this function is enabled.
-        if (!$this->params->def('email_new_fe', 1)) {
-            return;
-        }
-
-        // Check this is a new article.
-        if (!$isNew) {
-            return;
-        }
-
-        $db    = $this->db;
-        $query = $db->getQuery(true)
-            ->select($db->quoteName('id'))
-            ->from($db->quoteName('#__users'))
-            ->where($db->quoteName('sendEmail') . ' = 1')
-            ->where($db->quoteName('block') . ' = 0');
-        $db->setQuery($query);
-        $users = (array) $db->loadColumn();
-
-        if (empty($users)) {
-            return;
-        }
-
-        $user = $this->app->getIdentity();
-
-        // Messaging for new items
-
-        $default_language = ComponentHelper::getParams('com_languages')->get('administrator');
-        $debug            = $this->app->get('debug_lang');
-
-        foreach ($users as $user_id) {
-            if ($user_id != $user->id) {
-                // Load language for messaging
-                $receiver = User::getInstance($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->get('name'), $article->title),
-                ];
-                $model_message = $this->app->bootComponent('com_messages')->getMVCFactory()
-                    ->createModel('Message', 'Administrator');
-                $model_message->save($message);
-            }
-        }
-    }
-
-    /**
-     * Don't allow categories to be deleted if they contain items or subcategories with items
-     *
-     * @param   string  $context  The context for the content passed to the plugin.
-     * @param   object  $data     The data relating to the content that was deleted.
-     *
-     * @return  boolean
-     *
-     * @since   1.6
-     */
-    public function onContentBeforeDelete($context, $data)
-    {
-        // Skip plugin if we are deleting something other than categories
-        if (!in_array($context, ['com_categories.category', 'com_workflow.stage', 'com_workflow.workflow'])) {
-            return true;
-        }
-
-        switch ($context) {
-            case 'com_categories.category':
-                return $this->_canDeleteCategories($data);
-
-            case 'com_workflow.workflow':
-                return $this->_workflowNotUsed($data->id);
-
-            case 'com_workflow.stage':
-                return $this->_stageNotUsed($data->id);
-        }
-    }
-
-    /**
-     * Don't allow workflows/stages to be deleted if they contain items
-     *
-     * @param   string  $context  The context for the content passed to the plugin.
-     * @param   object  $pks      The IDs of the records which will be changed.
-     * @param   object  $value    The new state.
-     *
-     * @return  boolean
-     *
-     * @since   4.0.0
-     */
-    public function onContentBeforeChangeState($context, $pks, $value)
-    {
-        if ($value > 0 || !in_array($context, ['com_workflow.workflow', 'com_workflow.stage'])) {
-            return true;
-        }
-
-        $result = true;
-
-        foreach ($pks as $id) {
-            switch ($context) {
-                case 'com_workflow.workflow':
-                    $result = $result && $this->_workflowNotUsed($id);
-                    break;
-
-                case 'com_workflow.stage':
-                    $result = $result && $this->_stageNotUsed($id);
-                    break;
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Checks if a given category can be deleted
-     *
-     * @param   object  $data  The category object
-     *
-     * @return  boolean
-     */
-    private function _canDeleteCategories($data)
-    {
-        // Check if this function is enabled.
-        if (!$this->params->def('check_categories', 1)) {
-            return true;
-        }
-
-        $extension = $this->app->getInput()->getString('extension');
-
-        // Default to true if not a core extension
-        $result = true;
-
-        $tableInfo = [
-            'com_banners'   => ['table_name' => '#__banners'],
-            'com_contact'   => ['table_name' => '#__contact_details'],
-            'com_content'   => ['table_name' => '#__content'],
-            'com_newsfeeds' => ['table_name' => '#__newsfeeds'],
-            'com_users'     => ['table_name' => '#__user_notes'],
-            'com_weblinks'  => ['table_name' => '#__weblinks'],
-        ];
-
-        // Now check to see if this is a known core extension
-        if (isset($tableInfo[$extension])) {
-            // Get table name for known core extensions
-            $table = $tableInfo[$extension]['table_name'];
-
-            // See if this category has any content items
-            $count = $this->_countItemsInCategory($table, $data->get('id'));
-
-            // Return false if db error
-            if ($count === false) {
-                $result = false;
-            } else {
-                // Show error if items are found in the category
-                if ($count > 0) {
-                    $msg = Text::sprintf('COM_CATEGORIES_DELETE_NOT_ALLOWED', $data->get('title'))
-                        . ' ' . Text::plural('COM_CATEGORIES_N_ITEMS_ASSIGNED', $count);
-                    $this->app->enqueueMessage($msg, 'error');
-                    $result = false;
-                }
-
-                // Check for items in any child categories (if it is a leaf, there are no child categories)
-                if (!$data->isLeaf()) {
-                    $count = $this->_countItemsInChildren($table, $data->get('id'), $data);
-
-                    if ($count === false) {
-                        $result = false;
-                    } elseif ($count > 0) {
-                        $msg = Text::sprintf('COM_CATEGORIES_DELETE_NOT_ALLOWED', $data->get('title'))
-                            . ' ' . Text::plural('COM_CATEGORIES_HAS_SUBCATEGORY_ITEMS', $count);
-                        $this->app->enqueueMessage($msg, 'error');
-                        $result = false;
-                    }
-                }
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Checks if a given workflow can be deleted
-     *
-     * @param   int  $pk  The stage ID
-     *
-     * @return  boolean
-     *
-     * @since  4.0.0
-     */
-    private function _workflowNotUsed($pk)
-    {
-        // Check if this workflow is the default stage
-        $table = new WorkflowTable($this->db);
-
-        $table->load($pk);
-
-        if (empty($table->id)) {
-            return true;
-        }
-
-        if ($table->default) {
-            throw new Exception(Text::_('COM_WORKFLOW_MSG_DELETE_IS_DEFAULT'));
-        }
-
-        $parts = explode('.', $table->extension);
-
-        $component = $this->app->bootComponent($parts[0]);
-
-        $section = '';
-
-        if (!empty($parts[1])) {
-            $section = $parts[1];
-        }
-
-        // No core interface => we're ok
-        if (!$component instanceof WorkflowServiceInterface) {
-            return true;
-        }
-
-        /** @var \Joomla\Component\Workflow\Administrator\Model\StagesModel $model */
-        $model = $this->app->bootComponent('com_workflow')->getMVCFactory()
-            ->createModel('Stages', 'Administrator', ['ignore_request' => true]);
-
-        $model->setState('filter.workflow_id', $pk);
-        $model->setState('filter.extension', $table->extension);
-
-        $stages = $model->getItems();
-
-        $stage_ids = array_column($stages, 'id');
-
-        $result = $this->_countItemsInStage($stage_ids, $table->extension);
-
-        // Return false if db error
-        if ($result > 0) {
-            throw new Exception(Text::_('COM_WORKFLOW_MSG_DELETE_WORKFLOW_IS_ASSIGNED'));
-        }
-
-        return true;
-    }
-
-    /**
-     * Checks if a given stage can be deleted
-     *
-     * @param   int  $pk  The stage ID
-     *
-     * @return  boolean
-     *
-     * @since  4.0.0
-     */
-    private function _stageNotUsed($pk)
-    {
-        $table = new StageTable($this->db);
-
-        $table->load($pk);
-
-        if (empty($table->id)) {
-            return true;
-        }
-
-        // Check if this stage is the default stage
-        if ($table->default) {
-            throw new Exception(Text::_('COM_WORKFLOW_MSG_DELETE_IS_DEFAULT'));
-        }
-
-        $workflow = new WorkflowTable($this->db);
-
-        $workflow->load($table->workflow_id);
-
-        if (empty($workflow->id)) {
-            return true;
-        }
-
-        $parts = explode('.', $workflow->extension);
-
-        $component = $this->app->bootComponent($parts[0]);
-
-        // No core interface => we're ok
-        if (!$component instanceof WorkflowServiceInterface) {
-            return true;
-        }
-
-        $stage_ids = [$table->id];
-
-        $result = $this->_countItemsInStage($stage_ids, $workflow->extension);
-
-        // Return false if db error
-        if ($result > 0) {
-            throw new Exception(Text::_('COM_WORKFLOW_MSG_DELETE_STAGE_IS_ASSIGNED'));
-        }
-
-        return true;
-    }
-
-    /**
-     * Get count of items in a category
-     *
-     * @param   string   $table  table name of component table (column is catid)
-     * @param   integer  $catid  id of the category to check
-     *
-     * @return  mixed  count of items found or false if db error
-     *
-     * @since   1.6
-     */
-    private function _countItemsInCategory($table, $catid)
-    {
-        $db    = $this->db;
-        $query = $db->getQuery(true);
-
-        // Count the items in this category
-        $query->select('COUNT(' . $db->quoteName('id') . ')')
-            ->from($db->quoteName($table))
-            ->where($db->quoteName('catid') . ' = :catid')
-            ->bind(':catid', $catid, ParameterType::INTEGER);
-        $db->setQuery($query);
-
-        try {
-            $count = $db->loadResult();
-        } catch (RuntimeException $e) {
-            $this->app->enqueueMessage($e->getMessage(), 'error');
-
-            return false;
-        }
-
-        return $count;
-    }
-
-    /**
-     * Get count of items in assigned to a stage
-     *
-     * @param   array   $stageIds   The stage ids to test for
-     * @param   string  $extension  The extension of the workflow
-     *
-     * @return  bool
-     *
-     * @since   4.0.0
-     */
-    private function _countItemsInStage(array $stageIds, string $extension): bool
-    {
-        $db = $this->db;
-
-        $parts = explode('.', $extension);
-
-        $stageIds = ArrayHelper::toInteger($stageIds);
-        $stageIds = array_filter($stageIds);
-
-        $section = '';
-
-        if (!empty($parts[1])) {
-            $section = $parts[1];
-        }
-
-        $component = $this->app->bootComponent($parts[0]);
-
-        $table = $component->getWorkflowTableBySection($section);
-
-        if (empty($stageIds) || !$table) {
-            return false;
-        }
-
-        $query = $db->getQuery(true);
-
-        $query->select('COUNT(' . $db->quoteName('b.id') . ')')
-            ->from($db->quoteName('#__workflow_associations', 'wa'))
-            ->from($db->quoteName('#__workflow_stages', 's'))
-            ->from($db->quoteName($table, 'b'))
-            ->where($db->quoteName('wa.stage_id') . ' = ' . $db->quoteName('s.id'))
-            ->where($db->quoteName('wa.item_id') . ' = ' . $db->quoteName('b.id'))
-            ->whereIn($db->quoteName('s.id'), $stageIds);
-
-        try {
-            return (int) $db->setQuery($query)->loadResult();
-        } catch (Exception $e) {
-            $this->app->enqueueMessage($e->getMessage(), 'error');
-        }
-
-        return false;
-    }
-
-    /**
-     * Get count of items in a category's child categories
-     *
-     * @param   string   $table  table name of component table (column is catid)
-     * @param   integer  $catid  id of the category to check
-     * @param   object   $data   The data relating to the content that was deleted.
-     *
-     * @return  mixed  count of items found or false if db error
-     *
-     * @since   1.6
-     */
-    private function _countItemsInChildren($table, $catid, $data)
-    {
-        $db = $this->db;
-
-        // Create subquery for list of child categories
-        $childCategoryTree = $data->getTree();
-
-        // First element in tree is the current category, so we can skip that one
-        unset($childCategoryTree[0]);
-        $childCategoryIds = [];
-
-        foreach ($childCategoryTree as $node) {
-            $childCategoryIds[] = (int) $node->id;
-        }
-
-        // 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)
-                ->select('COUNT(' . $db->quoteName('id') . ')')
-                ->from($db->quoteName($table))
-                ->whereIn($db->quoteName('catid'), $childCategoryIds);
-            $db->setQuery($query);
-
-            try {
-                $count = $db->loadResult();
-            } catch (RuntimeException $e) {
-                $this->app->enqueueMessage($e->getMessage(), 'error');
-
-                return false;
-            }
-
-            return $count;
-        } else { // If we didn't have any categories to check, return 0
-            return 0;
-        }
-    }
-
-    /**
-     * Change the state in core_content if the stage in a table is changed
-     *
-     * @param   string   $context  The context for the content passed to the plugin.
-     * @param   array    $pks      A list of primary key ids of the content that has changed stage.
-     * @param   integer  $value    The value of the condition that the content has been changed to
-     *
-     * @return  boolean
-     *
-     * @since   3.1
-     */
-    public function onContentChangeState($context, $pks, $value)
-    {
-        $pks = ArrayHelper::toInteger($pks);
-
-        if ($context === 'com_workflow.stage' && $value < 1) {
-            foreach ($pks as $pk) {
-                if (!$this->_stageNotUsed($pk)) {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        $db    = $this->db;
-        $query = $db->getQuery(true)
-            ->select($db->quoteName('core_content_id'))
-            ->from($db->quoteName('#__ucm_content'))
-            ->where($db->quoteName('core_type_alias') . ' = :context')
-            ->whereIn($db->quoteName('core_content_item_id'), $pks)
-            ->bind(':context', $context);
-        $db->setQuery($query);
-        $ccIds = $db->loadColumn();
-
-        $cctable = new CoreContent($db);
-        $cctable->publish($ccIds, $value);
-
-        return true;
-    }
-
-    /**
-     * The save event.
-     *
-     * @param   string   $context  The context
-     * @param   object   $table    The item
-     * @param   boolean  $isNew    Is new item
-     * @param   array    $data     The validated data
-     *
-     * @return  boolean
-     *
-     * @since   3.9.12
-     */
-    private function checkMenuItemBeforeSave($context, $table, $isNew, $data)
-    {
-        // Check we are handling the frontend edit form.
-        if ($context === 'com_menus.item') {
-            return true;
-        }
-
-        // Special case for Create article menu item
-        if ($table->link !== 'index.php?option=com_content&view=form&layout=edit') {
-            return true;
-        }
-
-        // Display error if catid is not set when enable_category is enabled
-        $params = json_decode($table->params, true);
-
-        if ($params['enable_category'] == 1 && empty($params['catid'])) {
-            $table->setError(Text::_('COM_CONTENT_CREATE_ARTICLE_ERROR'));
-
-            return false;
-        }
-
-        return true;
-    }
-}
diff --git a/plugins/content/joomla/joomla.xml b/plugins/content/joomla/joomla.xml
index 272bdd471bd58..4982f67eb88fe 100644
--- a/plugins/content/joomla/joomla.xml
+++ b/plugins/content/joomla/joomla.xml
@@ -9,8 +9,10 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>3.0.0</version>
 	<description>PLG_CONTENT_JOOMLA_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\Content\Joomla</namespace>
 	<files>
-		<filename plugin="joomla">joomla.php</filename>
+		<folder plugin="joomla">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_content_joomla.ini</language>
@@ -44,6 +46,32 @@
 					<option value="0">JNO</option>
 					<option value="1">JYES</option>
 				</field>
+				<field
+					name="schema_content"
+					type="radio"
+					label="PLG_CONTENT_JOOMLA_SCHEMA_CONTENT_LABEL"
+					description="PLG_CONTENT_JOOMLA_SCHEMA_CONTENT_DESC"
+					layout="joomla.form.field.radio.switcher"
+					default="1"
+					filter="integer"
+					required="true"
+					>
+					<option value="0">JNO</option>
+					<option value="1">JYES</option>
+				</field>
+				<field
+					name="schema_contact"
+					type="radio"
+					label="PLG_CONTENT_JOOMLA_SCHEMA_CONTACT_LABEL"
+					description="PLG_CONTENT_JOOMLA_SCHEMA_CONTACT_DESC"
+					layout="joomla.form.field.radio.switcher"
+					default="1"
+					filter="integer"
+					required="true"
+					>
+					<option value="0">JNO</option>
+					<option value="1">JYES</option>
+				</field>
 			</fieldset>
 		</fields>
 	</config>
diff --git a/plugins/content/joomla/services/provider.php b/plugins/content/joomla/services/provider.php
new file mode 100644
index 0000000000000..b01ac39f31ca5
--- /dev/null
+++ b/plugins/content/joomla/services/provider.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Content.joomla
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\User\UserFactoryInterface;
+use Joomla\Database\DatabaseInterface;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\Content\Joomla\Extension\Joomla;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new Joomla(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('content', 'joomla')
+                );
+                $plugin->setApplication(Factory::getApplication());
+                $plugin->setDatabase($container->get(DatabaseInterface::class));
+                $plugin->setUserFactory($container->get(UserFactoryInterface::class));
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/content/joomla/src/Extension/Joomla.php b/plugins/content/joomla/src/Extension/Joomla.php
new file mode 100644
index 0000000000000..7683c052829da
--- /dev/null
+++ b/plugins/content/joomla/src/Extension/Joomla.php
@@ -0,0 +1,1021 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Content.joomla
+ *
+ * @copyright   (C) 2010 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Plugin\Content\Joomla\Extension;
+
+use Joomla\CMS\Cache\CacheControllerFactory;
+use Joomla\CMS\Component\ComponentHelper;
+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\Text;
+use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\CMS\Table\CoreContent;
+use Joomla\CMS\Uri\Uri;
+use Joomla\CMS\User\UserFactoryAwareTrait;
+use Joomla\CMS\Workflow\WorkflowServiceInterface;
+use Joomla\Component\Workflow\Administrator\Table\StageTable;
+use Joomla\Component\Workflow\Administrator\Table\WorkflowTable;
+use Joomla\Database\DatabaseAwareTrait;
+use Joomla\Database\ParameterType;
+use Joomla\Registry\Registry;
+use Joomla\Utilities\ArrayHelper;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Example Content Plugin
+ *
+ * @since  1.6
+ */
+final class Joomla extends CMSPlugin
+{
+    use DatabaseAwareTrait;
+    use UserFactoryAwareTrait;
+
+    /**
+     * The save event.
+     *
+     * @param   string   $context  The context
+     * @param   object   $table    The item
+     * @param   boolean  $isNew    Is new item
+     * @param   array    $data     The validated data
+     *
+     * @return  boolean
+     *
+     * @since   4.0.0
+     */
+    public function onContentBeforeSave($context, $table, $isNew, $data)
+    {
+        if ($context === 'com_menus.item') {
+            return $this->checkMenuItemBeforeSave($context, $table, $isNew, $data);
+        }
+
+        // Check we are handling the frontend edit form.
+        if (!in_array($context, ['com_workflow.stage', 'com_workflow.workflow']) || $isNew || !$table->hasField('published')) {
+            return true;
+        }
+
+        $item = clone $table;
+
+        $item->load($table->id);
+
+        $publishedField = $item->getColumnAlias('published');
+
+        if ($item->$publishedField > 0 && isset($data[$publishedField]) && $data[$publishedField] < 1) {
+            switch ($context) {
+                case 'com_workflow.workflow':
+                    return $this->workflowNotUsed($item->id);
+
+                case 'com_workflow.stage':
+                    return $this->stageNotUsed($item->id);
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Example after save content method
+     * Article is passed by reference, but after the save, so no changes will be saved.
+     * Method is called right after the content is saved
+     *
+     * @param   string   $context  The context of the content passed to the plugin (added in 1.6)
+     * @param   object   $article  A \Joomla\CMS\Table\Table object
+     * @param   boolean  $isNew    If the content is just about to be created
+     *
+     * @return  void
+     *
+     * @since   1.6
+     */
+    public function onContentAfterSave($context, $article, $isNew): void
+    {
+        // Check we are handling the frontend edit form.
+        if ($context !== 'com_content.form') {
+            return;
+        }
+
+        // Check if this function is enabled.
+        if (!$this->params->def('email_new_fe', 1)) {
+            return;
+        }
+
+        // Check this is a new article.
+        if (!$isNew) {
+            return;
+        }
+
+        $db    = $this->getDatabase();
+        $query = $db->getQuery(true)
+            ->select($db->quoteName('id'))
+            ->from($db->quoteName('#__users'))
+            ->where($db->quoteName('sendEmail') . ' = 1')
+            ->where($db->quoteName('block') . ' = 0');
+        $db->setQuery($query);
+        $users = (array) $db->loadColumn();
+
+        if (empty($users)) {
+            return;
+        }
+
+        $user = $this->getApplication()->getIdentity();
+
+        // Messaging for new items
+
+        $default_language = ComponentHelper::getParams('com_languages')->get('administrator');
+        $debug            = $this->getApplication()->get('debug_lang');
+
+        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->get('name'), $article->title),
+                ];
+                $model_message = $this->getApplication()->bootComponent('com_messages')->getMVCFactory()
+                    ->createModel('Message', 'Administrator');
+                $model_message->save($message);
+            }
+        }
+    }
+
+    /**
+     * Don't allow categories to be deleted if they contain items or subcategories with items
+     *
+     * @param   string  $context  The context for the content passed to the plugin.
+     * @param   object  $data     The data relating to the content that was deleted.
+     *
+     * @return  boolean
+     *
+     * @since   1.6
+     */
+    public function onContentBeforeDelete($context, $data)
+    {
+        // Skip plugin if we are deleting something other than categories
+        if (!in_array($context, ['com_categories.category', 'com_workflow.stage', 'com_workflow.workflow'])) {
+            return true;
+        }
+
+        switch ($context) {
+            case 'com_categories.category':
+                return $this->canDeleteCategories($data);
+
+            case 'com_workflow.workflow':
+                return $this->workflowNotUsed($data->id);
+
+            case 'com_workflow.stage':
+                return $this->stageNotUsed($data->id);
+        }
+    }
+
+    /**
+     * Don't allow workflows/stages to be deleted if they contain items
+     *
+     * @param   string  $context  The context for the content passed to the plugin.
+     * @param   object  $pks      The IDs of the records which will be changed.
+     * @param   object  $value    The new state.
+     *
+     * @return  boolean
+     *
+     * @since   4.0.0
+     */
+    public function onContentBeforeChangeState($context, $pks, $value)
+    {
+        if ($value > 0 || !in_array($context, ['com_workflow.workflow', 'com_workflow.stage'])) {
+            return true;
+        }
+
+        $result = true;
+
+        foreach ($pks as $id) {
+            switch ($context) {
+                case 'com_workflow.workflow':
+                    $result = $result && $this->workflowNotUsed($id);
+                    break;
+
+                case 'com_workflow.stage':
+                    $result = $result && $this->stageNotUsed($id);
+                    break;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Add autogenerated schema data for content and contacts
+     *
+     * @param   BeforeCompileHeadEvent  $event  The event object
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function onSchemaBeforeCompileHead(BeforeCompileHeadEvent $event): void
+    {
+        if (!$this->getApplication()->isClient('site')) {
+            return;
+        }
+
+        $context = $event->getContext();
+        $schema  = $event->getSchema();
+
+        [$extension, $view, $id] = explode('.', $context);
+
+        if ($extension === 'com_content' && $this->params->get('schema_content', 1)) {
+            $this->injectContentSchema($context, $schema);
+        } elseif ($extension === 'com_contact' && $this->params->get('schema_contact', 1)) {
+            $this->injectContactSchema($context, $schema);
+        }
+    }
+
+    /**
+     * Inject com_content schemas if needed
+     *
+     * @param   string    $context  The com_content context like com_content.article.5
+     * @param   Registry  $schema   The overall schema object to manipulate
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    private function injectContentSchema(string $context, Registry $schema)
+    {
+        $app = $this->getApplication();
+        $db  = $this->getDatabase();
+
+        [$extension, $view, $id] = explode('.', $context);
+
+        // Check if there is already a schema for the item, then skip it
+        $mySchema = $schema->toArray();
+
+        if (!isset($mySchema['@graph']) || !is_array($mySchema['@graph'])) {
+            return;
+        }
+
+        $baseId   = Uri::root() . '#/schema/';
+        $schemaId = $baseId . str_replace('.', '/', $context);
+
+        foreach ($mySchema['@graph'] as $entry) {
+            // Someone added our context already, no need to add automated data
+            if (isset($entry['@id']) && $entry['@id'] == $schemaId) {
+                return;
+            }
+        }
+
+        $additionalSchemas = [];
+
+        $component = $this->getApplication()->bootComponent('com_content')->getMVCFactory();
+
+        $enableCache = $this->params->get('schema_cache', 1);
+
+        $cache = Factory::getContainer()->get(CacheControllerFactory::class)
+            ->createCacheController('Callback', ['lifetime' => $app->get('cachetime'), 'caching' => $enableCache, 'defaultgroup' => 'schemaorg']);
+
+        // Add article data
+        if ($view == 'article' && $id > 0) {
+            $additionalSchemas = $cache->get(function ($id) use ($component, $baseId) {
+                $model = $component->createModel('Article', 'Site');
+
+                $article = $model->getItem($id);
+
+                if (empty($article->id)) {
+                    return;
+                }
+
+                $article->images = new Registry($article->images);
+
+                $articleSchema = $this->createArticleSchema($article);
+
+                $articleSchema['isPartOf'] = ['@id' => $baseId . 'WebPage/base'];
+
+                return [$articleSchema];
+            }, [$id]);
+        } elseif (in_array($view, ['category', 'featured', 'archive'])) {
+            $additionalSchemas = $cache->get(function ($view, $id) use ($component, $baseId, $app, $db) {
+                $menu = $app->getMenu()->getActive();
+                $schemaId = $baseId . 'com_content/' . $view . ($view == 'category' ? '/' . $id : '');
+
+                $additionalSchemas = [];
+
+                $additionalSchema = [
+                    '@type'    => 'Blog',
+                    '@id'      => $schemaId,
+                    'isPartOf' => ['@id' => $baseId . 'WebPage/base'],
+                    'name'     => htmlentities($menu->title),
+                    'blogPost' => [],
+                ];
+
+                if ($menu->getParams()->get('menu-meta_description')) {
+                    $additionalSchema['description'] = htmlentities($menu->getParams()->get('menu-meta_description'));
+                }
+
+                $model = $component->createModel($view, 'Site');
+
+                $articles = $model->getItems();
+
+                $articleIds = ArrayHelper::getColumn($articles, 'id');
+
+                if (!empty($articleIds)) {
+                    $aContext = 'com_content.article';
+
+                    // Load the schema data from the database
+                    $query = $db->getQuery(true)
+                        ->select('*')
+                        ->from($db->quoteName('#__schemaorg'))
+                        ->whereIn($db->quoteName('itemId'), $articleIds)
+                        ->where($db->quoteName('context') . ' = :context')
+                        ->bind(':context', $aContext, ParameterType::STRING);
+
+                    $schemas = $db->setQuery($query)->loadObjectList('itemId');
+
+                    foreach ($articles as $article) {
+                        if (isset($schemas[$article->id])) {
+                            $localSchema = new Registry($schemas[$article->id]->schema);
+
+                            $localSchema->set('@id', $baseId . str_replace('.', '/', $aContext) . '/' . (int) $article->id);
+
+                            $additionalSchema['blogPost'][] = ['@id' => $localSchema->get('@id')];
+
+                            $additionalSchemas[] = $localSchema->toArray();
+
+                            continue;
+                        }
+
+                        // No schema found, fallback to default one
+                        $article->images = new Registry($article->images);
+
+                        $articleSchema = $this->createArticleSchema($article);
+
+                        // Set to BlogPosting
+                        $articleSchema['@type'] = 'BlogPosting';
+
+                        $additionalSchemas[] = $articleSchema;
+
+                        $additionalSchema['blogPost'][] = ['@id' => $articleSchema['@id']];
+                    }
+                }
+
+                array_unshift($additionalSchemas, $additionalSchema);
+
+                return $additionalSchemas;
+            }, [$view, $id]);
+        }
+
+        if (!empty($additionalSchemas)) {
+            $mySchema['@graph'] = array_merge($mySchema['@graph'], $additionalSchemas);
+        }
+
+        $schema->set('@graph', $mySchema['@graph']);
+    }
+
+    /**
+     * Returns a finished Article schema type based on a given joomla article
+     *
+     * @param object $article  An article to extract schema data from
+     *
+     * @return array
+     *
+     * @since   5.0.0
+     */
+    private function createArticleSchema(object $article)
+    {
+        $baseId   = Uri::root() . '#/schema/';
+        $schemaId = $baseId . 'com_content/article/' . (int) $article->id;
+
+        $schema = [];
+
+        $schema['@type']       = 'Article';
+        $schema['@id']         = $schemaId;
+        $schema['name']        = $article->title;
+        $schema['headline']    = $article->title;
+
+        $schema['inLanguage']  = $article->language === '*' ? $this->getApplication()->get('language') : $article->language;
+
+        // Author information
+        if ($article->params->get('show_author') && !empty($article->author)) {
+            $author = [];
+
+            $author['@type'] = 'Person';
+            $author['name']  = $article->created_by_alias ?: $article->author;
+
+            if ($article->params->get('link_author') == true && !empty($article->contact_link)) {
+                $author['url'] = $article->contact_link;
+            }
+
+            $schema['author'] = $author;
+        }
+
+        // Images
+        if ($article->images->get('image_intro')) {
+            $schema['thumbnailUrl'] = HTMLHelper::_('cleanImageUrl', $article->images->get('image_intro'))->url;
+        }
+
+        if ($article->images->get('image_fulltext')) {
+            $schema['image'] = HTMLHelper::_('cleanImageUrl', $article->images->get('image_fulltext'))->url;
+        }
+
+        // Categories
+        $categories = [];
+
+        // Parent category if not root
+        if ($article->params->get('show_parent_category') && !empty($article->parent_id) && $article->parent_id > 1) {
+            $categories[] = $article->parent_title;
+        }
+
+        // Current category
+        if ($article->params->get('show_category')) {
+            $categories[] = $article->category_title;
+        }
+
+        if (!empty($categories)) {
+            $schema['articleSection'] = implode(', ', $categories);
+        }
+
+        // Dates
+        if ($article->params->get('show_publish_date')) {
+            $schema['dateCreated'] = Factory::getDate($article->created)->toISO8601();
+        }
+
+        if ($article->params->get('show_modify_date')) {
+            $schema['dateModified'] = Factory::getDate($article->modified)->toISO8601();
+        }
+
+        // Hits
+        if ($article->params->get('show_hits')) {
+            $counter = [];
+
+            $counter['@type']                = 'InteractionCounter';
+            $counter['userInteractionCount'] = $article->hits;
+
+            $schema['interactionStatistic'] = $counter;
+        }
+
+        return $schema;
+    }
+
+    /**
+     * Inject com_contact schemas if needed
+     *
+     * @param   string    $context  The com_contact context like com_contact.contact.5
+     * @param   Registry  $schema   The overall schema object to manipulate
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    private function injectContactSchema(string $context, Registry $schema)
+    {
+        $app = $this->getApplication();
+        $db  = $this->getDatabase();
+
+        [$extension, $view, $id] = explode('.', $context);
+
+        // Check if there is already a schema for the item, then skip it
+        $mySchema = $schema->toArray();
+
+        if (!isset($mySchema['@graph']) || !is_array($mySchema['@graph'])) {
+            return;
+        }
+
+        $baseId   = Uri::root() . '#/schema/';
+        $schemaId = $baseId . str_replace('.', '/', $context);
+
+        foreach ($mySchema['@graph'] as $entry) {
+            // Someone added our context already, no need to add automated data
+            if (isset($entry['@id']) && $entry['@id'] == $schemaId) {
+                return;
+            }
+        }
+
+        $additionalSchema = [];
+
+        $component = $this->getApplication()->bootComponent('com_contact')->getMVCFactory();
+
+        $enableCache = $this->params->get('schema_cache', 1);
+
+        $cache = Factory::getContainer()->get(CacheControllerFactory::class)
+            ->createCacheController('Callback', ['lifetime' => $app->get('cachetime'), 'caching' => $enableCache, 'defaultgroup' => 'schemaorg']);
+
+        // Add contact data
+        if ($view == 'contact' && $id > 0) {
+            $additionalSchema = $cache->get(function ($id) use ($component, $baseId) {
+                $model = $component->createModel('Contact', 'Site');
+
+                $contact = $model->getItem($id);
+
+                if (empty($contact->id)) {
+                    return;
+                }
+
+                $contactSchema = $this->createContactSchema($contact);
+
+                $contactSchema['isPartOf'] = ['@id' => $baseId . 'WebPage/base'];
+
+                return $contactSchema;
+            }, [$id]);
+
+            $mySchema['@graph'][] = $additionalSchema;
+        } elseif ($view === 'featured') {
+            $additionalSchemas = $cache->get(function ($graph) use ($component, $baseId) {
+                $model = $component->createModel('Featured', 'Site');
+
+                $contacts = $model->getItems();
+
+                $allSchemas = [];
+
+                foreach ($contacts as $contact) {
+                    foreach ($graph as $entry) {
+                        $schemaId = $baseId . 'com_contact/contact/' . (int) $contact->id;
+
+                        // Someone added our context already, no need to add automated data
+                        if (isset($entry['@id']) && $entry['@id'] == $schemaId) {
+                            return;
+                        }
+                    }
+
+                    $contactSchema = $this->createContactSchema($contact);
+
+                    $contactSchema['isPartOf'] = ['@id' => $baseId . 'WebPage/base'];
+
+                    $allSchemas[] = $contactSchema;
+                }
+
+                return $allSchemas;
+            }, [$mySchema['@graph']]);
+
+            foreach ($additionalSchemas as $additionalSchema) {
+                $mySchema['@graph'][] = $additionalSchema;
+            }
+        }
+
+        $schema->set('@graph', $mySchema['@graph']);
+    }
+
+    /**
+     * Returns a finished Person schema type based on a given joomla contact
+     *
+     * @param object $contact  A contact to extract schema data from
+     *
+     * @return array
+     *
+     * @since   5.0.0
+     */
+    private function createContactSchema(object $contact)
+    {
+        $baseId   = Uri::root() . '#/schema/';
+        $schemaId = $baseId . 'com_contact/contact/' . (int) $contact->id;
+
+        $schema = [];
+
+        $schema['@type']       = 'Person';
+        $schema['@id']         = $schemaId;
+        $schema['name']        = $contact->name;
+
+        if ($contact->image && $contact->params->get('show_image')) {
+            $schema['image'] = HTMLHelper::_('cleanImageUrl', $contact->image)->url;
+        }
+
+        if ($contact->con_position && $contact->params->get('show_position')) {
+            $schema['jobTitle'] = $contact->con_position;
+        }
+
+        $schema['address'] = [];
+
+        if ($contact->params->get('show_street_address') && $contact->address) {
+            $schema['address']['streetAddress'] = $contact->address;
+        }
+
+        if ($contact->params->get('show_suburb') && $contact->suburb) {
+            $schema['address']['addressLocality'] = $contact->suburb;
+        }
+
+        if ($contact->params->get('show_state') && $contact->state) {
+            $schema['address']['addressRegion'] = $contact->state;
+        }
+
+        if ($contact->params->get('show_postcode') && $contact->postcode) {
+            $schema['address']['postalCode'] = $contact->postcode;
+        }
+
+        if ($contact->params->get('show_country') && $contact->country) {
+            $schema['address']['addressCountry'] = $contact->country;
+        }
+
+        if ($contact->params->get('show_telephone') && $contact->telephone) {
+            $schema['address']['telephone'] = $contact->telephone;
+        } elseif ($contact->params->get('show_mobile') && $contact->mobile) {
+            $schema['address']['telephone'] = $contact->mobile;
+        }
+
+        if ($contact->params->get('show_fax') && $contact->fax) {
+            $schema['address']['faxNumber'] = $contact->fax;
+        }
+
+        if ($contact->params->get('show_webpage') && $contact->webpage) {
+            $schema['address']['url'] = $contact->webpage;
+        }
+
+        return $schema;
+    }
+
+    /**
+     * Checks if a given category can be deleted
+     *
+     * @param   object  $data  The category object
+     *
+     * @return  boolean
+     */
+    private function canDeleteCategories($data)
+    {
+        // Check if this function is enabled.
+        if (!$this->params->def('check_categories', 1)) {
+            return true;
+        }
+
+        $extension = $this->getApplication()->getInput()->getString('extension');
+
+        // Default to true if not a core extension
+        $result = true;
+
+        $tableInfo = [
+            'com_banners'   => ['table_name' => '#__banners'],
+            'com_contact'   => ['table_name' => '#__contact_details'],
+            'com_content'   => ['table_name' => '#__content'],
+            'com_newsfeeds' => ['table_name' => '#__newsfeeds'],
+            'com_users'     => ['table_name' => '#__user_notes'],
+            'com_weblinks'  => ['table_name' => '#__weblinks'],
+        ];
+
+        // Now check to see if this is a known core extension
+        if (isset($tableInfo[$extension])) {
+            // Get table name for known core extensions
+            $table = $tableInfo[$extension]['table_name'];
+
+            // See if this category has any content items
+            $count = $this->countItemsInCategory($table, $data->get('id'));
+
+            // Return false if db error
+            if ($count === false) {
+                $result = false;
+            } else {
+                // Show error if items are found in the category
+                if ($count > 0) {
+                    $msg = Text::sprintf('COM_CATEGORIES_DELETE_NOT_ALLOWED', $data->get('title'))
+                        . ' ' . Text::plural('COM_CATEGORIES_N_ITEMS_ASSIGNED', $count);
+                    $this->getApplication()->enqueueMessage($msg, 'error');
+                    $result = false;
+                }
+
+                // Check for items in any child categories (if it is a leaf, there are no child categories)
+                if (!$data->isLeaf()) {
+                    $count = $this->countItemsInChildren($table, $data->get('id'), $data);
+
+                    if ($count === false) {
+                        $result = false;
+                    } elseif ($count > 0) {
+                        $msg = Text::sprintf('COM_CATEGORIES_DELETE_NOT_ALLOWED', $data->get('title'))
+                            . ' ' . Text::plural('COM_CATEGORIES_HAS_SUBCATEGORY_ITEMS', $count);
+                        $this->getApplication()->enqueueMessage($msg, 'error');
+                        $result = false;
+                    }
+                }
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Checks if a given workflow can be deleted
+     *
+     * @param   int  $pk  The stage ID
+     *
+     * @return  boolean
+     *
+     * @since  4.0.0
+     */
+    private function workflowNotUsed($pk)
+    {
+        // Check if this workflow is the default stage
+        $table = new WorkflowTable($this->getDatabase());
+
+        $table->load($pk);
+
+        if (empty($table->id)) {
+            return true;
+        }
+
+        if ($table->default) {
+            throw new \Exception($this->getApplication()->getLanguage()->_('COM_WORKFLOW_MSG_DELETE_IS_DEFAULT'));
+        }
+
+        $parts = explode('.', $table->extension);
+
+        $component = $this->getApplication()->bootComponent($parts[0]);
+
+        $section = '';
+
+        if (!empty($parts[1])) {
+            $section = $parts[1];
+        }
+
+        // No core interface => we're ok
+        if (!$component instanceof WorkflowServiceInterface) {
+            return true;
+        }
+
+        /** @var \Joomla\Component\Workflow\Administrator\Model\StagesModel $model */
+        $model = $this->getApplication()->bootComponent('com_workflow')->getMVCFactory()
+            ->createModel('Stages', 'Administrator', ['ignore_request' => true]);
+
+        $model->setState('filter.workflow_id', $pk);
+        $model->setState('filter.extension', $table->extension);
+
+        $stages = $model->getItems();
+
+        $stage_ids = array_column($stages, 'id');
+
+        $result = $this->countItemsInStage($stage_ids, $table->extension);
+
+        // Return false if db error
+        if ($result > 0) {
+            throw new \Exception($this->getApplication()->getLanguage()->_('COM_WORKFLOW_MSG_DELETE_WORKFLOW_IS_ASSIGNED'));
+        }
+
+        return true;
+    }
+
+    /**
+     * Checks if a given stage can be deleted
+     *
+     * @param   int  $pk  The stage ID
+     *
+     * @return  boolean
+     *
+     * @since  4.0.0
+     */
+    private function stageNotUsed($pk)
+    {
+        $table = new StageTable($this->getDatabase());
+
+        $table->load($pk);
+
+        if (empty($table->id)) {
+            return true;
+        }
+
+        // Check if this stage is the default stage
+        if ($table->default) {
+            throw new \Exception($this->getApplication()->getLanguage()->_('COM_WORKFLOW_MSG_DELETE_IS_DEFAULT'));
+        }
+
+        $workflow = new WorkflowTable($this->getDatabase());
+
+        $workflow->load($table->workflow_id);
+
+        if (empty($workflow->id)) {
+            return true;
+        }
+
+        $parts = explode('.', $workflow->extension);
+
+        $component = $this->getApplication()->bootComponent($parts[0]);
+
+        // No core interface => we're ok
+        if (!$component instanceof WorkflowServiceInterface) {
+            return true;
+        }
+
+        $stage_ids = [$table->id];
+
+        $result = $this->countItemsInStage($stage_ids, $workflow->extension);
+
+        // Return false if db error
+        if ($result > 0) {
+            throw new \Exception($this->getApplication()->getLanguage()->_('COM_WORKFLOW_MSG_DELETE_STAGE_IS_ASSIGNED'));
+        }
+
+        return true;
+    }
+
+    /**
+     * Get count of items in a category
+     *
+     * @param   string   $table  table name of component table (column is catid)
+     * @param   integer  $catid  id of the category to check
+     *
+     * @return  mixed  count of items found or false if db error
+     *
+     * @since   1.6
+     */
+    private function countItemsInCategory($table, $catid)
+    {
+        $db    = $this->getDatabase();
+        $query = $db->getQuery(true);
+
+        // Count the items in this category
+        $query->select('COUNT(' . $db->quoteName('id') . ')')
+            ->from($db->quoteName($table))
+            ->where($db->quoteName('catid') . ' = :catid')
+            ->bind(':catid', $catid, ParameterType::INTEGER);
+        $db->setQuery($query);
+
+        try {
+            $count = $db->loadResult();
+        } catch (\RuntimeException $e) {
+            $this->getApplication()->enqueueMessage($e->getMessage(), 'error');
+
+            return false;
+        }
+
+        return $count;
+    }
+
+    /**
+     * Get count of items in assigned to a stage
+     *
+     * @param   array   $stageIds   The stage ids to test for
+     * @param   string  $extension  The extension of the workflow
+     *
+     * @return  bool
+     *
+     * @since   4.0.0
+     */
+    private function countItemsInStage(array $stageIds, string $extension): bool
+    {
+        $db = $this->getDatabase();
+
+        $parts = explode('.', $extension);
+
+        $stageIds = ArrayHelper::toInteger($stageIds);
+        $stageIds = array_filter($stageIds);
+
+        $section = '';
+
+        if (!empty($parts[1])) {
+            $section = $parts[1];
+        }
+
+        $component = $this->getApplication()->bootComponent($parts[0]);
+
+        $table = $component->getWorkflowTableBySection($section);
+
+        if (empty($stageIds) || !$table) {
+            return false;
+        }
+
+        $query = $db->getQuery(true);
+
+        $query->select('COUNT(' . $db->quoteName('b.id') . ')')
+            ->from($db->quoteName('#__workflow_associations', 'wa'))
+            ->from($db->quoteName('#__workflow_stages', 's'))
+            ->from($db->quoteName($table, 'b'))
+            ->where($db->quoteName('wa.stage_id') . ' = ' . $db->quoteName('s.id'))
+            ->where($db->quoteName('wa.item_id') . ' = ' . $db->quoteName('b.id'))
+            ->whereIn($db->quoteName('s.id'), $stageIds);
+
+        try {
+            return (int) $db->setQuery($query)->loadResult();
+        } catch (\Exception $e) {
+            $this->getApplication()->enqueueMessage($e->getMessage(), 'error');
+        }
+
+        return false;
+    }
+
+    /**
+     * Get count of items in a category's child categories
+     *
+     * @param   string   $table  table name of component table (column is catid)
+     * @param   integer  $catid  id of the category to check
+     * @param   object   $data   The data relating to the content that was deleted.
+     *
+     * @return  mixed  count of items found or false if db error
+     *
+     * @since   1.6
+     */
+    private function countItemsInChildren($table, $catid, $data)
+    {
+        $db = $this->getDatabase();
+
+        // Create subquery for list of child categories
+        $childCategoryTree = $data->getTree();
+
+        // First element in tree is the current category, so we can skip that one
+        unset($childCategoryTree[0]);
+        $childCategoryIds = [];
+
+        foreach ($childCategoryTree as $node) {
+            $childCategoryIds[] = (int) $node->id;
+        }
+
+        // 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)
+                ->select('COUNT(' . $db->quoteName('id') . ')')
+                ->from($db->quoteName($table))
+                ->whereIn($db->quoteName('catid'), $childCategoryIds);
+            $db->setQuery($query);
+
+            try {
+                $count = $db->loadResult();
+            } catch (\RuntimeException $e) {
+                $this->getApplication()->enqueueMessage($e->getMessage(), 'error');
+
+                return false;
+            }
+
+            return $count;
+        } else { // If we didn't have any categories to check, return 0
+            return 0;
+        }
+    }
+
+    /**
+     * Change the state in core_content if the stage in a table is changed
+     *
+     * @param   string   $context  The context for the content passed to the plugin.
+     * @param   array    $pks      A list of primary key ids of the content that has changed stage.
+     * @param   integer  $value    The value of the condition that the content has been changed to
+     *
+     * @return  boolean
+     *
+     * @since   3.1
+     */
+    public function onContentChangeState($context, $pks, $value)
+    {
+        $pks = ArrayHelper::toInteger($pks);
+
+        if ($context === 'com_workflow.stage' && $value < 1) {
+            foreach ($pks as $pk) {
+                if (!$this->stageNotUsed($pk)) {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        $db    = $this->getDatabase();
+        $query = $db->getQuery(true)
+            ->select($db->quoteName('core_content_id'))
+            ->from($db->quoteName('#__ucm_content'))
+            ->where($db->quoteName('core_type_alias') . ' = :context')
+            ->whereIn($db->quoteName('core_content_item_id'), $pks)
+            ->bind(':context', $context);
+        $db->setQuery($query);
+        $ccIds = $db->loadColumn();
+
+        $cctable = new CoreContent($db);
+        $cctable->publish($ccIds, $value);
+
+        return true;
+    }
+
+    /**
+     * The save event.
+     *
+     * @param   string   $context  The context
+     * @param   object   $table    The item
+     * @param   boolean  $isNew    Is new item
+     * @param   array    $data     The validated data
+     *
+     * @return  boolean
+     *
+     * @since   3.9.12
+     */
+    private function checkMenuItemBeforeSave($context, $table, $isNew, $data)
+    {
+        // Special case for Create article menu item
+        if ($table->link !== 'index.php?option=com_content&view=form&layout=edit') {
+            return true;
+        }
+
+        // Display error if catid is not set when enable_category is enabled
+        $params = json_decode($table->params, true);
+
+        if (isset($params['enable_category']) && $params['enable_category'] == 1 && empty($params['catid'])) {
+            $table->setError($this->getApplication()->getLanguage()->_('COM_CONTENT_CREATE_ARTICLE_ERROR'));
+
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/plugins/content/loadmodule/loadmodule.xml b/plugins/content/loadmodule/loadmodule.xml
index c62080c283466..3eeb863e4a9a2 100644
--- a/plugins/content/loadmodule/loadmodule.xml
+++ b/plugins/content/loadmodule/loadmodule.xml
@@ -9,8 +9,10 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>3.0.0</version>
 	<description>PLG_LOADMODULE_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\Content\LoadModule</namespace>
 	<files>
-		<filename plugin="loadmodule">loadmodule.php</filename>
+		<folder plugin="loadmodule">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_content_loadmodule.ini</language>
diff --git a/plugins/content/loadmodule/services/provider.php b/plugins/content/loadmodule/services/provider.php
new file mode 100644
index 0000000000000..439aeeea6e3aa
--- /dev/null
+++ b/plugins/content/loadmodule/services/provider.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Content.loadmodule
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\Content\LoadModule\Extension\LoadModule;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new LoadModule(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('content', 'loadmodule')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/content/loadmodule/loadmodule.php b/plugins/content/loadmodule/src/Extension/LoadModule.php
similarity index 92%
rename from plugins/content/loadmodule/loadmodule.php
rename to plugins/content/loadmodule/src/Extension/LoadModule.php
index ce5074f81902b..78c4a3845b7f2 100644
--- a/plugins/content/loadmodule/loadmodule.php
+++ b/plugins/content/loadmodule/src/Extension/LoadModule.php
@@ -6,11 +6,10 @@
  *
  * @copyright   (C) 2006 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
-use Joomla\CMS\Factory;
+namespace Joomla\Plugin\Content\LoadModule\Extension;
+
 use Joomla\CMS\Helper\ModuleHelper;
 use Joomla\CMS\Plugin\CMSPlugin;
 
@@ -24,7 +23,7 @@
  *
  * @since  1.5
  */
-class PlgContentLoadmodule extends CMSPlugin
+final class LoadModule extends CMSPlugin
 {
     protected static $modules = [];
 
@@ -88,7 +87,7 @@ public function onContentPrepare($context, &$article, &$params, $page = 0)
                     $position = trim($matcheslist[0]);
                     $style    = trim($matcheslist[1]);
 
-                    $output = $this->_load($position, $style);
+                    $output = $this->load($position, $style);
 
                     // We should replace only first occurrence in order to allow positions with the same name to regenerate their content:
                     if (($start = strpos($article->text, $match[0])) !== false) {
@@ -124,7 +123,7 @@ public function onContentPrepare($context, &$article, &$params, $page = 0)
                         $stylemod = trim($matchesmodlist[2]);
                     }
 
-                    $output = $this->_loadmod($module, $title, $stylemod);
+                    $output = $this->loadModule($module, $title, $stylemod);
 
                     // We should replace only first occurrence in order to allow positions with the same name to regenerate their content:
                     if (($start = strpos($article->text, $matchmod[0])) !== false) {
@@ -142,7 +141,7 @@ public function onContentPrepare($context, &$article, &$params, $page = 0)
             if ($matchesmodid) {
                 foreach ($matchesmodid as $match) {
                     $id     = trim($match[1]);
-                    $output = $this->_loadid($id);
+                    $output = $this->loadID($id);
 
                     // We should replace only first occurrence in order to allow positions with the same name to regenerate their content:
                     if (($start = strpos($article->text, $match[0])) !== false) {
@@ -163,9 +162,9 @@ public function onContentPrepare($context, &$article, &$params, $page = 0)
      *
      * @since   1.6
      */
-    protected function _load($position, $style = 'none')
+    private function load($position, $style = 'none')
     {
-        $document = Factory::getDocument();
+        $document = $this->getApplication()->getDocument();
         $renderer = $document->loadRenderer('module');
         $modules  = ModuleHelper::getModules($position);
         $params   = ['style' => $style];
@@ -190,9 +189,9 @@ protected function _load($position, $style = 'none')
      *
      * @since   1.6
      */
-    protected function _loadmod($module, $title, $style = 'none')
+    private function loadModule($module, $title, $style = 'none')
     {
-        $document = Factory::getDocument();
+        $document = $this->getApplication()->getDocument();
         $renderer = $document->loadRenderer('module');
         $mod      = ModuleHelper::getModule($module, $title);
 
@@ -222,9 +221,9 @@ protected function _loadmod($module, $title, $style = 'none')
      *
      * @since   3.9.0
      */
-    protected function _loadid($id)
+    private function loadID($id)
     {
-        $document = Factory::getDocument();
+        $document = $this->getApplication()->getDocument();
         $renderer = $document->loadRenderer('module');
         $modules  = ModuleHelper::getModuleById($id);
         $params   = ['style' => 'none'];
diff --git a/plugins/content/pagebreak/pagebreak.xml b/plugins/content/pagebreak/pagebreak.xml
index 3d91dff6c0f9e..c447ce17a7152 100644
--- a/plugins/content/pagebreak/pagebreak.xml
+++ b/plugins/content/pagebreak/pagebreak.xml
@@ -9,8 +9,11 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>3.0.0</version>
 	<description>PLG_CONTENT_PAGEBREAK_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\Content\PageBreak</namespace>
 	<files>
-		<filename plugin="pagebreak">pagebreak.php</filename>
+		<folder plugin="pagebreak">services</folder>
+		<folder>src</folder>
+		<folder>tmpl</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_content_pagebreak.ini</language>
diff --git a/plugins/content/pagebreak/services/provider.php b/plugins/content/pagebreak/services/provider.php
new file mode 100644
index 0000000000000..157a4ce85796e
--- /dev/null
+++ b/plugins/content/pagebreak/services/provider.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Content.pagebreak
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\Content\PageBreak\Extension\PageBreak;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new PageBreak(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('content', 'pagebreak')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/content/pagebreak/pagebreak.php b/plugins/content/pagebreak/src/Extension/PageBreak.php
similarity index 90%
rename from plugins/content/pagebreak/pagebreak.php
rename to plugins/content/pagebreak/src/Extension/PageBreak.php
index 6d4ec0c6b7b85..023c8976be381 100644
--- a/plugins/content/pagebreak/pagebreak.php
+++ b/plugins/content/pagebreak/src/Extension/PageBreak.php
@@ -6,11 +6,10 @@
  *
  * @copyright   (C) 2006 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
-use Joomla\CMS\Factory;
+namespace Joomla\Plugin\Content\PageBreak\Extension;
+
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Pagination\Pagination;
@@ -39,7 +38,7 @@
  *
  * @since  1.6
  */
-class PlgContentPagebreak extends CMSPlugin
+final class PageBreak extends CMSPlugin
 {
     /**
      * The navigation list with all page objects if parameter 'multipage_toc' is active.
@@ -74,7 +73,7 @@ public function onContentPrepare($context, &$row, &$params, $page = 0)
         // Expression to search for.
         $regex = '#<hr(.*)class="system-pagebreak"(.*)\/?>#iU';
 
-        $input = Factory::getApplication()->getInput();
+        $input = $this->getApplication()->getInput();
 
         $print   = $input->getBool('print');
         $showall = $input->getBool('showall');
@@ -92,7 +91,7 @@ public function onContentPrepare($context, &$row, &$params, $page = 0)
         // Simple performance check to determine whether bot should process further.
         if (StringHelper::strpos($row->text, 'class="system-pagebreak') === false) {
             if ($page > 0) {
-                throw new Exception(Text::_('JERROR_PAGE_NOT_FOUND'), 404);
+                throw new \Exception($this->getApplication()->getLanguage()->_('JERROR_PAGE_NOT_FOUND'), 404);
             }
 
             return;
@@ -124,7 +123,7 @@ public function onContentPrepare($context, &$row, &$params, $page = 0)
             if ($hasToc) {
                 // Display TOC.
                 $page = 1;
-                $this->_createToc($row, $matches, $page);
+                $this->createToc($row, $matches, $page);
             } else {
                 $row->toc = '';
             }
@@ -138,7 +137,7 @@ public function onContentPrepare($context, &$row, &$params, $page = 0)
         $text = preg_split($regex, $row->text);
 
         if (!isset($text[$page])) {
-            throw new Exception(Text::_('JERROR_PAGE_NOT_FOUND'), 404);
+            throw new \Exception($this->getApplication()->getLanguage()->_('JERROR_PAGE_NOT_FOUND'), 404);
         }
 
         // Count the number of pages.
@@ -164,7 +163,7 @@ public function onContentPrepare($context, &$row, &$params, $page = 0)
             if ($style === 'pages') {
                 // Display TOC.
                 if ($hasToc) {
-                    $this->_createToc($row, $matches, $page);
+                    $this->createToc($row, $matches, $page);
                 } else {
                     $row->toc = '';
                 }
@@ -189,7 +188,7 @@ public function onContentPrepare($context, &$row, &$params, $page = 0)
 
                 // Adds navigation between pages to bottom of text.
                 if ($hasToc) {
-                    $this->_createNavigation($row, $page, $n);
+                    $this->createNavigation($row, $page, $n);
                 }
 
                 // Page links shown at bottom of page if TOC disabled.
@@ -260,16 +259,16 @@ public function onContentPrepare($context, &$row, &$params, $page = 0)
      *
      * @since  1.6
      */
-    protected function _createToc(&$row, &$matches, &$page)
+    private function createToc(&$row, &$matches, &$page)
     {
-        $heading     = $row->title ?? Text::_('PLG_CONTENT_PAGEBREAK_NO_TITLE');
-        $input       = Factory::getApplication()->getInput();
+        $heading     = $row->title ?? $this->getApplication()->getLanguage()->_('PLG_CONTENT_PAGEBREAK_NO_TITLE');
+        $input       = $this->getApplication()->getInput();
         $limitstart  = $input->getUint('limitstart', 0);
         $showall     = $input->getInt('showall', 0);
         $headingtext = '';
 
         if ($this->params->get('article_index', 1) == 1) {
-            $headingtext = Text::_('PLG_CONTENT_PAGEBREAK_ARTICLE_INDEX');
+            $headingtext = $this->getApplication()->getLanguage()->_('PLG_CONTENT_PAGEBREAK_ARTICLE_INDEX');
 
             if ($this->params->get('article_index_text')) {
                 $headingtext = htmlspecialchars($this->params->get('article_index_text'), ENT_QUOTES, 'UTF-8');
@@ -277,7 +276,7 @@ protected function _createToc(&$row, &$matches, &$page)
         }
 
         // TOC first Page link.
-        $this->list[1]         = new stdClass();
+        $this->list[1]         = new \stdClass();
         $this->list[1]->link   = RouteHelper::getArticleRoute($row->slug, $row->catid, $row->language);
         $this->list[1]->title  = $heading;
         $this->list[1]->active = ($limitstart === 0 && $showall === 0);
@@ -299,7 +298,7 @@ protected function _createToc(&$row, &$matches, &$page)
                 $title = Text::sprintf('PLG_CONTENT_PAGEBREAK_PAGE_NUM', $i);
             }
 
-            $this->list[$i]         = new stdClass();
+            $this->list[$i]         = new \stdClass();
             $this->list[$i]->link   = RouteHelper::getArticleRoute($row->slug, $row->catid, $row->language) . '&limitstart=' . ($i - 1);
             $this->list[$i]->title  = $title;
             $this->list[$i]->active = ($limitstart === $i - 1);
@@ -308,9 +307,9 @@ protected function _createToc(&$row, &$matches, &$page)
         }
 
         if ($this->params->get('showall')) {
-            $this->list[$i]         = new stdClass();
+            $this->list[$i]         = new \stdClass();
             $this->list[$i]->link   = RouteHelper::getArticleRoute($row->slug, $row->catid, $row->language) . '&showall=1';
-            $this->list[$i]->title  = Text::_('PLG_CONTENT_PAGEBREAK_ALL_PAGES');
+            $this->list[$i]->title  = $this->getApplication()->getLanguage()->_('PLG_CONTENT_PAGEBREAK_ALL_PAGES');
             $this->list[$i]->active = ($limitstart === $i - 1);
         }
 
@@ -332,7 +331,7 @@ protected function _createToc(&$row, &$matches, &$page)
      *
      * @since   1.6
      */
-    protected function _createNavigation(&$row, $page, $n)
+    private function createNavigation(&$row, $page, $n)
     {
         $links = [
             'next'     => '',
diff --git a/plugins/content/pagebreak/tmpl/navigation.php b/plugins/content/pagebreak/tmpl/navigation.php
index 7e7a7ab8836ad..19794c861cce8 100644
--- a/plugins/content/pagebreak/tmpl/navigation.php
+++ b/plugins/content/pagebreak/tmpl/navigation.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
@@ -19,7 +18,7 @@
  * @var $page    integer  The page number
  */
 
-$lang = Factory::getLanguage();
+$lang = $this->getApplication()->getLanguage();
 ?>
 <ul class="pagination">
     <li class="previous page-item">
diff --git a/plugins/content/pagenavigation/services/provider.php b/plugins/content/pagenavigation/services/provider.php
index 80ba6554386ed..53a3997fe1cbe 100644
--- a/plugins/content/pagenavigation/services/provider.php
+++ b/plugins/content/pagenavigation/services/provider.php
@@ -27,16 +27,15 @@
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.4.0
      */
     public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new PageNavigation(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('content', 'pagenavigation')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/content/pagenavigation/tmpl/default.php b/plugins/content/pagenavigation/tmpl/default.php
index dd505e60f9757..1245c39e3d4ac 100644
--- a/plugins/content/pagenavigation/tmpl/default.php
+++ b/plugins/content/pagenavigation/tmpl/default.php
@@ -10,11 +10,11 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
-$lang = Factory::getLanguage(); ?>
+$lang = $this->getLanguage();
+?>
 
 <nav class="pagenavigation">
     <span class="pagination ms-0">
diff --git a/plugins/content/vote/services/provider.php b/plugins/content/vote/services/provider.php
new file mode 100644
index 0000000000000..3fb91158e350b
--- /dev/null
+++ b/plugins/content/vote/services/provider.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Content.vote
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\Content\Vote\Extension\Vote;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new Vote(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('content', 'vote')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/content/vote/vote.php b/plugins/content/vote/src/Extension/Vote.php
similarity index 80%
rename from plugins/content/vote/vote.php
rename to plugins/content/vote/src/Extension/Vote.php
index be232652a1423..7959e22983449 100644
--- a/plugins/content/vote/vote.php
+++ b/plugins/content/vote/src/Extension/Vote.php
@@ -6,10 +6,10 @@
  *
  * @copyright   (C) 2006 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
+namespace Joomla\Plugin\Content\Vote\Extension;
+
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Plugin\PluginHelper;
 
@@ -22,36 +22,17 @@
  *
  * @since  1.5
  */
-class PlgContentVote extends CMSPlugin
+final class Vote extends CMSPlugin
 {
     /**
      * @var    \Joomla\CMS\Application\CMSApplication
      *
      * @since  3.7.0
-     */
-    protected $app;
-
-    /**
-     * The position the voting data is displayed in relative to the article.
-     *
-     * @var    string
      *
-     * @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 $votingPosition;
-
-    /**
-     * @param   object  &$subject  The object to observe
-     * @param   array   $config    An optional associative array of configuration settings.
-     *
-     * @since   3.7.0
-     */
-    public function __construct(&$subject, $config)
-    {
-        parent::__construct($subject, $config);
-
-        $this->votingPosition = $this->params->get('position', 'top');
-    }
+    protected $app;
 
     /**
      * Displays the voting area when viewing an article and the voting section is displayed before the article
@@ -67,7 +48,7 @@ public function __construct(&$subject, $config)
      */
     public function onContentBeforeDisplay($context, &$row, &$params, $page = 0)
     {
-        if ($this->votingPosition !== 'top') {
+        if ($this->params->get('position', 'top') !== 'top') {
             return '';
         }
 
@@ -88,7 +69,7 @@ public function onContentBeforeDisplay($context, &$row, &$params, $page = 0)
      */
     public function onContentAfterDisplay($context, &$row, &$params, $page = 0)
     {
-        if ($this->votingPosition !== 'bottom') {
+        if ($this->params->get('position', 'top') !== 'bottom') {
             return '';
         }
 
@@ -130,7 +111,7 @@ private function displayVotingData($context, &$row, &$params, $page)
         include $path;
         $html = ob_get_clean();
 
-        if ($this->app->getInput()->getString('view', '') === 'article' && $row->state == 1) {
+        if ($this->getApplication()->getInput()->getString('view', '') === 'article' && $row->state == 1) {
             // Get the path for the voting form layout file
             $path = PluginHelper::getLayoutPath('content', 'vote', 'vote');
 
diff --git a/plugins/content/vote/tmpl/rating.php b/plugins/content/vote/tmpl/rating.php
index 9c8be5160f84b..0e7ad6f943f07 100644
--- a/plugins/content/vote/tmpl/rating.php
+++ b/plugins/content/vote/tmpl/rating.php
@@ -15,7 +15,7 @@
 use Joomla\CMS\Uri\Uri;
 
 /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
-$wa = $this->app->getDocument()->getWebAssetManager();
+$wa = $this->getApplication()->getDocument()->getWebAssetManager();
 $wa->registerAndUseStyle('plg_content_vote', 'plg_content_vote/rating.css');
 
 /**
diff --git a/plugins/content/vote/vote.xml b/plugins/content/vote/vote.xml
index 6a23f7e5120d8..73f319f91d86e 100644
--- a/plugins/content/vote/vote.xml
+++ b/plugins/content/vote/vote.xml
@@ -9,8 +9,10 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>3.0.0</version>
 	<description>PLG_VOTE_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\Content\Vote</namespace>
 	<files>
-		<filename plugin="vote">vote.php</filename>
+		<folder plugin="vote">services</folder>
+		<folder>src</folder>
 		<folder>tmpl</folder>
 	</files>
 	<languages>
diff --git a/plugins/editors-xtd/article/services/provider.php b/plugins/editors-xtd/article/services/provider.php
index 36d1bf1675c93..4fcd223b88d0b 100644
--- a/plugins/editors-xtd/article/services/provider.php
+++ b/plugins/editors-xtd/article/services/provider.php
@@ -33,10 +33,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
-
                 $plugin     = new Article(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('editors-xtd', 'article')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/editors-xtd/article/src/Extension/Article.php b/plugins/editors-xtd/article/src/Extension/Article.php
index 4bff95955ff4f..80c509d402276 100644
--- a/plugins/editors-xtd/article/src/Extension/Article.php
+++ b/plugins/editors-xtd/article/src/Extension/Article.php
@@ -10,10 +10,12 @@
 
 namespace Joomla\Plugin\EditorsXtd\Article\Extension;
 
+use Joomla\CMS\Editor\Button\Button;
+use Joomla\CMS\Event\Editor\EditorButtonsSetupEvent;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Session\Session;
+use Joomla\Event\SubscriberInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -24,24 +26,54 @@
  *
  * @since  1.5
  */
-final class Article extends CMSPlugin
+final class Article extends CMSPlugin implements SubscriberInterface
 {
     /**
-     * Load the language file on instantiation.
+     * Returns an array of events this subscriber will listen to.
      *
-     * @var    boolean
-     * @since  3.1
+     * @return array
+     *
+     * @since   5.0.0
      */
-    protected $autoloadLanguage = true;
+    public static function getSubscribedEvents(): array
+    {
+        return ['onEditorButtonsSetup' => 'onEditorButtonsSetup'];
+    }
+
+    /**
+     * @param  EditorButtonsSetupEvent $event
+     * @return void
+     *
+     * @since   5.0.0
+     */
+    public function onEditorButtonsSetup(EditorButtonsSetupEvent $event)
+    {
+        $subject  = $event->getButtonsRegistry();
+        $disabled = $event->getDisabledButtons();
+
+        if (\in_array($this->_name, $disabled)) {
+            return;
+        }
+
+        $this->loadLanguage();
+
+        $button = $this->onDisplay($event->getEditorId());
+
+        if ($button) {
+            $subject->add($button);
+        }
+    }
 
     /**
      * Display the button
      *
      * @param   string  $name  The name of the button to add
      *
-     * @return  CMSObject|void  The button options as CMSObject, void if ACL check fails.
+     * @return  Button|void  The button options as Button object, void if ACL check fails.
      *
      * @since   1.5
+     *
+     * @deprecated  6.0 Use onEditorButtonsSetup event
      */
     public function onDisplay($name)
     {
@@ -61,23 +93,28 @@ public function onDisplay($name)
             return;
         }
 
-        $link = 'index.php?option=com_content&amp;view=articles&amp;layout=modal&amp;tmpl=component&amp;'
-            . Session::getFormToken() . '=1&amp;editor=' . $name;
-
-        $button          = new CMSObject();
-        $button->modal   = true;
-        $button->link    = $link;
-        $button->text    = Text::_('PLG_ARTICLE_BUTTON_ARTICLE');
-        $button->name    = $this->_type . '_' . $this->_name;
-        $button->icon    = 'file-add';
-        $button->iconSVG = '<svg viewBox="0 0 32 32" width="24" height="24"><path d="M28 24v-4h-4v4h-4v4h4v4h4v-4h4v-4zM2 2h18v6h6v10h2v-10l-8-'
-            . '8h-20v32h18v-2h-16z"></path></svg>';
-        $button->options = [
-            'height'     => '300px',
-            'width'      => '800px',
-            'bodyHeight' => '70',
-            'modalWidth' => '80',
-        ];
+        $link = 'index.php?option=com_content&view=articles&layout=modal&tmpl=component&'
+            . Session::getFormToken() . '=1&editor=' . $name;
+
+        $button = new Button(
+            $this->_name,
+            [
+                'modal'   => true,
+                'link'    => $link,
+                'text'    => Text::_('PLG_ARTICLE_BUTTON_ARTICLE'),
+                'icon'    => 'file-add',
+                'iconSVG' => '<svg viewBox="0 0 32 32" width="24" height="24"><path d="M28 24v-4h-4v4h-4v4h4v4h4v-4h4v-4zM2 2h18v6h6v10h2v-10l-8-'
+                    . '8h-20v32h18v-2h-16z"></path></svg>',
+                // This is whole Plugin name, it is needed for keeping backward compatibility
+                'name' => $this->_type . '_' . $this->_name,
+            ],
+            [
+                'height'     => '300px',
+                'width'      => '800px',
+                'bodyHeight' => '70',
+                'modalWidth' => '80',
+            ]
+        );
 
         return $button;
     }
diff --git a/plugins/editors-xtd/contact/services/provider.php b/plugins/editors-xtd/contact/services/provider.php
index 14b43b991c65b..8f08d8b886083 100644
--- a/plugins/editors-xtd/contact/services/provider.php
+++ b/plugins/editors-xtd/contact/services/provider.php
@@ -33,10 +33,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
-
                 $plugin     = new Contact(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('editors-xtd', 'contact')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/editors-xtd/contact/src/Extension/Contact.php b/plugins/editors-xtd/contact/src/Extension/Contact.php
index d91869dc72a8e..b6fc9205b6cd2 100644
--- a/plugins/editors-xtd/contact/src/Extension/Contact.php
+++ b/plugins/editors-xtd/contact/src/Extension/Contact.php
@@ -53,11 +53,11 @@ public function onDisplay($name)
             || $user->authorise('core.edit.own', 'com_contact')
         ) {
             // The URL for the contacts list
-            $link = 'index.php?option=com_contact&amp;view=contacts&amp;layout=modal&amp;tmpl=component&amp;'
-                . Session::getFormToken() . '=1&amp;editor=' . $name;
+            $link = 'index.php?option=com_contact&view=contacts&layout=modal&tmpl=component&'
+                . Session::getFormToken() . '=1&editor=' . $name;
 
             $button          = new CMSObject();
-            $button->modal   = true;
+            $button->action  = 'modal';
             $button->link    = $link;
             $button->text    = Text::_('PLG_EDITORS-XTD_CONTACT_BUTTON_CONTACT');
             $button->name    = $this->_type . '_' . $this->_name;
@@ -69,13 +69,6 @@ public function onDisplay($name)
                             . '8v-19.2c0-31.8 30.1-57.6 67.2-57.6h5c12.3 5.1 25.7 8 39.8 8s27.6-2.9 39.8-8h5c37.1 0 67.2 25.8 67.2 57.6v19.2z">'
                             . '</path></svg>';
 
-            $button->options = [
-            'height'     => '300px',
-            'width'      => '800px',
-            'bodyHeight' => '70',
-            'modalWidth' => '80',
-            ];
-
             return $button;
         }
     }
diff --git a/plugins/editors-xtd/fields/services/provider.php b/plugins/editors-xtd/fields/services/provider.php
index f7e0e3f320673..a19a59b64a4bc 100644
--- a/plugins/editors-xtd/fields/services/provider.php
+++ b/plugins/editors-xtd/fields/services/provider.php
@@ -33,10 +33,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
-
                 $plugin     = new Fields(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('editors-xtd', 'fields')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/editors-xtd/fields/src/Extension/Fields.php b/plugins/editors-xtd/fields/src/Extension/Fields.php
index 9eece81094b5e..8ed11e14ff3e0 100644
--- a/plugins/editors-xtd/fields/src/Extension/Fields.php
+++ b/plugins/editors-xtd/fields/src/Extension/Fields.php
@@ -60,11 +60,11 @@ public function onDisplay($name)
             $context = $jinput->get('extension', 'com_content') . '.categories';
         }
 
-        $link = 'index.php?option=com_fields&amp;view=fields&amp;layout=modal&amp;tmpl=component&amp;context='
-            . $context . '&amp;editor=' . $name . '&amp;' . Session::getFormToken() . '=1';
+        $link = 'index.php?option=com_fields&view=fields&layout=modal&tmpl=component&context='
+            . $context . '&editor=' . $name . '&' . Session::getFormToken() . '=1';
 
         $button          = new CMSObject();
-        $button->modal   = true;
+        $button->action  = 'modal';
         $button->link    = $link;
         $button->text    = Text::_('PLG_EDITORS-XTD_FIELDS_BUTTON_FIELD');
         $button->name    = $this->_type . '_' . $this->_name;
@@ -76,12 +76,6 @@ public function onDisplay($name)
                             . '.788 19.216 61.788 54.717 0 39.735-36.288 50.158-36.288 85.985 0 60.803 129.675 25.73 181.23 25.73 0 0-34.725-120.1'
                             . '01 25.827-120.101 35.962 0 46.423 36.152 86.308 36.152C556.712 416 576 387.99 576 354.443c0-34.199-18.962-65.792-56'
                             . '.558-65.792z"></path></svg>';
-        $button->options = [
-            'height'     => '300px',
-            'width'      => '800px',
-            'bodyHeight' => '70',
-            'modalWidth' => '80',
-        ];
 
         return $button;
     }
diff --git a/plugins/editors-xtd/image/services/provider.php b/plugins/editors-xtd/image/services/provider.php
index 8c9cfeb90320a..519ccdcf3657e 100644
--- a/plugins/editors-xtd/image/services/provider.php
+++ b/plugins/editors-xtd/image/services/provider.php
@@ -33,10 +33,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
-
                 $plugin     = new Image(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('editors-xtd', 'image')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/editors-xtd/menu/services/provider.php b/plugins/editors-xtd/menu/services/provider.php
index 493292c1f7c9b..b9a1bb609efe7 100644
--- a/plugins/editors-xtd/menu/services/provider.php
+++ b/plugins/editors-xtd/menu/services/provider.php
@@ -33,10 +33,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
-
                 $plugin     = new Menu(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('editors-xtd', 'menu')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/editors-xtd/menu/src/Extension/Menu.php b/plugins/editors-xtd/menu/src/Extension/Menu.php
index 3a263792b861e..e6af865975019 100644
--- a/plugins/editors-xtd/menu/src/Extension/Menu.php
+++ b/plugins/editors-xtd/menu/src/Extension/Menu.php
@@ -54,11 +54,11 @@ public function onDisplay($name)
             $user->authorise('core.create', 'com_menus')
             || $user->authorise('core.edit', 'com_menus')
         ) {
-            $link = 'index.php?option=com_menus&amp;view=items&amp;layout=modal&amp;tmpl=component&amp;'
-            . Session::getFormToken() . '=1&amp;editor=' . $name;
+            $link = 'index.php?option=com_menus&view=items&layout=modal&tmpl=component&'
+            . Session::getFormToken() . '=1&editor=' . $name;
 
             $button          = new CMSObject();
-            $button->modal   = true;
+            $button->action  = 'modal';
             $button->link    = $link;
             $button->text    = Text::_('PLG_EDITORS-XTD_MENU_BUTTON_MENU');
             $button->name    = $this->_type . '_' . $this->_name;
@@ -70,13 +70,6 @@ public function onDisplay($name)
                             . 'v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16V80a16 16 0 0 0-16-16zm0 160H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16'
                             . 'h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16z"></path></svg>';
 
-            $button->options = [
-            'height'     => '300px',
-            'width'      => '800px',
-            'bodyHeight' => '70',
-            'modalWidth' => '80',
-            ];
-
             return $button;
         }
     }
diff --git a/plugins/editors-xtd/module/services/provider.php b/plugins/editors-xtd/module/services/provider.php
index 656dcab547929..888e15bb5bb44 100644
--- a/plugins/editors-xtd/module/services/provider.php
+++ b/plugins/editors-xtd/module/services/provider.php
@@ -33,10 +33,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
-
                 $plugin     = new Module(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('editors-xtd', 'module')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/editors-xtd/module/src/Extension/Module.php b/plugins/editors-xtd/module/src/Extension/Module.php
index 37b8eaa3ba609..56e03bf441c6b 100644
--- a/plugins/editors-xtd/module/src/Extension/Module.php
+++ b/plugins/editors-xtd/module/src/Extension/Module.php
@@ -56,10 +56,11 @@ public function onDisplay($name)
             || $user->authorise('core.edit', 'com_modules')
             || $user->authorise('core.edit.own', 'com_modules')
         ) {
-            $link = 'index.php?option=com_modules&amp;view=modules&amp;layout=modal&amp;tmpl=component&amp;editor='
-                    . $name . '&amp;' . Session::getFormToken() . '=1';
+            $link = 'index.php?option=com_modules&view=modules&layout=modal&tmpl=component&'
+                . Session::getFormToken() . '=1&editor=' . $name;
+
             $button          = new CMSObject();
-            $button->modal   = true;
+            $button->action  = 'modal';
             $button->link    = $link;
             $button->text    = Text::_('PLG_MODULE_BUTTON_MODULE');
             $button->name    = $this->_type . '_' . $this->_name;
@@ -68,12 +69,6 @@ public function onDisplay($name)
                 . '25-31.1 45v225.1c0 18.2 10.3 34.8 26.5 42.9l208 104c13.5 6.8 29.4 6.8 42.9 0l208-104c16.3-8.1 26.5-24.8 '
                 . '26.5-42.9V129.3c0-20-12.4-37.9-31.1-44.9l-208-78C262 2.2 250 2.2 239.1 6.3zM256 68.4l192 72v1.1l-192 '
                 . '78-192-78v-1.1l192-72zm32 356V275.5l160-65v133.9l-160 80z"></path></svg>';
-            $button->options = [
-                'height'     => '300px',
-                'width'      => '800px',
-                'bodyHeight' => '70',
-                'modalWidth' => '80',
-            ];
 
             return $button;
         }
diff --git a/plugins/editors-xtd/pagebreak/pagebreak.xml b/plugins/editors-xtd/pagebreak/pagebreak.xml
index 3b4040df3ad73..e62328ab39c69 100644
--- a/plugins/editors-xtd/pagebreak/pagebreak.xml
+++ b/plugins/editors-xtd/pagebreak/pagebreak.xml
@@ -9,8 +9,10 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>3.0.0</version>
 	<description>PLG_EDITORSXTD_PAGEBREAK_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\EditorsXtd\PageBreak</namespace>
 	<files>
-		<filename plugin="pagebreak">pagebreak.php</filename>
+		<folder plugin="pagebreak">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_editors-xtd_pagebreak.ini</language>
diff --git a/plugins/captcha/recaptcha/services/provider.php b/plugins/editors-xtd/pagebreak/services/provider.php
similarity index 70%
rename from plugins/captcha/recaptcha/services/provider.php
rename to plugins/editors-xtd/pagebreak/services/provider.php
index b93654389f3d8..142ae9398792a 100644
--- a/plugins/captcha/recaptcha/services/provider.php
+++ b/plugins/editors-xtd/pagebreak/services/provider.php
@@ -2,22 +2,21 @@
 
 /**
  * @package     Joomla.Plugin
- * @subpackage  Captcha.recaptcha
+ * @subpackage  Editors-xtd.pagebreak
  *
- * @copyright   (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
+ * @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\Captcha\Google\HttpBridgePostRequestMethod;
 use Joomla\CMS\Extension\PluginInterface;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
 use Joomla\Event\DispatcherInterface;
-use Joomla\Plugin\Captcha\ReCaptcha\Extension\ReCaptcha;
+use Joomla\Plugin\EditorsXtd\PageBreak\Extension\PageBreak;
 
 return new class () implements ServiceProviderInterface {
     /**
@@ -27,17 +26,16 @@
      *
      * @return  void
      *
-     * @since   4.3.0
+     * @since   4.4.0
      */
     public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $plugin = new ReCaptcha(
+                $plugin     = new PageBreak(
                     $container->get(DispatcherInterface::class),
-                    (array) PluginHelper::getPlugin('captcha', 'recaptcha'),
-                    new HttpBridgePostRequestMethod()
+                    (array) PluginHelper::getPlugin('editors-xtd', 'pagebreak')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
diff --git a/plugins/editors-xtd/pagebreak/pagebreak.php b/plugins/editors-xtd/pagebreak/src/Extension/PageBreak.php
similarity index 80%
rename from plugins/editors-xtd/pagebreak/pagebreak.php
rename to plugins/editors-xtd/pagebreak/src/Extension/PageBreak.php
index 4e3963395968a..0b3685e94fada 100644
--- a/plugins/editors-xtd/pagebreak/pagebreak.php
+++ b/plugins/editors-xtd/pagebreak/src/Extension/PageBreak.php
@@ -6,12 +6,11 @@
  *
  * @copyright   (C) 2006 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
+namespace Joomla\Plugin\EditorsXtd\PageBreak\Extension;
+
+use Joomla\CMS\Application\CMSWebApplicationInterface;
 use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Plugin\CMSPlugin;
 
@@ -24,7 +23,7 @@
  *
  * @since  1.5
  */
-class PlgButtonPagebreak extends CMSPlugin
+final class PageBreak extends CMSPlugin
 {
     /**
      * Load the language file on instantiation.
@@ -45,14 +44,20 @@ class PlgButtonPagebreak extends CMSPlugin
      */
     public function onDisplay($name)
     {
-        $user  = Factory::getUser();
+        $app = $this->getApplication();
+
+        if (!$app instanceof CMSWebApplicationInterface) {
+            return;
+        }
+
+        $user = $app->getIdentity();
 
         // Can create in any category (component permission) or at least in one category
         $canCreateRecords = $user->authorise('core.create', 'com_content')
             || count($user->getAuthorisedCategories('com_content', 'core.create')) > 0;
 
         // Instead of checking edit on all records, we can use **same** check as the form editing view
-        $values           = (array) Factory::getApplication()->getUserState('com_content.edit.article.id');
+        $values           = (array) $app->getUserState('com_content.edit.article.id');
         $isEditingRecords = count($values);
 
         // This ACL check is probably a double-check (form view already performed checks)
@@ -61,13 +66,13 @@ public function onDisplay($name)
             return;
         }
 
-        Factory::getDocument()->addScriptOptions('xtd-pagebreak', ['editor' => $name]);
+        $app->getDocument()->addScriptOptions('xtd-pagebreak', ['editor' => $name]);
         $link = 'index.php?option=com_content&amp;view=article&amp;layout=pagebreak&amp;tmpl=component&amp;e_name=' . $name;
 
         $button          = new CMSObject();
         $button->modal   = true;
         $button->link    = $link;
-        $button->text    = Text::_('PLG_EDITORSXTD_PAGEBREAK_BUTTON_PAGEBREAK');
+        $button->text    = $app->getLanguage()->_('PLG_EDITORSXTD_PAGEBREAK_BUTTON_PAGEBREAK');
         $button->name    = $this->_type . '_' . $this->_name;
         $button->icon    = 'copy';
         $button->iconSVG = '<svg viewBox="0 0 32 32" width="24" height="24"><path d="M26 8h-6v-2l-6-6h-14v24h12v8h20v-18l-6-6zM26 10.828l3.172 3'
diff --git a/plugins/editors-xtd/readmore/services/provider.php b/plugins/editors-xtd/readmore/services/provider.php
index dfc15b8525091..681850c482bd1 100644
--- a/plugins/editors-xtd/readmore/services/provider.php
+++ b/plugins/editors-xtd/readmore/services/provider.php
@@ -33,10 +33,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
-
                 $plugin     = new ReadMore(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('editors-xtd', 'readmore')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/editors-xtd/readmore/src/Extension/ReadMore.php b/plugins/editors-xtd/readmore/src/Extension/ReadMore.php
index aaa783b48925c..5729bdbbb6eb6 100644
--- a/plugins/editors-xtd/readmore/src/Extension/ReadMore.php
+++ b/plugins/editors-xtd/readmore/src/Extension/ReadMore.php
@@ -10,9 +10,11 @@
 
 namespace Joomla\Plugin\EditorsXtd\ReadMore\Extension;
 
+use Joomla\CMS\Editor\Button\Button;
+use Joomla\CMS\Event\Editor\EditorButtonsSetupEvent;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\Event\SubscriberInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -23,48 +25,77 @@
  *
  * @since  1.5
  */
-final class ReadMore extends CMSPlugin
+final class ReadMore extends CMSPlugin implements SubscriberInterface
 {
     /**
-     * Load the language file on instantiation.
+     * Returns an array of events this subscriber will listen to.
      *
-     * @var    boolean
-     * @since  3.1
+     * @return array
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public static function getSubscribedEvents(): array
+    {
+        return ['onEditorButtonsSetup' => 'onEditorButtonsSetup'];
+    }
+
+    /**
+     * @param  EditorButtonsSetupEvent $event
+     * @return void
+     *
+     * @since   __DEPLOY_VERSION__
      */
-    protected $autoloadLanguage = true;
+    public function onEditorButtonsSetup(EditorButtonsSetupEvent $event)
+    {
+        $subject  = $event->getButtonsRegistry();
+        $disabled = $event->getDisabledButtons();
+
+        if (\in_array($this->_name, $disabled)) {
+            return;
+        }
+
+        $this->loadLanguage();
+
+        $button = $this->onDisplay($event->getEditorId());
+        $subject->add($button);
+    }
 
     /**
      * Readmore button
      *
      * @param   string  $name  The name of the button to add
      *
-     * @return  CMSObject  $button  A two element array of (imageName, textToInsert)
+     * @return  Button  $button  A two element array of (imageName, textToInsert)
      *
      * @since   1.5
+     *
+     * @deprecated  6.0 Use onEditorButtonsSetup event
      */
     public function onDisplay($name)
     {
-        $doc = $this->getApplication()->getDocument();
-        $doc->getWebAssetManager()
-            ->registerAndUseScript('com_content.admin-article-readmore', 'com_content/admin-article-readmore.min.js', [], ['defer' => true], ['core']);
+        // Register the asset "editor-button.<button name>", will be loaded by the button layout
+        $this->getApplication()->getDocument()->getWebAssetManager()
+            ->registerScript(
+                'editor-button.' . $this->_name,
+                'com_content/admin-article-readmore.min.js',
+                [],
+                ['type' => 'module'],
+                ['editors', 'joomla.dialog']
+            );
+
+        Text::script('PLG_READMORE_ALREADY_EXISTS');
 
-        // Pass some data to javascript
-        $doc->addScriptOptions(
-            'xtd-readmore',
+        $button = new Button(
+            $this->_name,
             [
-                'exists' => Text::_('PLG_READMORE_ALREADY_EXISTS', true),
+                'action'  => 'insert-readmore',
+                'text'    => Text::_('PLG_READMORE_BUTTON_READMORE'),
+                'icon'    => 'arrow-down',
+                'iconSVG' => '<svg viewBox="0 0 32 32" width="24" height="24"><path d="M32 12l-6-6-10 10-10-10-6 6 16 16z"></path></svg>',
+                // This is whole Plugin name, it is needed for keeping backward compatibility
+                'name' => $this->_type . '_' . $this->_name,
             ]
         );
-
-        $button          = new CMSObject();
-        $button->modal   = false;
-        $button->onclick = 'insertReadmore(\'' . $name . '\');return false;';
-        $button->text    = Text::_('PLG_READMORE_BUTTON_READMORE');
-        $button->name    = $this->_type . '_' . $this->_name;
-        $button->icon    = 'arrow-down';
-        $button->iconSVG = '<svg viewBox="0 0 32 32" width="24" height="24"><path d="M32 12l-6-6-10 10-10-10-6 6 16 16z"></path></svg>';
-        $button->link    = '#';
-
         return $button;
     }
 }
diff --git a/plugins/editors/codemirror/codemirror.xml b/plugins/editors/codemirror/codemirror.xml
index 0b794aa67bf2f..69214bac8f946 100644
--- a/plugins/editors/codemirror/codemirror.xml
+++ b/plugins/editors/codemirror/codemirror.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="editors" method="upgrade">
 	<name>plg_editors_codemirror</name>
-	<version>5.65.12</version>
+	<version>6.0.0</version>
 	<creationDate>28 March 2011</creationDate>
 	<author>Marijn Haverbeke</author>
 	<authorEmail>marijnh@gmail.com</authorEmail>
@@ -11,7 +11,6 @@
 	<description>PLG_CODEMIRROR_XML_DESCRIPTION</description>
 	<namespace path="src">Joomla\Plugin\Editors\CodeMirror</namespace>
 	<files>
-		<filename>fonts.json</filename>
 		<folder>layouts</folder>
 		<folder plugin="codemirror">services</folder>
 		<folder>src</folder>
@@ -49,18 +48,6 @@
 					<option value="1">JON</option>
 				</field>
 
-				<field
-					name="markerGutter"
-					type="radio"
-					label="PLG_CODEMIRROR_FIELD_MARKERGUTTER_LABEL"
-					layout="joomla.form.field.radio.switcher"
-					default="1"
-					filter="integer"
-					>
-					<option value="0">JOFF</option>
-					<option value="1">JON</option>
-				</field>
-
 				<field
 					name="lineWrapping"
 					type="radio"
@@ -97,42 +84,6 @@
 					<option value="1">JON</option>
 				</field>
 
-				<field
-					name="matchTags"
-					type="radio"
-					layout="joomla.form.field.radio.switcher"
-					label="PLG_CODEMIRROR_FIELD_MATCHTAGS_LABEL"
-					default="1"
-					filter="integer"
-					>
-					<option value="0">JOFF</option>
-					<option value="1">JON</option>
-				</field>
-
-				<field
-					name="matchBrackets"
-					type="radio"
-					layout="joomla.form.field.radio.switcher"
-					label="PLG_CODEMIRROR_FIELD_MATCHBRACKETS_LABEL"
-					default="1"
-					filter="integer"
-					>
-					<option value="0">JOFF</option>
-					<option value="1">JON</option>
-				</field>
-
-				<field
-					name="autoCloseTags"
-					type="radio"
-					layout="joomla.form.field.radio.switcher"
-					label="PLG_CODEMIRROR_FIELD_AUTOCLOSETAGS_LABEL"
-					default="1"
-					filter="integer"
-					>
-					<option value="0">JOFF</option>
-					<option value="1">JON</option>
-				</field>
-
 				<field
 					name="autoCloseBrackets"
 					type="radio"
@@ -155,8 +106,6 @@
 					>
 					<option value="">JDEFAULT</option>
 					<option value="emacs">PLG_CODEMIRROR_FIELD_KEYMAP_EMACS</option>
-					<option value="sublime">PLG_CODEMIRROR_FIELD_KEYMAP_SUBLIME</option>
-					<option value="vim">PLG_CODEMIRROR_FIELD_KEYMAP_VIM</option>
 				</field>
 
 				<field
@@ -191,138 +140,28 @@
 					<option value="Alt">PLG_CODEMIRROR_FIELD_VALUE_FULLSCREEN_MOD_ALT</option>
 				</field>
 			</fieldset>
-
-			<fieldset
-				name="appearance"
-				label="PLG_CODEMIRROR_FIELDSET_APPEARANCE_OPTIONS_LABEL"
-				addfieldprefix="Joomla\Plugin\Editors\CodeMirror\Field"
-			>
-				<field
-					name="theme"
-					type="filelist"
-					label="PLG_CODEMIRROR_FIELD_THEME_LABEL"
-					default=""
-					fileFilter="\.css$"
-					stripext="true"
-					hide_none="true"
-					hide_default="false"
-					directory="media/vendor/codemirror/theme"
-					validate="options"
-				/>
-
-				<field
-					name="activeLineColor"
-					type="color"
-					label="PLG_CODEMIRROR_FIELD_ACTIVELINE_COLOR_LABEL"
-					default="#a4c2eb"
-					filter="color"
-				/>
-
-				<field
-					name="highlightMatchColor"
-					type="color"
-					label="PLG_CODEMIRROR_FIELD_HIGHLIGHT_MATCH_COLOR_LABEL"
-					default="#fa542f"
-					filter="color"
-				/>
-
-				<field
-					name="fontFamily"
-					type="fonts"
-					label="PLG_CODEMIRROR_FIELD_FONT_FAMILY_LABEL"
-					default="0"
-					>
-					<option value="0">PLG_CODEMIRROR_FIELD_VALUE_FONT_FAMILY_DEFAULT</option>
+			<fieldset name="advanced">
+				<field
+					name="customExtensions"
+					type="subform"
+					label="PLG_CODEMIRROR_FIELD_CUSTOM_EXTENSIONS_LABEL"
+					multiple="true"
+				>
+					<form>
+						<field
+							name="module"
+							type="text"
+							label="PLG_CODEMIRROR_FIELD_CUSTOM_EXTENSIONS_MODULE_LABEL"
+							description="PLG_CODEMIRROR_FIELD_CUSTOM_EXTENSIONS_MODULE_DESCR"
+						/>
+						<field
+							name="methods"
+							type="text"
+							label="PLG_CODEMIRROR_FIELD_CUSTOM_EXTENSIONS_METHOD_LABEL"
+							description="PLG_CODEMIRROR_FIELD_CUSTOM_EXTENSIONS_METHOD_DESCR"
+						/>
+					</form>
 				</field>
-
-				<field
-					name="fontSize"
-					type="integer"
-					label="PLG_CODEMIRROR_FIELD_FONT_SIZE_LABEL"
-					first="6"
-					last="16"
-					step="1"
-					default="13"
-					filter="integer"
-				/>
-
-				<field
-					name="lineHeight"
-					type="list"
-					label="PLG_CODEMIRROR_FIELD_LINE_HEIGHT_LABEL"
-					default="1.2"
-					filter="float"
-					validate="options"
-					>
-					<option value="1">1</option>
-					<option value="1.1">1.1</option>
-					<option value="1.2">1.2</option>
-					<option value="1.3">1.3</option>
-					<option value="1.4">1.4</option>
-					<option value="1.5">1.5</option>
-					<option value="1.6">1.6</option>
-					<option value="1.7">1.7</option>
-					<option value="1.8">1.8</option>
-					<option value="1.9">1.9</option>
-					<option value="2">2</option>
-				</field>
-
-				<field
-					name="scrollbarStyle"
-					type="list"
-					label="PLG_CODEMIRROR_FIELD_VALUE_SCROLLBARSTYLE_LABEL"
-					default="native"
-					validate="options"
-					>
-					<option value="native">PLG_CODEMIRROR_FIELD_VALUE_SCROLLBARSTYLE_DEFAULT</option>
-					<option value="simple">PLG_CODEMIRROR_FIELD_VALUE_SCROLLBARSTYLE_SIMPLE</option>
-					<option value="overlay">PLG_CODEMIRROR_FIELD_VALUE_SCROLLBARSTYLE_OVERLAY</option>
-				</field>
-
-				<field
-					name="preview"
-					type="editor"
-					label="PLG_CODEMIRROR_FIELD_PREVIEW_LABEL"
-					editor="codemirror"
-					filter="unset"
-					buttons="false"
-					>
-					<default>
-<![CDATA[
-<script type="text/javascript">
-	[].forEach.call(document.getElementsByClassName('hello'), function (el) {el.innerHtml = 'Hello World';});
-</script>
-
-<style type="text/css">
-	h1 {
-		background-clip: border-box;
-		background-color: #cacaff;
-		background-image: linear-gradient(45deg, transparent 0px, transparent 30px, #ababff 30px, #ababff 60px, transparent 60px);
-		background-repeat: repeat-x;
-		background-size: 90px 100%;
-		border: 1px solid #8989ff;
-		border-radius: 10px;
-		color: #333;
-		padding: 0 15px;
-	}
-</style>
-
-<div>
-	<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam a ornare lectus, quis semper urna. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Vivamus interdum metus id elit rutrum sollicitudin. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam in fermentum risus, id facilisis nulla. Phasellus gravida erat sed ullamcorper accumsan. Donec blandit sem eget sem congue, a varius sapien semper.</p>
-	<p>Integer euismod tempor convallis. Nullam porttitor et ex ac fringilla. Quisque facilisis est ac erat condimentum malesuada. Aenean commodo quam odio, tincidunt ultricies mauris suscipit et.</p>
-
-	<ul>
-		<li>Vivamus ultrices ligula a odio lacinia pellentesque.</li>
-		<li>Curabitur iaculis arcu pharetra, mollis turpis id, commodo erat.</li>
-		<li>Etiam consequat enim quis faucibus interdum.</li>
-		<li>Morbi in ipsum pulvinar, eleifend lorem sit amet, euismod magna.</li>
-		<li>Donec consectetur lacus vitae eros euismod porta.</li>
-	</ul>
-</div>
-]]>
-					</default>
-				</field>
-
 			</fieldset>
 		</fields>
 	</config>
diff --git a/plugins/editors/codemirror/fonts.json b/plugins/editors/codemirror/fonts.json
deleted file mode 100644
index 45c4c5198ba5e..0000000000000
--- a/plugins/editors/codemirror/fonts.json
+++ /dev/null
@@ -1,107 +0,0 @@
-{
-  "anonymous_pro": {
-    "name": "Anonymous Pro",
-    "url": "https://fonts.googleapis.com/css?family=Anonymous+Pro",
-    "css": "'Anonymous Pro', monospace"
-  },
-  "cousine": {
-    "name": "Cousine",
-    "url": "https://fonts.googleapis.com/css?family=Cousine",
-    "css": "Cousine, monospace"
-  },
-  "cutive_mono": {
-    "name": "Cutive Mono",
-    "url": "https://fonts.googleapis.com/css?family=Cutive+Mono",
-    "css": "'Cutive Mono', monospace"
-  },
-  "droid_sans_mono": {
-    "name": "Droid Sans Mono",
-    "url": "https://fonts.googleapis.com/css?family=Droid+Sans+Mono",
-    "css": "'Droid Sans Mono', monospace"
-  },
-  "fira_mono": {
-    "name": "Fira Mono",
-    "url": "https://fonts.googleapis.com/css?family=Fira+Mono",
-    "css": "'Fira Mono', monospace"
-  },
-  "ibm_plex_mono": {
-    "name": "IBM Plex Mono",
-    "url": "https://fonts.googleapis.com/css?family=IBM+Plex+Mono",
-    "css": "'IBM Plex Mono', monospace;"
-  },
-  "inconsolata": {
-    "name": "Inconsolata",
-    "url": "https://fonts.googleapis.com/css?family=Inconsolata",
-    "css": "Inconsolata, monospace"
-  },
-  "lekton": {
-    "name": "Lekton",
-    "url": "https://fonts.googleapis.com/css?family=Lekton",
-    "css": "Lekton, monospace"
-  },
-  "nanum_gothic_coding": {
-    "name": "Nanum Gothic Coding",
-    "url": "https://fonts.googleapis.com/css?family=Nanum+Gothic+Coding",
-    "css": "'Nanum Gothic Coding', monospace"
-  },
-  "nova_mono": {
-    "name": "Nova Mono",
-    "url": "https://fonts.googleapis.com/css?family=Nova+Mono",
-    "css": "'Nova Mono', monospace"
-  },
-  "overpass_mono": {
-    "name": "Overpass Mono",
-    "url": "https://fonts.googleapis.com/css?family=Overpass+Mono",
-    "css": "'Overpass Mono', monospace"
-  },
-  "oxygen_mono": {
-    "name": "Oxygen Mono",
-    "url": "https://fonts.googleapis.com/css?family=Oxygen+Mono",
-    "css": "'Oxygen Mono', monospace"
-  },
-  "press_start_2p": {
-    "name": "Press Start 2P",
-    "url": "https://fonts.googleapis.com/css?family=Press+Start+2P",
-    "css": "'Press Start 2P', monospace"
-  },
-  "pt_mono": {
-    "name": "PT Mono",
-    "url": "https://fonts.googleapis.com/css?family=PT+Mono",
-    "css": "'PT Mono', monospace"
-  },
-  "roboto_mono": {
-    "name": "Roboto Mono",
-    "url": "https://fonts.googleapis.com/css?family=Roboto+Mono",
-    "css": "'Roboto Mono', monospace"
-  },
-  "rubik_mono_one": {
-    "name": "Rubik Mono One",
-    "url": "https://fonts.googleapis.com/css?family=Rubik+Mono+One",
-    "css": "'Rubik Mono One', monospace"
-  },
-  "share_tech_mono": {
-    "name": "Share Tech Mono",
-    "url": "https://fonts.googleapis.com/css?family=Share+Tech+Mono",
-    "css": "'Share Tech Mono', monospace"
-  },
-  "source_code_pro": {
-    "name": "Source Code Pro",
-    "url": "https://fonts.googleapis.com/css?family=Source+Code+Pro",
-    "css": "'Source Code Pro', monospace"
-  },
-  "space_mono": {
-    "name": "Space Mono",
-    "url": "https://fonts.googleapis.com/css?family=Space+Mono",
-    "css": "'Space Mono', monospace"
-  },
-  "ubuntu_mono": {
-    "name": "Ubuntu Mono",
-    "url": "https://fonts.googleapis.com/css?family=Ubuntu+Mono",
-    "css": "'Ubuntu Mono', monospace"
-  },
-  "vt323": {
-    "name": "VT323",
-    "url": "https://fonts.googleapis.com/css?family=VT323",
-    "css": "'VT323', monospace"
-  }
-}
diff --git a/plugins/editors/codemirror/layouts/editors/codemirror/codemirror.php b/plugins/editors/codemirror/layouts/editors/codemirror/codemirror.php
new file mode 100644
index 0000000000000..2cb2f34430067
--- /dev/null
+++ b/plugins/editors/codemirror/layouts/editors/codemirror/codemirror.php
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Editors.codemirror
+ *
+ * @copyright   (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\Registry\Registry;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ *
+ * @var   array    $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)) . '"';
+$style   = '';
+
+if ($options->width) {
+    $style .= 'width:' . $options->width . ';';
+}
+if ($options->height) {
+    $style .= 'height:' . $options->height . ';';
+}
+
+// Fullscreen combo
+$fsCombo = '';
+if (empty($options->readOnly)) {
+    $fskeys          = $params->get('fullScreenMod', []);
+    $fskeys[]        = $params->get('fullScreen', 'F10');
+    $fullScreenCombo = implode('-', $fskeys);
+    $fsCombo         = ' fs-combo=' . $this->escape($fullScreenCombo);
+}
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = Factory::getApplication()->getDocument()->getWebAssetManager();
+$wa->getRegistry()->addExtensionRegistryFile('plg_editors_codemirror');
+$wa->useStyle('plg_editors_codemirror')
+    ->useScript('webcomponent.editor-codemirror');
+?>
+<joomla-editor-codemirror <?php echo $fsCombo . $option; ?>>
+<?php echo '<textarea name="' . $name . '" id="' . $id . '" cols="' . $cols . '" rows="' . $rows . '" style="' . $style . '">' . $content . '</textarea>'; ?>
+<?php if ($fsCombo) : ?>
+    <p class="small float-end">
+        <?php echo Text::sprintf('PLG_CODEMIRROR_TOGGLE_FULL_SCREEN', $fullScreenCombo); ?>
+    </p>
+<?php endif; ?>
+<?php echo $buttons ?? ''; ?>
+</joomla-editor-codemirror>
diff --git a/plugins/editors/codemirror/layouts/editors/codemirror/element.php b/plugins/editors/codemirror/layouts/editors/codemirror/element.php
deleted file mode 100644
index fd484dfe57c33..0000000000000
--- a/plugins/editors/codemirror/layouts/editors/codemirror/element.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Plugin
- * @subpackage  Editors.codemirror
- *
- * @copyright   (C) 2015 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\HTML\HTMLHelper;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Uri\Uri;
-
-$options         = $displayData->options;
-$params          = $displayData->params;
-$name            = $displayData->name;
-$id              = $displayData->id;
-$cols            = $displayData->cols;
-$rows            = $displayData->rows;
-$content         = $displayData->content;
-$extJS           = JDEBUG ? '.js' : '.min.js';
-$modifier        = $params->get('fullScreenMod', []) ? implode(' + ', $params->get('fullScreenMod', [])) . ' + ' : '';
-$basePath        = $displayData->basePath;
-$modePath        = $displayData->modePath;
-$modPath         = 'mod-path="' . Uri::root() . $modePath . $extJS . '"';
-$fskeys          = $params->get('fullScreenMod', []);
-$fskeys[]        = $params->get('fullScreen', 'F10');
-$fullScreenCombo = implode('-', $fskeys);
-$fsCombo         = 'fs-combo=' . json_encode($fullScreenCombo);
-$option          = 'options=\'' . json_encode($options) . '\'';
-$mediaVersion    = Factory::getDocument()->getMediaVersion();
-$editor          = 'editor="' . ltrim(HTMLHelper::_('script', $basePath . 'lib/codemirror' . $extJS, ['version' => 'auto', 'pathOnly' => true]), '/') . '?' . $mediaVersion . '"';
-$addons          = 'addons="' . ltrim(HTMLHelper::_('script', $basePath . 'lib/addons' . $extJS, ['version' => 'auto', 'pathOnly' => true]), '/') . '?' . $mediaVersion . '"';
-
-// Remove the fullscreen message and option if readonly not null.
-if (isset($options->readOnly)) {
-    $fsCombo = '';
-}
-
-Factory::getDocument()->getWebAssetManager()
-    ->registerAndUseStyle('codemirror.lib.main', $basePath . 'lib/codemirror.css')
-    ->registerAndUseStyle('codemirror.lib.addons', $basePath . 'lib/addons.css', [], [], ['codemirror.lib.main'])
-    ->registerScript(
-        'webcomponent.editor-codemirror-es5',
-        'plg_editors_codemirror/joomla-editor-codemirror-es5.min.js',
-        ['dependencies' => ['wcpolyfill']],
-        ['defer' => true, 'nomodule' => true],
-        ['wcpolyfill']
-    )
-    ->registerAndUseScript(
-        'webcomponent.editor-codemirror',
-        'plg_editors_codemirror/joomla-editor-codemirror.min.js',
-        [],
-        ['type' => 'module'],
-        ['webcomponent.editor-codemirror-es5']
-    );
-?>
-<joomla-editor-codemirror <?php echo $editor . ' ' . $addons . ' ' . $modPath . ' ' . $fsCombo . ' ' . $option; ?>>
-<?php echo '<textarea name="', $name, '" id="', $id, '" cols="', $cols, '" rows="', $rows, '">', $content, '</textarea>'; ?>
-<?php if ($fsCombo !== '') { ?>
-    <p class="small float-end">
-        <?php echo Text::sprintf('PLG_CODEMIRROR_TOGGLE_FULL_SCREEN', $fullScreenCombo); ?>
-    </p>
-<?php }; ?>
-</joomla-editor-codemirror>
-<?php echo $displayData->buttons; ?>
diff --git a/plugins/editors/codemirror/layouts/editors/codemirror/styles.php b/plugins/editors/codemirror/layouts/editors/codemirror/styles.php
deleted file mode 100644
index 2f272e2e51f21..0000000000000
--- a/plugins/editors/codemirror/layouts/editors/codemirror/styles.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Plugin
- * @subpackage  Editors.codemirror
- *
- * @copyright   (C) 2015 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Factory;
-
-$params     = $displayData->params;
-$fontFamily = $displayData->fontFamily ?? 'monospace';
-$fontSize   = $params->get('fontSize', 13) . 'px;';
-$lineHeight = $params->get('lineHeight', 1.2) . 'em;';
-
-// Set the active line color.
-$color           = $params->get('activeLineColor', '#a4c2eb');
-$r               = hexdec($color[1] . $color[2]);
-$g               = hexdec($color[3] . $color[4]);
-$b               = hexdec($color[5] . $color[6]);
-$activeLineColor = 'rgba(' . $r . ', ' . $g . ', ' . $b . ', .5)';
-
-// Set the color for matched tags.
-$color               = $params->get('highlightMatchColor', '#fa542f');
-$r                   = hexdec($color[1] . $color[2]);
-$g                   = hexdec($color[3] . $color[4]);
-$b                   = hexdec($color[5] . $color[6]);
-$highlightMatchColor = 'rgba(' . $r . ', ' . $g . ', ' . $b . ', .5)';
-
-/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
-$wa = Factory::getApplication()->getDocument()->getWebAssetManager();
-$wa->registerAndUseStyle('plg_editors_codemirror', 'plg_editors_codemirror/codemirror.css');
-$wa->addInlineStyle(
-    <<<CSS
-		.CodeMirror {
-			font-family: $fontFamily;
-			font-size: $fontSize;
-			line-height: $lineHeight;
-			height: calc(100vh - 600px);
-			min-height: 400px;
-			max-height: 800px;
-		}
-		.CodeMirror-activeline-background { background: $activeLineColor; }
-		.CodeMirror-matchingtag { background: $highlightMatchColor; }
-		.cm-matchhighlight {background-color: $highlightMatchColor; }
-		.CodeMirror-selection-highlight-scrollbar {background-color: $highlightMatchColor; }
-CSS
-);
diff --git a/plugins/editors/codemirror/services/provider.php b/plugins/editors/codemirror/services/provider.php
index 14d8a8d4d9ef4..44205bb649b9f 100644
--- a/plugins/editors/codemirror/services/provider.php
+++ b/plugins/editors/codemirror/services/provider.php
@@ -33,10 +33,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
-
                 $plugin     = new Codemirror(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('editors', 'codemirror')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/editors/codemirror/src/Extension/Codemirror.php b/plugins/editors/codemirror/src/Extension/Codemirror.php
index 41a3d5d346e68..16d68593d5e7f 100644
--- a/plugins/editors/codemirror/src/Extension/Codemirror.php
+++ b/plugins/editors/codemirror/src/Extension/Codemirror.php
@@ -10,11 +10,10 @@
 
 namespace Joomla\Plugin\Editors\CodeMirror\Extension;
 
-use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Event\Editor\EditorSetupEvent;
 use Joomla\CMS\Plugin\CMSPlugin;
-use Joomla\CMS\Plugin\PluginHelper;
-use Joomla\Event\Event;
-use stdClass;
+use Joomla\Event\SubscriberInterface;
+use Joomla\Plugin\Editors\CodeMirror\Provider\CodeMirrorProvider;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -25,291 +24,34 @@
  *
  * @since  1.6
  */
-final class Codemirror extends CMSPlugin
+final class Codemirror extends CMSPlugin implements SubscriberInterface
 {
     /**
-     * Affects constructor behavior. If true, language files will be loaded automatically.
+     * Returns an array of events this subscriber will listen to.
      *
-     * @var    boolean
-     * @since  3.1.4
-     */
-    protected $autoloadLanguage = true;
-
-    /**
-     * Mapping of syntax to CodeMirror modes.
-     *
-     * @var array
-     */
-    protected $modeAlias = [];
-
-    /**
-     * Base path for editor assets.
-     *
-     * @var  string
-     *
-     * @since  4.0.0
-     */
-    protected $basePath = 'media/vendor/codemirror/';
-
-    /**
-     * Base path for editor modes.
+     * @return array
      *
-     * @var  string
-     *
-     * @since  4.0.0
+     * @since   5.0.0
      */
-    protected $modePath = 'media/vendor/codemirror/mode/%N/%N';
-
-    /**
-     * Initialises the Editor.
-     *
-     * @return  void
-     */
-    public function onInit()
+    public static function getSubscribedEvents(): array
     {
-        static $done = false;
-
-        // Do this only once.
-        if ($done) {
-            return;
-        }
-
-        $done = true;
-
-        // Most likely need this later
-        $doc = $this->getApplication()->getDocument();
-
-        // Codemirror shall have its own group of plugins to modify and extend its behavior
-        PluginHelper::importPlugin('editors_codemirror');
-
-        // At this point, params can be modified by a plugin before going to the layout renderer.
-        $this->getApplication()->triggerEvent('onCodeMirrorBeforeInit', [&$this->params, &$this->basePath, &$this->modePath]);
-
-        $displayData = (object) ['params' => $this->params];
-        $font        = $this->params->get('fontFamily', '0');
-        $fontInfo    = $this->getFontInfo($font);
-
-        if (isset($fontInfo)) {
-            if (isset($fontInfo->url)) {
-                $doc->addStyleSheet($fontInfo->url);
-            }
-
-            if (isset($fontInfo->css)) {
-                $displayData->fontFamily = $fontInfo->css . '!important';
-            }
-        }
-
-        // We need to do output buffering here because layouts may actually 'echo' things which we do not want.
-        ob_start();
-        LayoutHelper::render('editors.codemirror.styles', $displayData, JPATH_PLUGINS . '/editors/codemirror/layouts');
-        ob_end_clean();
-
-        $this->getApplication()->triggerEvent('onCodeMirrorAfterInit', [&$this->params, &$this->basePath, &$this->modePath]);
+        return ['onEditorSetup' => 'onEditorSetup'];
     }
 
     /**
-     * Display the editor area.
+     * Register Editor instance
      *
-     * @param   string   $name     The control name.
-     * @param   string   $content  The contents of the text area.
-     * @param   string   $width    The width of the text area (px or %).
-     * @param   string   $height   The height of the text area (px or %).
-     * @param   int      $col      The number of columns for the textarea.
-     * @param   int      $row      The number of rows for the textarea.
-     * @param   boolean  $buttons  True and the editor buttons will be displayed.
-     * @param   string   $id       An optional ID for the textarea (note: since 1.6). If not supplied the name is used.
-     * @param   string   $asset    Not used.
-     * @param   object   $author   Not used.
-     * @param   array    $params   Associative array of editor parameters.
+     * @param EditorSetupEvent $event
      *
-     * @return  string  HTML
-     */
-    public function onDisplay(
-        $name,
-        $content,
-        $width,
-        $height,
-        $col,
-        $row,
-        $buttons = true,
-        $id = null,
-        $asset = null,
-        $author = null,
-        $params = []
-    ) {
-        // True if a CodeMirror already has autofocus. Prevent multiple autofocuses.
-        static $autofocused;
-
-        $id = empty($id) ? $name : $id;
-
-        // Must pass the field id to the buttons in this editor.
-        $buttons = $this->displayButtons($id, $buttons, $asset, $author);
-
-        // Only add "px" to width and height if they are not given as a percentage.
-        $width .= is_numeric($width) ? 'px' : '';
-        $height .= is_numeric($height) ? 'px' : '';
-
-        // Options for the CodeMirror constructor.
-        $options   = new stdClass();
-        $keyMapUrl = '';
-
-        // Is field readonly?
-        if (!empty($params['readonly'])) {
-            $options->readOnly = 'nocursor';
-        }
-
-        // Should we focus on the editor on load?
-        if (!$autofocused) {
-            $options->autofocus = isset($params['autofocus']) ? (bool) $params['autofocus'] : false;
-            $autofocused        = $options->autofocus;
-        }
-        // Set autorefresh to true - fixes issue when editor is not loaded in a focused tab
-        $options->autoRefresh = true;
-
-        $options->lineWrapping = (bool) $this->params->get('lineWrapping', 1);
-
-        // Add styling to the active line.
-        $options->styleActiveLine = (bool) $this->params->get('activeLine', 1);
-
-        // Do we highlight selection matches?
-        if ($this->params->get('selectionMatches', 1)) {
-            $options->highlightSelectionMatches = [
-                    'showToken'         => true,
-                    'annotateScrollbar' => true,
-                ];
-        }
-
-        // Do we use line numbering?
-        if ($options->lineNumbers = (bool) $this->params->get('lineNumbers', 1)) {
-            $options->gutters[] = 'CodeMirror-linenumbers';
-        }
-
-        // Do we use code folding?
-        if ($options->foldGutter = (bool) $this->params->get('codeFolding', 1)) {
-            $options->gutters[] = 'CodeMirror-foldgutter';
-        }
-
-        // Do we use a marker gutter?
-        if ($options->markerGutter = (bool) $this->params->get('markerGutter', $this->params->get('marker-gutter', 1))) {
-            $options->gutters[] = 'CodeMirror-markergutter';
-        }
-
-        // Load the syntax mode.
-        $syntax = !empty($params['syntax'])
-            ? $params['syntax']
-            : $this->params->get('syntax', 'html');
-        $options->mode = $this->modeAlias[$syntax] ?? $syntax;
-
-        // Load the theme if specified.
-        if ($theme = $this->params->get('theme')) {
-            $options->theme = $theme;
-
-            $this->getApplication()->getDocument()->getWebAssetManager()
-                ->registerAndUseStyle('codemirror.theme', $this->basePath . 'theme/' . $theme . '.css');
-        }
-
-        // Special options for tagged modes (xml/html).
-        if (in_array($options->mode, ['xml', 'html', 'php'])) {
-            // Autogenerate closing tags (html/xml only).
-            $options->autoCloseTags = (bool) $this->params->get('autoCloseTags', 1);
-
-            // Highlight the matching tag when the cursor is in a tag (html/xml only).
-            $options->matchTags = (bool) $this->params->get('matchTags', 1);
-        }
-
-        // Special options for non-tagged modes.
-        if (!in_array($options->mode, ['xml', 'html'])) {
-            // Autogenerate closing brackets.
-            $options->autoCloseBrackets = (bool) $this->params->get('autoCloseBrackets', 1);
-
-            // Highlight the matching bracket.
-            $options->matchBrackets = (bool) $this->params->get('matchBrackets', 1);
-        }
-
-        $options->scrollbarStyle = $this->params->get('scrollbarStyle', 'native');
-
-        // KeyMap settings.
-        $options->keyMap = $this->params->get('keyMap', false);
-
-        // Support for older settings.
-        if ($options->keyMap === false) {
-            $options->keyMap = $this->params->get('vimKeyBinding', 0) ? 'vim' : 'default';
-        }
-
-        if ($options->keyMap !== 'default') {
-            $keyMapUrl = $this->basePath . 'keymap/' . $options->keyMap . '.min.js';
-        }
-
-        $options->keyMapUrl = $keyMapUrl;
-
-        $displayData = (object) [
-            'options'  => $options,
-            'params'   => $this->params,
-            'name'     => $name,
-            'id'       => $id,
-            'cols'     => $col,
-            'rows'     => $row,
-            'content'  => $content,
-            'buttons'  => $buttons,
-            'basePath' => $this->basePath,
-            'modePath' => $this->modePath,
-        ];
-
-        // At this point, displayData can be modified by a plugin before going to the layout renderer.
-        $results = $this->getApplication()->triggerEvent('onCodeMirrorBeforeDisplay', [&$displayData]);
-
-        $results[] = LayoutHelper::render('editors.codemirror.element', $displayData, JPATH_PLUGINS . '/editors/codemirror/layouts');
-
-        foreach ($this->getApplication()->triggerEvent('onCodeMirrorAfterDisplay', [&$displayData]) as $result) {
-            $results[] = $result;
-        }
-
-        return implode("\n", $results);
-    }
-
-    /**
-     * Displays the editor buttons.
-     *
-     * @param   string  $name     Button name.
-     * @param   mixed   $buttons  [array with button objects | boolean true to display buttons]
-     * @param   mixed   $asset    Unused.
-     * @param   mixed   $author   Unused.
+     * @return void
      *
-     * @return  string|void
+     * @since   5.0.0
      */
-    protected function displayButtons($name, $buttons, $asset, $author)
+    public function onEditorSetup(EditorSetupEvent $event)
     {
-        if (is_array($buttons) || (is_bool($buttons) && $buttons)) {
-            $buttonsEvent = new Event(
-                'getButtons',
-                [
-                    'editor'  => $name,
-                    'buttons' => $buttons,
-                ]
-            );
-
-            $buttonsResult = $this->getDispatcher()->dispatch('getButtons', $buttonsEvent);
-            $buttons       = $buttonsResult['result'];
-
-            return LayoutHelper::render('joomla.editors.buttons', $buttons);
-        }
-    }
-
-    /**
-     * Gets font info from the json data file
-     *
-     * @param   string  $font  A key from the $fonts array.
-     *
-     * @return  object
-     */
-    protected function getFontInfo($font)
-    {
-        static $fonts;
-
-        if (!$fonts) {
-            $fonts = json_decode(file_get_contents(JPATH_PLUGINS . '/editors/codemirror/fonts.json'), true);
-        }
+        $this->loadLanguage();
 
-        return isset($fonts[$font]) ? (object) $fonts[$font] : null;
+        $event->getEditorsRegistry()
+            ->add(new CodeMirrorProvider($this->params, $this->getApplication(), $this->getDispatcher()));
     }
 }
diff --git a/plugins/editors/codemirror/src/Field/FontsField.php b/plugins/editors/codemirror/src/Field/FontsField.php
deleted file mode 100644
index 1f49fd42c2b48..0000000000000
--- a/plugins/editors/codemirror/src/Field/FontsField.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Plugin
- * @subpackage  Editors.codemirror
- *
- * @copyright   (C) 2014 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-namespace Joomla\Plugin\Editors\CodeMirror\Field;
-
-use Joomla\CMS\Form\Field\ListField;
-use Joomla\CMS\HTML\HTMLHelper;
-
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-
-/**
- * Supports an HTML select list of fonts
- *
- * @package     Joomla.Plugin
- * @subpackage  Editors.codemirror
- * @since       3.4
- */
-class FontsField extends ListField
-{
-    /**
-     * The form field type.
-     *
-     * @var    string
-     * @since  3.4
-     */
-    protected $type = 'Fonts';
-
-    /**
-     * Method to get the list of fonts field options.
-     *
-     * @return  array  The field option objects.
-     *
-     * @since   3.4
-     */
-    protected function getOptions()
-    {
-        $fonts   = json_decode(file_get_contents(JPATH_PLUGINS . '/editors/codemirror/fonts.json'));
-        $options = [];
-
-        foreach ($fonts as $key => $info) {
-            $options[] = HTMLHelper::_('select.option', $key, $info->name);
-        }
-
-        // Merge any additional options in the XML definition.
-        return array_merge(parent::getOptions(), $options);
-    }
-}
diff --git a/plugins/editors/codemirror/src/Provider/CodeMirrorProvider.php b/plugins/editors/codemirror/src/Provider/CodeMirrorProvider.php
new file mode 100644
index 0000000000000..d533d10259a1d
--- /dev/null
+++ b/plugins/editors/codemirror/src/Provider/CodeMirrorProvider.php
@@ -0,0 +1,165 @@
+<?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\Plugin\Editors\CodeMirror\Provider;
+
+use Joomla\CMS\Application\CMSApplicationInterface;
+use Joomla\CMS\Editor\AbstractEditorProvider;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Uri\Uri;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Registry\Registry;
+
+/**
+ * Editor provider class
+ *
+ * @since   5.0.0
+ */
+final class CodeMirrorProvider extends AbstractEditorProvider
+{
+    /**
+     * A Registry object holding the parameters for the plugin
+     *
+     * @var    Registry
+     * @since  5.0.0
+     */
+    protected $params;
+
+    /**
+     * The application object
+     *
+     * @var    CMSApplicationInterface
+     *
+     * @since  5.0.0
+     */
+    protected $application;
+
+    /**
+     * Class constructor
+     *
+     * @param   Registry                 $params
+     * @param   CMSApplicationInterface  $application
+     * @param   DispatcherInterface      $dispatcher
+     *
+     * @since  5.0.0
+     */
+    public function __construct(Registry $params, CMSApplicationInterface $application, DispatcherInterface $dispatcher)
+    {
+        $this->params      = $params;
+        $this->application = $application;
+
+        $this->setDispatcher($dispatcher);
+    }
+
+    /**
+     * Return Editor name, CMD string.
+     *
+     * @return string
+     * @since   5.0.0
+     */
+    public function getName(): string
+    {
+        return 'codemirror';
+    }
+
+    /**
+     * Gets the editor HTML markup
+     *
+     * @param   string  $name        Input name.
+     * @param   string  $content     The content of the field.
+     * @param   array   $attributes  Associative array of editor attributes.
+     * @param   array   $params      Associative array of editor parameters.
+     *
+     * @return  string  The HTML markup of the editor
+     *
+     * @since   5.0.0
+     */
+    public function display(string $name, string $content = '', array $attributes = [], array $params = []): string
+    {
+        $col     = $attributes['col'] ?? '';
+        $row     = $attributes['row'] ?? '';
+        $width   = $attributes['width'] ?? '';
+        $height  = $attributes['height'] ?? '';
+        $id      = $attributes['id'] ?? '';
+        $buttons = $params['buttons'] ?? true;
+        $asset   = $params['asset'] ?? 0;
+        $author  = $params['author'] ?? 0;
+
+        // Must pass the field id to the buttons in this editor.
+        $buttonsStr = $this->displayButtons($buttons, ['asset' => $asset, 'author' => $author, 'editorId' => $id]);
+
+        // Options for the CodeMirror constructor.
+        $options = new \stdClass();
+
+        // Is field readonly?
+        if (!empty($params['readonly'])) {
+            $options->readOnly = true;
+        }
+
+        // Only add "px" to width and height if they are not given as a percentage.
+        $options->width  = is_numeric($width) ? $width . 'px' : $width;
+        $options->height = is_numeric($height) ? $height . 'px' : $height;
+
+        $options->lineNumbers        = (bool) $this->params->get('lineNumbers', 1);
+        $options->foldGutter         = (bool) $this->params->get('codeFolding', 1);
+        $options->lineWrapping       = (bool) $this->params->get('lineWrapping', 1);
+        $options->activeLine         = (bool) $this->params->get('activeLine', 1);
+        $options->highlightSelection = (bool) $this->params->get('selectionMatches', 1);
+
+        // Load the syntax mode.
+        $modeAlias = [
+            'scss' => 'css',
+            'sass' => 'css',
+            'less' => 'css',
+        ];
+        $options->mode = !empty($params['syntax']) ? $params['syntax'] : $this->params->get('syntax', 'html');
+        $options->mode = $modeAlias[$options->mode] ?? $options->mode;
+
+        // Special options for non-tagged modes.
+        if (!in_array($options->mode, ['xml', 'html'])) {
+            // Autogenerate closing brackets.
+            $options->autoCloseBrackets = (bool) $this->params->get('autoCloseBrackets', 1);
+        }
+
+        // KeyMap settings.
+        $options->keyMap = $this->params->get('keyMap', '');
+
+        // Check for custom extensions
+        $customExtensions          = $this->params->get('customExtensions', []);
+        $options->customExtensions = [];
+
+        if ($customExtensions) {
+            foreach ($customExtensions as $item) {
+                $methods = array_filter(array_map('trim', explode(',', $item->methods ?? '')));
+
+                if (empty($item->module) || !$methods) {
+                    continue;
+                }
+
+                // Prepend root path if we have a file
+                $module = str_ends_with($item->module, '.js') ? Uri::root(true) . '/' . $item->module : $item->module;
+
+                $options->customExtensions[] = [$module, $methods];
+            }
+        }
+
+        $displayData = [
+            'options' => $options,
+            'params'  => $this->params,
+            'name'    => $name,
+            'id'      => $id,
+            'cols'    => $col,
+            'rows'    => $row,
+            'content' => $content,
+            'buttons' => $buttonsStr,
+        ];
+
+        return LayoutHelper::render('editors.codemirror.codemirror', $displayData, JPATH_PLUGINS . '/editors/codemirror/layouts');
+    }
+}
diff --git a/plugins/editors/none/services/provider.php b/plugins/editors/none/services/provider.php
index ce47ceb6696bf..bcca459625605 100644
--- a/plugins/editors/none/services/provider.php
+++ b/plugins/editors/none/services/provider.php
@@ -33,10 +33,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
-
                 $plugin     = new None(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('editors', 'none')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/editors/none/src/Extension/None.php b/plugins/editors/none/src/Extension/None.php
index 12651f4e0e91d..828be0467a561 100644
--- a/plugins/editors/none/src/Extension/None.php
+++ b/plugins/editors/none/src/Extension/None.php
@@ -75,14 +75,15 @@ public function onDisplay(
                 'webcomponent.editor-none',
                 'plg_editors_none/joomla-editor-none.min.js',
                 [],
-                ['type' => 'module']
+                ['type' => 'module'],
+                ['editors']
             );
 
         return '<joomla-editor-none>'
             . '<textarea name="' . $name . '" id="' . $id . '" cols="' . $col . '" rows="' . $row
             . '" style="width: ' . $width . '; height: ' . $height . ';"' . $readonly . '>' . $content . '</textarea>'
-            . '</joomla-editor-none>'
-            . $this->displayButtons($id, $buttons, $asset, $author);
+            . $this->displayButtons($id, $buttons, $asset, $author)
+            . '</joomla-editor-none>';
     }
 
     /**
diff --git a/plugins/editors/tinymce/services/provider.php b/plugins/editors/tinymce/services/provider.php
index ceb06661f42d5..175d1f390ec97 100644
--- a/plugins/editors/tinymce/services/provider.php
+++ b/plugins/editors/tinymce/services/provider.php
@@ -34,10 +34,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
-
                 $plugin     = new TinyMCE(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('editors', 'tinymce')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/editors/tinymce/src/Extension/TinyMCE.php b/plugins/editors/tinymce/src/Extension/TinyMCE.php
index 6db16d0a4573e..5bcc112c07dc1 100644
--- a/plugins/editors/tinymce/src/Extension/TinyMCE.php
+++ b/plugins/editors/tinymce/src/Extension/TinyMCE.php
@@ -10,7 +10,10 @@
 
 namespace Joomla\Plugin\Editors\TinyMCE\Extension;
 
+use Joomla\CMS\Filesystem\Folder;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\CMS\Session\Session;
 use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Plugin\Editors\TinyMCE\PluginTraits\DisplayTrait;
 
@@ -37,13 +40,49 @@ final class TinyMCE extends CMSPlugin
     protected $autoloadLanguage = true;
 
     /**
-     * Initializes the Editor.
+     * Returns the templates
      *
      * @return  void
      *
-     * @since   1.5
+     * @since   5.0.0
      */
-    public function onInit()
+    public function onAjaxTinymce()
     {
+        if (!Session::checkToken('request')) {
+            echo json_encode([]);
+            exit();
+        }
+
+        $templates = [];
+        $language  = $this->getApplication()->getLanguage();
+        $template  = $this->getApplication()->getInput()->getPath('template', '');
+
+        if ('' === $template) {
+            echo json_encode([]);
+            exit();
+        }
+
+        $filepaths = Folder::exists(JPATH_ROOT . '/templates/' . $template)
+            ? Folder::files(JPATH_ROOT . '/templates/' . $template, '\.(html|txt)$', false, true)
+            : [];
+
+        foreach ($filepaths as $filepath) {
+            $fileinfo    = pathinfo($filepath);
+            $filename    = $fileinfo['filename'];
+            $title_upper = strtoupper($filename);
+
+            if ($filename === 'index') {
+                continue;
+            }
+
+            $templates[] = (object) [
+                'title'       => $language->hasKey('PLG_TINY_TEMPLATE_' . $title_upper . '_TITLE') ? Text::_('PLG_TINY_TEMPLATE_' . $title_upper . '_TITLE') : $filename,
+                'description' => $language->hasKey('PLG_TINY_TEMPLATE_' . $title_upper . '_DESC') ? Text::_('PLG_TINY_TEMPLATE_' . $title_upper . '_DESC') : ' ',
+                'content'     => file_get_contents($filepath),
+            ];
+        }
+
+        echo json_encode($templates);
+        exit();
     }
 }
diff --git a/plugins/editors/tinymce/src/Field/TemplateslistField.php b/plugins/editors/tinymce/src/Field/TemplateslistField.php
index 03d27cd8d9d3c..a56457f4a65f8 100644
--- a/plugins/editors/tinymce/src/Field/TemplateslistField.php
+++ b/plugins/editors/tinymce/src/Field/TemplateslistField.php
@@ -63,18 +63,13 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
      */
     public function getOptions()
     {
-        $def         = new \stdClass();
-        $def->value  = '';
-        $def->text   = Text::_('JOPTION_DO_NOT_USE');
-        $options     = [0 => $def];
-        $directories = [JPATH_ROOT . '/templates', JPATH_ROOT . '/media/templates/site'];
+        $def             = new \stdClass();
+        $def->value      = '';
+        $def->text       = Text::_('JOPTION_DO_NOT_USE');
+        $options         = [0 => $def];
+        $this->directory = JPATH_ROOT . '/templates';
 
-        foreach ($directories as $directory) {
-            $this->directory = $directory;
-            $options         = array_merge($options, parent::getOptions());
-        }
-
-        return $options;
+        return array_merge($options, parent::getOptions());
     }
 
     /**
diff --git a/plugins/editors/tinymce/src/PluginTraits/ActiveSiteTemplate.php b/plugins/editors/tinymce/src/PluginTraits/ActiveSiteTemplate.php
index 379acc28506f6..2b0d6b0b28a2d 100644
--- a/plugins/editors/tinymce/src/PluginTraits/ActiveSiteTemplate.php
+++ b/plugins/editors/tinymce/src/PluginTraits/ActiveSiteTemplate.php
@@ -11,7 +11,6 @@
 namespace Joomla\Plugin\Editors\TinyMCE\PluginTraits;
 
 use Joomla\CMS\Language\Text;
-use RuntimeException;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -48,7 +47,7 @@ protected function getActiveSiteTemplate()
 
         try {
             return $db->loadObject();
-        } catch (RuntimeException $e) {
+        } catch (\RuntimeException $e) {
             $this->getApplication()->enqueueMessage(Text::_('JERROR_AN_ERROR_HAS_OCCURRED'), 'error');
 
             return new \stdClass();
diff --git a/plugins/editors/tinymce/src/PluginTraits/DisplayTrait.php b/plugins/editors/tinymce/src/PluginTraits/DisplayTrait.php
index a86a90e234c80..fe59d23efcbdc 100644
--- a/plugins/editors/tinymce/src/PluginTraits/DisplayTrait.php
+++ b/plugins/editors/tinymce/src/PluginTraits/DisplayTrait.php
@@ -18,7 +18,6 @@
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
 use Joomla\Registry\Registry;
-use stdClass;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -71,6 +70,7 @@ public function onDisplay(
         $user            = $this->getApplication()->getIdentity();
         $language        = $this->getApplication()->getLanguage();
         $doc             = $this->getApplication()->getDocument();
+        $wa              = $doc->getWebAssetManager();
         $id              = preg_replace('/(\s|[^A-Za-z0-9_])+/', '_', $id);
         $nameGroup       = explode('[', preg_replace('/\[\]|\]/', '', $name));
         $fieldName       = end($nameGroup);
@@ -78,9 +78,10 @@ public function onDisplay(
         $externalPlugins = [];
         $options         = $doc->getScriptOptions('plg_editor_tinymce');
         $theme           = 'silver';
+        $csrf            = Session::getFormToken();
 
         // Data object for the layout
-        $textarea           = new stdClass();
+        $textarea           = new \stdClass();
         $textarea->name     = $name;
         $textarea->id       = $id;
         $textarea->class    = 'mce_editable joomla-editor-tinymce';
@@ -136,8 +137,8 @@ public function onDisplay(
 
         // Prepare the parameters
         $levelParams      = new Registry();
-        $extraOptions     = new stdClass();
-        $toolbarParams    = new stdClass();
+        $extraOptions     = new \stdClass();
+        $toolbarParams    = new \stdClass();
         $extraOptionsAll  = (array) $this->params->get('configuration.setoptions', []);
         $toolbarParamsAll = (array) $this->params->get('configuration.toolbars', []);
 
@@ -304,49 +305,12 @@ public function onDisplay(
             }
         }
 
-        // Template
-        $templates = [];
-
-        if (!empty($allButtons['template'])) {
-            // Do we have a custom content_template_path
-            $template_path = $levelParams->get('content_template_path');
-            $template_path = $template_path ? '/templates/' . $template_path : '/media/vendor/tinymce/templates';
-
-            $filepaths = Folder::exists(JPATH_ROOT . $template_path)
-                ? Folder::files(JPATH_ROOT . $template_path, '\.(html|txt)$', false, true)
-                : [];
-
-            foreach ($filepaths as $filepath) {
-                $fileinfo      = pathinfo($filepath);
-                $filename      = $fileinfo['filename'];
-                $full_filename = $fileinfo['basename'];
-
-                if ($filename === 'index') {
-                    continue;
-                }
-
-                $title       = $filename;
-                $title_upper = strtoupper($filename);
-                $description = ' ';
-
-                if ($language->hasKey('PLG_TINY_TEMPLATE_' . $title_upper . '_TITLE')) {
-                    $title = Text::_('PLG_TINY_TEMPLATE_' . $title_upper . '_TITLE');
-                }
-
-                if ($language->hasKey('PLG_TINY_TEMPLATE_' . $title_upper . '_DESC')) {
-                    $description = Text::_('PLG_TINY_TEMPLATE_' . $title_upper . '_DESC');
-                }
-
-                $templates[] = [
-                    'title'       => $title,
-                    'description' => $description,
-                    'url'         => Uri::root(true) . $template_path . '/' . $full_filename,
-                ];
-            }
-        }
+        $jtemplates = !empty($allButtons['jtemplate'])
+            ? Uri::base(true) . '/index.php?option=com_ajax&plugin=tinymce&group=editors&format=json&format=json&template=' . $levelParams->get('content_template_path') . '&' . $csrf . '=1'
+            : false;
 
         // Check for extra plugins, from the setoptions form
-        foreach (['wordcount' => 1, 'advlist' => 1, 'autosave' => 1, 'textpattern' => 0] as $pName => $def) {
+        foreach (['wordcount' => 1, 'advlist' => 1, 'autosave' => 1] as $pName => $def) {
             if ($levelParams->get($pName, $def)) {
                 $plugins[] = $pName;
             }
@@ -354,7 +318,21 @@ public function onDisplay(
 
         // Use CodeMirror in the code view instead of plain text to provide syntax highlighting
         if ($levelParams->get('sourcecode', 1)) {
-            $externalPlugins['highlightPlus'] = HTMLHelper::_('script', 'plg_editors_tinymce/plugins/highlighter/plugin-es5.min.js', ['relative' => true, 'version' => 'auto', 'pathOnly' => true]);
+            // Check whether the plugin registered
+            if (!$wa->assetExists('script', 'plg_editors_tinymce_highlighter')) {
+                $wa->getRegistry()->addExtensionRegistryFile('plg_editors_codemirror');
+                $wa->registerScript(
+                    'plg_editors_tinymce_highlighter',
+                    'plg_editors_tinymce/plugins/joomla-highlighter/plugin.min.js',
+                    [],
+                    ['type' => 'module'],
+                    ['core', 'tinymce', 'codemirror']
+                );
+            }
+
+            // Enable joomla-highlighter plugin
+            $wa->useScript('plg_editors_tinymce_highlighter');
+            $plugins[] = 'joomlaHighlighter';
         }
 
         $dragdrop = $levelParams->get('drag_drop', 1);
@@ -372,7 +350,7 @@ public function onDisplay(
             Text::script('PLG_TINY_DND_EMPTY_ALT');
 
             $scriptOptions['parentUploadFolder'] = $levelParams->get('path', '');
-            $scriptOptions['csrfToken']          = Session::getFormToken();
+            $scriptOptions['csrfToken']          = $csrf;
             $scriptOptions['uploadUri']          = $uploadUrl;
 
             // @TODO have a way to select the adapter, similar to $levelParams->get('path', '');
@@ -390,7 +368,9 @@ public function onDisplay(
                     $ctemp[] = ['title' => $content_language['content_language_name'], 'code' => $content_language['content_language_code']];
                 }
             }
-            $scriptOptions['content_langs'] = array_merge($ctemp);
+            if (isset($ctemp)) {
+                $scriptOptions['content_langs'] = array_merge($ctemp);
+            }
         }
 
         // User custom plugins and buttons
@@ -401,11 +381,6 @@ public function onDisplay(
             $plugins   = array_merge($plugins, explode(strpos($custom_plugin, ',') !== false ? ',' : ' ', $custom_plugin));
         }
 
-        // Version 6 unload removed plugins
-        $plugins = array_filter($plugins, function ($plugin) {
-            return !in_array($plugin, ['hr', 'paste', 'print']);
-        });
-
         if ($custom_button) {
             $toolbar1  = array_merge($toolbar1, explode(strpos($custom_button, ',') !== false ? ',' : ' ', $custom_button));
         }
@@ -413,6 +388,11 @@ public function onDisplay(
         // Merge the two toolbars for backwards compatibility
         $toolbar = array_merge($toolbar1, $toolbar2);
 
+        // Should load the templates plugin?
+        if (in_array('jtemplate', $toolbar)) {
+            $externalPlugins['jtemplate'] = HTMLHelper::_('script', 'plg_editors_tinymce/plugins/jtemplate/plugin.min.js', ['relative' => true, 'version' => 'auto', 'pathOnly' => true]);
+        }
+
         // Build the final options set
         $scriptOptions   = array_merge(
             $scriptOptions,
@@ -466,7 +446,7 @@ public function onDisplay(
                 'width'             => $this->params->get('html_width', ''),
                 'elementpath'       => (bool) $levelParams->get('element_path', true),
                 'resize'            => $resizing,
-                'templates'         => $templates,
+                'jtemplates'        => $jtemplates,
                 'external_plugins'  => empty($externalPlugins) ? null : $externalPlugins,
                 'contextmenu'       => (bool) $levelParams->get('contextmenu', true) ? null : false,
                 'toolbar_sticky'    => true,
@@ -476,6 +456,12 @@ public function onDisplay(
                 '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'],
+                ],
 
                 // Drag and drop specific
                 'dndEnabled' => $dragdrop,
@@ -483,20 +469,22 @@ public function onDisplay(
                 // Disable TinyMCE Branding
                 'branding'  => false,
                 'promotion' => false,
+
+                // 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',
             ]
         );
 
         if ($levelParams->get('newlines')) {
             // Break
             $scriptOptions['force_br_newlines'] = true;
-            $scriptOptions['forced_root_block'] = '';
         } else {
             // Paragraph
             $scriptOptions['force_br_newlines'] = false;
             $scriptOptions['forced_root_block'] = 'p';
         }
 
-        $scriptOptions['rel_list'] = [
+        $scriptOptions['link_rel_list'] = [
             ['title' => 'None', 'value' => ''],
             ['title' => 'Alternate', 'value' => 'alternate'],
             ['title' => 'Author', 'value' => 'author'],
diff --git a/plugins/editors/tinymce/src/PluginTraits/KnownButtons.php b/plugins/editors/tinymce/src/PluginTraits/KnownButtons.php
index 3599cd3468b08..3d090a919e14a 100644
--- a/plugins/editors/tinymce/src/PluginTraits/KnownButtons.php
+++ b/plugins/editors/tinymce/src/PluginTraits/KnownButtons.php
@@ -25,8 +25,8 @@ trait KnownButtons
 {
     /**
      * Return list of known TinyMCE buttons
-     * @see https://www.tiny.cloud/docs/demo/full-featured/
-     * @see https://www.tiny.cloud/apps/#core-plugins
+     * @link https://www.tiny.cloud/docs/demo/full-featured/
+     * @link https://www.tiny.cloud/apps/#core-plugins
      *
      * @return array
      *
@@ -74,15 +74,15 @@ public static function getKnownButtons()
 
             'cut'          => ['label' => 'Cut'],
             'copy'         => ['label' => 'Copy'],
-            'paste'        => ['label' => 'Paste', 'plugin' => 'paste'],
-            'pastetext'    => ['label' => 'Paste as text', 'plugin' => 'paste'],
+            'paste'        => ['label' => 'Paste'],
+            'pastetext'    => ['label' => 'Paste as text'],
             'removeformat' => ['label' => 'Clear formatting'],
 
             'language' => ['label' => 'Language'],
 
             // Buttons from the plugins
             'anchor'         => ['label' => 'Anchor', 'plugin' => 'anchor'],
-            'hr'             => ['label' => 'Horizontal line', 'plugin' => 'hr'],
+            'hr'             => ['label' => 'Horizontal line'],
             'ltr'            => ['label' => 'Left to right', 'plugin' => 'directionality'],
             'rtl'            => ['label' => 'Right to left', 'plugin' => 'directionality'],
             'code'           => ['label' => 'Source code', 'plugin' => 'code'],
@@ -96,10 +96,10 @@ public static function getKnownButtons()
             'media'          => ['label' => 'Insert/edit video', 'plugin' => 'media'],
             'image'          => ['label' => 'Insert/edit image', 'plugin' => 'image'],
             'pagebreak'      => ['label' => 'Page break', 'plugin' => 'pagebreak'],
-            'print'          => ['label' => 'Print', 'plugin' => 'print'],
+            'print'          => ['label' => 'Print'],
             'preview'        => ['label' => 'Preview', 'plugin' => 'preview'],
             'fullscreen'     => ['label' => 'Fullscreen', 'plugin' => 'fullscreen'],
-            'template'       => ['label' => 'Insert template', 'plugin' => 'template'],
+            'jtemplate'      => ['label' => 'Insert template', 'plugin' => 'jtemplate'],
             '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 1070d9a506dd2..678411eed1fab 100644
--- a/plugins/editors/tinymce/src/PluginTraits/ToolbarPresets.php
+++ b/plugins/editors/tinymce/src/PluginTraits/ToolbarPresets.php
@@ -46,7 +46,7 @@ public static function getToolbarPreset()
                 'toolbar1' => [
                     'bold', 'italic', 'underline', 'strikethrough', '|',
                     'alignleft', 'aligncenter', 'alignright', 'alignjustify', '|',
-                    'formatselect', '|',
+                    'blocks', '|',
                     'bullist', 'numlist', '|',
                     'outdent', 'indent', '|',
                     'undo', 'redo', '|',
@@ -63,8 +63,8 @@ public static function getToolbarPreset()
                     'bold', 'italic', 'underline', 'strikethrough', '|',
                     'alignleft', 'aligncenter', 'alignright', 'alignjustify', '|',
                     'lineheight', '|',
-                    'styleselect', '|',
-                    'formatselect', 'fontfamily', 'fontsizeselect', '|',
+                    'styles', '|',
+                    'blocks', 'fontfamily', 'fontsize', '|',
                     'searchreplace', '|',
                     'bullist', 'numlist', '|',
                     'outdent', 'indent', '|',
@@ -77,7 +77,7 @@ public static function getToolbarPreset()
                     'subscript', 'superscript', '|',
                     'charmap', 'emoticons', 'media', 'hr', 'ltr', 'rtl', '|',
                     'cut', 'copy', 'paste', 'pastetext', '|',
-                    'visualchars', 'visualblocks', 'nonbreaking', 'blockquote', 'template', '|',
+                    'visualchars', 'visualblocks', 'nonbreaking', 'blockquote', 'jtemplate', '|',
                     'print', 'preview', 'codesample', 'insertdatetime', 'removeformat', 'jxtdbuttons',
                     'language',
                 ],
diff --git a/plugins/editors/tinymce/src/PluginTraits/XTDButtons.php b/plugins/editors/tinymce/src/PluginTraits/XTDButtons.php
index 9443819b05fb9..a90cb014eeb02 100644
--- a/plugins/editors/tinymce/src/PluginTraits/XTDButtons.php
+++ b/plugins/editors/tinymce/src/PluginTraits/XTDButtons.php
@@ -50,6 +50,9 @@ private function tinyButtons($name, $excluded)
         $buttonsResult = $this->getDispatcher()->dispatch('getButtons', $buttonsEvent);
         $buttons       = $buttonsResult['result'];
 
+        /** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
+        $wa = $this->getApplication()->getDocument()->getWebAssetManager();
+
         if (is_array($buttons) || (is_bool($buttons) && $buttons)) {
             Text::script('PLG_TINY_CORE_BUTTONS');
 
@@ -57,23 +60,74 @@ private function tinyButtons($name, $excluded)
             $btnsNames = [];
 
             // Build the script
-            foreach ($buttons as $i => $button) {
-                $button->id = $name . '_' . $button->name . '_modal';
+            foreach ($buttons as $button) {
+                $title   = $button->get('title') ?: $button->get('text', '');
+                $icon    = $button->get('icon');
+                $link    = $button->get('link');
+                $action  = $button->get('action', '');
+                $options = (array) $button->get('options');
+
+                $btnAsset = 'editor-button.' . $button->getButtonName();
+
+                // Enable the button assets if any
+                if ($wa->assetExists('style', $btnAsset)) {
+                    $wa->useStyle($btnAsset);
+                }
+                if ($wa->assetExists('script', $btnAsset)) {
+                    $wa->useScript($btnAsset);
+                }
+
+                // Correct the link
+                if ($link && $link[0] !== '#') {
+                    $link           = str_contains($link, '&amp;') ? htmlspecialchars_decode($link) : $link;
+                    $link           = Uri::base(true) . '/' . $link;
+                    $options['src'] = $options['src'] ?? $link;
+                }
+
+                // Set action to "modal" for legacy buttons, when possible
+                $legacyModal = $button->get('modal') && !empty($options['confirmCallback']);
 
-                echo LayoutHelper::render('joomla.editors.buttons.modal', $button);
+                if (!$action && $button->get('modal') && !$legacyModal) {
+                    $action = 'modal';
 
-                if ($button->get('name')) {
-                    $coreButton            = [];
-                    $coreButton['name']    = $button->get('text');
-                    $coreButton['href']    = $button->get('link') !== '#' ? Uri::base() . $button->get('link') : null;
+                    // Backward compatibility check, for older options
+                    if (!empty($options['modalWidth'])) {
+                        $options['width'] = $options['modalWidth'] . 'vw';
+                    }
+                    if (!empty($options['bodyHeight'])) {
+                        $options['height'] = $options['bodyHeight'] . 'vh';
+                    }
+                }
+
+                // Prepare default values for modal
+                if ($action === 'modal') {
+                    $this->getApplication()->getDocument()
+                        ->getWebAssetManager()->useScript('joomla.dialog');
+
+                    $options['popupType']  = $options['popupType'] ?? 'iframe';
+                    $options['textHeader'] = $options['textHeader'] ?? $title;
+                    $options['iconHeader'] = $options['iconHeader'] ?? 'icon-' . $icon;
+                }
+
+                $coreButton            = [];
+                $coreButton['name']    = $title;
+                $coreButton['icon']    = $icon;
+                $coreButton['click']   = $button->get('onclick');
+                $coreButton['iconSVG'] = $button->get('iconSVG');
+                $coreButton['action']  = $action;
+                $coreButton['options'] = $options;
+
+                if ($legacyModal) {
+                    $coreButton['bsModal'] = true;
                     $coreButton['id']      = $name . '_' . $button->name;
-                    $coreButton['icon']    = $button->get('icon');
-                    $coreButton['click']   = $button->get('onclick') ?: null;
-                    $coreButton['iconSVG'] = $button->get('iconSVG');
 
-                    // The array with the toolbar buttons
-                    $btnsNames[] = $coreButton;
+                    $button->id = $name . '_' . $button->name . '_modal';
+
+                    echo LayoutHelper::render('joomla.editors.buttons.modal', $button);
                 }
+
+                // The array with the toolbar buttons
+                $btnsNames[] = $coreButton;
             }
 
             sort($btnsNames);
diff --git a/plugins/editors/tinymce/tinymce.xml b/plugins/editors/tinymce/tinymce.xml
index 46915704f1208..c0abf56957593 100644
--- a/plugins/editors/tinymce/tinymce.xml
+++ b/plugins/editors/tinymce/tinymce.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="editors" method="upgrade">
 	<name>plg_editors_tinymce</name>
-	<version>6.4.0</version>
+	<version>6.7.0</version>
 	<creationDate>2005-08</creationDate>
 	<author>Tiny Technologies, Inc</author>
 	<authorEmail>N/A</authorEmail>
 	<authorUrl>https://www.tiny.cloud</authorUrl>
 	<copyright>Tiny Technologies, Inc</copyright>
-	<license>LGPL</license>
+	<license>MIT</license>
 	<description>PLG_TINY_XML_DESCRIPTION</description>
 	<namespace path="src">Joomla\Plugin\Editors\TinyMCE</namespace>
 	<files>
diff --git a/plugins/extension/finder/services/provider.php b/plugins/extension/finder/services/provider.php
index 33ee8f6bda4d5..698d4dd69e818 100644
--- a/plugins/extension/finder/services/provider.php
+++ b/plugins/extension/finder/services/provider.php
@@ -33,9 +33,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Finder(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('extension', 'finder')
                 );
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
diff --git a/plugins/extension/finder/src/Extension/Finder.php b/plugins/extension/finder/src/Extension/Finder.php
index 992cc713d7882..439be002322ba 100644
--- a/plugins/extension/finder/src/Extension/Finder.php
+++ b/plugins/extension/finder/src/Extension/Finder.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Plugin\Extension\Finder\Extension;
 
-use Exception;
 use Joomla\CMS\Installer\Installer;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\Component\Finder\Administrator\Indexer\Helper;
@@ -47,7 +46,19 @@ public function onExtensionAfterInstall($installer, $eid)
             return;
         }
 
-        $extension = $this->getLanguage($eid);
+        $db    = $this->getDatabase();
+        $query = $db->getQuery(true)
+            ->select($db->quoteName(['element', 'client_id']))
+            ->from($db->quoteName('#__extensions'))
+            ->where(
+                [
+                    $db->quoteName('extension_id') . ' = :eid',
+                    $db->quoteName('type') . ' = ' . $db->quote('language'),
+                ]
+            )
+            ->bind(':eid', $eid, ParameterType::INTEGER);
+
+        $extension = $db->setQuery($query)->loadObject();
 
         if ($extension) {
             $this->addCommonWords($extension);
@@ -88,37 +99,6 @@ public function onExtensionAfterUninstall($installer, $eid, $removed)
         }
     }
 
-    /**
-     * Get an object of information if the handled extension is a language
-     *
-     * @param   integer  $eid  Extension id
-     *
-     * @return  object
-     *
-     * @since   4.0.0
-     */
-    protected function getLanguage($eid)
-    {
-        $db  = $this->getDatabase();
-        $eid = (int) $eid;
-
-        $query = $db->getQuery(true)
-            ->select($db->quoteName(['element', 'client_id']))
-            ->from($db->quoteName('#__extensions'))
-            ->where(
-                [
-                    $db->quoteName('extension_id') . ' = :eid',
-                    $db->quoteName('type') . ' = ' . $db->quote('language'),
-                ]
-            )
-            ->bind(':eid', $eid, ParameterType::INTEGER);
-
-        $db->setQuery($query);
-        $extension = $db->loadObject();
-
-        return $extension;
-    }
-
     /**
      * Add common words from a txt file to com_finder
      *
@@ -174,7 +154,7 @@ function ($word) {
         try {
             $db->setQuery($query);
             $db->execute();
-        } catch (Exception $ex) {
+        } catch (\Exception $ex) {
             // It would be nice if the common word is stored to the DB, but it isn't super important
         }
     }
diff --git a/plugins/extension/joomla/services/provider.php b/plugins/extension/joomla/services/provider.php
index b6c74e772d785..99be9c30c73b7 100644
--- a/plugins/extension/joomla/services/provider.php
+++ b/plugins/extension/joomla/services/provider.php
@@ -33,9 +33,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Joomla(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('extension', 'joomla')
                 );
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
diff --git a/plugins/extension/joomla/src/Extension/Joomla.php b/plugins/extension/joomla/src/Extension/Joomla.php
index 814b1f408a1d8..7595150646f4c 100644
--- a/plugins/extension/joomla/src/Extension/Joomla.php
+++ b/plugins/extension/joomla/src/Extension/Joomla.php
@@ -21,7 +21,7 @@
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Joomla! master extension plugin.
+ * Joomla! main extension plugin.
  *
  * @since  1.6
  */
diff --git a/plugins/extension/namespacemap/services/provider.php b/plugins/extension/namespacemap/services/provider.php
index 9c3291d8961ee..54f7700a2d25b 100644
--- a/plugins/extension/namespacemap/services/provider.php
+++ b/plugins/extension/namespacemap/services/provider.php
@@ -32,9 +32,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new NamespaceMap(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     new JNamespacePsr4Map(),
                     (array) PluginHelper::getPlugin('extension', 'namespacemap')
                 );
diff --git a/plugins/extension/namespacemap/src/Extension/NamespaceMap.php b/plugins/extension/namespacemap/src/Extension/NamespaceMap.php
index 776b1bc3db926..4dc2fb80c864f 100644
--- a/plugins/extension/namespacemap/src/Extension/NamespaceMap.php
+++ b/plugins/extension/namespacemap/src/Extension/NamespaceMap.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Plugin\Extension\NamespaceMap\Extension;
 
-use JNamespacePsr4Map;
 use Joomla\CMS\Installer\Installer;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\Event\DispatcherInterface;
@@ -29,7 +28,7 @@ final class NamespaceMap extends CMSPlugin
     /**
      * The namespace map file creator
      *
-     * @var JNamespacePsr4Map
+     * @var \JNamespacePsr4Map
      */
     private $fileCreator = null;
 
@@ -37,18 +36,18 @@ final class NamespaceMap extends CMSPlugin
      * Constructor
      *
      * @param   DispatcherInterface  $subject  The object to observe
-     * @param   JNamespacePsr4Map    $map      The namespace map creator
+     * @param   \JNamespacePsr4Map   $map      The namespace map creator
      * @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   4.0.0
      */
-    public function __construct(DispatcherInterface $subject, JNamespacePsr4Map $map, $config = [])
+    public function __construct(DispatcherInterface $dispatcher, \JNamespacePsr4Map $map, array $config = [])
     {
         $this->fileCreator = $map;
 
-        parent::__construct($subject, $config);
+        parent::__construct($dispatcher, $config);
     }
 
     /**
diff --git a/plugins/fields/calendar/services/provider.php b/plugins/fields/calendar/services/provider.php
index 84bfc450a2de8..e6bf51460b3a1 100644
--- a/plugins/fields/calendar/services/provider.php
+++ b/plugins/fields/calendar/services/provider.php
@@ -33,9 +33,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Calendar(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('fields', 'calendar')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/fields/calendar/src/Extension/Calendar.php b/plugins/fields/calendar/src/Extension/Calendar.php
index 4ba207a93db94..bba963b3b03b5 100644
--- a/plugins/fields/calendar/src/Extension/Calendar.php
+++ b/plugins/fields/calendar/src/Extension/Calendar.php
@@ -10,9 +10,9 @@
 
 namespace Joomla\Plugin\Fields\Calendar\Extension;
 
-use DOMElement;
 use Joomla\CMS\Form\Form;
 use Joomla\Component\Fields\Administrator\Plugin\FieldsPlugin;
+use Joomla\Event\SubscriberInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -23,20 +23,20 @@
  *
  * @since  3.7.0
  */
-final class Calendar extends FieldsPlugin
+final class Calendar extends FieldsPlugin implements SubscriberInterface
 {
     /**
      * Transforms the field into a DOM XML element and appends it as a child on the given parent.
      *
      * @param   stdClass    $field   The field.
-     * @param   DOMElement  $parent  The field node parent.
+     * @param   \DOMElement  $parent  The field node parent.
      * @param   Form        $form    The form.
      *
-     * @return  DOMElement
+     * @return  \DOMElement
      *
      * @since   3.7.0
      */
-    public function onCustomFieldsPrepareDom($field, DOMElement $parent, Form $form)
+    public function onCustomFieldsPrepareDom($field, \DOMElement $parent, Form $form)
     {
         $fieldNode = parent::onCustomFieldsPrepareDom($field, $parent, $form);
 
diff --git a/plugins/fields/checkboxes/services/provider.php b/plugins/fields/checkboxes/services/provider.php
index 2b42bfa55f332..ded86277b6a77 100644
--- a/plugins/fields/checkboxes/services/provider.php
+++ b/plugins/fields/checkboxes/services/provider.php
@@ -33,9 +33,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Checkboxes(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('fields', 'checkboxes')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/fields/color/services/provider.php b/plugins/fields/color/services/provider.php
index ddb42640c0dbf..aab8a0ef6032a 100644
--- a/plugins/fields/color/services/provider.php
+++ b/plugins/fields/color/services/provider.php
@@ -33,9 +33,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Color(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('fields', 'color')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/fields/color/src/Extension/Color.php b/plugins/fields/color/src/Extension/Color.php
index 4c57cbbd1fb4b..04312306a09b3 100644
--- a/plugins/fields/color/src/Extension/Color.php
+++ b/plugins/fields/color/src/Extension/Color.php
@@ -10,9 +10,9 @@
 
 namespace Joomla\Plugin\Fields\Color\Extension;
 
-use DOMElement;
 use Joomla\CMS\Form\Form;
 use Joomla\Component\Fields\Administrator\Plugin\FieldsPlugin;
+use Joomla\Event\SubscriberInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -23,20 +23,20 @@
  *
  * @since  3.7.0
  */
-final class Color extends FieldsPlugin
+final class Color extends FieldsPlugin implements SubscriberInterface
 {
     /**
      * Transforms the field into a DOM XML element and appends it as a child on the given parent.
      *
      * @param   stdClass    $field   The field.
-     * @param   DOMElement  $parent  The field node parent.
+     * @param   \DOMElement  $parent  The field node parent.
      * @param   Form        $form    The form.
      *
-     * @return  DOMElement
+     * @return  \DOMElement
      *
      * @since   3.7.0
      */
-    public function onCustomFieldsPrepareDom($field, DOMElement $parent, Form $form)
+    public function onCustomFieldsPrepareDom($field, \DOMElement $parent, Form $form)
     {
         $fieldNode = parent::onCustomFieldsPrepareDom($field, $parent, $form);
 
diff --git a/plugins/fields/editor/editor.xml b/plugins/fields/editor/editor.xml
index 79ff69e44e070..9436b8a933d61 100644
--- a/plugins/fields/editor/editor.xml
+++ b/plugins/fields/editor/editor.xml
@@ -63,13 +63,13 @@
 					type="list"
 					label="PLG_FIELDS_EDITOR_PARAMS_FILTER_LABEL"
 					class="list"
-					default="JComponentHelper::filterText"
+					default="\Joomla\CMS\Component\ComponentHelper::filterText"
 					validate="options"
 					>
 					<option value="0">JNO</option>
 					<option value="raw">JLIB_FILTER_PARAMS_RAW</option>
 					<option value="safehtml">JLIB_FILTER_PARAMS_SAFEHTML</option>
-					<option value="JComponentHelper::filterText">JLIB_FILTER_PARAMS_TEXT</option>
+					<option value="\Joomla\CMS\Component\ComponentHelper::filterText">JLIB_FILTER_PARAMS_TEXT</option>
 				</field>
 			</fieldset>
 		</fields>
diff --git a/plugins/fields/editor/params/editor.xml b/plugins/fields/editor/params/editor.xml
index 4769d7ac0f886..da80ad7d94502 100644
--- a/plugins/fields/editor/params/editor.xml
+++ b/plugins/fields/editor/params/editor.xml
@@ -46,7 +46,7 @@
 				<option value="0">JNO</option>
 				<option value="raw">JLIB_FILTER_PARAMS_RAW</option>
 				<option value="safehtml">JLIB_FILTER_PARAMS_SAFEHTML</option>
-				<option value="JComponentHelper::filterText">JLIB_FILTER_PARAMS_TEXT</option>
+				<option value="\Joomla\CMS\Component\ComponentHelper::filterText">JLIB_FILTER_PARAMS_TEXT</option>
 			</field>
 		</fieldset>
 	</fields>
diff --git a/plugins/fields/editor/services/provider.php b/plugins/fields/editor/services/provider.php
index b9afc6ff855d6..b952d589371bf 100644
--- a/plugins/fields/editor/services/provider.php
+++ b/plugins/fields/editor/services/provider.php
@@ -33,9 +33,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Editor(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('fields', 'editor')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/fields/editor/src/Extension/Editor.php b/plugins/fields/editor/src/Extension/Editor.php
index f8bd24b2422e9..f6947a2cd613a 100644
--- a/plugins/fields/editor/src/Extension/Editor.php
+++ b/plugins/fields/editor/src/Extension/Editor.php
@@ -10,9 +10,9 @@
 
 namespace Joomla\Plugin\Fields\Editor\Extension;
 
-use DOMElement;
 use Joomla\CMS\Form\Form;
 use Joomla\Component\Fields\Administrator\Plugin\FieldsPlugin;
+use Joomla\Event\SubscriberInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -23,20 +23,20 @@
  *
  * @since  3.7.0
  */
-final class Editor extends FieldsPlugin
+final class Editor extends FieldsPlugin implements SubscriberInterface
 {
     /**
      * Transforms the field into a DOM XML element and appends it as a child on the given parent.
      *
      * @param   stdClass    $field   The field.
-     * @param   DOMElement  $parent  The field node parent.
+     * @param   \DOMElement  $parent  The field node parent.
      * @param   Form        $form    The form.
      *
-     * @return  DOMElement
+     * @return  \DOMElement
      *
      * @since   3.7.0
      */
-    public function onCustomFieldsPrepareDom($field, DOMElement $parent, Form $form)
+    public function onCustomFieldsPrepareDom($field, \DOMElement $parent, Form $form)
     {
         $fieldNode = parent::onCustomFieldsPrepareDom($field, $parent, $form);
 
diff --git a/plugins/fields/imagelist/services/provider.php b/plugins/fields/imagelist/services/provider.php
index 22f2aedef4854..64cb3c2c91b69 100644
--- a/plugins/fields/imagelist/services/provider.php
+++ b/plugins/fields/imagelist/services/provider.php
@@ -33,9 +33,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Imagelist(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('fields', 'imagelist')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/fields/imagelist/src/Extension/Imagelist.php b/plugins/fields/imagelist/src/Extension/Imagelist.php
index 260430835b259..492b74786c563 100644
--- a/plugins/fields/imagelist/src/Extension/Imagelist.php
+++ b/plugins/fields/imagelist/src/Extension/Imagelist.php
@@ -10,9 +10,9 @@
 
 namespace Joomla\Plugin\Fields\Imagelist\Extension;
 
-use DOMElement;
 use Joomla\CMS\Form\Form;
 use Joomla\Component\Fields\Administrator\Plugin\FieldsPlugin;
+use Joomla\Event\SubscriberInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -23,20 +23,20 @@
  *
  * @since  3.7.0
  */
-final class Imagelist extends FieldsPlugin
+final class Imagelist extends FieldsPlugin implements SubscriberInterface
 {
     /**
      * Transforms the field into a DOM XML element and appends it as a child on the given parent.
      *
      * @param   stdClass    $field   The field.
-     * @param   DOMElement  $parent  The field node parent.
+     * @param   \DOMElement  $parent  The field node parent.
      * @param   Form        $form    The form.
      *
-     * @return  DOMElement
+     * @return  \DOMElement
      *
      * @since   3.7.0
      */
-    public function onCustomFieldsPrepareDom($field, DOMElement $parent, Form $form)
+    public function onCustomFieldsPrepareDom($field, \DOMElement $parent, Form $form)
     {
         $fieldNode = parent::onCustomFieldsPrepareDom($field, $parent, $form);
 
diff --git a/plugins/fields/integer/services/provider.php b/plugins/fields/integer/services/provider.php
index 6ffe98a29364f..ac06582bf405f 100644
--- a/plugins/fields/integer/services/provider.php
+++ b/plugins/fields/integer/services/provider.php
@@ -33,9 +33,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Integer(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('fields', 'integer')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/fields/integer/src/Extension/Integer.php b/plugins/fields/integer/src/Extension/Integer.php
index b603e2c609a33..f096cd7ebf96a 100644
--- a/plugins/fields/integer/src/Extension/Integer.php
+++ b/plugins/fields/integer/src/Extension/Integer.php
@@ -11,6 +11,7 @@
 namespace Joomla\Plugin\Fields\Integer\Extension;
 
 use Joomla\Component\Fields\Administrator\Plugin\FieldsPlugin;
+use Joomla\Event\SubscriberInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -21,6 +22,6 @@
  *
  * @since  3.7.0
  */
-final class Integer extends FieldsPlugin
+final class Integer extends FieldsPlugin implements SubscriberInterface
 {
 }
diff --git a/plugins/fields/list/services/provider.php b/plugins/fields/list/services/provider.php
index ef97d2830767f..f3fede65436ca 100644
--- a/plugins/fields/list/services/provider.php
+++ b/plugins/fields/list/services/provider.php
@@ -33,9 +33,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new ListPlugin(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('fields', 'list')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/fields/media/services/provider.php b/plugins/fields/media/services/provider.php
index 929cfd86b4478..09a875e3a1fa2 100644
--- a/plugins/fields/media/services/provider.php
+++ b/plugins/fields/media/services/provider.php
@@ -33,9 +33,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Media(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('fields', 'media')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/fields/media/src/Extension/Media.php b/plugins/fields/media/src/Extension/Media.php
index ae8c898ecac45..a8f77122ba099 100644
--- a/plugins/fields/media/src/Extension/Media.php
+++ b/plugins/fields/media/src/Extension/Media.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Plugin\Fields\Media\Extension;
 
-use DOMElement;
 use Joomla\CMS\Form\Form;
 use Joomla\Component\Fields\Administrator\Plugin\FieldsPlugin;
 
@@ -29,14 +28,14 @@ final class Media extends FieldsPlugin
      * Transforms the field into a DOM XML element and appends it as a child on the given parent.
      *
      * @param   stdClass    $field   The field.
-     * @param   DOMElement  $parent  The field node parent.
+     * @param   \DOMElement  $parent  The field node parent.
      * @param   Form        $form    The form.
      *
-     * @return  DOMElement
+     * @return  \DOMElement
      *
      * @since   4.0.0
      */
-    public function onCustomFieldsPrepareDom($field, DOMElement $parent, Form $form)
+    public function onCustomFieldsPrepareDom($field, \DOMElement $parent, Form $form)
     {
         $fieldNode = parent::onCustomFieldsPrepareDom($field, $parent, $form);
 
diff --git a/plugins/fields/radio/services/provider.php b/plugins/fields/radio/services/provider.php
index ee93bb03c69a6..b55fd77d9f503 100644
--- a/plugins/fields/radio/services/provider.php
+++ b/plugins/fields/radio/services/provider.php
@@ -33,9 +33,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Radio(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('fields', 'radio')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/fields/sql/params/sql.xml b/plugins/fields/sql/params/sql.xml
index ba227f33ec139..20b80f2ecfdfa 100644
--- a/plugins/fields/sql/params/sql.xml
+++ b/plugins/fields/sql/params/sql.xml
@@ -11,7 +11,13 @@
 				rows="10"
 				required="true"
 			/>
-
+			<field
+				name="header"
+				type="text"
+				label="PLG_FIELDS_SQL_PARAMS_HEADER_LABEL"
+				description="PLG_FIELDS_SQL_PARAMS_HEADER_DESC"
+				filter="string"
+			/>
 			<field
 				name="multiple"
 				type="list"
diff --git a/plugins/fields/sql/services/provider.php b/plugins/fields/sql/services/provider.php
index 1ccabf7f65f0c..19034e643dbfe 100644
--- a/plugins/fields/sql/services/provider.php
+++ b/plugins/fields/sql/services/provider.php
@@ -33,9 +33,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new SQL(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('fields', 'sql')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/fields/sql/sql.xml b/plugins/fields/sql/sql.xml
index 05c1a63c11021..c02ebc4aa9b1e 100644
--- a/plugins/fields/sql/sql.xml
+++ b/plugins/fields/sql/sql.xml
@@ -33,6 +33,14 @@
 					required="true"
 				/>
 
+				<field
+					name="header"
+					type="text"
+					label="PLG_FIELDS_SQL_PARAMS_HEADER_LABEL"
+					description="PLG_FIELDS_SQL_PARAMS_HEADER_DESC"
+					filter="string"
+				/>
+
 				<field
 					name="multiple"
 					type="radio"
diff --git a/plugins/fields/sql/src/Extension/SQL.php b/plugins/fields/sql/src/Extension/SQL.php
index ab14218eb8c63..f33faaa550799 100644
--- a/plugins/fields/sql/src/Extension/SQL.php
+++ b/plugins/fields/sql/src/Extension/SQL.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Plugin\Fields\SQL\Extension;
 
-use DOMElement;
 use Joomla\CMS\Access\Access;
 use Joomla\CMS\Form\Form;
 use Joomla\Component\Fields\Administrator\Plugin\FieldsListPlugin;
@@ -30,14 +29,14 @@ final class SQL extends FieldsListPlugin
      * Transforms the field into a DOM XML element and appends it as a child on the given parent.
      *
      * @param   stdClass    $field   The field.
-     * @param   DOMElement  $parent  The field node parent.
+     * @param   \DOMElement  $parent  The field node parent.
      * @param   Form        $form    The form.
      *
-     * @return  DOMElement
+     * @return  \DOMElement
      *
      * @since   3.7.0
      */
-    public function onCustomFieldsPrepareDom($field, DOMElement $parent, Form $form)
+    public function onCustomFieldsPrepareDom($field, \DOMElement $parent, Form $form)
     {
         $fieldNode = parent::onCustomFieldsPrepareDom($field, $parent, $form);
 
diff --git a/plugins/fields/subform/services/provider.php b/plugins/fields/subform/services/provider.php
index 3f2a76f13b5ea..4925891c7173a 100644
--- a/plugins/fields/subform/services/provider.php
+++ b/plugins/fields/subform/services/provider.php
@@ -33,9 +33,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Subform(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('fields', 'subform')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/fields/subform/src/Extension/Subform.php b/plugins/fields/subform/src/Extension/Subform.php
index 6cbf4f39ac798..b90ccdf603b32 100644
--- a/plugins/fields/subform/src/Extension/Subform.php
+++ b/plugins/fields/subform/src/Extension/Subform.php
@@ -70,11 +70,11 @@ public function onContentPrepareForm(Form $form, $data)
         $formData = (object) $data;
 
         // Now load our own form definition into a DOMDocument, because we want to manipulate it
-        $xml = new DOMDocument();
+        $xml = new \DOMDocument();
         $xml->load($path);
 
         // Prepare a DOMXPath object
-        $xmlxpath = new DOMXPath($xml);
+        $xmlxpath = new \DOMXPath($xml);
 
         /**
          * Get all fields of type "subfields" in our own XML
@@ -242,14 +242,14 @@ public function onCustomFieldsPrepareField($context, $item, $field)
      * the form XML definition for this field.
      *
      * @param   \stdClass   $field   The field
-     * @param   DOMElement  $parent  The original parent element
+     * @param   \DOMElement  $parent  The original parent element
      * @param   Form        $form    The form
      *
      * @return  \DOMElement
      *
      * @since 4.0.0
      */
-    public function onCustomFieldsPrepareDom($field, DOMElement $parent, Form $form)
+    public function onCustomFieldsPrepareDom($field, \DOMElement $parent, Form $form)
     {
         // Call the onCustomFieldsPrepareDom method on FieldsPlugin
         $parent_field = parent::onCustomFieldsPrepareDom($field, $parent, $form);
@@ -277,7 +277,7 @@ public function onCustomFieldsPrepareDom($field, DOMElement $parent, Form $form)
         }
 
         // Create a child 'form' DOMElement under the field[type=subform] element.
-        $parent_fieldset = $parent_field->appendChild(new DOMElement('form'));
+        $parent_fieldset = $parent_field->appendChild(new \DOMElement('form'));
         $parent_fieldset->setAttribute('hidden', 'true');
         $parent_fieldset->setAttribute('name', ($field->name . '_modal'));
 
diff --git a/plugins/fields/text/params/text.xml b/plugins/fields/text/params/text.xml
index c854fc4361124..a28ae590879a1 100644
--- a/plugins/fields/text/params/text.xml
+++ b/plugins/fields/text/params/text.xml
@@ -13,7 +13,7 @@
 				<option value="0">JNO</option>
 				<option value="raw">JLIB_FILTER_PARAMS_RAW</option>
 				<option value="safehtml">JLIB_FILTER_PARAMS_SAFEHTML</option>
-				<option value="JComponentHelper::filterText">JLIB_FILTER_PARAMS_TEXT</option>
+				<option value="\Joomla\CMS\Component\ComponentHelper::filterText">JLIB_FILTER_PARAMS_TEXT</option>
 				<option value="alnum">JLIB_FILTER_PARAMS_ALNUM</option>
 				<option value="integer">JLIB_FILTER_PARAMS_INTEGER</option>
 				<option value="float">JLIB_FILTER_PARAMS_FLOAT</option>
diff --git a/plugins/fields/text/services/provider.php b/plugins/fields/text/services/provider.php
index 9a627c0f6c8b6..0d22333f059b0 100644
--- a/plugins/fields/text/services/provider.php
+++ b/plugins/fields/text/services/provider.php
@@ -33,9 +33,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Text(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('fields', 'text')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/fields/text/src/Extension/Text.php b/plugins/fields/text/src/Extension/Text.php
index 5171cb074a9b9..71c8c5d0844f0 100644
--- a/plugins/fields/text/src/Extension/Text.php
+++ b/plugins/fields/text/src/Extension/Text.php
@@ -11,6 +11,7 @@
 namespace Joomla\Plugin\Fields\Text\Extension;
 
 use Joomla\Component\Fields\Administrator\Plugin\FieldsPlugin;
+use Joomla\Event\SubscriberInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -21,6 +22,6 @@
  *
  * @since  3.7.0
  */
-final class Text extends FieldsPlugin
+final class Text extends FieldsPlugin implements SubscriberInterface
 {
 }
diff --git a/plugins/fields/text/text.xml b/plugins/fields/text/text.xml
index e33881eeb5c8e..2a02076cabb0e 100644
--- a/plugins/fields/text/text.xml
+++ b/plugins/fields/text/text.xml
@@ -28,13 +28,13 @@
 					type="list"
 					label="PLG_FIELDS_TEXT_PARAMS_FILTER_LABEL"
 					class="list"
-					default="JComponentHelper::filterText"
+					default="\Joomla\CMS\Component\ComponentHelper::filterText"
 					validate="options"
 					>
 					<option value="0">JNO</option>
 					<option value="raw">JLIB_FILTER_PARAMS_RAW</option>
 					<option value="safehtml">JLIB_FILTER_PARAMS_SAFEHTML</option>
-					<option value="JComponentHelper::filterText">JLIB_FILTER_PARAMS_TEXT</option>
+					<option value="\Joomla\CMS\Component\ComponentHelper::filterText">JLIB_FILTER_PARAMS_TEXT</option>
 					<option value="alnum">JLIB_FILTER_PARAMS_ALNUM</option>
 					<option value="integer">JLIB_FILTER_PARAMS_INTEGER</option>
 					<option value="float">JLIB_FILTER_PARAMS_FLOAT</option>
diff --git a/plugins/fields/textarea/params/textarea.xml b/plugins/fields/textarea/params/textarea.xml
index 6a7a30fabc68a..b28cced52ba46 100644
--- a/plugins/fields/textarea/params/textarea.xml
+++ b/plugins/fields/textarea/params/textarea.xml
@@ -34,7 +34,7 @@
 				<option value="0">JNO</option>
 				<option value="raw">JLIB_FILTER_PARAMS_RAW</option>
 				<option value="safehtml">JLIB_FILTER_PARAMS_SAFEHTML</option>
-				<option value="JComponentHelper::filterText">JLIB_FILTER_PARAMS_TEXT</option>
+				<option value="\Joomla\CMS\Component\ComponentHelper::filterText">JLIB_FILTER_PARAMS_TEXT</option>
 				<option value="alnum">JLIB_FILTER_PARAMS_ALNUM</option>
 				<option value="integer">JLIB_FILTER_PARAMS_INTEGER</option>
 				<option value="float">JLIB_FILTER_PARAMS_FLOAT</option>
diff --git a/plugins/fields/textarea/services/provider.php b/plugins/fields/textarea/services/provider.php
index cf7411812981a..3cce1729b3cad 100644
--- a/plugins/fields/textarea/services/provider.php
+++ b/plugins/fields/textarea/services/provider.php
@@ -33,9 +33,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Textarea(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('fields', 'textarea')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/fields/textarea/src/Extension/Textarea.php b/plugins/fields/textarea/src/Extension/Textarea.php
index 60ea071c42462..5dd16db0238da 100644
--- a/plugins/fields/textarea/src/Extension/Textarea.php
+++ b/plugins/fields/textarea/src/Extension/Textarea.php
@@ -11,6 +11,7 @@
 namespace Joomla\Plugin\Fields\Textarea\Extension;
 
 use Joomla\Component\Fields\Administrator\Plugin\FieldsPlugin;
+use Joomla\Event\SubscriberInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -21,6 +22,6 @@
  *
  * @since  3.7.0
  */
-final class Textarea extends FieldsPlugin
+final class Textarea extends FieldsPlugin implements SubscriberInterface
 {
 }
diff --git a/plugins/fields/textarea/textarea.xml b/plugins/fields/textarea/textarea.xml
index c7c7b1014cc28..ce42d0a1f3655 100644
--- a/plugins/fields/textarea/textarea.xml
+++ b/plugins/fields/textarea/textarea.xml
@@ -51,13 +51,13 @@
 					type="list"
 					label="PLG_FIELDS_TEXTAREA_PARAMS_FILTER_LABEL"
 					class="list"
-					default="JComponentHelper::filterText"
+					default="\Joomla\CMS\Component\ComponentHelper::filterText"
 					validate="options"
 					>
 					<option value="0">JNO</option>
 					<option value="raw">JLIB_FILTER_PARAMS_RAW</option>
 					<option value="safehtml">JLIB_FILTER_PARAMS_SAFEHTML</option>
-					<option value="JComponentHelper::filterText">JLIB_FILTER_PARAMS_TEXT</option>
+					<option value="\Joomla\CMS\Component\ComponentHelper::filterText">JLIB_FILTER_PARAMS_TEXT</option>
 					<option value="alnum">JLIB_FILTER_PARAMS_ALNUM</option>
 					<option value="integer">JLIB_FILTER_PARAMS_INTEGER</option>
 					<option value="float">JLIB_FILTER_PARAMS_FLOAT</option>
diff --git a/plugins/fields/url/services/provider.php b/plugins/fields/url/services/provider.php
index d75df111ea006..06fa255ee3ef0 100644
--- a/plugins/fields/url/services/provider.php
+++ b/plugins/fields/url/services/provider.php
@@ -33,9 +33,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Url(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('fields', 'url')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/fields/url/src/Extension/Url.php b/plugins/fields/url/src/Extension/Url.php
index 596bf640648b1..62eca9c3a53ce 100644
--- a/plugins/fields/url/src/Extension/Url.php
+++ b/plugins/fields/url/src/Extension/Url.php
@@ -10,9 +10,9 @@
 
 namespace Joomla\Plugin\Fields\Url\Extension;
 
-use DOMElement;
 use Joomla\CMS\Form\Form;
 use Joomla\Component\Fields\Administrator\Plugin\FieldsPlugin;
+use Joomla\Event\SubscriberInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -23,20 +23,20 @@
  *
  * @since  3.7.0
  */
-final class Url extends FieldsPlugin
+final class Url extends FieldsPlugin implements SubscriberInterface
 {
     /**
      * Transforms the field into a DOM XML element and appends it as a child on the given parent.
      *
      * @param   stdClass    $field   The field.
-     * @param   DOMElement  $parent  The field node parent.
+     * @param   \DOMElement  $parent  The field node parent.
      * @param   Form        $form    The form.
      *
-     * @return  DOMElement
+     * @return  \DOMElement
      *
      * @since   3.7.0
      */
-    public function onCustomFieldsPrepareDom($field, DOMElement $parent, Form $form)
+    public function onCustomFieldsPrepareDom($field, \DOMElement $parent, Form $form)
     {
         $fieldNode = parent::onCustomFieldsPrepareDom($field, $parent, $form);
 
diff --git a/plugins/fields/user/services/provider.php b/plugins/fields/user/services/provider.php
index a5fe1d768f55d..777166cac471e 100644
--- a/plugins/fields/user/services/provider.php
+++ b/plugins/fields/user/services/provider.php
@@ -13,6 +13,7 @@
 use Joomla\CMS\Extension\PluginInterface;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\User\UserFactoryInterface;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
 use Joomla\Event\DispatcherInterface;
@@ -33,12 +34,12 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new User(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('fields', 'user')
                 );
                 $plugin->setApplication(Factory::getApplication());
+                $plugin->setUserFactory($container->get(UserFactoryInterface::class));
 
                 return $plugin;
             }
diff --git a/plugins/fields/user/src/Extension/User.php b/plugins/fields/user/src/Extension/User.php
index d1884c8bb3c31..01e68e728e4e2 100644
--- a/plugins/fields/user/src/Extension/User.php
+++ b/plugins/fields/user/src/Extension/User.php
@@ -10,9 +10,10 @@
 
 namespace Joomla\Plugin\Fields\User\Extension;
 
-use DOMElement;
 use Joomla\CMS\Form\Form;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\Component\Fields\Administrator\Plugin\FieldsPlugin;
+use Joomla\Event\SubscriberInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -23,20 +24,22 @@
  *
  * @since  3.7.0
  */
-final class User extends FieldsPlugin
+final class User extends FieldsPlugin implements SubscriberInterface
 {
+    use UserFactoryAwareTrait;
+
     /**
      * Transforms the field into a DOM XML element and appends it as a child on the given parent.
      *
      * @param   stdClass    $field   The field.
-     * @param   DOMElement  $parent  The field node parent.
+     * @param   \DOMElement  $parent  The field node parent.
      * @param   Form        $form    The form.
      *
-     * @return  DOMElement
+     * @return  \DOMElement
      *
      * @since   3.7.0
      */
-    public function onCustomFieldsPrepareDom($field, DOMElement $parent, Form $form)
+    public function onCustomFieldsPrepareDom($field, \DOMElement $parent, Form $form)
     {
         if ($this->getApplication()->isClient('site')) {
             // The user field is not working on the front end
diff --git a/plugins/fields/user/tmpl/user.php b/plugins/fields/user/tmpl/user.php
index ec0c5ef544d08..f626b90210d28 100644
--- a/plugins/fields/user/tmpl/user.php
+++ b/plugins/fields/user/tmpl/user.php
@@ -10,8 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
-
 $value = $field->value;
 
 if ($value == '') {
@@ -26,7 +24,7 @@
         continue;
     }
 
-    $user = Factory::getUser($userId);
+    $user = $this->getUserFactory()->loadUserById($userId);
 
     if ($user) {
         // Use the Username
diff --git a/plugins/fields/usergrouplist/services/provider.php b/plugins/fields/usergrouplist/services/provider.php
index 83cf7147e8655..db0f358fda688 100644
--- a/plugins/fields/usergrouplist/services/provider.php
+++ b/plugins/fields/usergrouplist/services/provider.php
@@ -33,9 +33,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new UsergroupList(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('fields', 'usergrouplist')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/fields/usergrouplist/src/Extension/UsergroupList.php b/plugins/fields/usergrouplist/src/Extension/UsergroupList.php
index ec329ee9fca51..c795463de60cb 100644
--- a/plugins/fields/usergrouplist/src/Extension/UsergroupList.php
+++ b/plugins/fields/usergrouplist/src/Extension/UsergroupList.php
@@ -11,6 +11,7 @@
 namespace Joomla\Plugin\Fields\UsergroupList\Extension;
 
 use Joomla\Component\Fields\Administrator\Plugin\FieldsPlugin;
+use Joomla\Event\SubscriberInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -21,6 +22,6 @@
  *
  * @since  3.7.0
  */
-final class UsergroupList extends FieldsPlugin
+final class UsergroupList extends FieldsPlugin implements SubscriberInterface
 {
 }
diff --git a/plugins/filesystem/local/src/Adapter/LocalAdapter.php b/plugins/filesystem/local/src/Adapter/LocalAdapter.php
index bfaa62bc6c745..779cd1c0ab6f1 100644
--- a/plugins/filesystem/local/src/Adapter/LocalAdapter.php
+++ b/plugins/filesystem/local/src/Adapter/LocalAdapter.php
@@ -14,7 +14,6 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filesystem\File;
 use Joomla\CMS\Filesystem\Folder;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Helper\MediaHelper;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Image\Exception\UnparsableImageException;
@@ -22,9 +21,11 @@
 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;
 use Joomla\Component\Media\Administrator\Exception\FileNotFoundException;
 use Joomla\Component\Media\Administrator\Exception\InvalidPathException;
+use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -37,6 +38,8 @@
  */
 class LocalAdapter implements AdapterInterface
 {
+    use CurrentUserTrait;
+
     /**
      * The root path to gather file information from.
      *
@@ -430,7 +433,7 @@ private function getDate($date = null): Date
         $dateObj = Factory::getDate($date);
 
         $timezone = Factory::getApplication()->get('offset');
-        $user     = Factory::getUser();
+        $user     = $this->getCurrentUser();
 
         if ($user->id) {
             $userTimezone = $user->getParam('timezone');
diff --git a/plugins/filesystem/local/src/Extension/Local.php b/plugins/filesystem/local/src/Extension/Local.php
index 858ce01ee6dcf..be19fb209a417 100644
--- a/plugins/filesystem/local/src/Extension/Local.php
+++ b/plugins/filesystem/local/src/Extension/Local.php
@@ -95,7 +95,7 @@ public function getID()
      */
     public function getDisplayName()
     {
-        return $this->getApplication()->getLanguage()->_('PLG_FILESYSTEM_LOCAL_DEFAULT_NAME');
+        return $this->getLanguage()->_('PLG_FILESYSTEM_LOCAL_DEFAULT_NAME');
     }
 
     /**
@@ -133,6 +133,7 @@ public function getAdapters()
                 $directoryEntity->thumbs,
                 [200, 200]
             );
+            $adapter->setCurrentUser($this->getApplication()->getIdentity());
 
             $adapters[$adapter->getAdapterName()] = $adapter;
         }
diff --git a/plugins/finder/categories/categories.xml b/plugins/finder/categories/categories.xml
index 337b2dd77d131..e9ff96e9443db 100644
--- a/plugins/finder/categories/categories.xml
+++ b/plugins/finder/categories/categories.xml
@@ -18,4 +18,32 @@
 		<language tag="en-GB">language/en-GB/plg_finder_categories.ini</language>
 		<language tag="en-GB">language/en-GB/plg_finder_categories.sys.ini</language>
 	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic" addfieldprefix="Joomla\Component\Finder\Administrator\Field">
+				<field
+					name="search_archived"
+					type="radio"
+					layout="joomla.form.field.radio.switcher"
+					label="PLG_FINDER_CATEGORIES_FIELD_SEARCH_ARCHIVED_LABEL"
+					description="PLG_FINDER_CATEGORIES_FIELD_SEARCH_ARCHIVED_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="0">JNO</option>
+					<option value="1">JYES</option>
+				</field>
+				<field
+					name="taxonomies"
+					type="taxonomytypes"
+					label="PLG_FINDER_CATEGORIES_TAXONOMIES_LABEL"
+					default="type,language"
+					multiple="true"
+					>
+					<option value="language">PLG_FINDER_CATEGORIES_TAXONOMIES_LANGUAGE</option>
+					<option value="type">PLG_FINDER_CATEGORIES_TAXONOMIES_TYPE</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
 </extension>
diff --git a/plugins/finder/categories/services/provider.php b/plugins/finder/categories/services/provider.php
index 3519935662f8a..df3cbc50be925 100644
--- a/plugins/finder/categories/services/provider.php
+++ b/plugins/finder/categories/services/provider.php
@@ -34,9 +34,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Categories(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('finder', 'categories')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/finder/categories/src/Extension/Categories.php b/plugins/finder/categories/src/Extension/Categories.php
index b03ecde73c874..f88305fcb3780 100644
--- a/plugins/finder/categories/src/Extension/Categories.php
+++ b/plugins/finder/categories/src/Extension/Categories.php
@@ -335,11 +335,18 @@ protected function index(Result $item)
         // Translate the state. Categories should only be published if the parent category is published.
         $item->state = $this->translateState($item->state);
 
+        // Get taxonomies to display
+        $taxonomies = $this->params->get('taxonomies', ['type', 'language']);
+
         // Add the type taxonomy data.
-        $item->addTaxonomy('Type', 'Category');
+        if (in_array('type', $taxonomies)) {
+            $item->addTaxonomy('Type', 'Category');
+        }
 
         // Add the language taxonomy data.
-        $item->addTaxonomy('Language', $item->language);
+        if (in_array('language', $taxonomies)) {
+            $item->addTaxonomy('Language', $item->language);
+        }
 
         // Get content extras.
         Helper::getContentExtras($item);
diff --git a/plugins/finder/contacts/contacts.xml b/plugins/finder/contacts/contacts.xml
index 4aebc5bd728a4..240410021008f 100644
--- a/plugins/finder/contacts/contacts.xml
+++ b/plugins/finder/contacts/contacts.xml
@@ -18,4 +18,35 @@
 		<language tag="en-GB">language/en-GB/plg_finder_contacts.ini</language>
 		<language tag="en-GB">language/en-GB/plg_finder_contacts.sys.ini</language>
 	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic" addfieldprefix="Joomla\Component\Finder\Administrator\Field">
+				<field
+					name="search_archived"
+					type="radio"
+					layout="joomla.form.field.radio.switcher"
+					label="PLG_FINDER_CONTACTS_FIELD_SEARCH_ARCHIVED_LABEL"
+					description="PLG_FINDER_CONTACTS_FIELD_SEARCH_ARCHIVED_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="0">JNO</option>
+					<option value="1">JYES</option>
+				</field>
+				<field
+					name="taxonomies"
+					type="taxonomytypes"
+					label="PLG_FINDER_CONTACTS_TAXONOMIES_LABEL"
+					default="type,category,language,region,country"
+					multiple="true"
+					>
+					<option value="category">PLG_FINDER_CONTACTS_TAXONOMIES_CATEGORY</option>
+					<option value="country">PLG_FINDER_CONTACTS_TAXONOMIES_COUNTRY</option>
+					<option value="language">PLG_FINDER_CONTACTS_TAXONOMIES_LANGUAGE</option>
+					<option value="region">PLG_FINDER_CONTACTS_TAXONOMIES_REGION</option>
+					<option value="type">PLG_FINDER_CONTACTS_TAXONOMIES_TYPE</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
 </extension>
diff --git a/plugins/finder/contacts/services/provider.php b/plugins/finder/contacts/services/provider.php
index 23a0d4a5c42bf..905fe019107f2 100644
--- a/plugins/finder/contacts/services/provider.php
+++ b/plugins/finder/contacts/services/provider.php
@@ -34,9 +34,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Contacts(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('finder', 'contacts')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/finder/contacts/src/Extension/Contacts.php b/plugins/finder/contacts/src/Extension/Contacts.php
index 8154424469712..8dc00dba985f3 100644
--- a/plugins/finder/contacts/src/Extension/Contacts.php
+++ b/plugins/finder/contacts/src/Extension/Contacts.php
@@ -270,6 +270,12 @@ protected function index(Result $item)
             $item->title = $title;
         }
 
+        // Add the image.
+        if ($item->image) {
+            $item->imageUrl = $item->image;
+            $item->imageAlt = $item->title ?? '';
+        }
+
         /*
          * Add the metadata processing instructions based on the contact
          * configuration parameters.
@@ -333,35 +339,45 @@ protected function index(Result $item)
         // Handle the contact user name.
         $item->addInstruction(Indexer::META_CONTEXT, 'user');
 
+        // Get taxonomies to display
+        $taxonomies = $this->params->get('taxonomies', ['type', 'category', 'language', 'region', 'country']);
+
         // Add the type taxonomy data.
-        $item->addTaxonomy('Type', 'Contact');
+        if (in_array('type', $taxonomies)) {
+            $item->addTaxonomy('Type', 'Contact');
+        }
 
         // Add the category taxonomy data.
         $categories = $this->getApplication()->bootComponent('com_contact')->getCategory(['published' => false, 'access' => false]);
         $category   = $categories->get($item->catid);
 
-        // Category does not exist, stop here
         if (!$category) {
             return;
         }
 
-        $item->addNestedTaxonomy('Category', $category, $this->translateState($category->published), $category->access, $category->language);
+        // Add the category taxonomy data.
+        if (in_array('category', $taxonomies)) {
+            $item->addNestedTaxonomy('Category', $category, $this->translateState($category->published), $category->access, $category->language);
+        }
 
         // Add the language taxonomy data.
-        $item->addTaxonomy('Language', $item->language);
+        if (in_array('language', $taxonomies)) {
+            $item->addTaxonomy('Language', $item->language);
+        }
 
         // Add the region taxonomy data.
-        if (!empty($item->region) && $this->params->get('tax_add_region', true)) {
+        if (in_array('region', $taxonomies) && !empty($item->region) && $this->params->get('tax_add_region', true)) {
             $item->addTaxonomy('Region', $item->region);
         }
 
         // Add the country taxonomy data.
-        if (!empty($item->country) && $this->params->get('tax_add_country', true)) {
+        if (in_array('country', $taxonomies) && !empty($item->country) && $this->params->get('tax_add_country', true)) {
             $item->addTaxonomy('Country', $item->country);
         }
 
         // Get content extras.
         Helper::getContentExtras($item);
+        Helper::addCustomFields($item, 'com_contact.contact');
 
         // Index the item.
         $this->indexer->index($item);
@@ -401,7 +417,7 @@ protected function getListQuery($query = null)
             ->select('a.publish_up AS publish_start_date, a.publish_down AS publish_end_date')
             ->select('a.suburb AS city, a.state AS region, a.country, a.postcode AS zip')
             ->select('a.telephone, a.fax, a.misc AS summary, a.email_to AS email, a.mobile')
-            ->select('a.webpage, a.access, a.published AS state, a.ordering, a.params, a.catid')
+            ->select('a.image, a.webpage, a.access, a.published AS state, a.ordering, a.params, a.catid')
             ->select('c.title AS category, c.published AS cat_state, c.access AS cat_access');
 
         // Handle the alias CASE WHEN portion of the query
diff --git a/plugins/finder/content/content.xml b/plugins/finder/content/content.xml
index d5b79e0403b8c..b5358e0bacc9e 100644
--- a/plugins/finder/content/content.xml
+++ b/plugins/finder/content/content.xml
@@ -18,4 +18,34 @@
 		<language tag="en-GB">language/en-GB/plg_finder_content.ini</language>
 		<language tag="en-GB">language/en-GB/plg_finder_content.sys.ini</language>
 	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic" addfieldprefix="Joomla\Component\Finder\Administrator\Field">
+				<field
+					name="search_archived"
+					type="radio"
+					layout="joomla.form.field.radio.switcher"
+					label="PLG_FINDER_CONTENT_FIELD_SEARCH_ARCHIVED_LABEL"
+					description="PLG_FINDER_CONTENT_FIELD_SEARCH_ARCHIVED_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="0">JNO</option>
+					<option value="1">JYES</option>
+				</field>
+				<field
+					name="taxonomies"
+					type="taxonomytypes"
+					label="PLG_FINDER_CONTENT_TAXONOMIES_LABEL"
+					default="type,category,language,author"
+					multiple="true"
+					>
+					<option value="author">PLG_FINDER_CONTENT_TAXONOMIES_AUTHOR</option>
+					<option value="category">PLG_FINDER_CONTENT_TAXONOMIES_CATEGORY</option>
+					<option value="language">PLG_FINDER_CONTENT_TAXONOMIES_LANGUAGE</option>
+					<option value="type">PLG_FINDER_CONTENT_TAXONOMIES_TYPE</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
 </extension>
diff --git a/plugins/finder/content/services/provider.php b/plugins/finder/content/services/provider.php
index 21555b24cc87a..24c7ed69f0fab 100644
--- a/plugins/finder/content/services/provider.php
+++ b/plugins/finder/content/services/provider.php
@@ -34,9 +34,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Content(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('finder', 'content')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/finder/content/src/Extension/Content.php b/plugins/finder/content/src/Extension/Content.php
index d3698aef47ebd..8b1da5d6190fb 100644
--- a/plugins/finder/content/src/Extension/Content.php
+++ b/plugins/finder/content/src/Extension/Content.php
@@ -11,7 +11,7 @@
 namespace Joomla\Plugin\Finder\Content\Extension;
 
 use Joomla\CMS\Component\ComponentHelper;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Event\Finder as FinderEvent;
 use Joomla\Component\Content\Site\Helper\RouteHelper;
 use Joomla\Component\Finder\Administrator\Indexer\Adapter;
 use Joomla\Component\Finder\Administrator\Indexer\Helper;
@@ -19,6 +19,7 @@
 use Joomla\Component\Finder\Administrator\Indexer\Result;
 use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Database\DatabaseQuery;
+use Joomla\Event\SubscriberInterface;
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -30,7 +31,7 @@
  *
  * @since  2.5
  */
-final class Content extends Adapter
+final class Content extends Adapter implements SubscriberInterface
 {
     use DatabaseAwareTrait;
 
@@ -82,6 +83,24 @@ final class Content extends Adapter
      */
     protected $autoloadLanguage = true;
 
+    /**
+     * Returns an array of events this subscriber will listen to.
+     *
+     * @return  array
+     *
+     * @since   5.0.0
+     */
+    public static function getSubscribedEvents(): array
+    {
+        return array_merge([
+            'onFinderCategoryChangeState' => 'onFinderCategoryChangeState',
+            'onFinderChangeState'         => 'onFinderChangeState',
+            'onFinderAfterDelete'         => 'onFinderAfterDelete',
+            'onFinderBeforeSave'          => 'onFinderBeforeSave',
+            'onFinderAfterSave'           => 'onFinderAfterSave',
+        ], parent::getSubscribedEvents());
+    }
+
     /**
      * Method to setup the indexer to be run.
      *
@@ -99,35 +118,35 @@ protected function setup()
      * changed. This is fired when the item category is published or unpublished
      * from the list view.
      *
-     * @param   string   $extension  The extension whose category has been updated.
-     * @param   array    $pks        A list of primary key ids of the content that has changed state.
-     * @param   integer  $value      The value of the state that the content has been changed to.
+     * @param   FinderEvent\AfterCategoryChangeStateEvent   $event  The event instance.
      *
      * @return  void
      *
      * @since   2.5
      */
-    public function onFinderCategoryChangeState($extension, $pks, $value)
+    public function onFinderCategoryChangeState(FinderEvent\AfterCategoryChangeStateEvent $event)
     {
         // Make sure we're handling com_content categories.
-        if ($extension === 'com_content') {
-            $this->categoryStateChange($pks, $value);
+        if ($event->getExtension() === 'com_content') {
+            $this->categoryStateChange($event->getPks(), $event->getValue());
         }
     }
 
     /**
      * Method to remove the link information for items that have been deleted.
      *
-     * @param   string  $context  The context of the action being performed.
-     * @param   Table   $table    A Table object containing the record to be deleted
+     * @param   FinderEvent\AfterDeleteEvent   $event  The event instance.
      *
      * @return  void
      *
      * @since   2.5
      * @throws  \Exception on database error.
      */
-    public function onFinderAfterDelete($context, $table): void
+    public function onFinderAfterDelete(FinderEvent\AfterDeleteEvent $event): void
     {
+        $context = $event->getContext();
+        $table   = $event->getItem();
+
         if ($context === 'com_content.article') {
             $id = $table->id;
         } elseif ($context === 'com_finder.index') {
@@ -146,17 +165,19 @@ public function onFinderAfterDelete($context, $table): void
      * It also makes adjustments if the access level of an item or the
      * category to which it belongs has changed.
      *
-     * @param   string   $context  The context of the content passed to the plugin.
-     * @param   Table    $row      A Table object.
-     * @param   boolean  $isNew    True if the content has just been created.
+     * @param   FinderEvent\AfterSaveEvent   $event  The event instance.
      *
      * @return  void
      *
      * @since   2.5
      * @throws  \Exception on database error.
      */
-    public function onFinderAfterSave($context, $row, $isNew): void
+    public function onFinderAfterSave(FinderEvent\AfterSaveEvent $event): void
     {
+        $context = $event->getContext();
+        $row     = $event->getItem();
+        $isNew   = $event->getIsNew();
+
         // We only want to handle articles here.
         if ($context === 'com_content.article' || $context === 'com_content.form') {
             // Check if the access levels are different.
@@ -182,17 +203,19 @@ public function onFinderAfterSave($context, $row, $isNew): void
      * Smart Search before content save method.
      * This event is fired before the data is actually saved.
      *
-     * @param   string   $context  The context of the content passed to the plugin.
-     * @param   Table    $row      A Table object.
-     * @param   boolean  $isNew    If the content is just about to be created.
+     * @param   FinderEvent\BeforeSaveEvent   $event  The event instance.
      *
      * @return  boolean  True on success.
      *
      * @since   2.5
      * @throws  \Exception on database error.
      */
-    public function onFinderBeforeSave($context, $row, $isNew)
+    public function onFinderBeforeSave(FinderEvent\BeforeSaveEvent $event)
     {
+        $context = $event->getContext();
+        $row     = $event->getItem();
+        $isNew   = $event->getIsNew();
+
         // We only want to handle articles here.
         if ($context === 'com_content.article' || $context === 'com_content.form') {
             // Query the database for the old access level if the item isn't new.
@@ -217,16 +240,18 @@ public function onFinderBeforeSave($context, $row, $isNew)
      * from outside the edit screen. This is fired when the item is published,
      * unpublished, archived, or unarchived from the list view.
      *
-     * @param   string   $context  The context for the content passed to the plugin.
-     * @param   array    $pks      An array of primary key ids of the content that has changed state.
-     * @param   integer  $value    The value of the state that the content has been changed to.
+     * @param   FinderEvent\AfterChangeStateEvent   $event  The event instance.
      *
      * @return  void
      *
      * @since   2.5
      */
-    public function onFinderChangeState($context, $pks, $value)
+    public function onFinderChangeState(FinderEvent\AfterChangeStateEvent $event)
     {
+        $context = $event->getContext();
+        $pks     = $event->getPks();
+        $value   = $event->getValue();
+
         // We only want to handle articles here.
         if ($context === 'com_content.article' || $context === 'com_content.form') {
             $this->itemStateChange($pks, $value);
@@ -305,11 +330,16 @@ protected function index(Result $item)
         // Translate the state. Articles should only be published if the category is published.
         $item->state = $this->translateState($item->state, $item->cat_state);
 
+        // Get taxonomies to display
+        $taxonomies = $this->params->get('taxonomies', ['type', 'author', 'category', 'language']);
+
         // Add the type taxonomy data.
-        $item->addTaxonomy('Type', 'Article');
+        if (in_array('type', $taxonomies)) {
+            $item->addTaxonomy('Type', 'Article');
+        }
 
         // Add the author taxonomy data.
-        if (!empty($item->author) || !empty($item->created_by_alias)) {
+        if (in_array('author', $taxonomies) && (!empty($item->author) || !empty($item->created_by_alias))) {
             $item->addTaxonomy('Author', !empty($item->created_by_alias) ? $item->created_by_alias : $item->author, $item->state);
         }
 
@@ -317,18 +347,23 @@ protected function index(Result $item)
         $categories = $this->getApplication()->bootComponent('com_content')->getCategory(['published' => false, 'access' => false]);
         $category   = $categories->get($item->catid);
 
-        // Category does not exist, stop here
         if (!$category) {
             return;
         }
 
-        $item->addNestedTaxonomy('Category', $category, $this->translateState($category->published), $category->access, $category->language);
+        // Add the category taxonomy data.
+        if (in_array('category', $taxonomies)) {
+            $item->addNestedTaxonomy('Category', $category, $this->translateState($category->published), $category->access, $category->language);
+        }
 
         // Add the language taxonomy data.
-        $item->addTaxonomy('Language', $item->language);
+        if (in_array('language', $taxonomies)) {
+            $item->addTaxonomy('Language', $item->language);
+        }
 
         // Get content extras.
         Helper::getContentExtras($item);
+        Helper::addCustomFields($item, 'com_content.article');
 
         // Index the item.
         $this->indexer->index($item);
diff --git a/plugins/finder/newsfeeds/newsfeeds.xml b/plugins/finder/newsfeeds/newsfeeds.xml
index e31e27ddff8b6..cb2b9100b6d17 100644
--- a/plugins/finder/newsfeeds/newsfeeds.xml
+++ b/plugins/finder/newsfeeds/newsfeeds.xml
@@ -18,4 +18,33 @@
 		<language tag="en-GB">language/en-GB/plg_finder_newsfeeds.ini</language>
 		<language tag="en-GB">language/en-GB/plg_finder_newsfeeds.sys.ini</language>
 	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic" addfieldprefix="Joomla\Component\Finder\Administrator\Field">
+				<field
+					name="search_archived"
+					type="radio"
+					layout="joomla.form.field.radio.switcher"
+					label="PLG_FINDER_NEWSFEEDS_FIELD_SEARCH_ARCHIVED_LABEL"
+					description="PLG_FINDER_NEWSFEEDS_FIELD_SEARCH_ARCHIVED_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="0">JNO</option>
+					<option value="1">JYES</option>
+				</field>
+				<field
+					name="taxonomies"
+					type="taxonomytypes"
+					label="PLG_FINDER_NEWSFEEDS_TAXONOMIES_LABEL"
+					default="type,category,language"
+					multiple="true"
+					>
+					<option value="category">PLG_FINDER_NEWSFEEDS_TAXONOMIES_CATEGORY</option>
+					<option value="language">PLG_FINDER_NEWSFEEDS_TAXONOMIES_LANGUAGE</option>
+					<option value="type">PLG_FINDER_NEWSFEEDS_TAXONOMIES_TYPE</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
 </extension>
diff --git a/plugins/finder/newsfeeds/services/provider.php b/plugins/finder/newsfeeds/services/provider.php
index 1c7a010f2e4af..80bdca70e75e8 100644
--- a/plugins/finder/newsfeeds/services/provider.php
+++ b/plugins/finder/newsfeeds/services/provider.php
@@ -34,9 +34,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Newsfeeds(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('finder', 'newsfeeds')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/finder/newsfeeds/src/Extension/Newsfeeds.php b/plugins/finder/newsfeeds/src/Extension/Newsfeeds.php
index d63945bb9575d..1d92b7fd2e399 100644
--- a/plugins/finder/newsfeeds/src/Extension/Newsfeeds.php
+++ b/plugins/finder/newsfeeds/src/Extension/Newsfeeds.php
@@ -281,22 +281,31 @@ protected function index(Result $item)
         $item->addInstruction(Indexer::META_CONTEXT, 'author');
         $item->addInstruction(Indexer::META_CONTEXT, 'created_by_alias');
 
+        // Get taxonomies to display
+        $taxonomies = $this->params->get('taxonomies', ['type', 'category', 'language']);
+
         // Add the type taxonomy data.
-        $item->addTaxonomy('Type', 'News Feed');
+        if (in_array('type', $taxonomies)) {
+            $item->addTaxonomy('Type', 'News Feed');
+        }
 
         // Add the category taxonomy data.
         $categories = $this->getApplication()->bootComponent('com_newsfeeds')->getCategory(['published' => false, 'access' => false]);
         $category   = $categories->get($item->catid);
 
-        // Category does not exist, stop here
         if (!$category) {
             return;
         }
 
-        $item->addNestedTaxonomy('Category', $category, $this->translateState($category->published), $category->access, $category->language);
+        // Add the category taxonomy data.
+        if (in_array('category', $taxonomies)) {
+            $item->addNestedTaxonomy('Category', $category, $this->translateState($category->published), $category->access, $category->language);
+        }
 
         // Add the language taxonomy data.
-        $item->addTaxonomy('Language', $item->language);
+        if (in_array('language', $taxonomies)) {
+            $item->addTaxonomy('Language', $item->language);
+        }
 
         // Get content extras.
         Helper::getContentExtras($item);
diff --git a/plugins/finder/tags/services/provider.php b/plugins/finder/tags/services/provider.php
index 751821e95aa59..101349ae829c8 100644
--- a/plugins/finder/tags/services/provider.php
+++ b/plugins/finder/tags/services/provider.php
@@ -34,9 +34,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Tags(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('finder', 'tags')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/finder/tags/src/Extension/Tags.php b/plugins/finder/tags/src/Extension/Tags.php
index 55094909975b2..aa5a7f3d8d3b4 100644
--- a/plugins/finder/tags/src/Extension/Tags.php
+++ b/plugins/finder/tags/src/Extension/Tags.php
@@ -246,16 +246,23 @@ protected function index(Result $item)
         $item->addInstruction(Indexer::META_CONTEXT, 'author');
         $item->addInstruction(Indexer::META_CONTEXT, 'created_by_alias');
 
+        // Get taxonomies to display
+        $taxonomies = $this->params->get('taxonomies', ['type', 'author', 'language']);
+
         // Add the type taxonomy data.
-        $item->addTaxonomy('Type', 'Tag');
+        if (in_array('type', $taxonomies)) {
+            $item->addTaxonomy('Type', 'Tag');
+        }
 
         // Add the author taxonomy data.
-        if (!empty($item->author) || !empty($item->created_by_alias)) {
+        if (in_array('author', $taxonomies) && (!empty($item->author) || !empty($item->created_by_alias))) {
             $item->addTaxonomy('Author', !empty($item->created_by_alias) ? $item->created_by_alias : $item->author);
         }
 
         // Add the language taxonomy data.
-        $item->addTaxonomy('Language', $item->language);
+        if (in_array('language', $taxonomies)) {
+            $item->addTaxonomy('Language', $item->language);
+        }
 
         // Get content extras.
         Helper::getContentExtras($item);
diff --git a/plugins/finder/tags/tags.xml b/plugins/finder/tags/tags.xml
index 0f2951a8850b9..e4bd93066b28f 100644
--- a/plugins/finder/tags/tags.xml
+++ b/plugins/finder/tags/tags.xml
@@ -18,4 +18,33 @@
 		<language tag="en-GB">language/en-GB/plg_finder_tags.ini</language>
 		<language tag="en-GB">language/en-GB/plg_finder_tags.sys.ini</language>
 	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic" addfieldprefix="Joomla\Component\Finder\Administrator\Field">
+				<field
+					name="search_archived"
+					type="radio"
+					layout="joomla.form.field.radio.switcher"
+					label="PLG_FINDER_TAGS_FIELD_SEARCH_ARCHIVED_LABEL"
+					description="PLG_FINDER_TAGS_FIELD_SEARCH_ARCHIVED_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="0">JNO</option>
+					<option value="1">JYES</option>
+				</field>
+				<field
+					name="taxonomies"
+					type="taxonomytypes"
+					label="PLG_FINDER_TAGS_TAXONOMIES_LABEL"
+					default="type,language,author"
+					multiple="true"
+					>
+					<option value="author">PLG_FINDER_TAGS_TAXONOMIES_AUTHOR</option>
+					<option value="language">PLG_FINDER_TAGS_TAXONOMIES_LANGUAGE</option>
+					<option value="type">PLG_FINDER_TAGS_TAXONOMIES_TYPE</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
 </extension>
diff --git a/plugins/installer/folderinstaller/services/provider.php b/plugins/installer/folderinstaller/services/provider.php
index 347f56b0bf8fd..e55ec41c70b33 100644
--- a/plugins/installer/folderinstaller/services/provider.php
+++ b/plugins/installer/folderinstaller/services/provider.php
@@ -26,16 +26,15 @@
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.4.0
      */
     public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new FolderInstaller(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('installer', 'folderinstaller')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/installer/folderinstaller/src/Extension/FolderInstaller.php b/plugins/installer/folderinstaller/src/Extension/FolderInstaller.php
index fae97b97b5379..a8ee960b4e0ca 100644
--- a/plugins/installer/folderinstaller/src/Extension/FolderInstaller.php
+++ b/plugins/installer/folderinstaller/src/Extension/FolderInstaller.php
@@ -10,8 +10,10 @@
 
 namespace Joomla\Plugin\Installer\Folder\Extension;
 
+use Joomla\CMS\Event\Installer\AddInstallationTabEvent;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\Event\SubscriberInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -22,7 +24,7 @@
  *
  * @since  3.6.0
  */
-final class FolderInstaller extends CMSPlugin
+final class FolderInstaller extends CMSPlugin implements SubscriberInterface
 {
     /**
      * Application object.
@@ -34,13 +36,27 @@ final class FolderInstaller extends CMSPlugin
     protected $app;
 
     /**
-     * Textfield or Form of the Plugin.
+     * Returns an array of events this subscriber will listen to.
      *
-     * @return  array  Returns an array with the tab information
+     * @return  array
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public static function getSubscribedEvents(): array
+    {
+        return ['onInstallerAddInstallationTab' => 'onInstallerAddInstallationTab'];
+    }
+
+    /**
+     * Installer add Installation Tab listener.
+     *
+     * @param   AddInstallationTabEvent  $event  The event instance
+     *
+     * @return  void
      *
      * @since   3.6.0
      */
-    public function onInstallerAddInstallationTab()
+    public function onInstallerAddInstallationTab(AddInstallationTabEvent $event)
     {
         // Load language files
         $this->loadLanguage();
@@ -54,6 +70,6 @@ public function onInstallerAddInstallationTab()
         include PluginHelper::getLayoutPath('installer', 'folderinstaller');
         $tab['content'] = ob_get_clean();
 
-        return $tab;
+        $event->addResult($tab);
     }
 }
diff --git a/plugins/installer/override/services/provider.php b/plugins/installer/override/services/provider.php
index 642ad95633825..4011828447813 100644
--- a/plugins/installer/override/services/provider.php
+++ b/plugins/installer/override/services/provider.php
@@ -27,16 +27,15 @@
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.4.0
      */
     public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Override(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('installer', 'override')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/installer/packageinstaller/services/provider.php b/plugins/installer/packageinstaller/services/provider.php
index dfa3e92e2fa44..4f546e72ee503 100644
--- a/plugins/installer/packageinstaller/services/provider.php
+++ b/plugins/installer/packageinstaller/services/provider.php
@@ -26,16 +26,15 @@
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.4.0
      */
     public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new PackageInstaller(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('installer', 'packageinstaller')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/installer/packageinstaller/src/Extension/PackageInstaller.php b/plugins/installer/packageinstaller/src/Extension/PackageInstaller.php
index f4f974ba829db..add2a762ee2b3 100644
--- a/plugins/installer/packageinstaller/src/Extension/PackageInstaller.php
+++ b/plugins/installer/packageinstaller/src/Extension/PackageInstaller.php
@@ -10,8 +10,10 @@
 
 namespace Joomla\Plugin\Installer\Package\Extension;
 
+use Joomla\CMS\Event\Installer\AddInstallationTabEvent;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\Event\SubscriberInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -22,7 +24,7 @@
  *
  * @since  3.6.0
  */
-final class PackageInstaller extends CMSPlugin
+final class PackageInstaller extends CMSPlugin implements SubscriberInterface
 {
     /**
      * Application object
@@ -34,13 +36,27 @@ final class PackageInstaller extends CMSPlugin
     protected $app;
 
     /**
-     * Textfield or Form of the Plugin.
+     * Returns an array of events this subscriber will listen to.
      *
-     * @return  array  Returns an array with the tab information
+     * @return  array
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public static function getSubscribedEvents(): array
+    {
+        return ['onInstallerAddInstallationTab' => 'onInstallerAddInstallationTab'];
+    }
+
+    /**
+     * Installer add Installation Tab listener.
+     *
+     * @param   AddInstallationTabEvent  $event  The event instance
+     *
+     * @return  void
      *
      * @since   3.6.0
      */
-    public function onInstallerAddInstallationTab()
+    public function onInstallerAddInstallationTab(AddInstallationTabEvent $event)
     {
         // Load language files
         $this->loadLanguage();
@@ -54,6 +70,6 @@ public function onInstallerAddInstallationTab()
         include PluginHelper::getLayoutPath('installer', 'packageinstaller');
         $tab['content'] = ob_get_clean();
 
-        return $tab;
+        $event->addResult($tab);
     }
 }
diff --git a/plugins/installer/urlinstaller/services/provider.php b/plugins/installer/urlinstaller/services/provider.php
index b7410ed071e28..bcac5c05d6f40 100644
--- a/plugins/installer/urlinstaller/services/provider.php
+++ b/plugins/installer/urlinstaller/services/provider.php
@@ -26,16 +26,15 @@
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.4.0
      */
     public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new UrlInstaller(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('installer', 'urlinstaller')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/installer/urlinstaller/src/Extension/UrlInstaller.php b/plugins/installer/urlinstaller/src/Extension/UrlInstaller.php
index 1ee46cacf0f0c..03c271c5b1711 100644
--- a/plugins/installer/urlinstaller/src/Extension/UrlInstaller.php
+++ b/plugins/installer/urlinstaller/src/Extension/UrlInstaller.php
@@ -10,8 +10,10 @@
 
 namespace Joomla\Plugin\Installer\Url\Extension;
 
+use Joomla\CMS\Event\Installer\AddInstallationTabEvent;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\Event\SubscriberInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -22,7 +24,7 @@
  *
  * @since  3.6.0
  */
-final class UrlInstaller extends CMSPlugin
+final class UrlInstaller extends CMSPlugin implements SubscriberInterface
 {
     /**
      * Application object.
@@ -34,13 +36,27 @@ final class UrlInstaller extends CMSPlugin
     protected $app;
 
     /**
-     * Textfield or Form of the Plugin.
+     * Returns an array of events this subscriber will listen to.
      *
-     * @return  array  Returns an array with the tab information
+     * @return  array
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public static function getSubscribedEvents(): array
+    {
+        return ['onInstallerAddInstallationTab' => 'onInstallerAddInstallationTab'];
+    }
+
+    /**
+     * Installer add Installation Tab listener.
+     *
+     * @param   AddInstallationTabEvent  $event  The event instance
+     *
+     * @return  void
      *
      * @since   3.6.0
      */
-    public function onInstallerAddInstallationTab()
+    public function onInstallerAddInstallationTab(AddInstallationTabEvent $event)
     {
         // Load language files
         $this->loadLanguage();
@@ -54,6 +70,6 @@ public function onInstallerAddInstallationTab()
         include PluginHelper::getLayoutPath('installer', 'urlinstaller');
         $tab['content'] = ob_get_clean();
 
-        return $tab;
+        $event->addResult($tab);
     }
 }
diff --git a/plugins/installer/webinstaller/services/provider.php b/plugins/installer/webinstaller/services/provider.php
index 8cb7f482d440f..3723e27f1f92f 100644
--- a/plugins/installer/webinstaller/services/provider.php
+++ b/plugins/installer/webinstaller/services/provider.php
@@ -26,16 +26,15 @@
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.4.0
      */
     public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new WebInstaller(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('installer', 'webinstaller')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/installer/webinstaller/src/Extension/WebInstaller.php b/plugins/installer/webinstaller/src/Extension/WebInstaller.php
index 0052ab7c18732..871195dc9fb3c 100644
--- a/plugins/installer/webinstaller/src/Extension/WebInstaller.php
+++ b/plugins/installer/webinstaller/src/Extension/WebInstaller.php
@@ -11,6 +11,7 @@
 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;
 use Joomla\CMS\Plugin\CMSPlugin;
@@ -18,7 +19,7 @@
 use Joomla\CMS\Updater\Update;
 use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\Version;
-use SimpleXMLElement;
+use Joomla\Event\SubscriberInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -29,7 +30,7 @@
  *
  * @since  3.2
  */
-final class WebInstaller extends CMSPlugin
+final class WebInstaller extends CMSPlugin implements SubscriberInterface
 {
     /**
      * The URL for the remote server.
@@ -64,14 +65,28 @@ final class WebInstaller extends CMSPlugin
      */
     private $rtl = null;
 
+    /**
+     * Returns an array of events this subscriber will listen to.
+     *
+     * @return  array
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public static function getSubscribedEvents(): array
+    {
+        return ['onInstallerAddInstallationTab' => 'onInstallerAddInstallationTab'];
+    }
+
     /**
      * Event listener for the `onInstallerAddInstallationTab` event.
      *
-     * @return  array  Returns an array with the tab information
+     * @param   AddInstallationTabEvent  $event  The event instance
+     *
+     * @return  void
      *
      * @since   4.0.0
      */
-    public function onInstallerAddInstallationTab()
+    public function onInstallerAddInstallationTab(AddInstallationTabEvent $event)
     {
         // Load language files
         $this->loadLanguage();
@@ -126,7 +141,7 @@ public function onInstallerAddInstallationTab()
         $tab['content'] = ob_get_clean();
         $tab['content'] = '<legend>' . $tab['label'] . '</legend>' . $tab['content'];
 
-        return $tab;
+        $event->addResult($tab);
     }
 
     /**
@@ -157,7 +172,7 @@ private function getInstallFrom()
         if ($this->installfrom === null) {
             $installfrom = base64_decode($this->getApplication()->getInput()->getBase64('installfrom', ''));
 
-            $field = new SimpleXMLElement('<field></field>');
+            $field = new \SimpleXMLElement('<field></field>');
 
             if ((new UrlRule())->test($field, $installfrom) && preg_match('/\.xml\s*$/', $installfrom)) {
                 $update = new Update();
diff --git a/plugins/media-action/crop/services/provider.php b/plugins/media-action/crop/services/provider.php
index ba417c2756fd0..e6e1c8a40557b 100644
--- a/plugins/media-action/crop/services/provider.php
+++ b/plugins/media-action/crop/services/provider.php
@@ -26,16 +26,15 @@
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.4.0
      */
     public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Crop(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('media-action', 'crop')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/media-action/crop/src/Extension/Crop.php b/plugins/media-action/crop/src/Extension/Crop.php
index f885a70c2b45a..134057d9191db 100644
--- a/plugins/media-action/crop/src/Extension/Crop.php
+++ b/plugins/media-action/crop/src/Extension/Crop.php
@@ -39,7 +39,7 @@ protected function loadJs()
             return;
         }
 
-        $this->getApplication()->getDocument()->getWebAssetManager()->useScript('cropperjs');
+        $this->getApplication()->getDocument()->getWebAssetManager()->useScript('cropper-module');
     }
 
     /**
diff --git a/plugins/media-action/resize/services/provider.php b/plugins/media-action/resize/services/provider.php
index 009cf7a46f932..cc3cf040a55d7 100644
--- a/plugins/media-action/resize/services/provider.php
+++ b/plugins/media-action/resize/services/provider.php
@@ -26,16 +26,15 @@
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.4.0
      */
     public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Resize(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('media-action', 'resize')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/media-action/rotate/services/provider.php b/plugins/media-action/rotate/services/provider.php
index 00db1c57aad6c..b2ce3c55dfb76 100644
--- a/plugins/media-action/rotate/services/provider.php
+++ b/plugins/media-action/rotate/services/provider.php
@@ -26,16 +26,15 @@
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.4.0
      */
     public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Rotate(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('media-action', 'rotate')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/multifactorauth/email/services/provider.php b/plugins/multifactorauth/email/services/provider.php
index 2cc561f1e9b0b..b46dfdba3fb5d 100644
--- a/plugins/multifactorauth/email/services/provider.php
+++ b/plugins/multifactorauth/email/services/provider.php
@@ -13,6 +13,7 @@
 use Joomla\CMS\Extension\PluginInterface;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\User\UserFactoryInterface;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
 use Joomla\Event\DispatcherInterface;
@@ -33,11 +34,9 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $config  = (array) PluginHelper::getPlugin('multifactorauth', 'email');
-                $subject = $container->get(DispatcherInterface::class);
-
-                $plugin = new Email($subject, $config);
+                $plugin = new Email($container->get(DispatcherInterface::class), (array) PluginHelper::getPlugin('multifactorauth', 'email'));
                 $plugin->setApplication(Factory::getApplication());
+                $plugin->setUserFactory($container->get(UserFactoryInterface::class));
 
                 return $plugin;
             }
diff --git a/plugins/multifactorauth/email/src/Extension/Email.php b/plugins/multifactorauth/email/src/Extension/Email.php
index 998d8fb41669c..54690397beaa6 100644
--- a/plugins/multifactorauth/email/src/Extension/Email.php
+++ b/plugins/multifactorauth/email/src/Extension/Email.php
@@ -28,7 +28,7 @@
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\User\User;
-use Joomla\CMS\User\UserFactoryInterface;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\Component\Users\Administrator\DataShape\CaptiveRenderOptions;
 use Joomla\Component\Users\Administrator\DataShape\MethodDescriptor;
 use Joomla\Component\Users\Administrator\DataShape\SetupRenderOptions;
@@ -38,8 +38,6 @@
 use PHPMailer\PHPMailer\Exception as phpMailerException;
 use RuntimeException;
 
-use function count;
-
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
@@ -54,6 +52,8 @@
  */
 class Email extends CMSPlugin implements SubscriberInterface
 {
+    use UserFactoryAwareTrait;
+
     /**
      * Generated OTP length. Constant: 6 numeric digits.
      *
@@ -171,11 +171,11 @@ public function onUserMultifactorCaptive(Captive $event): void
         $key     = $options['key'] ?? '';
 
         // Send an email message with a new code and ask the user to enter it.
-        $user = Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById($record->user_id);
+        $user = $this->getUserFactory()->loadUserById($record->user_id);
 
         try {
             $this->sendCode($key, $user);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             return;
         }
 
@@ -217,7 +217,7 @@ public function onUserMultifactorCaptive(Captive $event): void
      * @param   GetSetup  $event  The event we are handling
      *
      * @return  void
-     * @throws  Exception
+     * @throws  \Exception
      * @since   4.2.0
      */
     public function onUserMultifactorGetSetup(GetSetup $event): void
@@ -250,7 +250,7 @@ public function onUserMultifactorGetSetup(GetSetup $event): void
             $session->set('plg_multifactorauth_email.emailcode.key', $key);
             $session->set('plg_multifactorauth_email.emailcode.user_id', $record->user_id);
 
-            $user = Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById($record->user_id);
+            $user = $this->getUserFactory()->loadUserById($record->user_id);
 
             $this->sendCode($key, $user);
 
@@ -324,7 +324,7 @@ public function onUserMultifactorSaveSetup(SaveSetup $event): void
 
         // If there is still no key in the options throw an error
         if (empty($key)) {
-            throw new RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
+            throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
         }
 
         /**
@@ -345,7 +345,7 @@ public function onUserMultifactorSaveSetup(SaveSetup $event): void
         $isValid  = $totp->checkCode((string) $key, (string) $code);
 
         if (!$isValid) {
-            throw new RuntimeException(Text::_('PLG_MULTIFACTORAUTH_EMAIL_ERR_INVALID_CODE'), 500);
+            throw new \RuntimeException(Text::_('PLG_MULTIFACTORAUTH_EMAIL_ERR_INVALID_CODE'), 500);
         }
 
         // The code is valid. Unset the key from the session.
@@ -413,7 +413,7 @@ public function onUserMultifactorValidate(Validate $event): void
      * @param   BeforeDisplayMethods  $event  The event we are handling
      *
      * @return  void
-     * @throws  Exception
+     * @throws  \Exception
      * @since   4.2.0
      */
     public function onUserMultifactorBeforeDisplayMethods(BeforeDisplayMethods $event): void
@@ -430,12 +430,12 @@ public function onUserMultifactorBeforeDisplayMethods(BeforeDisplayMethods $even
         $userMfaRecords = MfaHelper::getUserMfaRecords($user->id);
 
         // If there are no Methods go back
-        if (count($userMfaRecords) < 1) {
+        if (\count($userMfaRecords) < 1) {
             return;
         }
 
         // If the only Method is backup codes go back
-        if (count($userMfaRecords) == 1) {
+        if (\count($userMfaRecords) == 1) {
             /** @var MfaTable $record */
             $record = reset($userMfaRecords);
 
@@ -452,7 +452,7 @@ function (MfaTable $record) {
             }
         );
 
-        if (count($emailRecords)) {
+        if (\count($emailRecords)) {
             return;
         }
 
@@ -478,7 +478,7 @@ function (MfaTable $record) {
                     'user_id' => $user->id,
                 ]
             );
-        } catch (Exception $event) {
+        } catch (\Exception $event) {
             // Fail gracefully
         }
     }
@@ -513,7 +513,7 @@ private function decodeRecordOptions(MfaTable $record): array
      * @param   User|null  $user  The Joomla! user to use
      *
      * @return  void
-     * @throws  Exception
+     * @throws  \Exception
      * @since   4.2.0
      */
     private function sendCode(string $key, ?User $user = null)
@@ -522,8 +522,7 @@ private function sendCode(string $key, ?User $user = null)
 
         // Make sure we have a user
         if (!is_object($user) || !($user instanceof User)) {
-            $user = $this->getApplication()->getIdentity()
-                ?: Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById(0);
+            $user = $this->getApplication()->getIdentity() ?: $this->getUserFactory()->loadUserById(0);
         }
 
         if ($alreadySent) {
@@ -558,7 +557,7 @@ private function sendCode(string $key, ?User $user = null)
         } catch (MailDisabledException | phpMailerException $exception) {
             try {
                 Log::add(Text::_($exception->getMessage()), Log::WARNING, 'jerror');
-            } catch (RuntimeException $exception) {
+            } catch (\RuntimeException $exception) {
                 $this->getApplication()->enqueueMessage(Text::_($exception->errorMessage()), 'warning');
             }
         }
@@ -584,7 +583,7 @@ private function sendCode(string $key, ?User $user = null)
         } catch (MailDisabledException | phpMailerException $exception) {
             try {
                 Log::add(Text::_($exception->getMessage()), Log::WARNING, 'jerror');
-            } catch (RuntimeException $exception) {
+            } catch (\RuntimeException $exception) {
                 $this->getApplication()->enqueueMessage(Text::_($exception->errorMessage()), 'warning');
             }
         }
diff --git a/plugins/multifactorauth/fixed/services/provider.php b/plugins/multifactorauth/fixed/services/provider.php
index 3a92f52e9af42..ddb869d05ccda 100644
--- a/plugins/multifactorauth/fixed/services/provider.php
+++ b/plugins/multifactorauth/fixed/services/provider.php
@@ -32,10 +32,7 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $config  = (array) PluginHelper::getPlugin('multifactorauth', 'fixed');
-                $subject = $container->get(DispatcherInterface::class);
-
-                return new Fixed($subject, $config);
+                return new Fixed($container->get(DispatcherInterface::class), (array) PluginHelper::getPlugin('multifactorauth', 'fixed'));
             }
         );
     }
diff --git a/plugins/multifactorauth/fixed/src/Extension/Fixed.php b/plugins/multifactorauth/fixed/src/Extension/Fixed.php
index e36145bd03123..1b3cb44dfa4f6 100644
--- a/plugins/multifactorauth/fixed/src/Extension/Fixed.php
+++ b/plugins/multifactorauth/fixed/src/Extension/Fixed.php
@@ -157,6 +157,8 @@ public function onUserMultifactorCaptive(Captive $event): void
                     'html' => '',
                     // Custom HTML to display below the MFA form
                     'post_message' => Text::_('PLG_MULTIFACTORAUTH_FIXED_LBL_POSTMESSAGE'),
+                    // Override the autocomplete attribute for the HTML input box.
+                    'autocomplete' => 'off',
                 ]
             )
         );
@@ -245,7 +247,7 @@ public function onUserMultifactorSaveSetup(SaveSetup $event): void
 
         // Make sure the code is not empty
         if (empty($code)) {
-            throw new RuntimeException(Text::_('PLG_MULTIFACTORAUTH_FIXED_ERR_EMPTYCODE'));
+            throw new \RuntimeException(Text::_('PLG_MULTIFACTORAUTH_FIXED_ERR_EMPTYCODE'));
         }
 
         // Return the configuration to be serialized
diff --git a/plugins/multifactorauth/totp/services/provider.php b/plugins/multifactorauth/totp/services/provider.php
index 87932c08738f5..d73d2af8b4117 100644
--- a/plugins/multifactorauth/totp/services/provider.php
+++ b/plugins/multifactorauth/totp/services/provider.php
@@ -13,6 +13,7 @@
 use Joomla\CMS\Extension\PluginInterface;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\User\UserFactoryInterface;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
 use Joomla\Event\DispatcherInterface;
@@ -33,11 +34,9 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $config  = (array) PluginHelper::getPlugin('multifactorauth', 'totp');
-                $subject = $container->get(DispatcherInterface::class);
-
-                $plugin = new Totp($subject, $config);
+                $plugin = new Totp($container->get(DispatcherInterface::class), (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 2fb540db57c8c..657b23fab5e4b 100644
--- a/plugins/multifactorauth/totp/src/Extension/Totp.php
+++ b/plugins/multifactorauth/totp/src/Extension/Totp.php
@@ -16,12 +16,11 @@
 use Joomla\CMS\Event\MultiFactor\GetSetup;
 use Joomla\CMS\Event\MultiFactor\SaveSetup;
 use Joomla\CMS\Event\MultiFactor\Validate;
-use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\User\User;
-use Joomla\CMS\User\UserFactoryInterface;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\Component\Users\Administrator\DataShape\CaptiveRenderOptions;
 use Joomla\Component\Users\Administrator\DataShape\MethodDescriptor;
 use Joomla\Component\Users\Administrator\DataShape\SetupRenderOptions;
@@ -41,6 +40,8 @@
  */
 class Totp extends CMSPlugin implements SubscriberInterface
 {
+    use UserFactoryAwareTrait;
+
     /**
      * Affects constructor behavior. If true, language files will be loaded automatically.
      *
@@ -208,7 +209,7 @@ public function onUserMultifactorGetSetup(GetSetup $event): void
         }
 
         // Generate a QR code for the key
-        $user     = Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById($record->user_id);
+        $user     = $this->getUserFactory()->loadUserById($record->user_id);
         $hostname = Uri::getInstance()->toString(['host']);
         $otpURL   = sprintf("otpauth://totp/%s@%s?secret=%s", $user->username, $hostname, $key);
         $document = $this->getApplication()->getDocument();
@@ -286,7 +287,7 @@ public function onUserMultifactorSaveSetup(SaveSetup $event): void
 
         // If there is still no key in the options throw an error
         if (empty($key)) {
-            throw new RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
+            throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
         }
 
         /**
@@ -306,7 +307,7 @@ public function onUserMultifactorSaveSetup(SaveSetup $event): void
         $isValid = $totp->checkCode($key, $code);
 
         if (!$isValid) {
-            throw new RuntimeException(Text::_('PLG_MULTIFACTORAUTH_TOTP_ERR_VALIDATIONFAILED'), 500);
+            throw new \RuntimeException(Text::_('PLG_MULTIFACTORAUTH_TOTP_ERR_VALIDATIONFAILED'), 500);
         }
 
         // The code is valid. Unset the key from the session.
diff --git a/plugins/multifactorauth/webauthn/services/provider.php b/plugins/multifactorauth/webauthn/services/provider.php
index b0062c2cb376a..5ff18227a28fb 100644
--- a/plugins/multifactorauth/webauthn/services/provider.php
+++ b/plugins/multifactorauth/webauthn/services/provider.php
@@ -13,6 +13,7 @@
 use Joomla\CMS\Extension\PluginInterface;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\User\UserFactoryInterface;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
 use Joomla\Event\DispatcherInterface;
@@ -33,11 +34,9 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $config  = (array) PluginHelper::getPlugin('multifactorauth', 'webauthn');
-                $subject = $container->get(DispatcherInterface::class);
-
-                $plugin = new Webauthn($subject, $config);
+                $plugin = new Webauthn($container->get(DispatcherInterface::class), (array) PluginHelper::getPlugin('multifactorauth', 'webauthn'));
                 $plugin->setApplication(Factory::getApplication());
+                $plugin->setUserFactory($container->get(UserFactoryInterface::class));
 
                 return $plugin;
             }
diff --git a/plugins/multifactorauth/webauthn/src/CredentialRepository.php b/plugins/multifactorauth/webauthn/src/CredentialRepository.php
index ecee5ec00997c..4d705980acb6a 100644
--- a/plugins/multifactorauth/webauthn/src/CredentialRepository.php
+++ b/plugins/multifactorauth/webauthn/src/CredentialRepository.php
@@ -15,7 +15,6 @@
 use Joomla\CMS\User\UserFactoryInterface;
 use Joomla\Component\Users\Administrator\Helper\Mfa as MfaHelper;
 use Joomla\Component\Users\Administrator\Table\MfaTable;
-use RuntimeException;
 use Webauthn\AttestationStatement\AttestationStatement;
 use Webauthn\AttestedCredentialData;
 use Webauthn\PublicKeyCredentialDescriptor;
@@ -202,7 +201,7 @@ public function saveCredentialSource(PublicKeyCredentialSource $publicKeyCredent
     {
         // I can only create or update credentials for the user this class was created for
         if ($publicKeyCredentialSource->getUserHandle() != $this->userId) {
-            throw new RuntimeException('Cannot create or update WebAuthn credentials for a different user.', 403);
+            throw new \RuntimeException('Cannot create or update WebAuthn credentials for a different user.', 403);
         }
 
         // Do I have an existing record for this credential?
diff --git a/plugins/multifactorauth/webauthn/src/Extension/Webauthn.php b/plugins/multifactorauth/webauthn/src/Extension/Webauthn.php
index 072078bf7c521..5eef7a60a5232 100644
--- a/plugins/multifactorauth/webauthn/src/Extension/Webauthn.php
+++ b/plugins/multifactorauth/webauthn/src/Extension/Webauthn.php
@@ -11,19 +11,17 @@
 namespace Joomla\Plugin\Multifactorauth\Webauthn\Extension;
 
 use Exception;
-use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Event\MultiFactor\Captive;
 use Joomla\CMS\Event\MultiFactor\GetMethod;
 use Joomla\CMS\Event\MultiFactor\GetSetup;
 use Joomla\CMS\Event\MultiFactor\SaveSetup;
 use Joomla\CMS\Event\MultiFactor\Validate;
-use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\User\User;
-use Joomla\CMS\User\UserFactoryInterface;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\Component\Users\Administrator\DataShape\CaptiveRenderOptions;
 use Joomla\Component\Users\Administrator\DataShape\MethodDescriptor;
 use Joomla\Component\Users\Administrator\DataShape\SetupRenderOptions;
@@ -45,6 +43,8 @@
  */
 class Webauthn extends CMSPlugin implements SubscriberInterface
 {
+    use UserFactoryAwareTrait;
+
     /**
      * Auto-load the plugin's language files
      *
@@ -95,7 +95,7 @@ public function onUserMultifactorGetMethod(GetMethod $event): void
                     'name'               => $this->mfaMethodName,
                     'display'            => Text::_('PLG_MULTIFACTORAUTH_WEBAUTHN_LBL_DISPLAYEDAS'),
                     'shortinfo'          => Text::_('PLG_MULTIFACTORAUTH_WEBAUTHN_LBL_SHORTINFO'),
-                    'image'              => 'media/plg_multifactorauth_webauthn/images/webauthn.svg',
+                    'image'              => 'media/plg_multifactorauth_webauthn/images/passkeys.svg',
                     'allowMultiple'      => true,
                     'allowEntryBatching' => true,
                 ]
@@ -111,7 +111,7 @@ public function onUserMultifactorGetMethod(GetMethod $event): void
      * @param   GetSetup  $event  The event we are handling
      *
      * @return  void
-     * @throws  Exception
+     * @throws  \Exception
      * @since   4.2.0
      */
     public function onUserMultifactorGetSetup(GetSetup $event): void
@@ -156,8 +156,7 @@ public function onUserMultifactorGetSetup(GetSetup $event): void
             $document->addScriptOptions('com_users.pagetype', 'setup', false);
 
             // Save the WebAuthn request to the session
-            $user                    = Factory::getApplication()->getIdentity()
-                ?: Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById(0);
+            $user                    = $this->getApplication()->getIdentity() ?: $this->getUserFactory()->loadUserById(0);
             $hiddenData['pkRequest'] = base64_encode(Credentials::requestAttestation($user));
 
             // Special button handling
@@ -228,7 +227,7 @@ public function onUserMultifactorSaveSetup(SaveSetup $event): void
 
         // If there was no registration request BUT there is a registration response throw an error
         if (empty($registrationRequest) && !empty($code)) {
-            throw new RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
+            throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
         }
 
         // If there is no registration request (and there isn't a registration response) we are just saving the title.
@@ -241,8 +240,8 @@ public function onUserMultifactorSaveSetup(SaveSetup $event): void
         // In any other case try to authorize the registration
         try {
             $publicKeyCredentialSource = Credentials::verifyAttestation($code);
-        } catch (Exception $err) {
-            throw new RuntimeException($err->getMessage(), 403);
+        } catch (\Exception $err) {
+            throw new \RuntimeException($err->getMessage(), 403);
         } finally {
             // Unset the request data from the session.
             $session->set('plg_multifactorauth_webauthn.publicKeyCredentialCreationOptions', null);
@@ -266,7 +265,7 @@ public function onUserMultifactorSaveSetup(SaveSetup $event): void
      * @param   Captive  $event  The event we are handling
      *
      * @return  void
-     * @throws Exception
+     * @throws \Exception
      * @since   4.2.0
      */
     public function onUserMultifactorCaptive(Captive $event): void
@@ -318,22 +317,22 @@ public function onUserMultifactorCaptive(Captive $event): void
 
         try {
             if ($force) {
-                throw new RuntimeException('Expected exception (good): force a new key request');
+                throw new \RuntimeException('Expected exception (good): force a new key request');
             }
 
             if (empty($pkOptionsEncoded)) {
-                throw new RuntimeException('Expected exception (good): we do not have a pending key request');
+                throw new \RuntimeException('Expected exception (good): we do not have a pending key request');
             }
 
             $serializedOptions = base64_decode($pkOptionsEncoded);
             $pkOptions         = unserialize($serializedOptions);
 
             if (!is_object($pkOptions) || empty($pkOptions) || !($pkOptions instanceof PublicKeyCredentialRequestOptions)) {
-                throw new RuntimeException('The pending key request is corrupt; a new one will be created');
+                throw new \RuntimeException('The pending key request is corrupt; a new one will be created');
             }
 
             $pkRequest = json_encode($pkOptions, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $pkRequest = Credentials::requestAssertion($record->user_id);
         }
 
@@ -342,14 +341,12 @@ public function onUserMultifactorCaptive(Captive $event): void
         $wam->getRegistry()->addExtensionRegistryFile('plg_multifactorauth_webauthn');
 
         try {
-            /** @var CMSApplication $app */
-            $app = Factory::getApplication();
-            $app->getDocument()->addScriptOptions('com_users.authData', base64_encode($pkRequest), false);
+            $document->addScriptOptions('com_users.authData', base64_encode($pkRequest), false);
             $layoutPath = PluginHelper::getLayoutPath('multifactorauth', 'webauthn');
             ob_start();
             include $layoutPath;
             $html = ob_get_clean();
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             return;
         }
 
@@ -424,10 +421,10 @@ public function onUserMultifactorValidate(Validate $event): void
 
         try {
             Credentials::verifyAssertion($code);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             try {
                 $this->getApplication()->enqueueMessage($e->getMessage(), 'error');
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
             }
 
             $event->addResult(false);
diff --git a/plugins/multifactorauth/webauthn/src/Helper/Credentials.php b/plugins/multifactorauth/webauthn/src/Helper/Credentials.php
index 0fe92a44f776f..c9b53116e6d62 100644
--- a/plugins/multifactorauth/webauthn/src/Helper/Credentials.php
+++ b/plugins/multifactorauth/webauthn/src/Helper/Credentials.php
@@ -21,8 +21,6 @@
 use Joomla\Plugin\Multifactorauth\Webauthn\CredentialRepository;
 use Joomla\Session\SessionInterface;
 use Laminas\Diactoros\ServerRequestFactory;
-use ReflectionClass;
-use RuntimeException;
 use Webauthn\AttestedCredentialData;
 use Webauthn\AuthenticationExtensions\AuthenticationExtensionsClientInputs;
 use Webauthn\AuthenticatorSelectionCriteria;
@@ -52,7 +50,7 @@ abstract class Credentials
      * @param   User   $user   The Joomla user to create the public key for
      *
      * @return  string
-     * @throws  Exception  On error
+     * @throws  \Exception  On error
      * @since   4.2.0
      */
     public static function requestAttestation(User $user): string
@@ -93,7 +91,7 @@ public static function requestAttestation(User $user): string
      * @param   string   $data   The JSON-encoded data returned by the browser during the authentication flow
      *
      * @return  AttestedCredentialData|null
-     * @throws  Exception  When something does not check out
+     * @throws  \Exception  When something does not check out
      * @since   4.2.0
      */
     public static function verifyAttestation(string $data): ?PublicKeyCredentialSource
@@ -104,17 +102,17 @@ public static function verifyAttestation(string $data): ?PublicKeyCredentialSour
         $encodedOptions = $session->get('plg_multifactorauth_webauthn.publicKeyCredentialCreationOptions', null);
 
         if (empty($encodedOptions)) {
-            throw new RuntimeException(Text::_('PLG_MULTIFACTORAUTH_WEBAUTHN_ERR_CREATE_NO_PK'));
+            throw new \RuntimeException(Text::_('PLG_MULTIFACTORAUTH_WEBAUTHN_ERR_CREATE_NO_PK'));
         }
 
         try {
             $publicKeyCredentialCreationOptions = unserialize(base64_decode($encodedOptions));
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $publicKeyCredentialCreationOptions = null;
         }
 
         if (!is_object($publicKeyCredentialCreationOptions) || !($publicKeyCredentialCreationOptions instanceof PublicKeyCredentialCreationOptions)) {
-            throw new RuntimeException(Text::_('PLG_MULTIFACTORAUTH_WEBAUTHN_ERR_CREATE_NO_PK'));
+            throw new \RuntimeException(Text::_('PLG_MULTIFACTORAUTH_WEBAUTHN_ERR_CREATE_NO_PK'));
         }
 
         // Retrieve the stored user ID and make sure it's the same one in the request.
@@ -124,7 +122,7 @@ public static function verifyAttestation(string $data): ?PublicKeyCredentialSour
         $myUserId     = $myUser->id;
 
         if (($myUser->guest) || ($myUserId != $storedUserId)) {
-            throw new RuntimeException(Text::_('PLG_MULTIFACTORAUTH_WEBAUTHN_ERR_CREATE_INVALID_USER'));
+            throw new \RuntimeException(Text::_('PLG_MULTIFACTORAUTH_WEBAUTHN_ERR_CREATE_INVALID_USER'));
         }
 
         return self::getWebauthnServer($myUser->id)->loadAndCheckAttestationResponse(
@@ -140,7 +138,7 @@ public static function verifyAttestation(string $data): ?PublicKeyCredentialSour
      * @param   int  $userId  The user ID to create a WebAuthn PK for
      *
      * @return  string
-     * @throws  Exception  On error
+     * @throws  \Exception  On error
      * @since   4.2.0
      */
     public static function requestAssertion(int $userId): string
@@ -170,7 +168,7 @@ public static function requestAssertion(int $userId): string
      * @param   string   $response   Base64-encoded response
      *
      * @return  void
-     * @throws  Exception  When something does not check out.
+     * @throws  \Exception  When something does not check out.
      * @since   4.2.0
      */
     public static function verifyAssertion(string $response): void
@@ -187,14 +185,14 @@ public static function verifyAssertion(string $response): void
         $session->set('plg_multifactorauth_webauthn.userId', null);
 
         if (empty($userId)) {
-            throw new RuntimeException(Text::_('PLG_MULTIFACTORAUTH_WEBAUTHN_ERR_CREATE_INVALID_LOGIN_REQUEST'));
+            throw new \RuntimeException(Text::_('PLG_MULTIFACTORAUTH_WEBAUTHN_ERR_CREATE_INVALID_LOGIN_REQUEST'));
         }
 
         // Make sure the user exists
         $user = Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById($userId);
 
         if ($user->id != $userId) {
-            throw new RuntimeException(Text::_('PLG_MULTIFACTORAUTH_WEBAUTHN_ERR_CREATE_INVALID_LOGIN_REQUEST'));
+            throw new \RuntimeException(Text::_('PLG_MULTIFACTORAUTH_WEBAUTHN_ERR_CREATE_INVALID_LOGIN_REQUEST'));
         }
 
         // Make sure the user is ourselves (we cannot perform MFA on behalf of another user!)
@@ -202,7 +200,7 @@ public static function verifyAssertion(string $response): void
             ?: Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById(0);
 
         if ($currentUser->id != $userId) {
-            throw new RuntimeException(Text::_('PLG_MULTIFACTORAUTH_WEBAUTHN_ERR_CREATE_INVALID_LOGIN_REQUEST'));
+            throw new \RuntimeException(Text::_('PLG_MULTIFACTORAUTH_WEBAUTHN_ERR_CREATE_INVALID_LOGIN_REQUEST'));
         }
 
         // Make sure the public key credential request options in the session are valid
@@ -214,7 +212,7 @@ public static function verifyAssertion(string $response): void
             || empty($publicKeyCredentialRequestOptions)
             || !($publicKeyCredentialRequestOptions instanceof PublicKeyCredentialRequestOptions)
         ) {
-            throw new RuntimeException(Text::_('PLG_MULTIFACTORAUTH_WEBAUTHN_ERR_CREATE_INVALID_LOGIN_REQUEST'));
+            throw new \RuntimeException(Text::_('PLG_MULTIFACTORAUTH_WEBAUTHN_ERR_CREATE_INVALID_LOGIN_REQUEST'));
         }
 
         // Unserialize the browser response data
@@ -278,7 +276,7 @@ private static function getWebauthnServer(?int $userId): Server
         try {
             $app      = Factory::getApplication();
             $siteName = $app->get('sitename');
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $siteName = 'Joomla! Site';
         }
 
@@ -292,7 +290,7 @@ private static function getWebauthnServer(?int $userId): Server
             ''
         );
 
-        $refClass       = new ReflectionClass(Server::class);
+        $refClass       = new \ReflectionClass(Server::class);
         $refConstructor = $refClass->getConstructor();
         $params         = $refConstructor->getParameters();
 
diff --git a/plugins/multifactorauth/yubikey/services/provider.php b/plugins/multifactorauth/yubikey/services/provider.php
index 5c0379f3e36ac..5c20fcf5ecbeb 100644
--- a/plugins/multifactorauth/yubikey/services/provider.php
+++ b/plugins/multifactorauth/yubikey/services/provider.php
@@ -33,10 +33,7 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $config  = (array) PluginHelper::getPlugin('multifactorauth', 'yubikey');
-                $subject = $container->get(DispatcherInterface::class);
-
-                $plugin = new Yubikey($subject, $config);
+                $plugin = new Yubikey($container->get(DispatcherInterface::class), (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 f1625cb9bdf3b..a1eae1b7a2c9d 100644
--- a/plugins/multifactorauth/yubikey/src/Extension/Yubikey.php
+++ b/plugins/multifactorauth/yubikey/src/Extension/Yubikey.php
@@ -225,7 +225,7 @@ public function onUserMultifactorGetSetup(GetSetup $event): void
      * @param   SaveSetup  $event  The event we are handling
      *
      * @return  void The configuration data to save to the database
-     * @throws  Exception
+     * @throws  \Exception
      * @since   4.2.0
      */
     public function onUserMultifactorSaveSetup(SaveSetup $event): void
@@ -261,14 +261,14 @@ public function onUserMultifactorSaveSetup(SaveSetup $event): void
 
         // If an empty code or something other than 44 characters was submitted I'm not having any of this!
         if (empty($code) || (strlen($code) != 44)) {
-            throw new RuntimeException(Text::_('PLG_MULTIFACTORAUTH_YUBIKEY_ERR_VALIDATIONFAILED'), 500);
+            throw new \RuntimeException(Text::_('PLG_MULTIFACTORAUTH_YUBIKEY_ERR_VALIDATIONFAILED'), 500);
         }
 
         // Validate the code
         $isValid = $this->validateYubikeyOtp($code);
 
         if (!$isValid) {
-            throw new RuntimeException(Text::_('PLG_MULTIFACTORAUTH_YUBIKEY_ERR_VALIDATIONFAILED'), 500);
+            throw new \RuntimeException(Text::_('PLG_MULTIFACTORAUTH_YUBIKEY_ERR_VALIDATIONFAILED'), 500);
         }
 
         // The code is valid. Keep the Yubikey ID (first twelve characters)
@@ -285,7 +285,7 @@ public function onUserMultifactorSaveSetup(SaveSetup $event): void
      * @param   Validate  $event  The event we are handling
      *
      * @return  void
-     * @throws  Exception
+     * @throws  \Exception
      * @since   4.2.0
      */
     public function onUserMultifactorValidate(Validate $event): void
@@ -321,7 +321,7 @@ function ($rec) use ($record) {
                     return $rec->method === $record->method;
                 }
             );
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $records = [];
         }
 
@@ -343,7 +343,7 @@ function (bool $carry, $aRecord) use ($code) {
      * @param   string  $otp  The OTP generated by your Yubikey
      *
      * @return  boolean  True if it's a valid OTP
-     * @throws  Exception
+     * @throws  \Exception
      * @since   4.2.0
      */
     private function validateYubikeyOtp(string $otp): bool
@@ -411,7 +411,7 @@ private function validateYubikeyOtp(string $otp): bool
                 } else {
                     continue;
                 }
-            } catch (Exception $exc) {
+            } catch (\Exception $exc) {
                 // No response, continue with the next server
                 continue;
             }
@@ -484,7 +484,7 @@ private function validateYubikeyOtp(string $otp): bool
      * @return  void
      * @since   4.2.0
      *
-     * @see     https://developers.yubico.com/yubikey-val/Validation_Protocol_V2.0.html
+     * @link    https://developers.yubico.com/yubikey-val/Validation_Protocol_V2.0.html
      */
     private function signRequest(Uri $uri, string $secret): void
     {
@@ -588,7 +588,7 @@ private function decodeRecordOptions(MfaTable $record): array
      * @param   string    $code    The code given to us by the user
      *
      * @return  boolean
-     * @throws  Exception
+     * @throws  \Exception
      * @since   4.2.0
      */
     private function validateAgainstRecord(MfaTable $record, string $code): bool
diff --git a/plugins/privacy/actionlogs/services/provider.php b/plugins/privacy/actionlogs/services/provider.php
index bebf98f341020..4413b5fbaff65 100644
--- a/plugins/privacy/actionlogs/services/provider.php
+++ b/plugins/privacy/actionlogs/services/provider.php
@@ -27,16 +27,15 @@
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.4.0
      */
     public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Actionlogs(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('privacy', 'actionlogs')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/privacy/actionlogs/src/Extension/Actionlogs.php b/plugins/privacy/actionlogs/src/Extension/Actionlogs.php
index bd5e8c046a5e6..454f63f1e5727 100644
--- a/plugins/privacy/actionlogs/src/Extension/Actionlogs.php
+++ b/plugins/privacy/actionlogs/src/Extension/Actionlogs.php
@@ -10,11 +10,11 @@
 
 namespace Joomla\Plugin\Privacy\Actionlogs\Extension;
 
-use Joomla\CMS\User\User;
+use Joomla\CMS\Event\Privacy\ExportRequestEvent;
 use Joomla\Component\Actionlogs\Administrator\Helper\ActionlogsHelper;
 use Joomla\Component\Privacy\Administrator\Plugin\PrivacyPlugin;
-use Joomla\Component\Privacy\Administrator\Table\RequestTable;
 use Joomla\Database\ParameterType;
+use Joomla\Event\SubscriberInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -25,22 +25,38 @@
  *
  * @since  3.9.0
  */
-final class Actionlogs extends PrivacyPlugin
+final class Actionlogs extends PrivacyPlugin implements SubscriberInterface
 {
+    /**
+     * Returns an array of events this subscriber will listen to.
+     *
+     * @return  array
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            'onPrivacyExportRequest' => 'onPrivacyExportRequest',
+        ];
+    }
+
     /**
      * Processes an export request for Joomla core actionlog data
      *
-     * @param   RequestTable  $request  The request record being processed
-     * @param   User          $user     The user account associated with this request if available
+     * @param   ExportRequestEvent  $event  The request event
      *
-     * @return  \Joomla\Component\Privacy\Administrator\Export\Domain[]
+     * @return  void
      *
      * @since   3.9.0
      */
-    public function onPrivacyExportRequest(RequestTable $request, User $user = null)
+    public function onPrivacyExportRequest(ExportRequestEvent $event)
     {
+        $user = $event->getUser();
+
+        // RequestTable $request, User $user = null
         if (!$user) {
-            return [];
+            return;
         }
 
         $domain = $this->createDomain('user_action_logs', 'joomla_user_action_logs_data');
@@ -59,7 +75,7 @@ public function onPrivacyExportRequest(RequestTable $request, User $user = null)
         $data = $db->loadObjectList();
 
         if (!count($data)) {
-            return [];
+            return;
         }
 
         $data    = ActionlogsHelper::getCsvData($data);
@@ -75,6 +91,6 @@ public function onPrivacyExportRequest(RequestTable $request, User $user = null)
             $domain->addItem($this->createItemFromArray($item));
         }
 
-        return [$domain];
+        $event->addResult([$domain]);
     }
 }
diff --git a/plugins/privacy/consents/services/provider.php b/plugins/privacy/consents/services/provider.php
index be1159de59a5c..a1a7101ed1693 100644
--- a/plugins/privacy/consents/services/provider.php
+++ b/plugins/privacy/consents/services/provider.php
@@ -27,16 +27,15 @@
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.4.0
      */
     public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Consents(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('privacy', 'consents')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/privacy/contact/services/provider.php b/plugins/privacy/contact/services/provider.php
index 6dd339fae31e2..43e04bbb1c037 100644
--- a/plugins/privacy/contact/services/provider.php
+++ b/plugins/privacy/contact/services/provider.php
@@ -27,16 +27,15 @@
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.4.0
      */
     public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Contact(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('privacy', 'contact')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/privacy/content/services/provider.php b/plugins/privacy/content/services/provider.php
index deb5f0166402a..f84978061a5fe 100644
--- a/plugins/privacy/content/services/provider.php
+++ b/plugins/privacy/content/services/provider.php
@@ -27,16 +27,15 @@
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.4.0
      */
     public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Content(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('privacy', 'content')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/privacy/message/services/provider.php b/plugins/privacy/message/services/provider.php
index 4280d924bb4c0..7a4bd42a8dfcf 100644
--- a/plugins/privacy/message/services/provider.php
+++ b/plugins/privacy/message/services/provider.php
@@ -27,16 +27,15 @@
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.4.0
      */
     public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Message(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('privacy', 'message')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/privacy/user/services/provider.php b/plugins/privacy/user/services/provider.php
index 186b06c90bfe2..1ccc1652e9e24 100644
--- a/plugins/privacy/user/services/provider.php
+++ b/plugins/privacy/user/services/provider.php
@@ -27,16 +27,15 @@
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.4.0
      */
     public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new UserPlugin(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('privacy', 'user')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/privacy/user/src/Extension/UserPlugin.php b/plugins/privacy/user/src/Extension/UserPlugin.php
index 7d42c4c0e7cc1..701b175abe106 100644
--- a/plugins/privacy/user/src/Extension/UserPlugin.php
+++ b/plugins/privacy/user/src/Extension/UserPlugin.php
@@ -10,14 +10,17 @@
 
 namespace Joomla\Plugin\Privacy\User\Extension;
 
+use Joomla\CMS\Event\Privacy\CanRemoveDataEvent;
+use Joomla\CMS\Event\Privacy\ExportRequestEvent;
+use Joomla\CMS\Event\Privacy\RemoveDataEvent;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Table\User as TableUser;
 use Joomla\CMS\User\User;
 use Joomla\CMS\User\UserHelper;
 use Joomla\Component\Privacy\Administrator\Plugin\PrivacyPlugin;
 use Joomla\Component\Privacy\Administrator\Removal\Status;
-use Joomla\Component\Privacy\Administrator\Table\RequestTable;
 use Joomla\Database\ParameterType;
+use Joomla\Event\SubscriberInterface;
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -29,26 +32,43 @@
  *
  * @since  3.9.0
  */
-final class UserPlugin extends PrivacyPlugin
+final class UserPlugin extends PrivacyPlugin implements SubscriberInterface
 {
+    /**
+     * Returns an array of events this subscriber will listen to.
+     *
+     * @return  array
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            'onPrivacyCanRemoveData' => 'onPrivacyCanRemoveData',
+            'onPrivacyRemoveData'    => 'onPrivacyRemoveData',
+            'onPrivacyExportRequest' => 'onPrivacyExportRequest',
+        ];
+    }
+
     /**
      * Performs validation to determine if the data associated with a remove information request can be processed
      *
      * This event will not allow a super user account to be removed
      *
-     * @param   RequestTable  $request  The request record being processed
-     * @param   User          $user     The user account associated with this request if available
+     * @param   CanRemoveDataEvent  $event  The request event
      *
-     * @return  Status
+     * @return  void
      *
      * @since   3.9.0
      */
-    public function onPrivacyCanRemoveData(RequestTable $request, User $user = null)
+    public function onPrivacyCanRemoveData(CanRemoveDataEvent $event)
     {
+        $user   = $event->getUser();
         $status = new Status();
 
         if (!$user) {
-            return $status;
+            $event->addResult($status);
+            return;
         }
 
         if ($user->authorise('core.admin')) {
@@ -56,7 +76,7 @@ public function onPrivacyCanRemoveData(RequestTable $request, User $user = null)
             $status->reason    = Text::_('PLG_PRIVACY_USER_ERROR_CANNOT_REMOVE_SUPER_USER');
         }
 
-        return $status;
+        $event->addResult($status);
     }
 
     /**
@@ -69,17 +89,18 @@ public function onPrivacyCanRemoveData(RequestTable $request, User $user = null)
      * - #__user_profiles
      * - User custom fields
      *
-     * @param   RequestTable  $request  The request record being processed
-     * @param   User          $user     The user account associated with this request if available
+     * @param   ExportRequestEvent  $event  The request event
      *
-     * @return  \Joomla\Component\Privacy\Administrator\Export\Domain[]
+     * @return  void
      *
      * @since   3.9.0
      */
-    public function onPrivacyExportRequest(RequestTable $request, User $user = null)
+    public function onPrivacyExportRequest(ExportRequestEvent $event)
     {
+        $user = $event->getUser();
+
         if (!$user) {
-            return [];
+            return;
         }
 
         /** @var TableUser $userTable */
@@ -92,7 +113,7 @@ public function onPrivacyExportRequest(RequestTable $request, User $user = null)
         $domains[] = $this->createProfileDomain($userTable);
         $domains[] = $this->createCustomFieldsDomain('com_users.user', [$userTable]);
 
-        return $domains;
+        $event->addResult($domains);
     }
 
     /**
@@ -100,15 +121,16 @@ public function onPrivacyExportRequest(RequestTable $request, User $user = null)
      *
      * This event will pseudoanonymise the user account
      *
-     * @param   RequestTable  $request  The request record being processed
-     * @param   User          $user     The user account associated with this request if available
+     * @param   RemoveDataEvent  $event  The remove data event
      *
      * @return  void
      *
      * @since   3.9.0
      */
-    public function onPrivacyRemoveData(RequestTable $request, User $user = null)
+    public function onPrivacyRemoveData(RemoveDataEvent $event)
     {
+        $user = $event->getUser();
+
         // This plugin only processes data for registered user accounts
         if (!$user) {
             return;
diff --git a/plugins/quickicon/downloadkey/services/provider.php b/plugins/quickicon/downloadkey/services/provider.php
index cd88d2497b522..bffae71d7610f 100644
--- a/plugins/quickicon/downloadkey/services/provider.php
+++ b/plugins/quickicon/downloadkey/services/provider.php
@@ -33,9 +33,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Downloadkey(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('quickicon', 'downloadkey')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/quickicon/eos/eos.xml b/plugins/quickicon/eos/eos.xml
new file mode 100644
index 0000000000000..e0f325e1aa167
--- /dev/null
+++ b/plugins/quickicon/eos/eos.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extension type="plugin" group="quickicon" method="upgrade">
+	<name>plg_quickicon_eos</name>
+	<author>Joomla! Project</author>
+	<creationDate>2023-05</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>4.4.0</version>
+	<description>PLG_QUICKICON_EOS_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\Quickicon\Eos</namespace>
+	<files>
+		<folder plugin="eos">services</folder>
+		<folder>src</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">language/en-GB/plg_quickicon_eos.ini</language>
+		<language tag="en-GB">language/en-GB/plg_quickicon_eos.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="last_snoozed_id"
+					type="hidden"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/plugins/quickicon/eos/services/provider.php b/plugins/quickicon/eos/services/provider.php
new file mode 100644
index 0000000000000..cfc02522532ef
--- /dev/null
+++ b/plugins/quickicon/eos/services/provider.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Quickicon.eos
+ *
+ * @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\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\Event\DispatcherInterface;
+use Joomla\Plugin\Quickicon\Eos\Extension\Eos;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since  4.4.0
+     *
+     * @throws Exception
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new Eos(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('quickicon', 'eos')
+                );
+                $plugin->setApplication(Factory::getApplication());
+                $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
new file mode 100644
index 0000000000000..cdeeb12a2cfcb
--- /dev/null
+++ b/plugins/quickicon/eos/src/Extension/Eos.php
@@ -0,0 +1,305 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Quickicon.eos
+ *
+ * @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\Quickicon\Eos\Extension;
+
+use Joomla\CMS\Access\Exception\NotAllowed;
+use Joomla\CMS\Application\CMSWebApplicationInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\Database\DatabaseAwareTrait;
+use Joomla\Event\SubscriberInterface;
+use Joomla\Module\Quickicon\Administrator\Event\QuickIconsEvent;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Joomla! end of support notification plugin
+ *
+ * @since 4.4.0
+ */
+final class Eos extends CMSPlugin implements SubscriberInterface
+{
+    use DatabaseAwareTrait;
+
+    /**
+     * The EOS date for the current major version.
+     *
+     * @var    string
+     * @since 4.4.0
+     */
+    private const EOS_DATE = '2027-10-19';
+
+    /**
+     * Load the language file on instantiation.
+     *
+     * @var    bool
+     * @since  4.4.0
+     */
+    protected $autoloadLanguage = false;
+
+    /**
+     * Holding the current valid message to be shown.
+     *
+     * @var    array
+     * @since 4.4.0
+     */
+    private $currentMessage = [];
+
+    /**
+     * Are the messages initialized.
+     *
+     * @var    bool
+     * @since 4.4.0
+     */
+
+    private $messagesInitialized = false;
+
+    /**
+     * Returns an array of events this subscriber will listen to.
+     *
+     * @return  array
+     *
+     * @since 4.4.0
+     */
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            'onGetIcons' => 'getEndOfServiceNotification',
+            'onAjaxEos'  => 'onAjaxEos',
+        ];
+    }
+
+    /**
+     * Check and show the the alert.
+     *
+     * This method is called when the Quick Icons module is constructing its set
+     * of icons.
+     *
+     * @param   QuickIconsEvent  $event  The event object
+     *
+     * @return  void
+     *
+     * @since 4.4.0
+     *
+     * @throws \Exception
+     */
+    public function getEndOfServiceNotification(QuickIconsEvent $event): void
+    {
+        $app = $this->getApplication();
+
+        if (
+            $event->getContext() !== $this->params->get('context', 'update_quickicon')
+            || !$this->shouldDisplayMessage()
+            || (!$this->messagesInitialized && $this->setMessage() == [])
+            || !$app instanceof CMSWebApplicationInterface
+        ) {
+            return;
+        }
+
+        $this->loadLanguage();
+
+        // Show this only when not snoozed
+        if ($this->params->get('last_snoozed_id', 0) < $this->currentMessage['id']) {
+            // Build the  message to be displayed in the cpanel
+            $messageText = sprintf(
+                $app->getLanguage()->_($this->currentMessage['messageText']),
+                HTMLHelper::_('date', Eos::EOS_DATE, $app->getLanguage()->_('DATE_FORMAT_LC3')),
+                $this->currentMessage['messageLink']
+            );
+            if ($this->currentMessage['snoozable']) {
+                $messageText .= '<p><button class="btn btn-warning eosnotify-snooze-btn" type="button" >';
+                $messageText .= $app->getLanguage()->_('PLG_QUICKICON_EOS_SNOOZE_BUTTON') . '</button></p>';
+            }
+            $app->enqueueMessage($messageText, $this->currentMessage['messageType']);
+        }
+
+        $app->getDocument()->getWebAssetManager()
+            ->registerAndUseScript('plg_quickicon_eos.script', 'plg_quickicon_eos/snooze.js', [], ['type' => 'module']);
+    }
+
+    /**
+     * Save the plugin parameters.
+     *
+     * @return  bool
+     *
+     * @since 4.4.0
+     */
+    private function saveParams(): bool
+    {
+        $params = $this->params->toString('JSON');
+        $db     = $this->getDatabase();
+        $query  = $db->getQuery(true)
+            ->update($db->quoteName('#__extensions'))
+            ->set($db->quoteName('params') . ' = :params')
+            ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
+            ->where($db->quoteName('folder') . ' = ' . $db->quote('quickicon'))
+            ->where($db->quoteName('element') . ' = ' . $db->quote('eos'))
+            ->bind(':params', $params);
+
+        return $db->setQuery($query)->execute();
+    }
+
+    /**
+     * Determines if the message and quickicon should be displayed.
+     *
+     * @return  bool
+     *
+     * @since 4.4.0
+     *
+     * @throws \Exception
+     */
+    private function shouldDisplayMessage(): bool
+    {
+        // Show only on administration part
+        return $this->getApplication()->isClient('administrator')
+            // Only show for HTML requests
+            && $this->getApplication()->getDocument()->getType() === 'html'
+            // Don't show in modal
+            && $this->getApplication()->getInput()->getCmd('tmpl', 'index') !== 'component'
+            // Only show in cpanel
+            && $this->getApplication()->getInput()->get('option') === 'com_cpanel';
+    }
+
+    /**
+     * Return the texts to be displayed based on the time until we reach EOS.
+     *
+     * @param   int  $monthsUntilEOS  The months until we reach EOS
+     * @param   int  $inverted        Have we surpassed the EOS date
+     *
+     * @return  array  An array with the message to be displayed or false
+     *
+     * @since 4.4.0
+     */
+    private function getMessageInfo(int $monthsUntilEOS, int $inverted): array
+    {
+        // The EOS date has passed - Support has ended
+        if ($inverted === 1) {
+            return [
+                'id'          => 5,
+                'messageText' => 'PLG_QUICKICON_EOS_MESSAGE_ERROR_SUPPORT_ENDED',
+                'messageType' => 'error',
+                'messageLink' => 'https://docs.joomla.org/Special:MyLanguage/Joomla_4.4.x_to_5.x_Planning_and_Upgrade_Step_by_Step',
+                'snoozable'   => false,
+            ];
+        }
+
+        // The security support is ending in 6 months
+        if ($monthsUntilEOS < 6) {
+            return [
+                'id'          => 4,
+                'messageText' => 'PLG_QUICKICON_EOS_MESSAGE_WARNING_SUPPORT_ENDING',
+                'messageType' => 'warning',
+                'messageLink' => 'https://docs.joomla.org/Special:MyLanguage/Joomla_4.4.x_to_5.x_Planning_and_Upgrade_Step_by_Step',
+                'snoozable'   => true,
+            ];
+        }
+
+        // We are in security only mode now, 12 month to go from now on
+        if ($monthsUntilEOS < 12) {
+            return [
+                'id'          => 3,
+                'messageText' => 'PLG_QUICKICON_EOS_MESSAGE_WARNING_SECURITY_ONLY',
+                'messageType' => 'warning',
+                'messageLink' => 'https://docs.joomla.org/Special:MyLanguage/Joomla_4.4.x_to_5.x_Planning_and_Upgrade_Step_by_Step',
+                'snoozable'   => true,
+            ];
+        }
+
+        // We still have 16 month to go, lets remind our users about the pre upgrade checker
+        if ($monthsUntilEOS < 16) {
+            return [
+                'id'          => 2,
+                'messageText' => 'PLG_QUICKICON_EOS_MESSAGE_INFO_02',
+                'messageType' => 'info',
+                'messageLink' => 'https://docs.joomla.org/Special:MyLanguage/Pre-Update_Check',
+                'snoozable'   => true,
+            ];
+        }
+
+        // Lets start our messages 2 month after the initial release, still 22 month to go
+        if ($monthsUntilEOS < 22) {
+            return [
+                'id'          => 1,
+                'messageText' => 'PLG_QUICKICON_EOS_MESSAGE_INFO_01',
+                'messageType' => 'info',
+                'messageLink' => 'https://joomla.org/5',
+                'snoozable'   => true,
+            ];
+        }
+
+        return [];
+    }
+
+    /**
+     * Check if current user is allowed to send the data.
+     *
+     * @return  bool
+     *
+     * @since 4.4.0
+     *
+     * @throws \Exception
+     */
+    private function isAllowedUser(): bool
+    {
+        return $this->getApplication()->getIdentity()->authorise('core.login.admin');
+    }
+
+    /**
+     * User hit the snooze button.
+     *
+     * @return  string
+     *
+     * @since 4.4.0
+     *
+     * @throws  Notallowed  If user is not allowed
+     *
+     * @throws \Exception
+     */
+    public function onAjaxEos(): string
+    {
+        // No messages yet so nothing to snooze
+        if (!$this->messagesInitialized && $this->setMessage() == []) {
+            return '';
+        }
+
+        if (!$this->isAllowedUser()) {
+            throw new Notallowed($this->getApplication()->getLanguage()->_('JGLOBAL_AUTH_ACCESS_DENIED'), 403);
+        }
+
+        // Make sure only snoozable messages can be snoozed
+        if ($this->currentMessage['snoozable']) {
+            $this->params->set('last_snoozed_id', $this->currentMessage['id']);
+            $this->saveParams();
+        }
+
+        return '';
+    }
+
+    /**
+     * Calculates how many days and selects correct message.
+     *
+     * @return array
+     *
+     * @since  4.4.0
+     */
+    private function setMessage(): array
+    {
+        $diff                      = Factory::getDate()->diff(Factory::getDate(Eos::EOS_DATE));
+        $message                   = $this->getMessageInfo(floor($diff->days / 30.417), $diff->invert);
+        $this->currentMessage      = $message;
+        $this->messagesInitialized = true;
+
+        return $message;
+    }
+}
diff --git a/plugins/quickicon/extensionupdate/services/provider.php b/plugins/quickicon/extensionupdate/services/provider.php
index cc0c606ee14b8..39a8234f093a8 100644
--- a/plugins/quickicon/extensionupdate/services/provider.php
+++ b/plugins/quickicon/extensionupdate/services/provider.php
@@ -33,9 +33,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Extensionupdate(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('quickicon', 'extensionupdate')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/quickicon/joomlaupdate/joomlaupdate.xml b/plugins/quickicon/joomlaupdate/joomlaupdate.xml
index 222dc69849340..8f3ffb1070db3 100644
--- a/plugins/quickicon/joomlaupdate/joomlaupdate.xml
+++ b/plugins/quickicon/joomlaupdate/joomlaupdate.xml
@@ -11,7 +11,7 @@
 	<description>PLG_QUICKICON_JOOMLAUPDATE_XML_DESCRIPTION</description>
 	<namespace path="src">Joomla\Plugin\Quickicon\Joomlaupdate</namespace>
 	<files>
-		<folder>services</folder>
+		<folder plugin="joomlaupdate">services</folder>
 		<folder>src</folder>
 	</files>
 	<languages>
diff --git a/plugins/quickicon/joomlaupdate/src/Extension/Joomlaupdate.php b/plugins/quickicon/joomlaupdate/src/Extension/Joomlaupdate.php
index a3a1353eb9ca4..b9ad120d24e6a 100644
--- a/plugins/quickicon/joomlaupdate/src/Extension/Joomlaupdate.php
+++ b/plugins/quickicon/joomlaupdate/src/Extension/Joomlaupdate.php
@@ -64,17 +64,17 @@ public static function getSubscribedEvents(): array
     /**
      * Constructor
      *
-     * @param   DispatcherInterface  $subject   The object to observe
-     * @param   Document             $document  The document
-     * @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).
+     * @param   DispatcherInterface  $dispatcher   The object to observe
+     * @param   Document             $document     The document
+     * @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   4.0.0
      */
-    public function __construct($subject, Document $document, $config = [])
+    public function __construct($dispatcher, Document $document, array $config = [])
     {
-        parent::__construct($subject, $config);
+        parent::__construct($dispatcher, $config);
 
         $this->document = $document;
     }
diff --git a/plugins/quickicon/overridecheck/services/provider.php b/plugins/quickicon/overridecheck/services/provider.php
index 4a3153c0c1567..c3d52a6cce74a 100644
--- a/plugins/quickicon/overridecheck/services/provider.php
+++ b/plugins/quickicon/overridecheck/services/provider.php
@@ -34,9 +34,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new OverrideCheck(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('quickicon', 'overridecheck')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/quickicon/phpversioncheck/services/provider.php b/plugins/quickicon/phpversioncheck/services/provider.php
index 43fc37e43ed56..67c76c2a45468 100644
--- a/plugins/quickicon/phpversioncheck/services/provider.php
+++ b/plugins/quickicon/phpversioncheck/services/provider.php
@@ -33,9 +33,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new PhpVersionCheck(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('quickicon', 'phpversioncheck')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/quickicon/phpversioncheck/src/Extension/PhpVersionCheck.php b/plugins/quickicon/phpversioncheck/src/Extension/PhpVersionCheck.php
index 65f78b7996c17..3e5d3f9cbd80e 100644
--- a/plugins/quickicon/phpversioncheck/src/Extension/PhpVersionCheck.php
+++ b/plugins/quickicon/phpversioncheck/src/Extension/PhpVersionCheck.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Plugin\Quickicon\PhpVersionCheck\Extension;
 
-use DateInterval;
 use Joomla\CMS\Date\Date;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Plugin\CMSPlugin;
@@ -197,7 +196,7 @@ private function getPhpSupport()
 
             // If the version is still supported, check if it has reached eol minus 3 month
             $securityWarningDate = clone $phpEndOfSupport;
-            $securityWarningDate->sub(new DateInterval('P3M'));
+            $securityWarningDate->sub(new \DateInterval('P3M'));
 
             if (!$phpNotSupported && $today > $securityWarningDate) {
                 $supportStatus['status']  = self::PHP_SECURITY_ONLY;
diff --git a/plugins/quickicon/privacycheck/services/provider.php b/plugins/quickicon/privacycheck/services/provider.php
index c8fec59db1f4f..7648398600437 100644
--- a/plugins/quickicon/privacycheck/services/provider.php
+++ b/plugins/quickicon/privacycheck/services/provider.php
@@ -33,9 +33,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new PrivacyCheck(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('quickicon', 'privacycheck')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/sampledata/blog/services/provider.php b/plugins/sampledata/blog/services/provider.php
index 40938d0cac82e..f407dfd929b8c 100644
--- a/plugins/sampledata/blog/services/provider.php
+++ b/plugins/sampledata/blog/services/provider.php
@@ -27,16 +27,15 @@
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.4.0
      */
     public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Blog(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('sampledata', 'blog')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/sampledata/blog/src/Extension/Blog.php b/plugins/sampledata/blog/src/Extension/Blog.php
index 7ea2086558501..4bc1ef911f2a7 100644
--- a/plugins/sampledata/blog/src/Extension/Blog.php
+++ b/plugins/sampledata/blog/src/Extension/Blog.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Plugin\SampleData\Blog\Extension;
 
-use Exception;
 use Joomla\CMS\Application\ApplicationHelper;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Extension\ExtensionHelper;
@@ -22,7 +21,6 @@
 use Joomla\CMS\Session\Session;
 use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Database\ParameterType;
-use stdClass;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -58,7 +56,7 @@ final class Blog extends CMSPlugin
     /**
      * Get an overview of the proposed sampledata.
      *
-     * @return  stdClass|void  Will be converted into the JSON response to the module.
+     * @return  \stdClass|void  Will be converted into the JSON response to the module.
      *
      * @since  3.8.0
      */
@@ -68,7 +66,7 @@ public function onSampledataGetOverview()
             return;
         }
 
-        $data              = new stdClass();
+        $data              = new \stdClass();
         $data->name        = $this->_name;
         $data->title       = $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_BLOG_OVERVIEW_TITLE');
         $data->description = $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_BLOG_OVERVIEW_DESC');
@@ -133,9 +131,9 @@ public function onAjaxSampledataApplyStep1()
             try {
                 if (!$modelTag->save($tag)) {
                     $this->getApplication()->getLanguage()->load('com_tags');
-                    throw new Exception($this->getApplication()->getLanguage()->_($modelTag->getError()));
+                    throw new \Exception($this->getApplication()->getLanguage()->_($modelTag->getError()));
                 }
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 $response            = [];
                 $response['success'] = false;
                 $response['message'] = Text::sprintf('PLG_SAMPLEDATA_BLOG_STEP_FAILED', 1, $e->getMessage());
@@ -178,9 +176,9 @@ public function onAjaxSampledataApplyStep1()
 
             try {
                 if (!$groupModel->save($group)) {
-                    throw new Exception($groupModel->getError());
+                    throw new \Exception($groupModel->getError());
                 }
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 $response            = [];
                 $response['success'] = false;
                 $response['message'] = Text::sprintf('PLG_SAMPLEDATA_BLOG_STEP_FAILED', 1, $e->getMessage());
@@ -241,9 +239,9 @@ public function onAjaxSampledataApplyStep1()
 
                 try {
                     if (!$fieldModel->save($cf)) {
-                        throw new Exception($fieldModel->getError());
+                        throw new \Exception($fieldModel->getError());
                     }
-                } catch (Exception $e) {
+                } catch (\Exception $e) {
                     $response            = [];
                     $response['success'] = false;
                     $response['message'] = Text::sprintf('PLG_SAMPLEDATA_BLOG_STEP_FAILED', 1, $e->getMessage());
@@ -495,9 +493,9 @@ public function onAjaxSampledataApplyStep1()
             try {
                 if (!$categoryModel->save($category)) {
                     $this->getApplication()->getLanguage()->load('com_categories');
-                    throw new Exception($categoryModel->getError());
+                    throw new \Exception($categoryModel->getError());
                 }
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 $response            = [];
                 $response['success'] = false;
                 $response['message'] = Text::sprintf('PLG_SAMPLEDATA_BLOG_STEP_FAILED', 1, $e->getMessage());
@@ -818,11 +816,11 @@ public function onAjaxSampledataApplyStep2()
 
                 if (!$menuTable->check()) {
                     $this->getApplication()->getLanguage()->load('com_menu');
-                    throw new Exception($menuTable->getError());
+                    throw new \Exception($menuTable->getError());
                 }
 
                 $menuTable->store();
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 $response            = [];
                 $response['success'] = false;
                 $response['message'] = Text::sprintf('PLG_SAMPLEDATA_BLOG_STEP_FAILED', 2, $e->getMessage());
@@ -1050,7 +1048,7 @@ public function onAjaxSampledataApplyStep2()
 
         try {
             $menuIdsLevel1 = $this->addMenuItems($menuItems, 1);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $response            = [];
             $response['success'] = false;
             $response['message'] = Text::sprintf('PLG_SAMPLEDATA_BLOG_STEP_FAILED', 2, $e->getMessage());
@@ -1119,7 +1117,7 @@ public function onAjaxSampledataApplyStep2()
 
         try {
             $menuIdsLevel1 = array_merge($menuIdsLevel1, $this->addMenuItems($menuItems, 1));
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $response            = [];
             $response['success'] = false;
             $response['message'] = Text::sprintf('PLG_SAMPLEDATA_BLOG_STEP_FAILED', 2, $e->getMessage());
@@ -1256,7 +1254,7 @@ public function onAjaxSampledataApplyStep2()
 
         try {
             $menuIdsLevel2 = $this->addMenuItems($menuItems, 2);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $response            = [];
             $response['success'] = false;
             $response['message'] = Text::sprintf('PLG_SAMPLEDATA_BLOG_STEP_FAILED', 2, $e->getMessage());
@@ -1303,7 +1301,7 @@ public function onAjaxSampledataApplyStep2()
 
         try {
             $this->addMenuItems($menuItems, 3);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $response            = [];
             $response['success'] = false;
             $response['message'] = Text::sprintf('PLG_SAMPLEDATA_BLOG_STEP_FAILED', 2, $e->getMessage());
@@ -1783,7 +1781,7 @@ public function onAjaxSampledataApplyStep4()
      *
      * @since  3.8.0
      *
-     * @throws  Exception
+     * @throws  \Exception
      */
     private function addMenuItems(array $menuItems, $level)
     {
@@ -1856,7 +1854,7 @@ private function addMenuItems(array $menuItems, $level)
                     $menuItem['alias'] = substr_replace($menuItem['alias'], '2', -1);
 
                     if (!$this->menuItemModel->save($menuItem)) {
-                        throw new Exception($menuItem['title'] . ' => ' . $menuItem['alias'] . ' : ' . $this->menuItemModel->getError());
+                        throw new \Exception($menuItem['title'] . ' => ' . $menuItem['alias'] . ' : ' . $this->menuItemModel->getError());
                     }
                 }
             }
diff --git a/plugins/sampledata/multilang/services/provider.php b/plugins/sampledata/multilang/services/provider.php
index 7126a1121d8a7..0cf5bff953812 100644
--- a/plugins/sampledata/multilang/services/provider.php
+++ b/plugins/sampledata/multilang/services/provider.php
@@ -27,16 +27,15 @@
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.4.0
      */
     public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new MultiLanguage(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('sampledata', 'multilang')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/sampledata/multilang/src/Extension/MultiLanguage.php b/plugins/sampledata/multilang/src/Extension/MultiLanguage.php
index 49095c5492375..dc11ad26126d1 100644
--- a/plugins/sampledata/multilang/src/Extension/MultiLanguage.php
+++ b/plugins/sampledata/multilang/src/Extension/MultiLanguage.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Plugin\SampleData\MultiLanguage\Extension;
 
-use Exception;
 use Joomla\CMS\Application\ApplicationHelper;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Extension\ExtensionHelper;
@@ -26,8 +25,6 @@
 use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Database\Exception\ExecutionFailureException;
 use Joomla\Database\ParameterType;
-use RuntimeException;
-use stdClass;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -68,7 +65,7 @@ final class MultiLanguage extends CMSPlugin
     /**
      * Get an overview of the proposed sampledata.
      *
-     * @return  stdClass|void  Will be converted into the JSON response to the module.
+     * @return  \stdClass|void  Will be converted into the JSON response to the module.
      *
      * @since   4.0.0
      */
@@ -78,7 +75,7 @@ public function onSampledataGetOverview()
             return;
         }
 
-        $data              = new stdClass();
+        $data              = new \stdClass();
         $data->name        = $this->_name;
         $data->title       = $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_MULTILANG_OVERVIEW_TITLE');
         $data->description = $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_MULTILANG_OVERVIEW_DESC');
@@ -587,7 +584,7 @@ private function addModuleLanguageSwitcher()
     /**
      * Add Module Menu.
      *
-     * @param   stdClass  $itemLanguage  Language Object.
+     * @param   \stdClass  $itemLanguage  Language Object.
      *
      * @return  boolean
      *
@@ -637,7 +634,7 @@ private function addModuleMenu($itemLanguage)
     /**
      * Add Menu Group.
      *
-     * @param   stdClass  $itemLanguage  Language Object.
+     * @param   \stdClass  $itemLanguage  Language Object.
      *
      * @return  boolean
      *
@@ -676,7 +673,7 @@ private function addMenuGroup($itemLanguage)
     /**
      * Add List All Categories Menu Item for new router.
      *
-     * @param   stdClass  $itemLanguage  Language Object.
+     * @param   \stdClass  $itemLanguage  Language Object.
      *
      * @return  Table|boolean Menu Item Object. False otherwise.
      *
@@ -750,7 +747,7 @@ private function addAllCategoriesMenuItem($itemLanguage)
     /**
      * Add Blog Menu Item.
      *
-     * @param   stdClass  $itemLanguage  Language Object.
+     * @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.
@@ -896,7 +893,7 @@ private function addModuleInModuleMenu($moduleId)
 
         try {
             $db->execute();
-        } catch (RuntimeException $e) {
+        } catch (\RuntimeException $e) {
             return false;
         }
 
@@ -906,7 +903,7 @@ private function addModuleInModuleMenu($moduleId)
     /**
      * Method to create a category for a specific language.
      *
-     * @param   stdClass  $itemLanguage  Language Object.
+     * @param   \stdClass  $itemLanguage  Language Object.
      *
      * @return  Table|boolean Category Object. False otherwise.
      *
@@ -976,7 +973,7 @@ public function addCategory($itemLanguage)
     /**
      * Create an article in a specific language.
      *
-     * @param   stdClass  $itemLanguage  Language Object.
+     * @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.
@@ -1154,7 +1151,7 @@ protected function getInstalledlangs($clientName = 'administrator')
             }
 
             $info          = Installer::parseXMLInstallFile($file);
-            $row           = new stdClass();
+            $row           = new \stdClass();
             $row->language = $lang;
 
             if (!is_array($info)) {
@@ -1213,9 +1210,7 @@ protected function getLanguageList($clientId = 1)
 
         $db->setQuery($query);
 
-        $this->langlist = $db->loadColumn();
-
-        return $this->langlist;
+        return $db->loadColumn();
     }
 
     /**
@@ -1261,9 +1256,7 @@ protected function getPath()
      */
     protected function getClient($client = 'administrator')
     {
-        $this->client = ApplicationHelper::getClientInfo($client, true);
-
-        return $this->client;
+        return ApplicationHelper::getClientInfo($client, true);
     }
 
     /**
@@ -1304,7 +1297,7 @@ private function getAdminId()
         $db->setQuery($query);
         $id = $db->loadResult();
 
-        if (!$id || $id instanceof Exception) {
+        if (!$id || $id instanceof \Exception) {
             return false;
         }
 
diff --git a/plugins/sampledata/testing/language/en-GB/en-GB.plg_sampledata_testing.ini b/plugins/sampledata/testing/language/en-GB/en-GB.plg_sampledata_testing.ini
index 21661b3af8626..63f9e5c64d7c1 100644
--- a/plugins/sampledata/testing/language/en-GB/en-GB.plg_sampledata_testing.ini
+++ b/plugins/sampledata/testing/language/en-GB/en-GB.plg_sampledata_testing.ini
@@ -201,7 +201,7 @@ PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_43_FULLTEXT=""
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_43_INTROTEXT="<p>This module shows information about your server installation together with statistics on the Web site users and the number of Articles in your database.</p><div class='sample-module'>{loadmodule mod_stats,Statistics}</div>"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_43_TITLE="Statistics Module"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_44_FULLTEXT=""
-PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_44_INTROTEXT="<p>The syndicate module will display a link that allows users to take a feed from your site. It will only display on pages for which feeds are possible. That means it will not display on single article, contact or weblinks pages, such as this one. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help40:Extensions_Module_Manager_Syndication_Feeds' title='Synicate Module'>Help</a></p><div class='sample-module'>{loadposition syndicate,Syndicate}</div>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_44_INTROTEXT="<p>The syndicate module will display a link that allows users to take a feed from your site. It will only display on pages for which feeds are possible. That means it will not display on single article, contact or weblinks pages, such as this one. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help40:Extensions_Module_Manager_Syndication_Feeds' title='Synicate Module'>Help</a></p><div class='sample-module'>{loadposition syndicate,Syndicate Feeds}</div>"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_44_TITLE="Syndicate Module"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_45_FULLTEXT=""
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_45_INTROTEXT="<p>System plugins operate every time a page on your site loads. They control such things as your URLS, whether users can check a \"remember me\" box on the login module, and whether caching is enabled. New is the redirect plugin that together with the redirect component will assist you in managing changes in URLs.</p><p>Default on:</p><ul><li>Remember me <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help40:Extensions_Plugin_Manager_Edit#System_-_Remember_Me'>Help</a></li><li>SEF <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help40:Extensions_Plugin_Manager_Edit#System_-_SEF'>Help</a></li><li>Debug <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help40:Extensions_Plugin_Manager_Edit#System_-_Debug'>Help</a></li></ul><p>Default off:</p><ul><li>Cache <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help40:Extensions_Plugin_Manager_Edit#System_-_Cache'>Help</a></li><li>Log <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help40:Extensions_Plugin_Manager_Edit#System_-_Log'>Help</a></li><li>Redirect <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help40:Extensions_Plugin_Manager_Edit#System_-_Redirect'>Help</a></li></ul>"
@@ -255,7 +255,7 @@ PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_61_FULLTEXT="<p> </p>"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_61_INTROTEXT="<p> </p>"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_61_TITLE="Ormiston Pound"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_62_FULLTEXT=""
-PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_62_INTROTEXT="<p>This module displays the latest registered users. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help40:Extensions_Module_Manager_Latest_Users'>Help</a></p><div class='sample-module'>{loadmodule users_latest,Users Latest}</div>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_62_INTROTEXT="<p>This module displays the latest registered users. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help40:Extensions_Module_Manager_Latest_Users'>Help</a></p><div class='sample-module'>{loadmodule users_latest,Users Latest Module}</div>"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_62_TITLE="Latest Users Module"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_63_FULLTEXT=""
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_63_INTROTEXT="<p>This article deliberately archived as an example.</p><p>As with previous releases, Joomla! provides a unified and easy-to-use framework for delivering content for Web sites of all kinds. To support the changing nature of the Internet and emerging Web technologies, Joomla! required substantial restructuring of its core functionality and we also used this effort to simplify many challenges within the current user interface. Joomla! 1.5 has many new features.</p><p style='margin-bottom: 0in;'>In Joomla! 1.5, you''ll notice:</p><ul><li>Substantially improved usability, manageability, and scalability far beyond the original Mambo foundations</li><li>Expanded accessibility to support internationalisation, double-byte characters and right-to-left support for Arabic, Farsi, and Hebrew languages among others</li><li>Extended integration of external applications through Web services</li><li>Enhanced content delivery, template and presentation capabilities to support accessibility standards and content delivery to any destination</li><li>A more sustainable and flexible framework for Component and Extension developers</li><li>Backward compatibility with previous releases of Components, Templates, Modules, and other Extensions</li></ul>"
@@ -267,14 +267,23 @@ PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_65_FULLTEXT=""
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_65_INTROTEXT="<p> The Quick Icon plugin group is used to provide notification that updates to Joomla! or installed extensions are available and should be applied. These notifications display on your administrator Home Dashboard, which is the page you see when you first log in to your site administrator.</p><p>Default on:</p><ul><li>Quick icon - Joomla! extensions updates notification <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help40:Extensions_Plugin_Manager_Edit'>Help</a>.</li><li>Quick icon - Joomla! update notification <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help40:Extensions_Plugin_Manager_Edit'>Help</a></li></ul>"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_65_TITLE="Quick Icons"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_66_FULLTEXT=""
-PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_66_INTROTEXT="<p>This module provides search using the Smart Search component. You should only use it if you have indexed your content and either have enabled the Smart Search content plugin or are keeping the index of your site updated manually. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help40:Extensions_Module_Manager_Smart_Search'>Help</a>.</p><div class='sample-module'>{loadmodule finder,Smart Search}</div>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_66_INTROTEXT="<p>This module provides search using the Smart Search component. You should only use it if you have indexed your content and either have enabled the Smart Search content plugin or are keeping the index of your site updated manually. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help40:Extensions_Module_Manager_Smart_Search'>Help</a>.</p><div class='sample-module'>{loadmodule finder,Smart Search Module}</div>"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_66_TITLE="Smart Search"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_67_FULLTEXT=""
-PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_67_INTROTEXT="<p>The similar tags modules shows a list of items which have the same or a similar set of tags.</p><p>{loadmodule tags_similar,Similar Tags}</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_67_INTROTEXT="<p>The similar tags modules shows a list of items which have the same or a similar set of tags.</p><p>{loadmodule tags_similar,Similar Tags Module}</p>"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_67_TITLE="Similar Tags"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_68_FULLTEXT=""
-PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_68_INTROTEXT="<p>The Popular Tags displays a list of the most commonly uses tags. It offers both a list and a tag cloud layout.</p><p>{loadmodule tags_popular,Popular Tags}</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_68_INTROTEXT="<p>The Popular Tags displays a list of the most commonly uses tags. It offers both a list and a tag cloud layout.</p><p>{loadmodule tags_popular,Popular Tags Module}</p>"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_68_TITLE="Popular Tags"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_69_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_69_INTROTEXT="<p>Config Component</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_69_TITLE="Config Component"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_70_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_70_INTROTEXT="<p>Tags Component</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_70_TITLE="Tags Component"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_71_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_71_INTROTEXT="<p>Wrapper Component</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_71_TITLE="Wrapper Component"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_TITLE="Sample Data-Articles"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_TITLE="Joomla!"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_DESC="<p>The Joomla! content management system lets you create webpages of various types using extensions. There are 5 basic types of extensions: components, modules, templates, languages, and plugins. Your website includes the extensions you need to create a basic website in English, but thousands of additional extensions of all types are available. The <a href='http://extensions.joomla.org'>Joomla! Extensions Directory</a> is the largest directory of Joomla extensions.</p>"
@@ -347,7 +356,7 @@ PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_22_TITLE="Contact Component"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_23_TITLE="Users Component"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_24_TITLE="Article Categories"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_25_TITLE="Contact Single Category"
-PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_26_TITLE="Search Components"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_26_TITLE="Smart Search Component"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_TITLE="Using Joomla!"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_TITLE="Using Extensions"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_TITLE="Templates"
@@ -369,29 +378,29 @@ PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_3_TITLE="Editors"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_4_TITLE="Editors Extended"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_5_TITLE="Search"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_6_TITLE="User"
-PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_28_TITLE="Latest Users"
-PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_29_TITLE="Who's Online"
-PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_30_TITLE="Most Read"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_28_TITLE="Latest Users Module"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_29_TITLE="Who's Online Module"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_30_TITLE="Most Read Module"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_31_TITLE="Menu"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_32_TITLE="Statistics"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_33_TITLE="Banner"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_34_TITLE="Search Module"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_35_TITLE="Random Image"
-PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_36_TITLE="News Flash"
-PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_37_TITLE="Latest Articles"
-PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_38_TITLE="Syndicate"
-PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_39_TITLE="Login"
-PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_40_TITLE="Wrapper"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_36_TITLE="News Flash Module"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_37_TITLE="Latest Articles Module"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_38_TITLE="Syndicate Module"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_39_TITLE="Login Module"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_40_TITLE="Wrapper Module"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_41_TITLE="Footer"
-PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_42_TITLE="Archive"
-PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_43_TITLE="Related Items"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_42_TITLE="Archive Module"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_43_TITLE="Related Items Module"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_44_TITLE="Login Form"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_45_TITLE="User Profile"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_46_TITLE="Edit User Profile"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_47_TITLE="Registration Form"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_48_TITLE="Username Reminder Request"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_49_TITLE="Password Reset"
-PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_50_TITLE="Feed Display"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_50_TITLE="Feed Display Module"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_51_TITLE="Content Modules"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_52_TITLE="User Modules"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_53_TITLE="Breadcrumbs"
@@ -404,18 +413,18 @@ PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_59_TITLE="Login Form"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_60_TITLE="Directions"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_61_TITLE="Testing Home"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_62_TITLE="Getting Started"
-PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_63_TITLE="Article Categories"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_63_TITLE="Article Categories Module"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_64_TITLE="Language Switcher"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_65_TITLE="Site Administrator"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_66_TITLE="Submit an Article"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_67_TITLE="Featured Contacts"
-PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_68_TITLE="Article Category"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_68_TITLE="Article Category Module"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_69_TITLE="Add a recipe"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_70_TITLE="Recipes"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_71_TITLE="Smart Search"
-PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_72_TITLE="Smart Search"
-PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_73_TITLE="Similar Tags"
-PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_74_TITLE="Popular Tags"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_72_TITLE="Smart Search Module"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_73_TITLE="Similar Tags Module"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_74_TITLE="Popular Tags Module"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_75_TITLE="Compact Tagged"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_76_TITLE="Tagged Items"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_77_TITLE="All Tags"
@@ -427,6 +436,14 @@ PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_101_TITLE="Testing Home"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_102_TITLE="Parks"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_103_TITLE="Fruit Shop"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_104_TITLE="Shop"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_105_TITLE="Config Component"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_106_TITLE="Tags Component"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_107_TITLE="Wrapper Component"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_108_TITLE="Wrapper"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_109_TITLE="Privacy Component"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_110_TITLE="Confirm"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_111_TITLE="Remind"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_112_TITLE="Request"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_MENU_0_DESCRIPTION="A Menu for logged-in Users"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_MENU_0_TITLE="User Menu"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_MENU_1_DESCRIPTION="Links for major types of users"
@@ -441,8 +458,6 @@ PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_MENU_5_DESCRIPTION="Menu for the sample
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_MENU_5_TITLE="Fruit Shop"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_MENU_6_DESCRIPTION=""
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_MENU_6_TITLE="All Front End Views"
-PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_MENU_7_DESCRIPTION=""
-PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_MENU_7_TITLE="All Modules"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_0_TITLE="Main Menu Testing"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_1_TITLE="Book Store"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_1_FOOTEER_TEXT="Books!"
@@ -459,7 +474,6 @@ PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_11_TITLE="Feed Display"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_12_TITLE="News Flash"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_13_TITLE="Random Image"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_14_TITLE="Articles Related Items"
-PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_15_TITLE="Search"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_16_TITLE="Statistics"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_17_TITLE="Syndicate Feeds"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_18_TITLE="Users Latest"
diff --git a/plugins/sampledata/testing/services/provider.php b/plugins/sampledata/testing/services/provider.php
index 228fc481d9304..7ed88f120cb9a 100644
--- a/plugins/sampledata/testing/services/provider.php
+++ b/plugins/sampledata/testing/services/provider.php
@@ -27,16 +27,15 @@
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.4.0
      */
     public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Testing(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('sampledata', 'testing')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/sampledata/testing/src/Extension/Testing.php b/plugins/sampledata/testing/src/Extension/Testing.php
index 3efad8e9e6ee9..aabc6b06a7448 100644
--- a/plugins/sampledata/testing/src/Extension/Testing.php
+++ b/plugins/sampledata/testing/src/Extension/Testing.php
@@ -10,14 +10,12 @@
 
 namespace Joomla\Plugin\SampleData\Testing\Extension;
 
-use Exception;
 use Joomla\CMS\Application\ApplicationHelper;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\Component\Categories\Administrator\Model\CategoryModel;
 use Joomla\Database\DatabaseAwareTrait;
-use stdClass;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -59,6 +57,8 @@ final class Testing extends CMSPlugin
      */
     private $menuItemModel;
 
+    protected $menuModuleMapping = [];
+
     /**
      * Get an overview of the proposed sampledata.
      *
@@ -68,7 +68,7 @@ final class Testing extends CMSPlugin
      */
     public function onSampledataGetOverview()
     {
-        $data              = new stdClass();
+        $data              = new \stdClass();
         $data->name        = $this->_name;
         $data->title       = $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_OVERVIEW_TITLE');
         $data->description = $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_OVERVIEW_DESC');
@@ -123,9 +123,9 @@ public function onAjaxSampledataApplyStep1()
             try {
                 if (!$model->save($tag)) {
                     $this->getApplication()->getLanguage()->load('com_tags');
-                    throw new Exception($this->getApplication()->getLanguage()->_($model->getError()));
+                    throw new \Exception($this->getApplication()->getLanguage()->_($model->getError()));
                 }
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 $response            = [];
                 $response['success'] = false;
                 $response['message'] = Text::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 1, $e->getMessage());
@@ -153,9 +153,9 @@ public function onAjaxSampledataApplyStep1()
         try {
             if (!$model->save($tag)) {
                 $this->getApplication()->getLanguage()->load('com_tags');
-                throw new Exception($this->getApplication()->getLanguage()->_($model->getError()));
+                throw new \Exception($this->getApplication()->getLanguage()->_($model->getError()));
             }
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $response            = [];
             $response['success'] = false;
             $response['message'] = Text::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 1, $e->getMessage());
@@ -215,7 +215,7 @@ public function onAjaxSampledataApplyStep2()
 
         try {
             $catIds = $this->addCategories($categories, 'com_banners', 1);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $response            = [];
             $response['success'] = false;
             $response['message'] = Text::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 2, $e->getMessage());
@@ -262,9 +262,9 @@ public function onAjaxSampledataApplyStep2()
             try {
                 if (!$clientModel->save($client)) {
                     $this->getApplication()->getLanguage()->load('com_banners');
-                    throw new Exception($this->getApplication()->getLanguage()->_($clientModel->getError()));
+                    throw new \Exception($this->getApplication()->getLanguage()->_($clientModel->getError()));
                 }
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 $response            = [];
                 $response['success'] = false;
                 $response['message'] = Text::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 2, $e->getMessage());
@@ -321,9 +321,9 @@ public function onAjaxSampledataApplyStep2()
             try {
                 if (!$bannerModel->save($banner)) {
                     $this->getApplication()->getLanguage()->load('com_banners');
-                    throw new Exception($this->getApplication()->getLanguage()->_($bannerModel->getError()));
+                    throw new \Exception($this->getApplication()->getLanguage()->_($bannerModel->getError()));
                 }
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 $response            = [];
                 $response['success'] = false;
                 $response['message'] = Text::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 2, $e->getMessage());
@@ -369,7 +369,7 @@ public function onAjaxSampledataApplyStep3()
 
         try {
             $catIdsLevel1 = $this->addCategories($categories, 'com_content', 1);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $response            = [];
             $response['success'] = false;
             $response['message'] = Text::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 3, $e->getMessage());
@@ -395,7 +395,7 @@ public function onAjaxSampledataApplyStep3()
 
         try {
             $catIdsLevel2 = $this->addCategories($categories, 'com_content', 2);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $response            = [];
             $response['success'] = false;
             $response['message'] = Text::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 3, $e->getMessage());
@@ -436,7 +436,7 @@ public function onAjaxSampledataApplyStep3()
 
         try {
             $catIdsLevel3 = $this->addCategories($categories, 'com_content', 3);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $response            = [];
             $response['success'] = false;
             $response['message'] = Text::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 3, $e->getMessage());
@@ -484,7 +484,7 @@ public function onAjaxSampledataApplyStep3()
 
         try {
             $catIdsLevel4 = $this->addCategories($categories, 'com_content', 4);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $response            = [];
             $response['success'] = false;
             $response['message'] = Text::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 3, $e->getMessage());
@@ -537,7 +537,7 @@ public function onAjaxSampledataApplyStep3()
 
         try {
             $catIdsLevel5 = $this->addCategories($categories, 'com_content', 5);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $response            = [];
             $response['success'] = false;
             $response['message'] = Text::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 3, $e->getMessage());
@@ -888,7 +888,7 @@ public function onAjaxSampledataApplyStep4()
                 'catid'    => $catIdsLevel4[4],
                 'ordering' => 7,
             ],
-            // Articles 60 - 68
+            // Articles 60 - 69
             [
                 'catid'  => $catIdsLevel4[6],
                 'images' => [
@@ -945,11 +945,24 @@ public function onAjaxSampledataApplyStep4()
                 'catid'    => $catIdsLevel5[0],
                 'ordering' => 0,
             ],
+            [
+                'catid'    => $catIdsLevel5[0],
+                'ordering' => 0,
+            ],
+            // Articles 70 -
+            [
+                'catid'    => $catIdsLevel5[0],
+                'ordering' => 0,
+            ],
+            [
+                'catid'    => $catIdsLevel5[0],
+                'ordering' => 0,
+            ],
         ];
 
         try {
             $ids = $this->addArticles($articles);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $response            = [];
             $response['success'] = false;
             $response['message'] = Text::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 4, $e->getMessage());
@@ -1001,7 +1014,7 @@ public function onAjaxSampledataApplyStep5()
 
         try {
             $catIdsLevel1 = $this->addCategories($categories, 'com_contact', 1);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $response            = [];
             $response['success'] = false;
             $response['message'] = Text::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 5, $e->getMessage());
@@ -1022,7 +1035,7 @@ public function onAjaxSampledataApplyStep5()
 
         try {
             $catIdsLevel2 = $this->addCategories($categories, 'com_contact', 2);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $response            = [];
             $response['success'] = false;
             $response['message'] = Text::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 5, $e->getMessage());
@@ -1045,7 +1058,7 @@ public function onAjaxSampledataApplyStep5()
 
         try {
             $catIdsLevel3 = $this->addCategories($categories, 'com_contact', 3);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $response            = [];
             $response['success'] = false;
             $response['message'] = Text::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 5, $e->getMessage());
@@ -1066,7 +1079,7 @@ public function onAjaxSampledataApplyStep5()
 
         try {
             $catIdsLevel4 = $this->addCategories($categories, 'com_contact', 4);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $response            = [];
             $response['success'] = false;
             $response['message'] = Text::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 5, $e->getMessage());
@@ -1266,9 +1279,9 @@ public function onAjaxSampledataApplyStep5()
             try {
                 if (!$model->save($contact)) {
                     $this->getApplication()->getLanguage()->load('com_contact');
-                    throw new Exception($this->getApplication()->getLanguage()->_($model->getError()));
+                    throw new \Exception($this->getApplication()->getLanguage()->_($model->getError()));
                 }
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 $response            = [];
                 $response['success'] = false;
                 $response['message'] = Text::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 5, $e->getMessage());
@@ -1329,7 +1342,7 @@ public function onAjaxSampledataApplyStep6()
 
         try {
             $catIdsLevel1 = $this->addCategories($categories, 'com_newsfeeds', 1);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $response            = [];
             $response['success'] = false;
             $response['message'] = Text::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 6, $e->getMessage());
@@ -1387,9 +1400,9 @@ public function onAjaxSampledataApplyStep6()
             try {
                 if (!$model->save($newsfeed)) {
                     $this->getApplication()->getLanguage()->load('com_newsfeeds');
-                    throw new Exception($this->getApplication()->getLanguage()->_($model->getError()));
+                    throw new \Exception($this->getApplication()->getLanguage()->_($model->getError()));
                 }
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 $response            = [];
                 $response['success'] = false;
                 $response['message'] = Text::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 6, $e->getMessage());
@@ -1451,7 +1464,7 @@ public function onAjaxSampledataApplyStep7()
 
             try {
                 $model->save($menu);
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 $this->getApplication()->getLanguage()->load('com_menus');
                 $response            = [];
                 $response['success'] = false;
@@ -1491,8 +1504,8 @@ public function onAjaxSampledataApplyStep7()
         $menuItemTable->home = 0;
         $menuItemTable->store();
 
-        // Insert first level of menuitems.
-        $menuItems = [
+        // Insert User Menu Items
+        $userMenuItems = [
             [
                 'menutype'     => $menuTypes[0],
                 'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_0_TITLE'),
@@ -1506,32 +1519,32 @@ public function onAjaxSampledataApplyStep7()
                 ],
             ],
             [
-                'menutype'     => $menuTypes[1],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_1_TITLE'),
-                'link'         => 'https://joomla.org',
-                'type'         => 'url',
-                'component_id' => 0,
-            ],
-            [
-                'menutype'     => $menuTypes[6],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_2_TITLE'),
-                'link'         => 'index.php?option=com_contact&view=contact&id=' . $contactIds[0],
-                'component_id' => ComponentHelper::getComponent('com_contact')->id,
-                'params'       => [
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[4],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_3_TITLE'),
-                'link'         => 'index.php?option=com_users&view=login',
-                'component_id' => ComponentHelper::getComponent('com_users')->id,
+                'menutype'     => $menuTypes[0],
+                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_66_TITLE'),
+                'link'         => 'index.php?option=com_content&view=form&layout=edit',
+                'component_id' => ComponentHelper::getComponent('com_content')->id,
+                'access'       => 3,
                 'params'       => [
+                    'enable_category'   => 0,
+                    'menu_text'         => 1,
                     'show_page_heading' => 0,
                     'secure'            => 0,
                 ],
             ],
+        ];
+
+        try {
+            $userMenuIds = $this->addMenuItems($userMenuItems, 1);
+        } catch (\Exception $e) {
+            $response            = [];
+            $response['success'] = false;
+            $response['message'] = Text::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 7, $e->getMessage());
+
+            return $response;
+        }
+
+        // Insert Park Menu Items
+        $parkMenuItems = [
             [
                 'menutype'          => $menuTypes[3],
                 'title'             => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_4_TITLE'),
@@ -1551,24 +1564,6 @@ public function onAjaxSampledataApplyStep7()
                     'secure'                 => 0,
                 ],
             ],
-            [
-                'menutype'     => $menuTypes[4],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_5_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[37],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'show_category'        => 0,
-                    'show_parent_category' => 0,
-                    'show_author'          => 0,
-                    'show_create_date'     => 0,
-                    'show_modify_date'     => 0,
-                    'show_publish_date'    => 0,
-                    'show_item_navigation' => 0,
-                    'show_hits'            => 0,
-                    'show_page_heading'    => 0,
-                    'secure'               => 0,
-                ],
-            ],
             [
                 'menutype'          => $menuTypes[3],
                 'title'             => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_6_TITLE'),
@@ -1577,6 +1572,7 @@ public function onAjaxSampledataApplyStep7()
                 'access'            => 3,
                 'template_style_id' => 114,
                 'params'            => [
+                    'enable_category'   => 0,
                     'show_page_heading' => 0,
                     'secure'            => 0,
                 ],
@@ -1622,740 +1618,700 @@ public function onAjaxSampledataApplyStep7()
                     'show_page_heading'      => 0,
                     'secure'                 => 0,
                 ],
-            ],
-            [
-                'menutype'     => $menuTypes[6],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_9_TITLE'),
-                'link'         => 'index.php?option=com_contact&view=categories&id=' . $contactCatids1[0],
-                'component_id' => ComponentHelper::getComponent('com_contact')->id,
-                'params'       => [
-                    'maxLevel'           => -1,
-                    'presentation_style' => 'sliders',
-                    'show_links'         => 1,
-                    'show_page_heading'  => 0,
-                    'secure'             => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[6],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_10_TITLE'),
-                'link'         => 'index.php?option=com_newsfeeds&view=categories&id=0',
-                'component_id' => ComponentHelper::getComponent('com_newsfeeds')->id,
-                'params'       => [
-                    'show_base_description'  => 1,
-                    'categories_description' => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_10_PARAM_CATEGORIES_DESCRIPTION'),
-                    'maxLevel'               => -1,
-                    'show_empty_categories'  => 1,
-                    'show_description'       => 1,
-                    'show_description_image' => 1,
-                    'show_cat_num_articles'  => 1,
-                    'feed_character_count'   => 0,
-                    'show_page_heading'      => 0,
-                    'secure'                 => 0,
+                'children' => [
+                    [
+                        'menutype'          => $menuTypes[3],
+                        'title'             => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_8_1_TITLE'),
+                        'link'              => 'index.php?option=com_content&view=category&layout=blog&id=' . $articleCatids4[5],
+                        'component_id'      => ComponentHelper::getComponent('com_content')->id,
+                        'template_style_id' => 114,
+                        'params'            => [
+                            'show_description'       => 1,
+                            'show_description_image' => 0,
+                            'num_leading_articles'   => 0,
+                            'num_intro_articles'     => 6,
+                            'num_columns'            => 2,
+                            'num_links'              => 4,
+                            'multi_column_order'     => 1,
+                            'show_pagination'        => 2,
+                            'show_intro'             => 0,
+                            'show_category'          => 1,
+                            'link_category'          => 1,
+                            'show_author'            => 0,
+                            'show_create_date'       => 0,
+                            'show_modify_date'       => 0,
+                            'show_publish_date'      => 0,
+                            'show_item_navigation'   => 1,
+                            'show_feed_link'         => 1,
+                            'show_page_heading'      => 0,
+                            'secure'                 => 0,
+                        ],
+                    ],
+                    [
+                        'menutype'          => $menuTypes[3],
+                        'title'             => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_8_2_TITLE'),
+                        'link'              => 'index.php?option=com_content&view=category&layout=blog&id=' . $articleCatids4[5],
+                        'component_id'      => ComponentHelper::getComponent('com_content')->id,
+                        'template_style_id' => 114,
+                        'params'            => [
+                            'show_description'       => 0,
+                            'show_description_image' => 0,
+                            'num_leading_articles'   => 0,
+                            'num_intro_articles'     => 4,
+                            'num_columns'            => 2,
+                            'num_links'              => 4,
+                            'multi_column_order'     => 1,
+                            'show_pagination'        => 2,
+                            'show_intro'             => 0,
+                            'show_category'          => 1,
+                            'show_parent_category'   => 0,
+                            'link_parent_category'   => 0,
+                            'show_author'            => 0,
+                            'link_author'            => 0,
+                            'show_create_date'       => 0,
+                            'show_modify_date'       => 0,
+                            'show_publish_date'      => 0,
+                            'show_item_navigation'   => 1,
+                            'show_readmore'          => 1,
+                            'show_icons'             => 0,
+                            'show_print_icon'        => 0,
+                            'show_email_icon'        => 0,
+                            'show_hits'              => 0,
+                            'show_feed_link'         => 1,
+                            'show_page_heading'      => 0,
+                            'secure'                 => 0,
+                        ],
+                    ],
                 ],
             ],
+        ];
+
+        try {
+            $parkMenuIds = $this->addMenuItems($parkMenuItems, 1);
+        } catch (\Exception $e) {
+            $response            = [];
+            $response['success'] = false;
+            $response['message'] = Text::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 7, $e->getMessage());
+
+            return $response;
+        }
+
+        // Insert Fruitshop Menu Items
+        $fruitshopMenuItems = [
             [
-                'menutype'     => $menuTypes[6],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_11_TITLE'),
-                'link'         => 'index.php?option=com_newsfeeds&view=category&id=' . $newsfeedsCatids[0],
-                'component_id' => ComponentHelper::getComponent('com_newsfeeds')->id,
-                'params'       => [
-                    'maxLevel'             => -1,
-                    'feed_character_count' => 0,
+                'menutype'          => $menuTypes[5],
+                'title'             => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_56_TITLE'),
+                'link'              => 'index.php?option=com_content&view=article&id=' . $articleIds[19],
+                'component_id'      => ComponentHelper::getComponent('com_content')->id,
+                'template_style_id' => 7,
+                'params'            => [
+                    'show_title'           => 0,
+                    'link_titles'          => 0,
+                    'show_intro'           => 1,
+                    'show_category'        => 0,
+                    'link_category'        => 0,
+                    'show_author'          => 0,
+                    'show_create_date'     => 0,
+                    'show_modify_date'     => 0,
+                    'show_publish_date'    => 0,
+                    'show_item_navigation' => 0,
+                    'show_icons'           => 0,
+                    'show_print_icon'      => 0,
+                    'show_email_icon'      => 0,
+                    'show_hits'            => 0,
+                    'menu_text'            => 1,
                     'show_page_heading'    => 0,
                     'secure'               => 0,
                 ],
             ],
             [
-                'menutype'     => $menuTypes[6],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_12_TITLE'),
-                'link'         => 'index.php?option=com_newsfeeds&view=newsfeed&id=' . $newsfeedsIds[0],
-                'component_id' => ComponentHelper::getComponent('com_newsfeeds')->id,
-                'params'       => [
-                    'feed_character_count' => 0,
-                    'show_page_heading'    => 0,
-                    'secure'               => 0,
+                'menutype'          => $menuTypes[5],
+                'title'             => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_55_TITLE'),
+                'link'              => 'index.php?option=com_contact&view=categories&id=' . $contactCatids3[1],
+                'component_id'      => ComponentHelper::getComponent('com_contact')->id,
+                'template_style_id' => 7,
+                'params'            => [
+                    'show_base_description'   => 1,
+                    'show_description'        => 1,
+                    'show_description_image'  => 1,
+                    'maxLevel'                => -1,
+                    'show_empty_categories'   => 1,
+                    'show_headings'           => 0,
+                    'show_email_headings'     => 0,
+                    'show_telephone_headings' => 0,
+                    'show_mobile_headings'    => 0,
+                    'show_fax_headings'       => 0,
+                    'show_suburb_headings'    => 0,
+                    'show_links'              => 1,
+                    'menu_text'               => 1,
+                    'show_page_heading'       => 0,
+                    'pageclass_sfx'           => ' categories-listalphabet',
+                    'secure'                  => 0,
                 ],
             ],
             [
-                'menutype'     => $menuTypes[6],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_14_TITLE'),
-                'link'         => 'index.php?option=com_content&view=archive',
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'show_category'     => 1,
-                    'link_category'     => 1,
-                    'show_title'        => 1,
-                    'link_titles'       => 1,
-                    'show_intro'        => 1,
+                'menutype'          => $menuTypes[5],
+                'title'             => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_57_TITLE'),
+                'link'              => 'index.php?option=com_contact&view=category&id=' . $contactCatids3[0],
+                'component_id'      => ComponentHelper::getComponent('com_contact')->id,
+                'template_style_id' => 7,
+                'params'            => [
+                    'maxLevel'          => -1,
+                    'show_headings'     => 0,
+                    'show_links'        => 1,
+                    'show_feed_link'    => 1,
+                    'menu_text'         => 1,
                     'show_page_heading' => 0,
                     'secure'            => 0,
                 ],
             ],
             [
-                'menutype'     => $menuTypes[6],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_15_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[5],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
+                'menutype'          => $menuTypes[5],
+                'title'             => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_58_TITLE'),
+                'link'              => 'index.php?option=com_content&view=category&layout=blog&id=' . $articleCatids3[3],
+                'component_id'      => ComponentHelper::getComponent('com_content')->id,
+                'template_style_id' => 7,
+                'params'            => [
+                    'layout_type'          => 'blog',
+                    'show_category_title'  => 1,
+                    'show_description'     => 1,
+                    'maxLevel'             => 0,
+                    'num_leading_articles' => 5,
+                    'num_intro_articles'   => 0,
+                    'num_columns'          => 1,
+                    'num_links'            => 4,
+                    'orderby_sec'          => 'alpha',
+                    'show_title'           => 1,
+                    'link_titles'          => 1,
+                    'show_intro'           => 1,
+                    'show_category'        => 0,
+                    'show_parent_category' => 0,
+                    'link_parent_category' => 0,
+                    'show_author'          => 0,
+                    'show_publish_date'    => 0,
+                    'show_hits'            => 0,
+                    'menu_text'            => 1,
+                    'show_page_heading'    => 0,
+                    'secure'               => 0,
                 ],
             ],
             [
-                'menutype'     => $menuTypes[6],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_16_TITLE'),
-                'link'         => 'index.php?option=com_content&view=category&layout=blog&id=' . $articleCatids3[1],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'show_description'       => 0,
-                    'show_description_image' => 0,
-                    'num_leading_articles'   => 1,
-                    'num_intro_articles'     => 4,
-                    'num_columns'            => 2,
-                    'num_links'              => 4,
-                    'show_pagination'        => 2,
-                    'show_feed_link'         => 1,
+                'menutype'          => $menuTypes[5],
+                'title'             => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_59_TITLE'),
+                'link'              => 'index.php?option=com_users&view=login',
+                'component_id'      => ComponentHelper::getComponent('com_users')->id,
+                'template_style_id' => 7,
+                'params'            => [
+                    'logindescription_show'  => 1,
+                    'logoutdescription_show' => 1,
+                    'menu_text'              => 1,
                     'show_page_heading'      => 0,
                     'secure'                 => 0,
                 ],
             ],
             [
-                'menutype'     => $menuTypes[6],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_17_TITLE'),
-                'link'         => 'index.php?option=com_content&view=category&id=' . $articleCatids2[0],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'orderby_sec'       => 'alpha',
-                    'display_num'       => 10,
+                'menutype'          => $menuTypes[5],
+                'title'             => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_60_TITLE'),
+                'link'              => 'index.php?option=com_content&view=article&id=' . $articleIds[12],
+                'component_id'      => ComponentHelper::getComponent('com_content')->id,
+                'template_style_id' => 7,
+                'params'            => [
                     'menu_text'         => 1,
                     'show_page_heading' => 0,
                     'secure'            => 0,
                 ],
             ],
             [
-                'menutype'     => $menuTypes[6],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_18_TITLE'),
-                'link'         => 'index.php?option=com_content&view=featured',
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'num_leading_articles' => 1,
-                    'num_intro_articles'   => 4,
-                    'num_columns'          => 2,
-                    'num_links'            => 4,
-                    'multi_column_order'   => 1,
-                    'orderby_sec'          => 'front',
-                    'show_pagination'      => 2,
-                    'show_feed_link'       => 1,
-                    'show_page_heading'    => 0,
-                    'secure'               => 0,
+                'menutype'          => $menuTypes[5],
+                'title'             => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_69_TITLE'),
+                'link'              => 'index.php?option=com_content&view=form&layout=edit',
+                'component_id'      => ComponentHelper::getComponent('com_content')->id,
+                'access'            => 4,
+                'template_style_id' => 7,
+                'params'            => [
+                    'enable_category'   => 0,
+                    'catid'             => 14,
+                    'menu_text'         => 1,
+                    'show_page_heading' => 1,
+                    'secure'            => 0,
                 ],
             ],
             [
-                'menutype'     => $menuTypes[6],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_19_TITLE'),
-                'link'         => 'index.php?option=com_content&view=form&layout=edit',
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'access'       => 3,
-                'params'       => [
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[6],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_20_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[9],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[6],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_21_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[57],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'show_page_heading' => 1,
-                    'page_title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_21_PARAM_PAGE_TITLE'),
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[6],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_22_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[8],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[6],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_23_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[51],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[6],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_24_TITLE'),
-                'link'         => 'index.php?option=com_content&view=categories&id=' . $articleCatids1[0],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'maxLevel'             => -1,
-                    'num_leading_articles' => 1,
-                    'num_intro_articles'   => 4,
-                    'num_columns'          => 2,
-                    'num_links'            => 4,
-                    'show_page_heading'    => 0,
-                    'secure'               => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[6],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_25_TITLE'),
-                'link'         => 'index.php?option=com_contact&view=category&id=' . $contactCatids3[0],
-                'component_id' => ComponentHelper::getComponent('com_contact')->id,
-                'params'       => [
-                    'maxLevel'           => -1,
-                    'display_num'        => 20,
-                    'presentation_style' => 'sliders',
-                    'show_links'         => 1,
-                    'show_feed_link'     => 1,
-                    'show_page_heading'  => 0,
-                    'secure'             => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[6],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_26_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[38],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'menu_text'         => 1,
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
+                'menutype'          => $menuTypes[5],
+                'title'             => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_70_TITLE'),
+                'link'              => 'index.php?option=com_content&view=category&id=' . $articleCatids3[4],
+                'component_id'      => ComponentHelper::getComponent('com_content')->id,
+                'template_style_id' => 7,
+                'params'            => [
+                    'show_category_title'   => 1,
+                    'show_description'      => 1,
+                    'maxLevel'              => 0,
+                    'show_empty_categories' => 0,
+                    'display_num'           => 10,
+                    'menu_text'             => 1,
+                    'show_page_heading'     => 0,
+                    'secure'                => 0,
                 ],
             ],
+        ];
+
+        try {
+            $fruitshopMenuIds = $this->addMenuItems($fruitshopMenuItems, 1);
+        } catch (\Exception $e) {
+            $response            = [];
+            $response['success'] = false;
+            $response['message'] = Text::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 7, $e->getMessage());
+
+            return $response;
+        }
+
+        // Insert Frontend Views & Modules Menu Items
+        $frontendMenuIds = $this->addFrontendViewsMenu($menuTypes);
+        $this->getApplication()->setUserState('sampledata.testing.menu_module_mapping', $this->menuModuleMapping);
+
+        // Insert About Joomla Menu Items
+        $aboutMenuItems = [
             [
                 'menutype'     => $menuTypes[2],
                 'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_TITLE'),
                 'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[52],
                 'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'show_title'           => 1,
-                    'link_titles'          => 0,
-                    'show_intro'           => 1,
-                    'show_category'        => 0,
-                    'show_parent_category' => 0,
-                    'show_author'          => 0,
-                    'show_create_date'     => 0,
-                    'show_modify_date'     => 0,
-                    'show_publish_date'    => 0,
-                    'show_item_navigation' => 0,
-                    'show_hits'            => 0,
-                    'show_noauth'          => 0,
-                    'show_page_heading'    => 0,
-                    'secure'               => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[7],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_28_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[62],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[7],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_29_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[55],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[7],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_30_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[29],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[7],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_31_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[28],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[7],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_32_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[43],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[7],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_33_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[6],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'menu_text'         => 1,
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[7],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_34_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[39],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'menu_text'         => 1,
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[7],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_35_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[35],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[7],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_36_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[30],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[7],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_37_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[26],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[7],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_38_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[44],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[7],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_39_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[27],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'menu_text'         => 1,
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[7],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_40_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[56],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'menu_text'         => 1,
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[7],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_41_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[18],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[7],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_42_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[1],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[7],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_43_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[36],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[6],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_44_TITLE'),
-                'link'         => 'index.php?option=com_users&view=login',
-                'component_id' => ComponentHelper::getComponent('com_users')->id,
-                'params'       => [
-                    'logindescription_show'  => 1,
-                    'logoutdescription_show' => 1,
-                    'show_page_heading'      => 0,
-                    'secure'                 => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[6],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_45_TITLE'),
-                'link'         => 'index.php?option=com_users&view=profile',
-                'component_id' => ComponentHelper::getComponent('com_users')->id,
-                'params'       => [
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[6],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_46_TITLE'),
-                'link'         => 'index.php?option=com_users&view=profile&layout=edit',
-                'component_id' => ComponentHelper::getComponent('com_users')->id,
-                'params'       => [
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[6],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_47_TITLE'),
-                'link'         => 'index.php?option=com_users&view=registration',
-                'component_id' => ComponentHelper::getComponent('com_users')->id,
-                'params'       => [
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[6],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_48_TITLE'),
-                'link'         => 'index.php?option=com_users&view=remind',
-                'component_id' => ComponentHelper::getComponent('com_users')->id,
-                'params'       => [
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[6],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_49_TITLE'),
-                'link'         => 'index.php?option=com_users&view=reset',
-                'component_id' => ComponentHelper::getComponent('com_users')->id,
-                'params'       => [
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[7],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_50_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[15],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[7],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_51_TITLE'),
-                'link'         => 'index.php?option=com_content&view=category&id=' . $articleCatids5[0],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'maxLevel'              => 0,
-                    'show_category_title'   => 1,
-                    'show_empty_categories' => 1,
-                    'show_description'      => 1,
-                    'display_num'           => 0,
-                    'show_headings'         => 0,
-                    'list_show_title'       => 1,
-                    'list_show_date'        => 0,
-                    'list_show_hits'        => 0,
-                    'list_show_author'      => 0,
-                    'orderby_sec'           => 'order',
-                    'show_category'         => 1,
-                    'link_category'         => 1,
-                    'show_page_heading'     => 0,
-                    'secure'                => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[7],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_52_TITLE'),
-                'link'         => 'index.php?option=com_content&view=category&id=' . $articleCatids5[1],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'maxLevel'            => 0,
-                    'show_category_title' => 1,
-                    'show_description'    => 1,
-                    'display_num'         => 0,
-                    'show_headings'       => 0,
-                    'list_show_title'     => 1,
-                    'list_show_hits'      => 0,
-                    'list_show_author'    => 0,
-                    'orderby_sec'         => 'order',
-                    'show_category'       => 1,
-                    'link_category'       => 1,
-                    'show_page_heading'   => 0,
-                    'secure'              => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[7],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_53_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[58],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'menu_text'         => 1,
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[7],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_54_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[11],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'          => $menuTypes[5],
-                'title'             => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_55_TITLE'),
-                'link'              => 'index.php?option=com_contact&view=categories&id=' . $contactCatids3[1],
-                'component_id'      => ComponentHelper::getComponent('com_contact')->id,
-                'template_style_id' => 7,
-                'params'            => [
-                    'show_base_description'   => 1,
-                    'show_description'        => 1,
-                    'show_description_image'  => 1,
-                    'maxLevel'                => -1,
-                    'show_empty_categories'   => 1,
-                    'show_headings'           => 0,
-                    'show_email_headings'     => 0,
-                    'show_telephone_headings' => 0,
-                    'show_mobile_headings'    => 0,
-                    'show_fax_headings'       => 0,
-                    'show_suburb_headings'    => 0,
-                    'show_links'              => 1,
-                    'menu_text'               => 1,
-                    'show_page_heading'       => 0,
-                    'pageclass_sfx'           => ' categories-listalphabet',
-                    'secure'                  => 0,
-                ],
-            ],
-            [
-                'menutype'          => $menuTypes[5],
-                'title'             => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_56_TITLE'),
-                'link'              => 'index.php?option=com_content&view=article&id=' . $articleIds[19],
-                'component_id'      => ComponentHelper::getComponent('com_content')->id,
-                'template_style_id' => 7,
-                'params'            => [
-                    'show_title'           => 0,
+                'params'       => [
+                    'show_title'           => 1,
                     'link_titles'          => 0,
                     'show_intro'           => 1,
                     'show_category'        => 0,
-                    'link_category'        => 0,
+                    'show_parent_category' => 0,
                     'show_author'          => 0,
                     'show_create_date'     => 0,
                     'show_modify_date'     => 0,
                     'show_publish_date'    => 0,
                     'show_item_navigation' => 0,
-                    'show_icons'           => 0,
-                    'show_print_icon'      => 0,
-                    'show_email_icon'      => 0,
                     'show_hits'            => 0,
-                    'menu_text'            => 1,
+                    'show_noauth'          => 0,
                     'show_page_heading'    => 0,
                     'secure'               => 0,
                 ],
-            ],
-            [
-                'menutype'          => $menuTypes[5],
-                'title'             => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_57_TITLE'),
-                'link'              => 'index.php?option=com_contact&view=category&id=' . $contactCatids3[0],
-                'component_id'      => ComponentHelper::getComponent('com_contact')->id,
-                'template_style_id' => 7,
-                'params'            => [
-                    'maxLevel'          => -1,
-                    'show_headings'     => 0,
-                    'show_links'        => 1,
-                    'show_feed_link'    => 1,
-                    'menu_text'         => 1,
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
+                'children' => [
+                    [
+                        'menutype'     => $menuTypes[2],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_TITLE'),
+                        'link'         => 'index.php?option=com_content&view=categories&id=' . $articleCatids3[0],
+                        'component_id' => ComponentHelper::getComponent('com_content')->id,
+                        'params'       => [
+                            'show_base_description'     => 1,
+                            'maxLevelcat'               => 1,
+                            'show_empty_categories_cat' => 1,
+                            'show_subcat_desc_cat'      => 1,
+                            'show_cat_num_articles_cat' => 0,
+                            'show_description'          => 1,
+                            'show_description_image'    => 1,
+                            'maxLevel'                  => 1,
+                            'show_empty_categories'     => 1,
+                            'num_leading_articles'      => 1,
+                            'num_intro_articles'        => 4,
+                            'num_columns'               => 2,
+                            'num_links'                 => 4,
+                            'secure'                    => 0,
+                        ],
+                        'children' => [
+                            [
+                                'menutype'     => $menuTypes[2],
+                                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_TITLE'),
+                                'link'         => 'index.php?option=com_content&view=category&id=' . $articleCatids4[2],
+                                'component_id' => ComponentHelper::getComponent('com_content')->id,
+                                'params'       => [
+                                    'show_description'      => 1,
+                                    'maxLevel'              => 2,
+                                    'show_empty_categories' => 1,
+                                    'show_no_articles'      => '0',
+                                    'show_subcat_desc'      => 1,
+                                    'show_pagination_limit' => '0',
+                                    'filter_field'          => 'hide',
+                                    'show_headings'         => '0',
+                                    'list_show_date'        => '0',
+                                    'list_show_hits'        => '0',
+                                    'list_show_author'      => '0',
+                                    'show_pagination'       => '0',
+                                    'show_title'            => 1,
+                                    'link_titles'           => 1,
+                                    'menu_text'             => 1,
+                                    'page_title'            => 'Templates',
+                                    'show_page_heading'     => 0,
+                                    'secure'                => 0,
+                                ],
+                                'children' => [
+                                    [
+                                        'menutype'     => $menuTypes[2],
+                                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_7_TITLE'),
+                                        'link'         => 'index.php?option=com_content&view=category&layout=blog&id=' . $articleCatids5[6],
+                                        'component_id' => ComponentHelper::getComponent('com_content')->id,
+                                        'params'       => [
+                                            'show_description'     => 1,
+                                            'num_leading_articles' => 1,
+                                            'num_intro_articles'   => 4,
+                                            'num_columns'          => 2,
+                                            'num_links'            => 4,
+                                            'show_page_heading'    => 0,
+                                            'secure'               => 0,
+                                        ],
+                                        'children' => [
+                                            [
+                                                'menutype'          => $menuTypes[2],
+                                                'title'             => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_7_2_TITLE'),
+                                                'link'              => 'index.php?option=com_content&view=article&id=' . $articleIds[48],
+                                                'component_id'      => ComponentHelper::getComponent('com_content')->id,
+                                                'template_style_id' => 4,
+                                                'params'            => [
+                                                    'show_page_heading' => 0,
+                                                    'secure'            => 0,
+                                                ],
+                                            ],
+                                            [
+                                                'menutype'          => $menuTypes[2],
+                                                'title'             => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_7_3_TITLE'),
+                                                'link'              => 'index.php?option=com_content&view=featured',
+                                                'component_id'      => ComponentHelper::getComponent('com_content')->id,
+                                                'template_style_id' => 4,
+                                                'params'            => [
+                                                    'num_leading_articles' => 1,
+                                                    'num_intro_articles'   => 3,
+                                                    'num_columns'          => 3,
+                                                    'num_links'            => 0,
+                                                    'multi_column_order'   => 1,
+                                                    'orderby_sec'          => 'front',
+                                                    'show_pagination'      => 2,
+                                                    'show_feed_link'       => 1,
+                                                    'show_page_heading'    => 0,
+                                                    'secure'               => 0,
+                                                ],
+
+                                            ],
+                                        ],
+                                    ],
+                                    [
+                                        'menutype'     => $menuTypes[2],
+                                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_8_TITLE'),
+                                        'link'         => 'index.php?option=com_content&view=category&layout=blog&id=' . $articleCatids5[5],
+                                        'component_id' => ComponentHelper::getComponent('com_content')->id,
+                                        'params'       => [
+                                            'show_description'     => 1,
+                                            'num_leading_articles' => 2,
+                                            'num_intro_articles'   => 4,
+                                            'num_columns'          => 2,
+                                            'num_links'            => 4,
+                                            'show_page_heading'    => 0,
+                                            'secure'               => 0,
+                                        ],
+                                        'children' => [
+                                            [
+                                                'menutype'          => $menuTypes[2],
+                                                'title'             => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_8_0_TITLE'),
+                                                'link'              => 'index.php?option=com_content&view=article&id=' . $articleIds[48],
+                                                'component_id'      => ComponentHelper::getComponent('com_content')->id,
+                                                'template_style_id' => 3,
+                                                'params'            => [
+                                                    'show_page_heading' => 0,
+                                                    'secure'            => 0,
+                                                ],
+                                            ],
+                                            [
+                                                'menutype'          => $menuTypes[2],
+                                                'title'             => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_8_1_TITLE'),
+                                                'link'              => 'index.php?option=com_content&view=featured',
+                                                'component_id'      => ComponentHelper::getComponent('com_content')->id,
+                                                'template_style_id' => 3,
+                                                'params'            => [
+                                                    'num_leading_articles' => 1,
+                                                    'num_intro_articles'   => 3,
+                                                    'num_columns'          => 3,
+                                                    'num_links'            => 0,
+                                                    'multi_column_order'   => 1,
+                                                    'orderby_sec'          => 'front',
+                                                    'show_pagination'      => 2,
+                                                    'show_feed_link'       => 1,
+                                                    'show_page_heading'    => 0,
+                                                    'secure'               => 0,
+                                                ],
+                                            ],
+                                        ],
+                                    ],
+                                    [
+                                        'menutype'     => $menuTypes[2],
+                                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_9_TITLE'),
+                                        'link'         => 'index.php?option=com_content&view=category&layout=blog&id=' . $articleCatids5[7],
+                                        'component_id' => ComponentHelper::getComponent('com_content')->id,
+                                        'params'       => [
+                                            'show_description'     => 1,
+                                            'num_leading_articles' => 1,
+                                            'num_intro_articles'   => 4,
+                                            'num_columns'          => 2,
+                                            'num_links'            => 4,
+                                            'show_page_heading'    => 1,
+                                            'secure'               => 0,
+                                        ],
+                                        'children' => [
+                                            [
+                                                'menutype'     => $menuTypes[2],
+                                                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_9_4_TITLE'),
+                                                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[48],
+                                                'component_id' => ComponentHelper::getComponent('com_content')->id,
+                                                'params'       => [
+                                                    'show_page_heading' => 1,
+                                                    'secure'            => 0,
+                                                ],
+                                            ],
+                                            [
+                                                'menutype'     => $menuTypes[2],
+                                                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_9_5_TITLE'),
+                                                'link'         => 'index.php?option=com_content&view=featured',
+                                                'component_id' => ComponentHelper::getComponent('com_content')->id,
+                                                'params'       => [
+                                                    'num_leading_articles' => 1,
+                                                    'num_intro_articles'   => 3,
+                                                    'num_columns'          => 3,
+                                                    'num_links'            => 0,
+                                                    'orderby_sec'          => 'front',
+                                                    'show_page_heading'    => 1,
+                                                    'secure'               => 0,
+                                                ],
+                                            ],
+                                        ],
+                                    ],
+                                ],
+                            ],
+                            [
+                                'menutype'     => $menuTypes[2],
+                                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_1_TITLE'),
+                                'link'         => 'index.php?option=com_content&view=category&layout=blog&id=' . $articleCatids4[3],
+                                'component_id' => ComponentHelper::getComponent('com_content')->id,
+                                'params'       => [
+                                    'show_description'       => 1,
+                                    'show_description_image' => 1,
+                                    'show_category_title'    => 1,
+                                    'num_leading_articles'   => 1,
+                                    'num_intro_articles'     => 4,
+                                    'num_columns'            => 2,
+                                    'num_links'              => 4,
+                                    'show_page_heading'      => 0,
+                                    'secure'                 => 0,
+                                ],
+                            ],
+                            [
+                                'menutype'     => $menuTypes[2],
+                                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_TITLE'),
+                                'link'         => 'index.php?option=com_content&view=category&layout=blog&id=' . $articleCatids4[4],
+                                'component_id' => ComponentHelper::getComponent('com_content')->id,
+                                'params'       => [
+                                    'show_description'     => 1,
+                                    'show_category_title'  => 1,
+                                    'num_leading_articles' => 0,
+                                    'num_intro_articles'   => 7,
+                                    'num_columns'          => 1,
+                                    'num_links'            => 0,
+                                    'orderby_sec'          => 'order',
+                                    'show_category'        => 0,
+                                    'link_category'        => 0,
+                                    'show_parent_category' => 0,
+                                    'link_parent_category' => 0,
+                                    'show_author'          => 0,
+                                    'show_create_date'     => 0,
+                                    'show_modify_date'     => 0,
+                                    'show_publish_date'    => 0,
+                                    'show_icons'           => 0,
+                                    'show_print_icon'      => 0,
+                                    'show_email_icon'      => 0,
+                                    'show_hits'            => 0,
+                                    'show_page_heading'    => 0,
+                                    'secure'               => 0,
+                                ],
+                                'children' => [
+                                    [
+                                        'menutype'     => $menuTypes[2],
+                                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_0_TITLE'),
+                                        'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[45],
+                                        'component_id' => ComponentHelper::getComponent('com_content')->id,
+                                        'params'       => [
+                                            'show_page_heading' => 0,
+                                            'secure'            => 0,
+                                        ],
+                                    ],
+                                    [
+                                        'menutype'     => $menuTypes[2],
+                                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_1_TITLE'),
+                                        'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[4],
+                                        'component_id' => ComponentHelper::getComponent('com_content')->id,
+                                        'params'       => [
+                                            'show_page_heading' => 0,
+                                            'secure'            => 0,
+                                        ],
+                                    ],
+                                    [
+                                        'menutype'     => $menuTypes[2],
+                                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_2_TITLE'),
+                                        'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[59],
+                                        'component_id' => ComponentHelper::getComponent('com_content')->id,
+                                        'params'       => [
+                                            'show_page_heading' => 0,
+                                            'secure'            => 0,
+                                        ],
+                                    ],
+                                    [
+                                        'menutype'     => $menuTypes[2],
+                                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_3_TITLE'),
+                                        'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[13],
+                                        'component_id' => ComponentHelper::getComponent('com_content')->id,
+                                        'params'       => [
+                                            'show_page_heading' => 0,
+                                            'secure'            => 0,
+                                        ],
+                                    ],
+                                    [
+                                        'menutype'     => $menuTypes[2],
+                                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_4_TITLE'),
+                                        'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[14],
+                                        'component_id' => ComponentHelper::getComponent('com_content')->id,
+                                        'params'       => [
+                                            'show_page_heading' => 0,
+                                            'secure'            => 0,
+                                        ],
+                                    ],
+                                    [
+                                        'menutype'     => $menuTypes[2],
+                                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_5_TITLE'),
+                                        'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[40],
+                                        'component_id' => ComponentHelper::getComponent('com_content')->id,
+                                        'params'       => [
+                                            'show_page_heading' => 0,
+                                            'secure'            => 0,
+                                        ],
+                                    ],
+                                    [
+                                        'menutype'     => $menuTypes[2],
+                                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_6_TITLE'),
+                                        'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[50],
+                                        'component_id' => ComponentHelper::getComponent('com_content')->id,
+                                        'params'       => [
+                                            'show_page_heading' => 0,
+                                            'secure'            => 0,
+                                        ],
+                                    ],
+                                ],
+                            ],
+                        ],
+                    ],
                 ],
             ],
             [
-                'menutype'          => $menuTypes[5],
-                'title'             => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_58_TITLE'),
-                'link'              => 'index.php?option=com_content&view=category&layout=blog&id=' . $articleCatids3[3],
-                'component_id'      => ComponentHelper::getComponent('com_content')->id,
-                'template_style_id' => 7,
-                'params'            => [
-                    'layout_type'          => 'blog',
-                    'show_category_title'  => 1,
-                    'show_description'     => 1,
-                    'maxLevel'             => 0,
-                    'num_leading_articles' => 5,
-                    'num_intro_articles'   => 0,
-                    'num_columns'          => 1,
-                    'num_links'            => 4,
-                    'orderby_sec'          => 'alpha',
+                'menutype'     => $menuTypes[2],
+                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_62_TITLE'),
+                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[21],
+                'component_id' => ComponentHelper::getComponent('com_content')->id,
+                'params'       => [
                     'show_title'           => 1,
-                    'link_titles'          => 1,
-                    'show_intro'           => 1,
+                    'link_titles'          => 0,
                     'show_category'        => 0,
                     'show_parent_category' => 0,
-                    'link_parent_category' => 0,
                     'show_author'          => 0,
+                    'show_create_date'     => 0,
+                    'show_modify_date'     => 0,
                     'show_publish_date'    => 0,
+                    'show_item_navigation' => 0,
                     'show_hits'            => 0,
-                    'menu_text'            => 1,
                     'show_page_heading'    => 0,
                     'secure'               => 0,
                 ],
             ],
+        ];
+
+        try {
+            $aboutMenuIds = $this->addMenuItems($aboutMenuItems, 1);
+        } catch (\Exception $e) {
+            $response            = [];
+            $response['success'] = false;
+            $response['message'] = Text::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 7, $e->getMessage());
+
+            return $response;
+        }
+
+        // Insert Main Menu Testing Menu Items
+        $mainMenuItems = [
             [
-                'menutype'          => $menuTypes[5],
-                'title'             => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_59_TITLE'),
-                'link'              => 'index.php?option=com_users&view=login',
-                'component_id'      => ComponentHelper::getComponent('com_users')->id,
-                'template_style_id' => 7,
-                'params'            => [
-                    'logindescription_show'  => 1,
-                    'logoutdescription_show' => 1,
-                    'menu_text'              => 1,
-                    'show_page_heading'      => 0,
-                    'secure'                 => 0,
-                ],
-            ],
-            [
-                'menutype'          => $menuTypes[5],
-                'title'             => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_60_TITLE'),
-                'link'              => 'index.php?option=com_content&view=article&id=' . $articleIds[12],
-                'component_id'      => ComponentHelper::getComponent('com_content')->id,
-                'template_style_id' => 7,
-                'params'            => [
-                    'menu_text'         => 1,
+                'menutype'     => $menuTypes[4],
+                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_3_TITLE'),
+                'link'         => 'index.php?option=com_users&view=login',
+                'component_id' => ComponentHelper::getComponent('com_users')->id,
+                'params'       => [
                     'show_page_heading' => 0,
                     'secure'            => 0,
                 ],
             ],
             [
                 'menutype'     => $menuTypes[4],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_61_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[23],
+                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_5_TITLE'),
+                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[37],
                 'component_id' => ComponentHelper::getComponent('com_content')->id,
                 'params'       => [
-                    'show_title'           => 1,
                     'show_category'        => 0,
-                    'link_category'        => 0,
                     'show_parent_category' => 0,
-                    'link_parent_category' => 0,
                     'show_author'          => 0,
-                    'link_author'          => 0,
                     'show_create_date'     => 0,
                     'show_modify_date'     => 0,
                     'show_publish_date'    => 0,
                     'show_item_navigation' => 0,
-                    'show_icons'           => 0,
-                    'show_print_icon'      => 0,
-                    'show_email_icon'      => 0,
                     'show_hits'            => 0,
-                    'menu_text'            => 1,
                     'show_page_heading'    => 0,
                     'secure'               => 0,
                 ],
-                'home' => 1,
+                'children' => [
+                    [
+                        'menutype'     => $menuTypes[4],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_102_TITLE'),
+                        'link'         => 'index.php?Itemid=',
+                        'type'         => 'alias',
+                        'component_id' => 0,
+                        'params'       => [
+                            'aliasoptions' => $parkMenuIds[0],
+                        ],
+                    ],
+                    [
+                        'menutype'     => $menuTypes[4],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_104_TITLE'),
+                        'link'         => 'index.php?Itemid=',
+                        'type'         => 'alias',
+                        'component_id' => 0,
+                        'params'       => [
+                            'aliasoptions' => $fruitshopMenuIds[0],
+                        ],
+                    ],
+                ],
             ],
             [
-                'menutype'     => $menuTypes[2],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_62_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[21],
+                'menutype'     => $menuTypes[4],
+                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_61_TITLE'),
+                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[23],
                 'component_id' => ComponentHelper::getComponent('com_content')->id,
                 'params'       => [
                     'show_title'           => 1,
-                    'link_titles'          => 0,
                     'show_category'        => 0,
+                    'link_category'        => 0,
                     'show_parent_category' => 0,
+                    'link_parent_category' => 0,
                     'show_author'          => 0,
+                    'link_author'          => 0,
                     'show_create_date'     => 0,
                     'show_modify_date'     => 0,
                     'show_publish_date'    => 0,
                     'show_item_navigation' => 0,
+                    'show_icons'           => 0,
+                    'show_print_icon'      => 0,
+                    'show_email_icon'      => 0,
                     'show_hits'            => 0,
+                    'menu_text'            => 1,
                     'show_page_heading'    => 0,
                     'secure'               => 0,
                 ],
-            ],
-            [
-                'menutype'     => $menuTypes[7],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_63_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[2],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[7],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_64_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[25],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
+                'home' => 1,
             ],
             [
                 'menutype'     => $menuTypes[4],
@@ -2365,190 +2321,11 @@ public function onAjaxSampledataApplyStep7()
                 'component_id' => 0,
                 'params'       => [],
             ],
-            [
-                'menutype'     => $menuTypes[0],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_66_TITLE'),
-                'link'         => 'index.php?option=com_content&view=form&layout=edit',
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'access'       => 3,
-                'params'       => [
-                    'menu_text'         => 1,
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[6],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_67_TITLE'),
-                'link'         => 'index.php?option=com_contact&view=featured',
-                'component_id' => ComponentHelper::getComponent('com_contact')->id,
-                'params'       => [
-                    'maxLevel'           => -1,
-                    'presentation_style' => 'sliders',
-                    'show_links'         => 1,
-                    'show_page_heading'  => 1,
-                    'secure'             => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[7],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_68_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[3],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'show_page_heading' => 1,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'          => $menuTypes[5],
-                'title'             => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_69_TITLE'),
-                'link'              => 'index.php?option=com_content&view=form&layout=edit',
-                'component_id'      => ComponentHelper::getComponent('com_content')->id,
-                'access'            => 4,
-                'template_style_id' => 7,
-                'params'            => [
-                    'enable_category'   => 0,
-                    'catid'             => 14,
-                    'menu_text'         => 1,
-                    'show_page_heading' => 1,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'          => $menuTypes[5],
-                'title'             => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_70_TITLE'),
-                'link'              => 'index.php?option=com_content&view=category&id=' . $articleCatids3[4],
-                'component_id'      => ComponentHelper::getComponent('com_content')->id,
-                'template_style_id' => 7,
-                'params'            => [
-                    'show_category_title'   => 1,
-                    'show_description'      => 1,
-                    'maxLevel'              => 0,
-                    'show_empty_categories' => 0,
-                    'display_num'           => 10,
-                    'menu_text'             => 1,
-                    'show_page_heading'     => 0,
-                    'secure'                => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[6],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_71_TITLE'),
-                'link'         => 'index.php?option=com_finder&view=search&q=&f=',
-                'component_id' => ComponentHelper::getComponent('com_finder')->id,
-                'params'       => [
-                    'description_length' => 255,
-                    'allow_empty_query'  => 0,
-                    'show_feed'          => 0,
-                    'show_feed_text'     => 0,
-                    'menu_text'          => 1,
-                    'show_page_heading'  => 0,
-                    'secure'             => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[7],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_72_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[66],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'menu_text'         => 1,
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[7],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_73_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[67],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'menu_text'         => 1,
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[7],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_74_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[68],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'menu_text'         => 1,
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[6],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_75_TITLE'),
-                'link'         => 'index.php?option=com_tags&view=tag&layout=list&id[0]=' . $tagIds[2],
-                'component_id' => ComponentHelper::getComponent('com_tags')->id,
-                'params'       => [
-                    'tag_list_item_maximum_characters' => 0,
-                    'maximum'                          => 200,
-                    'menu_text'                        => 1,
-                    'show_page_heading'                => 0,
-                    'secure'                           => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[6],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_76_TITLE'),
-                'link'         => 'index.php?option=com_tags&view=tag&id[0]=' . $tagIds[1],
-                'component_id' => ComponentHelper::getComponent('com_tags')->id,
-                'params'       => [
-                    'tag_list_item_maximum_characters' => 0,
-                    'maximum'                          => 200,
-                    'menu_text'                        => 1,
-                    'show_page_heading'                => 0,
-                    'secure'                           => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[6],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_77_TITLE'),
-                'link'         => 'index.php?option=com_tags&view=tags',
-                'component_id' => ComponentHelper::getComponent('com_tags')->id,
-                'params'       => [
-                    'tag_columns'                     => 4,
-                    'all_tags_tag_maximum_characters' => 0,
-                    'maximum'                         => 200,
-                    'menu_text'                       => 1,
-                    'show_page_heading'               => 0,
-                    'secure'                          => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[6],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_78_TITLE'),
-                'link'         => 'index.php?option=com_config&view=config',
-                'component_id' => ComponentHelper::getComponent('com_config')->id,
-                'access'       => 6,
-                'params'       => [
-                    'menu_text'         => 1,
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[6],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_79_TITLE'),
-                'link'         => 'index.php?option=com_config&view=templates',
-                'component_id' => ComponentHelper::getComponent('com_config')->id,
-                'access'       => 6,
-                'params'       => [
-                    'menu_text'         => 1,
-                    'show_page_heading' => 0,
-                    'secure'            => 0,
-                ],
-            ],
         ];
 
         try {
-            $menuIdsLevel1 = $this->addMenuItems($menuItems, 1);
-        } catch (Exception $e) {
+            $mainMenuIds = $this->addMenuItems($mainMenuItems, 1);
+        } catch (\Exception $e) {
             $response            = [];
             $response['success'] = false;
             $response['message'] = Text::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 7, $e->getMessage());
@@ -2556,8 +2333,15 @@ public function onAjaxSampledataApplyStep7()
             return $response;
         }
 
-        // Insert alias menu items for level 1.
-        $menuItems = [
+        // Insert Top Menu Items
+        $topMenuItems = [
+            [
+                'menutype'     => $menuTypes[1],
+                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_1_TITLE'),
+                'link'         => 'https://joomla.org',
+                'type'         => 'url',
+                'component_id' => 0,
+            ],
             [
                 'menutype'     => $menuTypes[1],
                 'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_100_TITLE'),
@@ -2565,7 +2349,7 @@ public function onAjaxSampledataApplyStep7()
                 'type'         => 'alias',
                 'component_id' => 0,
                 'params'       => [
-                    'aliasoptions' => $menuIdsLevel1[5],
+                    'aliasoptions' => $mainMenuIds[1],
                 ],
             ],
             [
@@ -2575,7 +2359,7 @@ public function onAjaxSampledataApplyStep7()
                 'type'         => 'alias',
                 'component_id' => 0,
                 'params'       => [
-                    'aliasoptions' => $menuIdsLevel1[61],
+                    'aliasoptions' => end($aboutMenuIds),
                 ],
             ],
             [
@@ -2585,7 +2369,7 @@ public function onAjaxSampledataApplyStep7()
                 'type'         => 'alias',
                 'component_id' => 0,
                 'params'       => [
-                    'aliasoptions' => $menuIdsLevel1[7],
+                    'aliasoptions' => $parkMenuIds[0],
                     'menu_text'    => 1,
                 ],
             ],
@@ -2596,15 +2380,15 @@ public function onAjaxSampledataApplyStep7()
                 'type'         => 'alias',
                 'component_id' => 0,
                 'params'       => [
-                    'aliasoptions' => $menuIdsLevel1[56],
+                    'aliasoptions' => $fruitshopMenuIds[0],
                     'menu_text'    => 1,
                 ],
             ],
         ];
 
         try {
-            $menuIdsLevel1Alias = $this->addMenuItems($menuItems, 1);
-        } catch (Exception $e) {
+            $topMenuIds = $this->addMenuItems($topMenuItems, 1);
+        } catch (\Exception $e) {
             $response            = [];
             $response['success'] = false;
             $response['message'] = Text::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 7, $e->getMessage());
@@ -2612,489 +2396,825 @@ public function onAjaxSampledataApplyStep7()
             return $response;
         }
 
-        // Insert second level of menuitems.
-        $menuItems = [
-            [
-                'menutype'     => $menuTypes[2],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_TITLE'),
-                'link'         => 'index.php?option=com_content&view=categories&id=' . $articleCatids3[0],
-                'parent_id'    => $menuIdsLevel1[27],
-                'component_id' => ComponentHelper::getComponent('com_content')->id,
-                'params'       => [
-                    'show_base_description'     => 1,
-                    'maxLevelcat'               => 1,
-                    'show_empty_categories_cat' => 1,
-                    'show_subcat_desc_cat'      => 1,
-                    'show_cat_num_articles_cat' => 0,
-                    'show_description'          => 1,
-                    'show_description_image'    => 1,
-                    'maxLevel'                  => 1,
-                    'show_empty_categories'     => 1,
-                    'num_leading_articles'      => 1,
-                    'num_intro_articles'        => 4,
-                    'num_columns'               => 2,
-                    'num_links'                 => 4,
-                    'secure'                    => 0,
-                ],
-            ],
-            [
-                'menutype'          => $menuTypes[3],
-                'title'             => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_8_1_TITLE'),
-                'link'              => 'index.php?option=com_content&view=category&layout=blog&id=' . $articleCatids4[5],
-                'parent_id'         => $menuIdsLevel1[8],
-                'component_id'      => ComponentHelper::getComponent('com_content')->id,
-                'template_style_id' => 114,
-                'params'            => [
-                    'show_description'       => 1,
-                    'show_description_image' => 0,
-                    'num_leading_articles'   => 0,
-                    'num_intro_articles'     => 6,
-                    'num_columns'            => 2,
-                    'num_links'              => 4,
-                    'multi_column_order'     => 1,
-                    'show_pagination'        => 2,
-                    'show_intro'             => 0,
-                    'show_category'          => 1,
-                    'link_category'          => 1,
-                    'show_author'            => 0,
-                    'show_create_date'       => 0,
-                    'show_modify_date'       => 0,
-                    'show_publish_date'      => 0,
-                    'show_item_navigation'   => 1,
-                    'show_feed_link'         => 1,
-                    'show_page_heading'      => 0,
-                    'secure'                 => 0,
-                ],
-            ],
-            [
-                'menutype'          => $menuTypes[3],
-                'title'             => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_8_2_TITLE'),
-                'link'              => 'index.php?option=com_content&view=category&layout=blog&id=' . $articleCatids4[5],
-                'parent_id'         => $menuIdsLevel1[8],
-                'component_id'      => ComponentHelper::getComponent('com_content')->id,
-                'template_style_id' => 114,
-                'params'            => [
-                    'show_description'       => 0,
-                    'show_description_image' => 0,
-                    'num_leading_articles'   => 0,
-                    'num_intro_articles'     => 4,
-                    'num_columns'            => 2,
-                    'num_links'              => 4,
-                    'multi_column_order'     => 1,
-                    'show_pagination'        => 2,
-                    'show_intro'             => 0,
-                    'show_category'          => 1,
-                    'show_parent_category'   => 0,
-                    'link_parent_category'   => 0,
-                    'show_author'            => 0,
-                    'link_author'            => 0,
-                    'show_create_date'       => 0,
-                    'show_modify_date'       => 0,
-                    'show_publish_date'      => 0,
-                    'show_item_navigation'   => 1,
-                    'show_readmore'          => 1,
-                    'show_icons'             => 0,
-                    'show_print_icon'        => 0,
-                    'show_email_icon'        => 0,
-                    'show_hits'              => 0,
-                    'show_feed_link'         => 1,
-                    'show_page_heading'      => 0,
-                    'secure'                 => 0,
-                ],
-            ],
-        ];
-
-        try {
-            $menuIdsLevel2 = $this->addMenuItems($menuItems, 2);
-        } catch (Exception $e) {
-            $response            = [];
-            $response['success'] = false;
-            $response['message'] = Text::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 7, $e->getMessage());
-
-            return $response;
-        }
+        $this->getApplication()->setUserState('sampledata.testing.menus.user', $userMenuIds);
+        $this->getApplication()->setUserState('sampledata.testing.menus.park', $parkMenuIds);
+        $this->getApplication()->setUserState('sampledata.testing.menus.fruitshop', $fruitshopMenuIds);
+        $this->getApplication()->setUserState('sampledata.testing.menus.frontend', $frontendMenuIds);
+        $this->getApplication()->setUserState('sampledata.testing.menus.about', $aboutMenuIds);
+        $this->getApplication()->setUserState('sampledata.testing.menus.main', $mainMenuIds);
+        $this->getApplication()->setUserState('sampledata.testing.menus.top', $topMenuIds);
 
-        // Insert alias menu items for level 2.
-        $menuItems = [
-            [
-                'menutype'     => $menuTypes[4],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_103_TITLE'),
-                'link'         => 'index.php?Itemid=',
-                'type'         => 'alias',
-                'parent_id'    => $menuIdsLevel1[5],
-                'component_id' => 0,
-                'params'       => [
-                    'aliasoptions' => $menuIdsLevel1[7],
-                ],
-            ],
-            [
-                'menutype'     => $menuTypes[4],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_104_TITLE'),
-                'link'         => 'index.php?Itemid=',
-                'type'         => 'alias',
-                'parent_id'    => $menuIdsLevel1[5],
-                'component_id' => 0,
-                'params'       => [
-                    'aliasoptions' => $menuIdsLevel1[56],
-                ],
-            ],
-        ];
+        $response            = [];
+        $response['success'] = true;
+        $response['message'] = $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_STEP7_SUCCESS');
 
-        try {
-            $menuIdsLevel2Alias = $this->addMenuItems($menuItems, 2);
-        } catch (Exception $e) {
-            $response            = [];
-            $response['success'] = false;
-            $response['message'] = Text::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 7, $e->getMessage());
+        return $response;
+    }
 
-            return $response;
-        }
+    protected function addFrontendViewsMenu($menuTypes)
+    {
+        // Get previously entered Data from UserStates
+        $contactIds      = $this->getApplication()->getUserState('sampledata.testing.contacts');
+        $contactCatids1  = $this->getApplication()->getUserState('sampledata.testing.contacts.catids1');
+        $contactCatids3  = $this->getApplication()->getUserState('sampledata.testing.contacts.catids3');
+        $articleIds      = $this->getApplication()->getUserState('sampledata.testing.articles');
+        $articleCatids1  = $this->getApplication()->getUserState('sampledata.testing.articles.catids1');
+        $articleCatids2  = $this->getApplication()->getUserState('sampledata.testing.articles.catids2');
+        $articleCatids3  = $this->getApplication()->getUserState('sampledata.testing.articles.catids3');
+        $articleCatids4  = $this->getApplication()->getUserState('sampledata.testing.articles.catids4');
+        $articleCatids5  = $this->getApplication()->getUserState('sampledata.testing.articles.catids5');
+        $tagIds          = $this->getApplication()->getUserState('sampledata.testing.tags');
+        $newsfeedsIds    = $this->getApplication()->getUserState('sampledata.testing.newsfeeds');
+        $newsfeedsCatids = $this->getApplication()->getUserState('sampledata.testing.newsfeeds.catids');
 
-        // Insert third level of menuitems.
         $menuItems = [
+            // com_config
             [
-                'menutype'     => $menuTypes[2],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_TITLE'),
-                'link'         => 'index.php?option=com_content&view=category&id=' . $articleCatids4[2],
-                'parent_id'    => $menuIdsLevel2[0],
+                'menutype'     => $menuTypes[6],
+                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_105_TITLE'),
+                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[69],
                 'component_id' => ComponentHelper::getComponent('com_content')->id,
                 'params'       => [
-                    'show_description'      => 1,
-                    'maxLevel'              => 2,
-                    'show_empty_categories' => 1,
-                    'show_no_articles'      => '0',
-                    'show_subcat_desc'      => 1,
-                    'show_pagination_limit' => '0',
-                    'filter_field'          => 'hide',
-                    'show_headings'         => '0',
-                    'list_show_date'        => '0',
-                    'list_show_hits'        => '0',
-                    'list_show_author'      => '0',
-                    'show_pagination'       => '0',
-                    'show_title'            => 1,
-                    'link_titles'           => 1,
-                    'menu_text'             => 1,
-                    'page_title'            => 'Templates',
-                    'show_page_heading'     => 0,
-                    'secure'                => 0,
+                    'show_page_heading' => 0,
+                    'secure'            => 0,
                 ],
-            ],
+                'children' => [
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_78_TITLE'),
+                        'link'         => 'index.php?option=com_config&view=config',
+                        'component_id' => ComponentHelper::getComponent('com_config')->id,
+                        'access'       => 6,
+                        'params'       => [
+                            'menu_text'         => 1,
+                            'show_page_heading' => 0,
+                            'secure'            => 0,
+                        ],
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_79_TITLE'),
+                        'link'         => 'index.php?option=com_config&view=templates',
+                        'component_id' => ComponentHelper::getComponent('com_config')->id,
+                        'access'       => 6,
+                        'params'       => [
+                            'menu_text'         => 1,
+                            'show_page_heading' => 0,
+                            'secure'            => 0,
+                        ],
+                    ],
+                ],
+            ],
+
+            // com_contact
             [
-                'menutype'     => $menuTypes[2],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_1_TITLE'),
-                'link'         => 'index.php?option=com_content&view=category&layout=blog&id=' . $articleCatids4[3],
-                'parent_id'    => $menuIdsLevel2[0],
+                'menutype'     => $menuTypes[6],
+                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_22_TITLE'),
+                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[8],
                 'component_id' => ComponentHelper::getComponent('com_content')->id,
                 'params'       => [
-                    'show_description'       => 1,
-                    'show_description_image' => 1,
-                    'show_category_title'    => 1,
-                    'num_leading_articles'   => 1,
-                    'num_intro_articles'     => 4,
-                    'num_columns'            => 2,
-                    'num_links'              => 4,
-                    'show_page_heading'      => 0,
-                    'secure'                 => 0,
+                    'show_page_heading' => 0,
+                    'secure'            => 0,
                 ],
-            ],
+                'children' => [
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_2_TITLE'),
+                        'link'         => 'index.php?option=com_contact&view=contact&id=' . $contactIds[0],
+                        'component_id' => ComponentHelper::getComponent('com_contact')->id,
+                        'params'       => [
+                            'show_page_heading' => 0,
+                            'secure'            => 0,
+                        ],
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_9_TITLE'),
+                        'link'         => 'index.php?option=com_contact&view=categories&id=' . $contactCatids1[0],
+                        'component_id' => ComponentHelper::getComponent('com_contact')->id,
+                        'params'       => [
+                            'maxLevel'           => -1,
+                            'presentation_style' => 'sliders',
+                            'show_links'         => 1,
+                            'show_page_heading'  => 0,
+                            'secure'             => 0,
+                        ],
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_25_TITLE'),
+                        'link'         => 'index.php?option=com_contact&view=category&id=' . $contactCatids3[0],
+                        'component_id' => ComponentHelper::getComponent('com_contact')->id,
+                        'params'       => [
+                            'maxLevel'           => -1,
+                            'display_num'        => 20,
+                            'presentation_style' => 'sliders',
+                            'show_links'         => 1,
+                            'show_feed_link'     => 1,
+                            'show_page_heading'  => 0,
+                            'secure'             => 0,
+                        ],
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_67_TITLE'),
+                        'link'         => 'index.php?option=com_contact&view=featured',
+                        'component_id' => ComponentHelper::getComponent('com_contact')->id,
+                        'params'       => [
+                            'maxLevel'           => -1,
+                            'presentation_style' => 'sliders',
+                            'show_links'         => 1,
+                            'show_page_heading'  => 1,
+                            'secure'             => 0,
+                        ],
+                    ],
+                ],
+            ],
+
+            // com_content
             [
-                'menutype'     => $menuTypes[2],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_TITLE'),
-                'link'         => 'index.php?option=com_content&view=category&layout=blog&id=' . $articleCatids4[4],
-                'parent_id'    => $menuIdsLevel2[0],
+                'menutype'     => $menuTypes[6],
+                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_20_TITLE'),
+                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[9],
                 'component_id' => ComponentHelper::getComponent('com_content')->id,
                 'params'       => [
-                    'show_description'     => 1,
-                    'show_category_title'  => 1,
-                    'num_leading_articles' => 0,
-                    'num_intro_articles'   => 7,
-                    'num_columns'          => 1,
-                    'num_links'            => 0,
-                    'orderby_sec'          => 'order',
-                    'show_category'        => 0,
-                    'link_category'        => 0,
-                    'show_parent_category' => 0,
-                    'link_parent_category' => 0,
-                    'show_author'          => 0,
-                    'show_create_date'     => 0,
-                    'show_modify_date'     => 0,
-                    'show_publish_date'    => 0,
-                    'show_icons'           => 0,
-                    'show_print_icon'      => 0,
-                    'show_email_icon'      => 0,
-                    'show_hits'            => 0,
-                    'show_page_heading'    => 0,
-                    'secure'               => 0,
+                    'show_page_heading' => 0,
+                    'secure'            => 0,
                 ],
-            ],
-        ];
-
-        try {
-            $menuIdsLevel3 = $this->addMenuItems($menuItems, 3);
-        } catch (Exception $e) {
-            $response            = [];
-            $response['success'] = false;
-            $response['message'] = Text::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 7, $e->getMessage());
-
-            return $response;
-        }
-
-        // Insert fourth level of menuitems.
-        $menuItems = [
+                'children' => [
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_14_TITLE'),
+                        'link'         => 'index.php?option=com_content&view=archive',
+                        'component_id' => ComponentHelper::getComponent('com_content')->id,
+                        'params'       => [
+                            'show_category'     => 1,
+                            'link_category'     => 1,
+                            'show_title'        => 1,
+                            'link_titles'       => 1,
+                            'show_intro'        => 1,
+                            'show_page_heading' => 0,
+                            'secure'            => 0,
+                        ],
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_15_TITLE'),
+                        'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[5],
+                        'component_id' => ComponentHelper::getComponent('com_content')->id,
+                        'params'       => [
+                            'show_page_heading' => 0,
+                            'secure'            => 0,
+                        ],
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_16_TITLE'),
+                        'link'         => 'index.php?option=com_content&view=category&layout=blog&id=' . $articleCatids3[1],
+                        'component_id' => ComponentHelper::getComponent('com_content')->id,
+                        'params'       => [
+                            'show_description'       => 0,
+                            'show_description_image' => 0,
+                            'num_leading_articles'   => 1,
+                            'num_intro_articles'     => 4,
+                            'num_columns'            => 2,
+                            'num_links'              => 4,
+                            'show_pagination'        => 2,
+                            'show_feed_link'         => 1,
+                            'show_page_heading'      => 0,
+                            'secure'                 => 0,
+                        ],
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_17_TITLE'),
+                        'link'         => 'index.php?option=com_content&view=category&id=' . $articleCatids2[0],
+                        'component_id' => ComponentHelper::getComponent('com_content')->id,
+                        'params'       => [
+                            'orderby_sec'       => 'alpha',
+                            'display_num'       => 10,
+                            'menu_text'         => 1,
+                            'show_page_heading' => 0,
+                            'secure'            => 0,
+                        ],
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_18_TITLE'),
+                        'link'         => 'index.php?option=com_content&view=featured',
+                        'component_id' => ComponentHelper::getComponent('com_content')->id,
+                        'params'       => [
+                            'num_leading_articles' => 1,
+                            'num_intro_articles'   => 4,
+                            'num_columns'          => 2,
+                            'num_links'            => 4,
+                            'multi_column_order'   => 1,
+                            'orderby_sec'          => 'front',
+                            'show_pagination'      => 2,
+                            'show_feed_link'       => 1,
+                            'show_page_heading'    => 0,
+                            'secure'               => 0,
+                        ],
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_19_TITLE'),
+                        'link'         => 'index.php?option=com_content&view=form&layout=edit',
+                        'component_id' => ComponentHelper::getComponent('com_content')->id,
+                        'access'       => 3,
+                        'params'       => [
+                            'enable_category'   => 0,
+                            'show_page_heading' => 0,
+                            'secure'            => 0,
+                        ],
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_24_TITLE'),
+                        'link'         => 'index.php?option=com_content&view=categories&id=' . $articleCatids1[0],
+                        'component_id' => ComponentHelper::getComponent('com_content')->id,
+                        'params'       => [
+                            'maxLevel'             => -1,
+                            'num_leading_articles' => 1,
+                            'num_intro_articles'   => 4,
+                            'num_columns'          => 2,
+                            'num_links'            => 4,
+                            'show_page_heading'    => 0,
+                            'secure'               => 0,
+                        ],
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_30_TITLE'),
+                        'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[29],
+                        'component_id' => ComponentHelper::getComponent('com_content')->id,
+                        'params'       => [
+                            'show_page_heading' => 0,
+                            'secure'            => 0,
+                        ],
+                        'sampledata_module' => 'mod_articles_popular',
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_36_TITLE'),
+                        'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[30],
+                        'component_id' => ComponentHelper::getComponent('com_content')->id,
+                        'params'       => [
+                            'show_page_heading' => 0,
+                            'secure'            => 0,
+                        ],
+                        'sampledata_module' => 'mod_articles_news',
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_37_TITLE'),
+                        'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[26],
+                        'component_id' => ComponentHelper::getComponent('com_content')->id,
+                        'params'       => [
+                            'show_page_heading' => 0,
+                            'secure'            => 0,
+                        ],
+                        'sampledata_module' => 'mod_articles_latest',
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_42_TITLE'),
+                        'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[1],
+                        'component_id' => ComponentHelper::getComponent('com_content')->id,
+                        'params'       => [
+                            'show_page_heading' => 0,
+                            'secure'            => 0,
+                        ],
+                        'sampledata_module' => 'mod_articles_archive',
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_43_TITLE'),
+                        'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[36],
+                        'component_id' => ComponentHelper::getComponent('com_content')->id,
+                        'params'       => [
+                            'show_page_heading' => 0,
+                            'secure'            => 0,
+                        ],
+                        'sampledata_module' => 'mod_related_items',
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_63_TITLE'),
+                        'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[2],
+                        'component_id' => ComponentHelper::getComponent('com_content')->id,
+                        'params'       => [
+                            'show_page_heading' => 0,
+                            'secure'            => 0,
+                        ],
+                        'sampledata_module' => 'mod_articles_categories',
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_68_TITLE'),
+                        'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[3],
+                        'component_id' => ComponentHelper::getComponent('com_content')->id,
+                        'params'       => [
+                            'show_page_heading' => 1,
+                            'secure'            => 0,
+                        ],
+                        'sampledata_module' => 'mod_articles_category',
+                    ],
+                ],
+            ],
+
+            // com_finder
             [
-                'menutype'     => $menuTypes[2],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_0_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[45],
-                'parent_id'    => $menuIdsLevel3[2],
+                'menutype'     => $menuTypes[6],
+                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_26_TITLE'),
+                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[38],
                 'component_id' => ComponentHelper::getComponent('com_content')->id,
                 'params'       => [
+                    'menu_text'         => 1,
                     'show_page_heading' => 0,
                     'secure'            => 0,
                 ],
-            ],
+                'children' => [
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_71_TITLE'),
+                        'link'         => 'index.php?option=com_finder&view=search&q=&f=',
+                        'component_id' => ComponentHelper::getComponent('com_finder')->id,
+                        'params'       => [
+                            'description_length' => 255,
+                            'allow_empty_query'  => 0,
+                            'show_feed'          => 0,
+                            'show_feed_text'     => 0,
+                            'menu_text'          => 1,
+                            'show_page_heading'  => 0,
+                            'secure'             => 0,
+                        ],
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_72_TITLE'),
+                        'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[66],
+                        'component_id' => ComponentHelper::getComponent('com_content')->id,
+                        'params'       => [
+                            'menu_text'         => 1,
+                            'show_page_heading' => 0,
+                            'secure'            => 0,
+                        ],
+                        'sampledata_module' => 'mod_finder',
+                    ],
+                ],
+            ],
+
+            // com_newsfeeds
             [
-                'menutype'     => $menuTypes[2],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_1_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[4],
-                'parent_id'    => $menuIdsLevel3[2],
+                'menutype'     => $menuTypes[6],
+                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_21_TITLE'),
+                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[57],
                 'component_id' => ComponentHelper::getComponent('com_content')->id,
                 'params'       => [
-                    'show_page_heading' => 0,
+                    'show_page_heading' => 1,
+                    'page_title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_21_PARAM_PAGE_TITLE'),
                     'secure'            => 0,
                 ],
-            ],
+                'children' => [
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_10_TITLE'),
+                        'link'         => 'index.php?option=com_newsfeeds&view=categories&id=0',
+                        'component_id' => ComponentHelper::getComponent('com_newsfeeds')->id,
+                        'params'       => [
+                            'show_base_description'  => 1,
+                            'categories_description' => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_10_PARAM_CATEGORIES_DESCRIPTION'),
+                            'maxLevel'               => -1,
+                            'show_empty_categories'  => 1,
+                            'show_description'       => 1,
+                            'show_description_image' => 1,
+                            'show_cat_num_articles'  => 1,
+                            'feed_character_count'   => 0,
+                            'show_page_heading'      => 0,
+                            'secure'                 => 0,
+                        ],
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_11_TITLE'),
+                        'link'         => 'index.php?option=com_newsfeeds&view=category&id=' . $newsfeedsCatids[0],
+                        'component_id' => ComponentHelper::getComponent('com_newsfeeds')->id,
+                        'params'       => [
+                            'maxLevel'             => -1,
+                            'feed_character_count' => 0,
+                            'show_page_heading'    => 0,
+                            'secure'               => 0,
+                        ],
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_12_TITLE'),
+                        'link'         => 'index.php?option=com_newsfeeds&view=newsfeed&id=' . $newsfeedsIds[0],
+                        'component_id' => ComponentHelper::getComponent('com_newsfeeds')->id,
+                        'params'       => [
+                            'feed_character_count' => 0,
+                            'show_page_heading'    => 0,
+                            'secure'               => 0,
+                        ],
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_38_TITLE'),
+                        'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[44],
+                        'component_id' => ComponentHelper::getComponent('com_content')->id,
+                        'params'       => [
+                            'show_page_heading' => 0,
+                            'secure'            => 0,
+                        ],
+                        'sampledata_module' => 'mod_syndicate',
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_50_TITLE'),
+                        'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[15],
+                        'component_id' => ComponentHelper::getComponent('com_content')->id,
+                        'params'       => [
+                            'show_page_heading' => 0,
+                            'secure'            => 0,
+                        ],
+                        'sampledata_module' => 'mod_feed',
+                    ],
+                ],
+            ],
+            // com_privacy
             [
-                'menutype'     => $menuTypes[2],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_2_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[59],
-                'parent_id'    => $menuIdsLevel3[2],
+                'menutype'     => $menuTypes[6],
+                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_109_TITLE'),
+                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[71],
                 'component_id' => ComponentHelper::getComponent('com_content')->id,
                 'params'       => [
-                    'show_page_heading' => 0,
+                    'show_page_heading' => 1,
                     'secure'            => 0,
                 ],
-            ],
+                'children' => [
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_110_TITLE'),
+                        'link'         => 'index.php?option=com_privacy&view=confirm',
+                        'component_id' => ComponentHelper::getComponent('com_privacy')->id,
+                        'params'       => [
+                            'tag_list_item_maximum_characters' => 0,
+                            'maximum'                          => 200,
+                            'menu_text'                        => 1,
+                            'show_page_heading'                => 0,
+                            'secure'                           => 0,
+                        ],
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_111_TITLE'),
+                        'link'         => 'index.php?option=com_privacy&view=remind',
+                        'component_id' => ComponentHelper::getComponent('com_privacy')->id,
+                        'params'       => [
+                            'tag_list_item_maximum_characters' => 0,
+                            'maximum'                          => 200,
+                            'menu_text'                        => 1,
+                            'show_page_heading'                => 0,
+                            'secure'                           => 0,
+                        ],
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_112_TITLE'),
+                        'link'         => 'index.php?option=com_privacy&view=request',
+                        'component_id' => ComponentHelper::getComponent('com_privacy')->id,
+                        'params'       => [
+                            'tag_columns'                     => 4,
+                            'all_tags_tag_maximum_characters' => 0,
+                            'maximum'                         => 200,
+                            'menu_text'                       => 1,
+                            'show_page_heading'               => 0,
+                            'secure'                          => 0,
+                        ],
+                    ],
+                ],
+            ],
+
+            //com_tags
             [
-                'menutype'     => $menuTypes[2],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_3_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[13],
-                'parent_id'    => $menuIdsLevel3[2],
+                'menutype'     => $menuTypes[6],
+                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_106_TITLE'),
+                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[70],
                 'component_id' => ComponentHelper::getComponent('com_content')->id,
                 'params'       => [
-                    'show_page_heading' => 0,
+                    'show_page_heading' => 1,
                     'secure'            => 0,
                 ],
-            ],
+                'children' => [
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_75_TITLE'),
+                        'link'         => 'index.php?option=com_tags&view=tag&layout=list&id[0]=' . $tagIds[2],
+                        'component_id' => ComponentHelper::getComponent('com_tags')->id,
+                        'params'       => [
+                            'tag_list_item_maximum_characters' => 0,
+                            'maximum'                          => 200,
+                            'menu_text'                        => 1,
+                            'show_page_heading'                => 0,
+                            'secure'                           => 0,
+                        ],
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_76_TITLE'),
+                        'link'         => 'index.php?option=com_tags&view=tag&id[0]=' . $tagIds[1],
+                        'component_id' => ComponentHelper::getComponent('com_tags')->id,
+                        'params'       => [
+                            'tag_list_item_maximum_characters' => 0,
+                            'maximum'                          => 200,
+                            'menu_text'                        => 1,
+                            'show_page_heading'                => 0,
+                            'secure'                           => 0,
+                        ],
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_77_TITLE'),
+                        'link'         => 'index.php?option=com_tags&view=tags',
+                        'component_id' => ComponentHelper::getComponent('com_tags')->id,
+                        'params'       => [
+                            'tag_columns'                     => 4,
+                            'all_tags_tag_maximum_characters' => 0,
+                            'maximum'                         => 200,
+                            'menu_text'                       => 1,
+                            'show_page_heading'               => 0,
+                            'secure'                          => 0,
+                        ],
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_73_TITLE'),
+                        'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[67],
+                        'component_id' => ComponentHelper::getComponent('com_content')->id,
+                        'params'       => [
+                            'menu_text'         => 1,
+                            'show_page_heading' => 0,
+                            'secure'            => 0,
+                        ],
+                        'sampledata_module' => 'mod_tags_similar',
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_74_TITLE'),
+                        'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[68],
+                        'component_id' => ComponentHelper::getComponent('com_content')->id,
+                        'params'       => [
+                            'menu_text'         => 1,
+                            'show_page_heading' => 0,
+                            'secure'            => 0,
+                        ],
+                        'sampledata_module' => 'mod_tags_popular',
+                    ],
+                ],
+            ],
+
+            // com_users
             [
-                'menutype'     => $menuTypes[2],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_4_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[14],
-                'parent_id'    => $menuIdsLevel3[2],
+                'menutype'     => $menuTypes[6],
+                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_23_TITLE'),
+                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[51],
                 'component_id' => ComponentHelper::getComponent('com_content')->id,
                 'params'       => [
                     'show_page_heading' => 0,
                     'secure'            => 0,
                 ],
-            ],
+                'children' => [
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_44_TITLE'),
+                        'link'         => 'index.php?option=com_users&view=login',
+                        'component_id' => ComponentHelper::getComponent('com_users')->id,
+                        'params'       => [
+                            'logindescription_show'  => 1,
+                            'logoutdescription_show' => 1,
+                            'show_page_heading'      => 0,
+                            'secure'                 => 0,
+                        ],
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_45_TITLE'),
+                        'link'         => 'index.php?option=com_users&view=profile',
+                        'component_id' => ComponentHelper::getComponent('com_users')->id,
+                        'params'       => [
+                            'show_page_heading' => 0,
+                            'secure'            => 0,
+                        ],
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_46_TITLE'),
+                        'link'         => 'index.php?option=com_users&view=profile&layout=edit',
+                        'component_id' => ComponentHelper::getComponent('com_users')->id,
+                        'params'       => [
+                            'show_page_heading' => 0,
+                            'secure'            => 0,
+                        ],
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_47_TITLE'),
+                        'link'         => 'index.php?option=com_users&view=registration',
+                        'component_id' => ComponentHelper::getComponent('com_users')->id,
+                        'params'       => [
+                            'show_page_heading' => 0,
+                            'secure'            => 0,
+                        ],
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_48_TITLE'),
+                        'link'         => 'index.php?option=com_users&view=remind',
+                        'component_id' => ComponentHelper::getComponent('com_users')->id,
+                        'params'       => [
+                            'show_page_heading' => 0,
+                            'secure'            => 0,
+                        ],
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_49_TITLE'),
+                        'link'         => 'index.php?option=com_users&view=reset',
+                        'component_id' => ComponentHelper::getComponent('com_users')->id,
+                        'params'       => [
+                            'show_page_heading' => 0,
+                            'secure'            => 0,
+                        ],
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_28_TITLE'),
+                        'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[62],
+                        'component_id' => ComponentHelper::getComponent('com_content')->id,
+                        'params'       => [
+                            'show_page_heading' => 0,
+                            'secure'            => 0,
+                        ],
+                        'sampledata_module' => 'mod_users_latest',
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_29_TITLE'),
+                        'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[55],
+                        'component_id' => ComponentHelper::getComponent('com_content')->id,
+                        'params'       => [
+                            'show_page_heading' => 0,
+                            'secure'            => 0,
+                        ],
+                        'sampledata_module' => 'mod_whosonline',
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_39_TITLE'),
+                        'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[27],
+                        'component_id' => ComponentHelper::getComponent('com_content')->id,
+                        'params'       => [
+                            'menu_text'         => 1,
+                            'show_page_heading' => 0,
+                            'secure'            => 0,
+                        ],
+                        'sampledata_module' => 'mod_login',
+                    ],
+                ],
+            ],
+
+            // com_wrapper
             [
-                'menutype'     => $menuTypes[2],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_5_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[40],
-                'parent_id'    => $menuIdsLevel3[2],
+                'menutype'     => $menuTypes[6],
+                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_107_TITLE'),
+                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[71],
                 'component_id' => ComponentHelper::getComponent('com_content')->id,
                 'params'       => [
+                    'menu_text'         => 1,
                     'show_page_heading' => 0,
                     'secure'            => 0,
                 ],
-            ],
+                'children' => [
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_108_TITLE'),
+                        'link'         => 'index.php?option=com_wrapper&view=wrapper',
+                        'component_id' => ComponentHelper::getComponent('com_wrapper')->id,
+                        'params'       => [
+                            'show_page_heading' => 0,
+                            'secure'            => 0,
+                        ],
+                    ],
+                    [
+                        'menutype'     => $menuTypes[6],
+                        'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_40_TITLE'),
+                        'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[56],
+                        'component_id' => ComponentHelper::getComponent('com_content')->id,
+                        'params'       => [
+                            'menu_text'         => 1,
+                            'show_page_heading' => 0,
+                            'secure'            => 0,
+                        ],
+                        'sampledata_module' => 'mod_wrapper',
+                    ],
+                ],
+            ],
+
+            // Misc
             [
-                'menutype'     => $menuTypes[2],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_6_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[50],
-                'parent_id'    => $menuIdsLevel3[2],
+                'menutype'     => $menuTypes[6],
+                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_31_TITLE'),
+                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[28],
                 'component_id' => ComponentHelper::getComponent('com_content')->id,
                 'params'       => [
                     'show_page_heading' => 0,
                     'secure'            => 0,
                 ],
+                'sampledata_module' => 'mod_menu',
             ],
             [
-                'menutype'     => $menuTypes[2],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_7_TITLE'),
-                'link'         => 'index.php?option=com_content&view=category&layout=blog&id=' . $articleCatids5[6],
-                'parent_id'    => $menuIdsLevel3[0],
+                'menutype'     => $menuTypes[6],
+                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_32_TITLE'),
+                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[43],
                 'component_id' => ComponentHelper::getComponent('com_content')->id,
                 'params'       => [
-                    'show_description'     => 1,
-                    'num_leading_articles' => 1,
-                    'num_intro_articles'   => 4,
-                    'num_columns'          => 2,
-                    'num_links'            => 4,
-                    'show_page_heading'    => 0,
-                    'secure'               => 0,
+                    'show_page_heading' => 0,
+                    'secure'            => 0,
                 ],
+                'sampledata_module' => 'mod_stats',
             ],
             [
-                'menutype'     => $menuTypes[2],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_8_TITLE'),
-                'link'         => 'index.php?option=com_content&view=category&layout=blog&id=' . $articleCatids5[5],
-                'parent_id'    => $menuIdsLevel3[0],
+                'menutype'     => $menuTypes[6],
+                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_33_TITLE'),
+                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[6],
                 'component_id' => ComponentHelper::getComponent('com_content')->id,
                 'params'       => [
-                    'show_description'     => 1,
-                    'num_leading_articles' => 2,
-                    'num_intro_articles'   => 4,
-                    'num_columns'          => 2,
-                    'num_links'            => 4,
-                    'show_page_heading'    => 0,
-                    'secure'               => 0,
+                    'menu_text'         => 1,
+                    'show_page_heading' => 0,
+                    'secure'            => 0,
                 ],
+                'sampledata_module' => 'mod_banners',
             ],
             [
-                'menutype'     => $menuTypes[2],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_9_TITLE'),
-                'link'         => 'index.php?option=com_content&view=category&layout=blog&id=' . $articleCatids5[7],
-                'parent_id'    => $menuIdsLevel3[0],
+                'menutype'     => $menuTypes[6],
+                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_35_TITLE'),
+                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[35],
                 'component_id' => ComponentHelper::getComponent('com_content')->id,
                 'params'       => [
-                    'show_description'     => 1,
-                    'num_leading_articles' => 1,
-                    'num_intro_articles'   => 4,
-                    'num_columns'          => 2,
-                    'num_links'            => 4,
-                    'show_page_heading'    => 1,
-                    'secure'               => 0,
-                ],
-            ],
-        ];
-
-        try {
-            $menuIdsLevel4 = $this->addMenuItems($menuItems, 4);
-        } catch (Exception $e) {
-            $response            = [];
-            $response['success'] = false;
-            $response['message'] = Text::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 7, $e->getMessage());
-
-            return $response;
-        }
-
-        // Insert fifth level of menuitems.
-        $menuItems = [
-            [
-                'menutype'          => $menuTypes[2],
-                'title'             => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_8_0_TITLE'),
-                'link'              => 'index.php?option=com_content&view=article&id=' . $articleIds[48],
-                'parent_id'         => $menuIdsLevel4[8],
-                'component_id'      => ComponentHelper::getComponent('com_content')->id,
-                'template_style_id' => 3,
-                'params'            => [
                     'show_page_heading' => 0,
                     'secure'            => 0,
                 ],
+                'sampledata_module' => 'mod_random_image',
             ],
             [
-                'menutype'          => $menuTypes[2],
-                'title'             => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_8_1_TITLE'),
-                'link'              => 'index.php?option=com_content&view=featured',
-                'parent_id'         => $menuIdsLevel4[8],
-                'component_id'      => ComponentHelper::getComponent('com_content')->id,
-                'template_style_id' => 3,
-                'params'            => [
-                    'num_leading_articles' => 1,
-                    'num_intro_articles'   => 3,
-                    'num_columns'          => 3,
-                    'num_links'            => 0,
-                    'multi_column_order'   => 1,
-                    'orderby_sec'          => 'front',
-                    'show_pagination'      => 2,
-                    'show_feed_link'       => 1,
-                    'show_page_heading'    => 0,
-                    'secure'               => 0,
-                ],
-            ],
-            [
-                'menutype'          => $menuTypes[2],
-                'title'             => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_7_2_TITLE'),
-                'link'              => 'index.php?option=com_content&view=article&id=' . $articleIds[48],
-                'parent_id'         => $menuIdsLevel4[7],
-                'component_id'      => ComponentHelper::getComponent('com_content')->id,
-                'template_style_id' => 4,
-                'params'            => [
+                'menutype'     => $menuTypes[6],
+                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_41_TITLE'),
+                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[18],
+                'component_id' => ComponentHelper::getComponent('com_content')->id,
+                'params'       => [
                     'show_page_heading' => 0,
                     'secure'            => 0,
                 ],
+                'sampledata_module' => 'mod_footer',
             ],
             [
-                'menutype'          => $menuTypes[2],
-                'title'             => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_7_3_TITLE'),
-                'link'              => 'index.php?option=com_content&view=featured',
-                'parent_id'         => $menuIdsLevel4[7],
-                'component_id'      => ComponentHelper::getComponent('com_content')->id,
-                'template_style_id' => 4,
-                'params'            => [
-                    'num_leading_articles' => 1,
-                    'num_intro_articles'   => 3,
-                    'num_columns'          => 3,
-                    'num_links'            => 0,
-                    'multi_column_order'   => 1,
-                    'orderby_sec'          => 'front',
-                    'show_pagination'      => 2,
-                    'show_feed_link'       => 1,
-                    'show_page_heading'    => 0,
-                    'secure'               => 0,
+                'menutype'     => $menuTypes[6],
+                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_53_TITLE'),
+                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[58],
+                'component_id' => ComponentHelper::getComponent('com_content')->id,
+                'params'       => [
+                    'menu_text'         => 1,
+                    'show_page_heading' => 0,
+                    'secure'            => 0,
                 ],
-
+                'sampledata_module' => 'mod_breadcrumbs',
             ],
             [
-                'menutype'     => $menuTypes[2],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_9_4_TITLE'),
-                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[48],
-                'parent_id'    => $menuIdsLevel4[9],
+                'menutype'     => $menuTypes[6],
+                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_54_TITLE'),
+                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[11],
                 'component_id' => ComponentHelper::getComponent('com_content')->id,
                 'params'       => [
-                    'show_page_heading' => 1,
+                    'show_page_heading' => 0,
                     'secure'            => 0,
                 ],
+                'sampledata_module' => 'mod_custom',
             ],
             [
-                'menutype'     => $menuTypes[2],
-                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_9_5_TITLE'),
-                'link'         => 'index.php?option=com_content&view=featured',
-                'parent_id'    => $menuIdsLevel4[9],
+                'menutype'     => $menuTypes[6],
+                'title'        => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_64_TITLE'),
+                'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[25],
                 'component_id' => ComponentHelper::getComponent('com_content')->id,
                 'params'       => [
-                    'num_leading_articles' => 1,
-                    'num_intro_articles'   => 3,
-                    'num_columns'          => 3,
-                    'num_links'            => 0,
-                    'orderby_sec'          => 'front',
-                    'show_page_heading'    => 1,
-                    'secure'               => 0,
+                    'show_page_heading' => 0,
+                    'secure'            => 0,
                 ],
+                'sampledata_module' => 'mod_languages',
             ],
         ];
 
-        try {
-            $menuIdsLevel5 = $this->addMenuItems($menuItems, 5);
-        } catch (Exception $e) {
-            $response            = [];
-            $response['success'] = false;
-            $response['message'] = Text::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 7, $e->getMessage());
-
-            return $response;
-        }
-
-        $this->getApplication()->setUserState('sampledata.testing.menus.menuids1', $menuIdsLevel1);
-        $this->getApplication()->setUserState('sampledata.testing.menus.menuids2', $menuIdsLevel2);
-        $this->getApplication()->setUserState('sampledata.testing.menus.menuids3', $menuIdsLevel3);
-        $this->getApplication()->setUserState('sampledata.testing.menus.menuids4', $menuIdsLevel4);
-        $this->getApplication()->setUserState('sampledata.testing.menus.menuids5', $menuIdsLevel5);
-
-        $response            = [];
-        $response['success'] = true;
-        $response['message'] = $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_STEP7_SUCCESS');
-
-        return $response;
+        return $this->addMenuItems($menuItems, 1);
     }
 
     /**
@@ -3122,16 +3242,21 @@ public function onAjaxSampledataApplyStep8()
         $access = (int) $this->getApplication()->get('access', 1);
 
         // Get previously entered Data from UserStates
-        $menuTypes      = $this->getApplication()->getUserState('sampledata.testing.menutypes');
-        $articleCatids1 = $this->getApplication()->getUserState('sampledata.testing.articles.catids1');
-        $articleCatids2 = $this->getApplication()->getUserState('sampledata.testing.articles.catids2');
-        $articleCatids3 = $this->getApplication()->getUserState('sampledata.testing.articles.catids3');
-        $articleCatids4 = $this->getApplication()->getUserState('sampledata.testing.articles.catids4');
-        $articleCatids5 = $this->getApplication()->getUserState('sampledata.testing.articles.catids5');
-        $bannerCatids   = $this->getApplication()->getUserState('sampledata.testing.banners.catids');
-        $menuIdsLevel1  = $this->getApplication()->getUserState('sampledata.testing.menus.menuids1');
-        $menuIdsLevel2  = $this->getApplication()->getUserState('sampledata.testing.menus.menuids2');
-        $menuIdsLevel5  = $this->getApplication()->getUserState('sampledata.testing.menus.menuids5');
+        $menuTypes        = $this->getApplication()->getUserState('sampledata.testing.menutypes');
+        $articleCatids1   = $this->getApplication()->getUserState('sampledata.testing.articles.catids1');
+        $articleCatids2   = $this->getApplication()->getUserState('sampledata.testing.articles.catids2');
+        $articleCatids3   = $this->getApplication()->getUserState('sampledata.testing.articles.catids3');
+        $articleCatids4   = $this->getApplication()->getUserState('sampledata.testing.articles.catids4');
+        $articleCatids5   = $this->getApplication()->getUserState('sampledata.testing.articles.catids5');
+        $bannerCatids     = $this->getApplication()->getUserState('sampledata.testing.banners.catids');
+        $menuMapping      = $this->getApplication()->getUserState('sampledata.testing.menu_module_mapping');
+        $userMenuIds      = $this->getApplication()->getUserState('sampledata.testing.menus.user');
+        $parkMenuIds      = $this->getApplication()->getUserState('sampledata.testing.menus.park');
+        $fruitshopMenuIds = $this->getApplication()->getUserState('sampledata.testing.menus.fruitshop');
+        $frontendMenuIds  = $this->getApplication()->getUserState('sampledata.testing.menus.frontend');
+        $aboutMenuIds     = $this->getApplication()->getUserState('sampledata.testing.menus.about');
+        $mainMenuIds      = $this->getApplication()->getUserState('sampledata.testing.menus.main');
+        $topMenuIds       = $this->getApplication()->getUserState('sampledata.testing.menus.top');
 
         $modules = [
             [
@@ -3177,23 +3302,8 @@ public function onAjaxSampledataApplyStep8()
                 'module'     => 'mod_menu',
                 'access'     => 2,
                 'assignment' => -1,
-                'assigned'   => [
-                    $menuIdsLevel1[4],
-                    $menuIdsLevel1[6],
-                    $menuIdsLevel1[7],
-                    $menuIdsLevel1[8],
-                    $menuIdsLevel1[55],
-                    $menuIdsLevel1[56],
-                    $menuIdsLevel1[57],
-                    $menuIdsLevel1[58],
-                    $menuIdsLevel1[59],
-                    $menuIdsLevel1[60],
-                    $menuIdsLevel1[69],
-                    $menuIdsLevel1[70],
-                    $menuIdsLevel2[1],
-                    $menuIdsLevel2[2],
-                ],
-                'params' => [
+                'assigned'   => array_merge($parkMenuIds, $fruitshopMenuIds),
+                'params'     => [
                     'menutype'        => $menuTypes[0],
                     'startLevel'      => 1,
                     'endLevel'        => 0,
@@ -3228,16 +3338,8 @@ public function onAjaxSampledataApplyStep8()
                 'module'     => 'mod_menu',
                 'access'     => $access,
                 'assignment' => 1,
-                'assigned'   => [
-                    $menuIdsLevel1[4],
-                    $menuIdsLevel1[5],
-                    $menuIdsLevel1[6],
-                    $menuIdsLevel1[7],
-                    $menuIdsLevel1[8],
-                    $menuIdsLevel2[1],
-                    $menuIdsLevel2[2],
-                ],
-                'params' => [
+                'assigned'   => array_merge($parkMenuIds, [$mainMenuIds[1]]),
+                'params'     => [
                     'menutype'        => $menuTypes[3],
                     'startLevel'      => 1,
                     'endLevel'        => 0,
@@ -3254,24 +3356,8 @@ public function onAjaxSampledataApplyStep8()
                 'module'     => 'mod_menu',
                 'access'     => $access,
                 'assignment' => -1,
-                'assigned'   => [
-                    $menuIdsLevel1[4],
-                    $menuIdsLevel1[5],
-                    $menuIdsLevel1[6],
-                    $menuIdsLevel1[7],
-                    $menuIdsLevel1[8],
-                    $menuIdsLevel1[55],
-                    $menuIdsLevel1[56],
-                    $menuIdsLevel1[57],
-                    $menuIdsLevel1[58],
-                    $menuIdsLevel1[59],
-                    $menuIdsLevel1[60],
-                    $menuIdsLevel1[69],
-                    $menuIdsLevel1[70],
-                    $menuIdsLevel2[1],
-                    $menuIdsLevel2[2],
-                ],
-                'params' => [
+                'assigned'   => array_merge($parkMenuIds, $fruitshopMenuIds, [$mainMenuIds[4]]),
+                'params'     => [
                     'menutype'        => $menuTypes[2],
                     'startLevel'      => 1,
                     'endLevel'        => 0,
@@ -3308,24 +3394,8 @@ public function onAjaxSampledataApplyStep8()
                 'module'     => 'mod_menu',
                 'access'     => $access,
                 'assignment' => -1,
-                'assigned'   => [
-                    $menuIdsLevel1[4],
-                    $menuIdsLevel1[5],
-                    $menuIdsLevel1[6],
-                    $menuIdsLevel1[7],
-                    $menuIdsLevel1[8],
-                    $menuIdsLevel1[55],
-                    $menuIdsLevel1[56],
-                    $menuIdsLevel1[57],
-                    $menuIdsLevel1[58],
-                    $menuIdsLevel1[59],
-                    $menuIdsLevel1[60],
-                    $menuIdsLevel1[69],
-                    $menuIdsLevel1[70],
-                    $menuIdsLevel2[1],
-                    $menuIdsLevel2[2],
-                ],
-                'params' => [
+                'assigned'   => array_merge($parkMenuIds, $fruitshopMenuIds, [$mainMenuIds[1]]),
+                'params'     => [
                     'menutype'        => $menuTypes[4],
                     'startLevel'      => 1,
                     'endLevel'        => 1,
@@ -3343,7 +3413,7 @@ public function onAjaxSampledataApplyStep8()
                 'access'     => $access,
                 'assignment' => 1,
                 'assigned'   => [
-                    $menuIdsLevel1[42],
+                    $menuMapping['mod_articles_archive'],
                 ],
                 'params' => [
                     'count'      => '10',
@@ -3359,7 +3429,7 @@ public function onAjaxSampledataApplyStep8()
                 'access'     => $access,
                 'assignment' => 1,
                 'assigned'   => [
-                    $menuIdsLevel1[37],
+                    $menuMapping['mod_articles_latest'],
                 ],
                 'params' => [
                     'catid'      => [$articleCatids2[0]],
@@ -3378,7 +3448,7 @@ public function onAjaxSampledataApplyStep8()
                 'access'     => $access,
                 'assignment' => 1,
                 'assigned'   => [
-                    $menuIdsLevel1[30],
+                    $menuMapping['mod_articles_popular'],
                 ],
                 'params' => [
                     'catid'      => [$articleCatids2[1], $articleCatids2[2]],
@@ -3396,7 +3466,7 @@ public function onAjaxSampledataApplyStep8()
                 'access'     => $access,
                 'assignment' => 1,
                 'assigned'   => [
-                    $menuIdsLevel1[50],
+                    $menuMapping['mod_feed'],
                 ],
                 'params' => [
                     'rssurl'      => 'https://community.joomla.org/blogs/community.feed?type=rss',
@@ -3418,7 +3488,7 @@ public function onAjaxSampledataApplyStep8()
                 'access'     => $access,
                 'assignment' => 1,
                 'assigned'   => [
-                    $menuIdsLevel1[36],
+                    $menuMapping['mod_articles_news'],
                 ],
                 'params' => [
                     'catid'             => [$articleCatids2[0]],
@@ -3441,7 +3511,7 @@ public function onAjaxSampledataApplyStep8()
                 'access'     => $access,
                 'assignment' => 1,
                 'assigned'   => [
-                    $menuIdsLevel1[35],
+                    $menuMapping['mod_random_image'],
                 ],
                 'params' => [
                     'type'   => 'jpg',
@@ -3457,31 +3527,13 @@ public function onAjaxSampledataApplyStep8()
                 'access'     => $access,
                 'assignment' => 1,
                 'assigned'   => [
-                    $menuIdsLevel1[43],
+                    $menuMapping['mod_related_items'],
                 ],
                 'params' => [
                     'showDate' => 0,
                     'owncache' => 1,
                 ],
             ],
-            [
-                'title'      => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_15_TITLE'),
-                'ordering'   => 1,
-                'module'     => 'mod_search',
-                'access'     => $access,
-                'assignment' => 1,
-                'assigned'   => [
-                    $menuIdsLevel1[34],
-                ],
-                'params' => [
-                    'width'      => '20',
-                    'button_pos' => 'right',
-                    'opensearch' => 1,
-                    'cache'      => 1,
-                    'cache_time' => 900,
-                    'cachemode'  => 'itemid',
-                ],
-            ],
             [
                 'title'      => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_16_TITLE'),
                 'ordering'   => 1,
@@ -3489,7 +3541,7 @@ public function onAjaxSampledataApplyStep8()
                 'access'     => $access,
                 'assignment' => 1,
                 'assigned'   => [
-                    $menuIdsLevel1[32],
+                    $menuMapping['mod_stats'],
                 ],
                 'params' => [
                     'serverinfo' => 1,
@@ -3509,7 +3561,7 @@ public function onAjaxSampledataApplyStep8()
                 'access'     => $access,
                 'assignment' => 1,
                 'assigned'   => [
-                    $menuIdsLevel1[38],
+                    $menuMapping['mod_syndicate'],
                 ],
                 'params' => [
                     'text'   => 'Feed Entries',
@@ -3524,7 +3576,7 @@ public function onAjaxSampledataApplyStep8()
                 'access'     => $access,
                 'assignment' => 1,
                 'assigned'   => [
-                    $menuIdsLevel1[28],
+                    $menuMapping['mod_users_latest'],
                 ],
                 'params' => [
                     'shownumber' => 5,
@@ -3541,7 +3593,7 @@ public function onAjaxSampledataApplyStep8()
                 'access'     => $access,
                 'assignment' => 1,
                 'assigned'   => [
-                    $menuIdsLevel1[29],
+                    $menuMapping['mod_whosonline'],
                 ],
                 'params' => [
                     'showmode'  => 2,
@@ -3556,7 +3608,7 @@ public function onAjaxSampledataApplyStep8()
                 'access'     => $access,
                 'assignment' => 1,
                 'assigned'   => [
-                    $menuIdsLevel1[40],
+                    $menuMapping['mod_wrapper'],
                 ],
                 'params' => [
                     'url'         => 'https://www.youtube.com/embed/vb2eObvmvdI',
@@ -3577,7 +3629,7 @@ public function onAjaxSampledataApplyStep8()
                 'access'     => $access,
                 'assignment' => 1,
                 'assigned'   => [
-                    $menuIdsLevel1[41],
+                    $menuMapping['mod_footer'],
                 ],
                 'params' => [
                     'cache'      => 1,
@@ -3592,7 +3644,7 @@ public function onAjaxSampledataApplyStep8()
                 'access'     => $access,
                 'assignment' => 1,
                 'assigned'   => [
-                    $menuIdsLevel1[39],
+                    $menuMapping['mod_login'],
                 ],
                 'params' => [
                     'login'     => 280,
@@ -3610,7 +3662,7 @@ public function onAjaxSampledataApplyStep8()
                 'access'     => $access,
                 'assignment' => 1,
                 'assigned'   => [
-                    $menuIdsLevel1[31],
+                    $menuMapping['mod_menu'],
                 ],
                 'params' => [
                     'menutype'        => $menuTypes[4],
@@ -3629,15 +3681,8 @@ public function onAjaxSampledataApplyStep8()
                 'module'     => 'mod_articles_latest',
                 'access'     => $access,
                 'assignment' => 1,
-                'assigned'   => [
-                    $menuIdsLevel1[4],
-                    $menuIdsLevel1[6],
-                    $menuIdsLevel1[7],
-                    $menuIdsLevel1[8],
-                    $menuIdsLevel2[1],
-                    $menuIdsLevel2[2],
-                ],
-                'params' => [
+                'assigned'   => $parkMenuIds,
+                'params'     => [
                     'catid'      => [$articleCatids3[1]],
                     'count'      => 5,
                     'ordering'   => 'c_dsc',
@@ -3654,7 +3699,7 @@ public function onAjaxSampledataApplyStep8()
                 'module'   => 'mod_custom',
                 'access'   => $access,
                 'assigned' => [
-                    $menuIdsLevel1[54],
+                    $menuMapping['mod_custom'],
                 ],
                 'params' => [
                     'prepare_content' => 1,
@@ -3669,7 +3714,7 @@ public function onAjaxSampledataApplyStep8()
                 'module'   => 'mod_breadcrumbs',
                 'access'   => $access,
                 'assigned' => [
-                    $menuIdsLevel1[53],
+                    $menuMapping['mod_breadcrumbs'],
                 ],
                 'params' => [
                     'showHere'   => 1,
@@ -3687,7 +3732,7 @@ public function onAjaxSampledataApplyStep8()
                 'module'   => 'mod_banners',
                 'access'   => $access,
                 'assigned' => [
-                    $menuIdsLevel1[33],
+                    $menuMapping['mod_banners'],
                 ],
                 'params' => [
                     'target'     => 1,
@@ -3707,18 +3752,8 @@ public function onAjaxSampledataApplyStep8()
                 'module'     => 'mod_menu',
                 'access'     => $access,
                 'assignment' => 1,
-                'assigned'   => [
-                    $menuIdsLevel1[5],
-                    $menuIdsLevel1[55],
-                    $menuIdsLevel1[56],
-                    $menuIdsLevel1[57],
-                    $menuIdsLevel1[58],
-                    $menuIdsLevel1[59],
-                    $menuIdsLevel1[60],
-                    $menuIdsLevel1[69],
-                    $menuIdsLevel1[70],
-                ],
-                'params' => [
+                'assigned'   => array_merge($fruitshopMenuIds, [$mainMenuIds[1]]),
+                'params'     => [
                     'menutype'        => $menuTypes[5],
                     'startLevel'      => 1,
                     'endLevel'        => 0,
@@ -3736,17 +3771,8 @@ public function onAjaxSampledataApplyStep8()
                 'module'     => 'mod_custom',
                 'access'     => 4,
                 'assignment' => 1,
-                'assigned'   => [
-                    $menuIdsLevel1[55],
-                    $menuIdsLevel1[56],
-                    $menuIdsLevel1[57],
-                    $menuIdsLevel1[58],
-                    $menuIdsLevel1[59],
-                    $menuIdsLevel1[60],
-                    $menuIdsLevel1[69],
-                    $menuIdsLevel1[70],
-                ],
-                'params' => [
+                'assigned'   => $fruitshopMenuIds,
+                'params'     => [
                     'prepare_content' => 1,
                     'cache'           => 1,
                     'cache_time'      => 900,
@@ -3760,10 +3786,10 @@ public function onAjaxSampledataApplyStep8()
                 'access'     => $access,
                 'assignment' => 1,
                 'assigned'   => [
-                    $menuIdsLevel1[63],
+                    $menuMapping['mod_articles_categories'],
                 ],
                 'params' => [
-                    'parent'           => 29,
+                    'parent'           => 19,
                     'show_description' => 0,
                     'show_children'    => 0,
                     'count'            => 0,
@@ -3781,36 +3807,14 @@ public function onAjaxSampledataApplyStep8()
                 'module'     => 'mod_languages',
                 'access'     => $access,
                 'assignment' => 1,
-                'assigned'   => [
-                    $menuIdsLevel1[4],
-                    $menuIdsLevel1[6],
-                    $menuIdsLevel1[7],
-                    $menuIdsLevel1[8],
-                    $menuIdsLevel2[1],
-                    $menuIdsLevel2[2],
-                ],
-                'params' => [
+                'assigned'   => $parkMenuIds,
+                'params'     => [
                     'image'      => 1,
                     'cache'      => 1,
                     'cache_time' => 900,
                     'cachemode'  => 'static',
                 ],
             ],
-            [
-                'title'    => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_32_TITLE'),
-                'ordering' => 1,
-                'position' => 'search',
-                'module'   => 'mod_search',
-                'access'   => $access,
-                'params'   => [
-                    'width'       => '20',
-                    'button_pos'  => 'right',
-                    'imagebutton' => 1,
-                    'cache'       => 1,
-                    'cache_time'  => 900,
-                    'cachemode'   => 'itemid',
-                ],
-            ],
             [
                 'title'      => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_33_TITLE'),
                 'ordering'   => 1,
@@ -3820,7 +3824,7 @@ public function onAjaxSampledataApplyStep8()
                 'access'     => $access,
                 'assignment' => 1,
                 'assigned'   => [
-                    $menuIdsLevel1[64],
+                    $menuMapping['mod_languages'],
                 ],
                 'params' => [
                     'image'      => 1,
@@ -3837,41 +3841,14 @@ public function onAjaxSampledataApplyStep8()
                 'module'     => 'mod_custom',
                 'access'     => $access,
                 'assignment' => 1,
-                'assigned'   => [
-                    $menuIdsLevel1[55],
-                    $menuIdsLevel1[56],
-                    $menuIdsLevel1[57],
-                    $menuIdsLevel1[58],
-                    $menuIdsLevel1[60],
-                    $menuIdsLevel1[69],
-                    $menuIdsLevel1[70],
-                ],
-                'params' => [
+                'assigned'   => $fruitshopMenuIds,
+                'params'     => [
                     'prepare_content' => 1,
                     'cache'           => 1,
                     'cache_time'      => 900,
                     'cachemode'       => 'static',
                 ],
             ],
-            [
-                'title'      => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_35_TITLE'),
-                'ordering'   => 2,
-                'position'   => 'sidebar-right',
-                'published'  => 0,
-                'module'     => 'mod_menu',
-                'access'     => $access,
-                'assignment' => '-',
-                'params'     => [
-                    'menutype'        => $menuTypes[2],
-                    'startLevel'      => 1,
-                    'endLevel'        => 6,
-                    'showAllChildren' => 0,
-                    'class_sfx'       => '-menu',
-                    'cache'           => 0,
-                    'cache_time'      => 900,
-                    'cachemode'       => 'itemid',
-                ],
-            ],
             [
                 'title'      => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_36_TITLE'),
                 'content'    => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_36_CONTENT'),
@@ -3881,7 +3858,7 @@ public function onAjaxSampledataApplyStep8()
                 'access'     => $access,
                 'assignment' => 1,
                 'assigned'   => [
-                    $menuIdsLevel1[7],
+                    $parkMenuIds[0],
                 ],
                 'params' => [
                     'prepare_content' => 1,
@@ -3897,7 +3874,7 @@ public function onAjaxSampledataApplyStep8()
                 'access'     => $access,
                 'assignment' => 1,
                 'assigned'   => [
-                    $menuIdsLevel1[69],
+                    $menuMapping['mod_articles_category'],
                 ],
                 'params' => [
                     'mode'                         => 'normal',
@@ -3937,147 +3914,6 @@ public function onAjaxSampledataApplyStep8()
                     'cache_time'                   => 900,
                 ],
             ],
-            [
-                'title'      => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_38_TITLE'),
-                'ordering'   => 1,
-                'position'   => 'atomic-search',
-                'module'     => 'mod_search',
-                'access'     => $access,
-                'showtitle'  => 0,
-                'assignment' => 1,
-                'assigned'   => [
-                    $menuIdsLevel5[0],
-                    $menuIdsLevel5[1],
-                ],
-                'params' => [
-                    'width'      => 20,
-                    'button_pos' => 'right',
-                    'cache'      => 1,
-                    'cache_time' => 900,
-                    'cachemode'  => 'itemid',
-                ],
-            ],
-            [
-                'title'      => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_39_TITLE'),
-                'ordering'   => 1,
-                'position'   => 'atomic-topmenu',
-                'module'     => 'mod_menu',
-                'access'     => $access,
-                'showtitle'  => 0,
-                'assignment' => 1,
-                'assigned'   => [
-                    $menuIdsLevel5[0],
-                    $menuIdsLevel5[1],
-                ],
-                'params' => [
-                    'menutype'        => $menuTypes[2],
-                    'startLevel'      => 1,
-                    'endLevel'        => 0,
-                    'showAllChildren' => 0,
-                    'cache'           => 1,
-                    'cache_time'      => 900,
-                    'cachemode'       => 'itemid',
-                ],
-            ],
-            [
-                'title'      => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_40_TITLE'),
-                'content'    => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_40_CONTENT'),
-                'ordering'   => 1,
-                'position'   => 'atomic-topquote',
-                'module'     => 'mod_custom',
-                'access'     => $access,
-                'showtitle'  => 0,
-                'assignment' => 1,
-                'assigned'   => [
-                    $menuIdsLevel5[0],
-                    $menuIdsLevel5[1],
-                ],
-                'params' => [
-                    'prepare_content' => 1,
-                    'cache'           => 1,
-                    'cache_time'      => 900,
-                    'cachemode'       => 'static',
-                ],
-            ],
-            [
-                'title'      => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_41_TITLE'),
-                'content'    => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_41_CONTENT'),
-                'ordering'   => 1,
-                'position'   => 'atomic-bottomleft',
-                'module'     => 'mod_custom',
-                'access'     => $access,
-                'showtitle'  => 0,
-                'assignment' => 1,
-                'assigned'   => [
-                    $menuIdsLevel5[0],
-                    $menuIdsLevel5[1],
-                ],
-                'params' => [
-                    'prepare_content' => 1,
-                    'cache'           => 1,
-                    'cache_time'      => 900,
-                    'cachemode'       => 'static',
-                ],
-            ],
-            [
-                'title'      => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_42_TITLE'),
-                'content'    => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_42_CONTENT'),
-                'ordering'   => 1,
-                'position'   => 'atomic-bottommiddle',
-                'module'     => 'mod_custom',
-                'access'     => $access,
-                'showtitle'  => 0,
-                'assignment' => 1,
-                'assigned'   => [
-                    $menuIdsLevel5[0],
-                    $menuIdsLevel5[1],
-                ],
-                'params' => [
-                    'prepare_content' => 1,
-                    'cache'           => 1,
-                    'cache_time'      => 900,
-                    'cachemode'       => 'static',
-                ],
-            ],
-            [
-                'title'      => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_43_TITLE'),
-                'content'    => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_43_CONTENT'),
-                'ordering'   => 1,
-                'position'   => 'atomic-sidebar',
-                'module'     => 'mod_custom',
-                'access'     => $access,
-                'showtitle'  => 0,
-                'assignment' => 1,
-                'assigned'   => [
-                    $menuIdsLevel5[0],
-                    $menuIdsLevel5[1],
-                ],
-                'params' => [
-                    'prepare_content' => 1,
-                    'cache'           => 1,
-                    'cache_time'      => 900,
-                    'cachemode'       => 'static',
-                ],
-            ],
-            [
-                'title'      => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_44_TITLE'),
-                'ordering'   => 2,
-                'position'   => 'atomic-sidebar',
-                'module'     => 'mod_login',
-                'access'     => $access,
-                'showtitle'  => 0,
-                'assignment' => 1,
-                'assigned'   => [
-                    $menuIdsLevel5[0],
-                    $menuIdsLevel5[1],
-                ],
-                'params' => [
-                    'greeting'  => 1,
-                    'name'      => 0,
-                    'usesecure' => 0,
-                    'cache'     => 0,
-                ],
-            ],
             [
                 'title'     => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_45_TITLE'),
                 'ordering'  => 1,
@@ -4123,7 +3959,7 @@ public function onAjaxSampledataApplyStep8()
                 'access'     => $access,
                 'assignment' => 1,
                 'assigned'   => [
-                    $menuIdsLevel1[72],
+                    $menuMapping['mod_finder'],
                 ],
                 'params' => [
                     'show_autosuggest' => 1,
@@ -4139,7 +3975,7 @@ public function onAjaxSampledataApplyStep8()
             [
                 'title'    => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_48_TITLE'),
                 'ordering' => '2',
-                'position' => 'sidebar-right',
+                'position' => 'sidebar-left',
                 'module'   => 'mod_menu',
                 'access'   => $access,
                 'params'   => [
@@ -4168,40 +4004,15 @@ public function onAjaxSampledataApplyStep8()
                     'cachemode'       => 'itemid',
                 ],
             ],
-            [
-                'title'      => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_50_TITLE'),
-                'ordering'   => 1,
-                'position'   => 'sidebar-right',
-                'module'     => 'mod_menu',
-                'access'     => $access,
-                'assignment' => 1,
-                'assigned'   => [
-                    $menuIdsLevel1[5],
-                    $menuIdsLevel1[55],
-                    $menuIdsLevel1[56],
-                    $menuIdsLevel1[57],
-                    $menuIdsLevel1[58],
-                    $menuIdsLevel1[59],
-                    $menuIdsLevel1[60],
-                    $menuIdsLevel1[69],
-                    $menuIdsLevel1[70],
-                ],
-                'params' => [
-                    'menutype'        => $menuTypes[5],
-                    'startLevel'      => 1,
-                    'endLevel'        => 0,
-                    'showAllChildren' => 0,
-                    'cache'           => 0,
-                    'cache_time'      => 900,
-                    'cachemode'       => 'itemid',
-                ],
-            ],
             [
                 'title'    => $this->getApplication()->getLanguage()->_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_51_TITLE'),
                 'ordering' => 1,
                 'module'   => 'mod_tags_popular',
                 'access'   => $access,
-                'params'   => [
+                'assigned' => [
+                    $menuMapping['mod_tags_popular'],
+                ],
+                'params' => [
                     'maximum'         => 5,
                     'timeframe'       => 'alltime',
                     'order_value'     => 'count',
@@ -4218,7 +4029,10 @@ public function onAjaxSampledataApplyStep8()
                 'ordering' => 1,
                 'module'   => 'mod_tags_similar',
                 'access'   => $access,
-                'params'   => [
+                'assigned' => [
+                    $menuMapping['mod_tags_similar'],
+                ],
+                'params' => [
                     'maximum'   => 5,
                     'matchtype' => 'any',
                     'owncache'  => 1,
@@ -4261,7 +4075,6 @@ public function onAjaxSampledataApplyStep8()
                     'prepare_content' => 1,
                     'cache'           => 1,
                     'cache_time'      => 900,
-                    'bootstrap_size'  => 6,
                 ],
                 'client_id' => 1,
             ],
@@ -4273,17 +4086,16 @@ public function onAjaxSampledataApplyStep8()
                 'module'    => 'mod_feed',
                 'access'    => $access,
                 'params'    => [
-                    'rssurl'         => 'http://feeds.joomla.org/JoomlaAnnouncements',
-                    'rssrtl'         => 0,
-                    'rsstitle'       => 1,
-                    'rssdesc'        => 1,
-                    'rssimage'       => 1,
-                    'rssitems'       => 3,
-                    'rssitemdesc'    => 1,
-                    'word_count'     => 0,
-                    'cache'          => 1,
-                    'cache_time'     => 900,
-                    'bootstrap_size' => 6,
+                    'rssurl'      => 'http://feeds.joomla.org/JoomlaAnnouncements',
+                    'rssrtl'      => 0,
+                    'rsstitle'    => 1,
+                    'rssdesc'     => 1,
+                    'rssimage'    => 1,
+                    'rssitems'    => 3,
+                    'rssitemdesc' => 1,
+                    'word_count'  => 0,
+                    'cache'       => 1,
+                    'cache_time'  => 900,
                 ],
                 'client_id' => 1,
             ],
@@ -4294,44 +4106,16 @@ public function onAjaxSampledataApplyStep8()
                 'module'   => 'mod_stats_admin',
                 'access'   => $access,
                 'params'   => [
-                    'serverinfo'     => 1,
-                    'siteinfo'       => 1,
-                    'counter'        => 1,
-                    'increase'       => 0,
-                    'cache'          => 1,
-                    'cache_time'     => 900,
-                    'cachemode'      => 'static',
-                    'bootstrap_size' => 6,
+                    'serverinfo' => 1,
+                    'siteinfo'   => 1,
+                    'counter'    => 1,
+                    'increase'   => 0,
+                    'cache'      => 1,
+                    'cache_time' => 900,
+                    'cachemode'  => 'static',
                 ],
                 'client_id' => 1,
             ],
-            /*
-            TODO: Altering existing admin modules (Bootstrap Size).
-            array(
-                'title'            => 'Popular Articles',
-                'position'         => 'cpanel',
-                'module'           => 'mod_popular',
-                'params'           => array(
-                    'bootstrap_size'  => 6,
-                ),
-            ),
-            array(
-                'title'            => 'Logged-in Users',
-                'position'         => 'cpanel',
-                'module'           => 'mod_logged',
-                'params'           => array(
-                    'bootstrap_size'  => 6,
-                ),
-            ),
-            array(
-                'title'            => 'Recently Added Articles',
-                'position'         => 'cpanel',
-                'module'           => 'mod_latest',
-                'params'           => array(
-                    'bootstrap_size'  => 6,
-                ),
-            ),
-            */
         ];
 
         foreach ($modules as $module) {
@@ -4414,7 +4198,7 @@ public function onAjaxSampledataApplyStep9()
      *
      * @return  array  IDs of the inserted categories.
      *
-     * @throws  Exception
+     * @throws  \Exception
      *
      * @since  3.8.0
      */
@@ -4453,7 +4237,7 @@ private function addCategories(array $categories, $extension, $level)
             }
 
             if (!$this->categoryModel->save($category)) {
-                throw new Exception($this->categoryModel->getError());
+                throw new \Exception($this->categoryModel->getError());
             }
 
             // Get ID from category we just added
@@ -4470,7 +4254,7 @@ private function addCategories(array $categories, $extension, $level)
      *
      * @return  array  IDs of the inserted categories.
      *
-     * @throws  Exception
+     * @throws  \Exception
      *
      * @since  3.8.0
      */
@@ -4522,7 +4306,7 @@ private function addArticles(array $articles)
 
             if (!$model->save($article)) {
                 $this->getApplication()->getLanguage()->load('com_content');
-                throw new Exception($this->getApplication()->getLanguage()->_($model->getError()));
+                throw new \Exception($this->getApplication()->getLanguage()->_($model->getError()));
             }
 
             // Get ID from category we just added
@@ -4540,7 +4324,7 @@ private function addArticles(array $articles)
      *
      * @return  array  IDs of the inserted menuitems.
      *
-     * @throws  Exception
+     * @throws  \Exception
      *
      * @since  3.8.0
      */
@@ -4606,13 +4390,26 @@ private function addMenuItems(array $menuItems, $level)
                     $menuItem['alias'] = substr_replace($menuItem['alias'], '2', -1);
 
                     if (!$this->menuItemModel->save($menuItem)) {
-                        throw new Exception($menuItem['title'] . ' => ' . $menuItem['alias'] . ' : ' . $this->menuItemModel->getError());
+                        throw new \Exception($menuItem['title'] . ' => ' . $menuItem['alias'] . ' : ' . $this->menuItemModel->getError());
                     }
                 }
             }
 
             // Get ID from menuitem we just added
-            $itemIds[] = $this->menuItemModel->getstate('item.id');
+            $id        = $this->menuItemModel->getstate('item.id');
+            $itemIds[] = $id;
+
+            if (isset($menuItem['sampledata_module'])) {
+                $this->menuModuleMapping[$menuItem['sampledata_module']] = $id;
+            }
+
+            if (isset($menuItem['children'])) {
+                foreach ($menuItem['children'] as &$item) {
+                    $item['parent_id'] = $id;
+                }
+
+                $itemIds = array_merge($itemIds, $this->addMenuItems($menuItem['children'], $level + 1));
+            }
         }
 
         return $itemIds;
diff --git a/plugins/schemaorg/blogposting/blogposting.xml b/plugins/schemaorg/blogposting/blogposting.xml
new file mode 100755
index 0000000000000..036227ab4fc42
--- /dev/null
+++ b/plugins/schemaorg/blogposting/blogposting.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extension type="plugin" group="schemaorg" method="upgrade">
+	<name>plg_schemaorg_blogposting</name>
+	<author>Joomla! Project</author>
+	<creationDate>2023-07</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_SCHEMAORG_BLOGPOSTING_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\Schemaorg\BlogPosting</namespace>
+	<files>
+		<folder plugin="blogposting">services</folder>
+		<folder>src</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">language/en-GB/plg_schemaorg_blogposting.ini</language>
+		<language tag="en-GB">language/en-GB/plg_schemaorg_blogposting.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="allowedlist"
+					type="SchemaorgComponentSections"
+					label="JSCHEMAORG_EXTENSION_ALLOWED_LABEL"
+					description="JSCHEMAORG_EXTENSION_ALLOWED_DESCRIPTION"
+					multiple="multiple"
+					layout="joomla.form.field.list-fancy-select"
+				/>
+				<field
+					name="forbiddenlist"
+					type="SchemaorgComponentSections"
+					label="JSCHEMAORG_EXTENSION_FORBIDDEN_LABEL"
+					description="JSCHEMAORG_EXTENSION_FORBIDDEN_DESCRIPTION"
+					multiple="multiple"
+					layout="joomla.form.field.list-fancy-select"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/plugins/schemaorg/blogposting/forms/schemaorg.xml b/plugins/schemaorg/blogposting/forms/schemaorg.xml
new file mode 100755
index 0000000000000..6a395d643dd4d
--- /dev/null
+++ b/plugins/schemaorg/blogposting/forms/schemaorg.xml
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form>
+	<fields name="schema">
+		<fieldset
+			name="schema"
+			label="PLG_SYSTEM_SCHEMA_FIELD_SCHEMA_LABEL"
+		>
+			<field
+				name="BlogPosting"
+				type="subform"
+				showon="schemaType:BlogPosting"
+			>
+				<form>
+
+					<field
+						name="@type"
+						type="hidden"
+						default="BlogPosting"
+					/>
+
+					<field
+						name="noteBlogPost"
+						type="note"
+						description="PLG_SCHEMAORG_BLOGPOSTING_DESCRIPTION_LABEL"
+						class="alert alert-info w-100"
+					/>
+
+					<field
+						name="image"
+						type="media"
+						label="PLG_SCHEMAORG_BLOGPOSTING_FIELD_IMAGE_LABEL"
+					/>
+
+					<field
+						name="headline"
+						type="text"
+						label="PLG_SCHEMAORG_BLOGPOSTING_FIELD_HEADLINE_LABEL"
+						filter="string"
+						size="30"
+					/>
+
+					<field
+						name="description"
+						type="text"
+						label="PLG_SCHEMAORG_BLOGPOSTING_FIELD_DESCRIPTION_LABEL"
+						filter="string"
+					/>
+
+					<field
+						name="author"
+						type="subform"
+						label="PLG_SCHEMAORG_BLOGPOSTING_FIELD_AUTHOR_LABEL"
+						>
+						<form>
+
+							<field
+								name="@type"
+								type="list"
+								label="PLG_SCHEMAORG_BLOGPOSTING_FIELD_TYPE_LABEL"
+								default="person"
+								>
+								<option value="person">PLG_SCHEMAORG_BLOGPOSTING_FIELD_PERSON_LABEL</option>
+								<option value="organization">PLG_SCHEMAORG_BLOGPOSTING_FIELD_ORGANIZATION_LABEL</option>
+							</field>
+
+							<field
+								name="name"
+								type="text"
+								label="PLG_SCHEMAORG_BLOGPOSTING_FIELD_NAME_LABEL"
+								filter="string"
+							/>
+
+							<field
+								name="url"
+								type="url"
+								label="PLG_SCHEMAORG_BLOGPOSTING_FIELD_URL_LABEL"
+								filter="url"
+								validate="url"
+							/>
+
+							<field
+								name="logo"
+								type="subform"
+								label="PLG_SCHEMAORG_BLOGPOSTING_FIELD_LOGO_LABEL"
+								showon="@type:organization"
+							>
+								<form>
+
+									<field
+										name="@type"
+										type="hidden"
+										default="ImageObject"
+									/>
+
+									<field
+										name="url"
+										type="media"
+										label="PLG_SCHEMAORG_BLOGPOSTING_FIELD_URL_LABEL"
+									/>
+
+								</form>
+							</field>
+
+							<field
+								name="email"
+								type="email"
+								label="PLG_SCHEMAORG_BLOGPOSTING_FIELD_EMAIL_LABEL"
+								validate="email"
+							/>
+
+							<field
+								name="address"
+								type="subform"
+								label="PLG_SCHEMAORG_BLOGPOSTING_FIELD_ADDRESS_LABEL"
+							>
+								<form>
+
+									<field
+										name="@type"
+										type="hidden"
+										default="PostalAddress"
+									/>
+
+									<field
+										name="addressLocality"
+										type="text"
+										label="PLG_SCHEMAORG_BLOGPOSTING_FIELD_LOCALITY_LABEL"
+									/>
+
+									<field
+										name="postalCode"
+										type="text"
+										label="PLG_SCHEMAORG_BLOGPOSTING_FIELD_POSTAL_CODE_LABEL"
+									/>
+
+									<field
+										name="streetAddress"
+										type="text"
+										label="PLG_SCHEMAORG_BLOGPOSTING_FIELD_STREET_ADDRESS_LABEL"
+									/>
+
+								</form>
+							</field>
+
+						</form>
+					</field>
+
+					<field
+						name="datePublished"
+						type="calendar"
+						label="PLG_SCHEMAORG_BLOGPOSTING_FIELD_DATE_PUBLISHED_LABEL"
+						class="input-small"
+						filter="user_utc"
+						showtime="false"
+						todaybutton="true"
+						translateformat="true"
+					/>
+
+					<field
+						name="dateModified"
+						type="calendar"
+						label="PLG_SCHEMAORG_BLOGPOSTING_FIELD_DATE_MODIFIED_LABEL"
+						class="input-small"
+						filter="user_utc"
+						showtime="false"
+						todaybutton="true"
+						translateformat="true"
+					/>
+
+					<field
+						name="genericField"
+						type="subform"
+						label="PLG_SCHEMAORG_BLOGPOSTING_FIELD_GENERIC_FIELD_LABEL"
+						multiple="true"
+					>
+						<form>
+							<field
+								name="genericTitle"
+								type="text"
+								label="PLG_SCHEMAORG_BLOGPOSTING_FIELD_GENERIC_TITLE_LABEL"
+								filter="string"
+								size="30"
+							/>
+							<field
+								name="genericValue"
+								type="text"
+								filter="string"
+								size="30"
+								label="PLG_SCHEMAORG_BLOGPOSTING_FIELD_GENERIC_VALUE_LABEL"
+							/>
+						</form>
+
+					</field>
+
+				</form>
+			</field>
+		</fieldset>
+	</fields>
+</form>
diff --git a/plugins/schemaorg/blogposting/services/provider.php b/plugins/schemaorg/blogposting/services/provider.php
new file mode 100644
index 0000000000000..4963cd1282784
--- /dev/null
+++ b/plugins/schemaorg/blogposting/services/provider.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Schemaorg.blogposting
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\Schemaorg\BlogPosting\Extension\BlogPosting;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function register(Container $container)
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $dispatcher = $container->get(DispatcherInterface::class);
+                $plugin     = new BlogPosting(
+                    $dispatcher,
+                    (array) PluginHelper::getPlugin('schemaorg', 'blogposting')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/schemaorg/blogposting/src/Extension/BlogPosting.php b/plugins/schemaorg/blogposting/src/Extension/BlogPosting.php
new file mode 100755
index 0000000000000..362cd4df6c7f0
--- /dev/null
+++ b/plugins/schemaorg/blogposting/src/Extension/BlogPosting.php
@@ -0,0 +1,102 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Schemaorg.blogposting
+ *
+ * @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\Schemaorg\BlogPosting\Extension;
+
+use Joomla\CMS\Event\Plugin\System\Schemaorg\BeforeCompileHeadEvent;
+use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\CMS\Schemaorg\SchemaorgPluginTrait;
+use Joomla\CMS\Schemaorg\SchemaorgPrepareDateTrait;
+use Joomla\CMS\Schemaorg\SchemaorgPrepareImageTrait;
+use Joomla\Event\Priority;
+use Joomla\Event\SubscriberInterface;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Schemaorg Plugin
+ *
+ * @since  5.0.0
+ */
+final class BlogPosting extends CMSPlugin implements SubscriberInterface
+{
+    use SchemaorgPluginTrait;
+    use SchemaorgPrepareDateTrait;
+    use SchemaorgPrepareImageTrait;
+
+    /**
+     * Load the language file on instantiation.
+     *
+     * @var    boolean
+     * @since  5.0.0
+     */
+    protected $autoloadLanguage = true;
+
+    /**
+     * The name of the schema form
+     *
+     * @var   string
+     * @since 5.0.0
+     */
+    protected $pluginName = 'BlogPosting';
+
+    /**
+     * Returns an array of events this subscriber will listen to.
+     *
+     * @return  array
+     *
+     * @since   5.0.0
+     */
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            'onSchemaPrepareForm'       => 'onSchemaPrepareForm',
+            'onSchemaBeforeCompileHead' => ['onSchemaBeforeCompileHead', Priority::BELOW_NORMAL],
+        ];
+    }
+
+    /**
+     * Cleanup all BlogPosting types
+     *
+     * @param   BeforeCompileHeadEvent  $event  The given event
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function onSchemaBeforeCompileHead(BeforeCompileHeadEvent $event): void
+    {
+        $schema = $event->getSchema();
+
+        $graph = $schema->get('@graph');
+
+        foreach ($graph as &$entry) {
+            if (!isset($entry['@type']) || $entry['@type'] !== 'BlogPosting') {
+                continue;
+            }
+
+            if (!empty($entry['datePublished'])) {
+                $entry['datePublished'] = $this->prepareDate($entry['datePublished']);
+            }
+
+            if (!empty($entry['dateModified'])) {
+                $entry['dateModified'] = $this->prepareDate($entry['dateModified']);
+            }
+
+            if (!empty($entry['image'])) {
+                $entry['image'] = $this->prepareImage($entry['image']);
+            }
+        }
+
+        $schema->set('@graph', $graph);
+    }
+}
diff --git a/plugins/schemaorg/book/book.xml b/plugins/schemaorg/book/book.xml
new file mode 100755
index 0000000000000..f519b7b4040c1
--- /dev/null
+++ b/plugins/schemaorg/book/book.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extension type="plugin" group="schemaorg" method="upgrade">
+	<name>plg_schemaorg_book</name>
+	<author>Joomla! Project</author>
+	<creationDate>2023-07</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_SCHEMAORG_BOOK_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\Schemaorg\Book</namespace>
+	<files>
+		<folder plugin="book">services</folder>
+		<folder>src</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">language/en-GB/plg_schemaorg_book.ini</language>
+		<language tag="en-GB">language/en-GB/plg_schemaorg_book.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="allowedlist"
+					type="SchemaorgComponentSections"
+					label="JSCHEMAORG_EXTENSION_ALLOWED_LABEL"
+					description="JSCHEMAORG_EXTENSION_ALLOWED_DESCRIPTION"
+					multiple="multiple"
+					layout="joomla.form.field.list-fancy-select"
+				/>
+				<field
+					name="forbiddenlist"
+					type="SchemaorgComponentSections"
+					label="JSCHEMAORG_EXTENSION_FORBIDDEN_LABEL"
+					description="JSCHEMAORG_EXTENSION_FORBIDDEN_DESCRIPTION"
+					multiple="multiple"
+					layout="joomla.form.field.list-fancy-select"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/plugins/schemaorg/book/forms/schemaorg.xml b/plugins/schemaorg/book/forms/schemaorg.xml
new file mode 100755
index 0000000000000..ee8b4445e1deb
--- /dev/null
+++ b/plugins/schemaorg/book/forms/schemaorg.xml
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form>
+	<fields name="schema">
+		<fieldset
+			name="schema"
+			label="PLG_SYSTEM_SCHEMA_FIELD_SCHEMA_LABEL"
+		>
+			<field
+				name="Book"
+				type="subform"
+				showon="schemaType:Book"
+			>
+				<form>
+
+					<field
+						name="@type"
+						type="hidden"
+						default="Book"
+					/>
+
+					<field
+						name="noteBook"
+						type="note"
+						description="PLG_SCHEMAORG_BOOK_DESCRIPTION_LABEL"
+						class="alert alert-info w-100"
+					/>
+
+					<field
+						name="name"
+						type="text"
+						label="PLG_SCHEMAORG_BOOK_FIELD_NAME_LABEL"
+						filter="string"
+						size="30"
+					/>
+
+					<field
+						name="author"
+						type="text"
+						label="PLG_SCHEMAORG_BOOK_FIELD_AUTHOR_LABEL"
+						filter="string"
+						size="30"
+					/>
+
+					<field
+						name="datePublished"
+						type="calendar"
+						label="PLG_SCHEMAORG_BOOK_FIELD_DATE_PUBLISHED_LABEL"
+						class="input-small"
+						filter="user_utc"
+						showtime="false"
+						todaybutton="true"
+						translateformat="true"
+					/>
+
+					<field
+						name="abridged"
+						type="list"
+						label="PLG_SCHEMAORG_BOOK_FIELD_ABRIDGED_LABEL"
+						default="0"
+						>
+						<option>JNONE</option>
+						<option value="true">JYES</option>
+						<option value="false">JNO</option>
+					</field>
+
+					<field
+						name="bookEdition"
+						type="text"
+						label="PLG_SCHEMAORG_BOOK_FIELD_BOOK_EDITION_LABEL"
+						filter="string"
+						size="30"
+					/>
+
+					<field
+						name="bookFormat"
+						type="list"
+						label="PLG_SCHEMAORG_BOOK_FIELD_BOOK_FORMAT_LABEL"
+						default="0"
+						>
+						<option>JNONE</option>
+						<option value="AudiobookFormat">PLG_SCHEMAORG_BOOK_FIELD_AUDIOBOOK_LABEL</option>
+						<option value="EBook">PLG_SCHEMAORG_BOOK_FIELD_E_BOOK_LABEL</option>
+						<option value="GraphicNovel">PLG_SCHEMAORG_BOOK_FIELD_GRAPHIC_NOVEL</option>
+						<option value="Hardcover">PLG_SCHEMAORG_BOOK_FIELD_HARDCOVER_LABEL</option>
+						<option value="Paperback">PLG_SCHEMAORG_BOOK_FIELD_PAPERBACK_LABEL</option>
+					</field>
+
+					<field
+						name="illustrator"
+						type="subform"
+						label="PLG_SCHEMAORG_BOOK_FIELD_ILLUSTRATOR_LABEL"
+					>
+						<form>
+
+							<field
+								name="@type"
+								type="hidden"
+								default="Person"
+							/>
+
+							<field
+								name="name"
+								type="text"
+								label="PLG_SCHEMAORG_BOOK_FIELD_ILLUSTRATOR_NAME_LABEL"
+								filter="string"
+							/>
+
+							<field
+								name="url"
+								type="url"
+								label="PLG_SCHEMAORG_BOOK_FIELD_URL_LABEL"
+								filter="url"
+								validate="url"
+							/>
+
+							<field
+								name="email"
+								type="email"
+								label="PLG_SCHEMAORG_BOOK_FIELD_EMAIL_LABEL"
+								validate="email"
+							/>
+
+							<field
+								name="address"
+								type="subform"
+								label="PLG_SCHEMAORG_BOOK_FIELD_ADDRESS_LABEL"
+							>
+								<form>
+
+									<field
+										name="@type"
+										type="hidden"
+										default="PostalAddress"
+									/>
+
+									<field
+										name="addressLocality"
+										type="text"
+										label="PLG_SCHEMAORG_BOOK_FIELD_LOCALITY_LABEL"
+									/>
+
+									<field
+										name="postalCode"
+										type="text"
+										label="PLG_SCHEMAORG_BOOK_FIELD_POSTAL_CODE_LABEL"
+									/>
+
+									<field
+										name="streetAddress"
+										type="text"
+										label="PLG_SCHEMAORG_BOOK_FIELD_STREET_ADDRESS_LABEL"
+									/>
+
+								</form>
+
+							</field>
+
+						</form>
+
+					</field>
+
+					<field
+						name="isbn"
+						type="text"
+						label="PLG_SCHEMAORG_BOOK_FIELD_ISBN_LABEL"
+						filter="string"
+						size="30"
+					/>
+
+					<field
+						name="numberOfPages"
+						type="number"
+						label="PLG_SCHEMAORG_BOOK_FIELD_NUMBER_OF_PAGES_LABEL"
+					/>
+
+					<field
+						name="genericField"
+						type="subform"
+						label="PLG_SCHEMAORG_BOOK_FIELD_GENERIC_FIELD_LABEL"
+						multiple="true"
+					>
+						<form>
+							<field
+								name="genericTitle"
+								type="text"
+								label="PLG_SCHEMAORG_BOOK_FIELD_GENERIC_TITLE_LABEL"
+								filter="string"
+								size="30"
+							/>
+							<field
+								name="genericValue"
+								type="text"
+								label="PLG_SCHEMAORG_BOOK_FIELD_GENERIC_VALUE_LABEL"
+								filter="string"
+								size="30"
+							/>
+						</form>
+
+					</field>
+
+				</form>
+			</field>
+		</fieldset>
+	</fields>
+</form>
diff --git a/plugins/task/demotasks/services/provider.php b/plugins/schemaorg/book/services/provider.php
similarity index 78%
rename from plugins/task/demotasks/services/provider.php
rename to plugins/schemaorg/book/services/provider.php
index 42c908c9835c3..eec2591fc7001 100644
--- a/plugins/task/demotasks/services/provider.php
+++ b/plugins/schemaorg/book/services/provider.php
@@ -2,9 +2,9 @@
 
 /**
  * @package     Joomla.Plugin
- * @subpackage  Task.DemoTasks
+ * @subpackage  Schemaorg.book
  *
- * @copyright   (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
+ * @copyright   (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -16,7 +16,7 @@
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
 use Joomla\Event\DispatcherInterface;
-use Joomla\Plugin\Task\DemoTasks\Extension\DemoTasks;
+use Joomla\Plugin\Schemaorg\Book\Extension\Book;
 
 return new class () implements ServiceProviderInterface {
     /**
@@ -26,7 +26,7 @@
      *
      * @return  void
      *
-     * @since   4.2.0
+     * @since   5.0.0
      */
     public function register(Container $container)
     {
@@ -35,10 +35,11 @@ public function register(Container $container)
             function (Container $container) {
                 $dispatcher = $container->get(DispatcherInterface::class);
 
-                $plugin = new DemoTasks(
+                $plugin = new Book(
                     $dispatcher,
-                    (array) PluginHelper::getPlugin('task', 'demotasks')
+                    (array) PluginHelper::getPlugin('schemaorg', 'book')
                 );
+
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
diff --git a/plugins/schemaorg/book/src/Extension/Book.php b/plugins/schemaorg/book/src/Extension/Book.php
new file mode 100755
index 0000000000000..ae91d73eeb355
--- /dev/null
+++ b/plugins/schemaorg/book/src/Extension/Book.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Schemaorg.book
+ *
+ * @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\Schemaorg\Book\Extension;
+
+use Joomla\CMS\Event\Plugin\System\Schemaorg\BeforeCompileHeadEvent;
+use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\CMS\Schemaorg\SchemaorgPluginTrait;
+use Joomla\CMS\Schemaorg\SchemaorgPrepareDateTrait;
+use Joomla\Event\Priority;
+use Joomla\Event\SubscriberInterface;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Schemaorg Plugin
+ *
+ * @since  5.0.0
+ */
+final class Book extends CMSPlugin implements SubscriberInterface
+{
+    use SchemaorgPluginTrait;
+    use SchemaorgPrepareDateTrait;
+
+    /**
+     * Load the language file on instantiation.
+     *
+     * @var    boolean
+     * @since  5.0.0
+     */
+    protected $autoloadLanguage = true;
+
+    /**
+     * The name of the schema form
+     *
+     * @var   string
+     * @since 5.0.0
+     */
+    protected $pluginName = 'Book';
+
+    /**
+     * Returns an array of events this subscriber will listen to.
+     *
+     * @return  array
+     *
+     * @since   5.0.0
+     */
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            'onSchemaPrepareForm'       => 'onSchemaPrepareForm',
+            'onSchemaBeforeCompileHead' => ['onSchemaBeforeCompileHead', Priority::BELOW_NORMAL],
+        ];
+    }
+
+    /**
+     * Cleanup all Book types
+     *
+     * @param   BeforeCompileHeadEvent  $event  The given event
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function onSchemaBeforeCompileHead(BeforeCompileHeadEvent $event): void
+    {
+        $schema = $event->getSchema();
+
+        $graph = $schema->get('@graph');
+
+        foreach ($graph as &$entry) {
+            if (!isset($entry['@type']) || $entry['@type'] !== 'Book') {
+                continue;
+            }
+
+            if (!empty($entry['datePublished'])) {
+                $entry['datePublished'] = $this->prepareDate($entry['datePublished']);
+            }
+        }
+
+        $schema->set('@graph', $graph);
+    }
+}
diff --git a/plugins/schemaorg/event/event.xml b/plugins/schemaorg/event/event.xml
new file mode 100755
index 0000000000000..f5e71d4e50a7d
--- /dev/null
+++ b/plugins/schemaorg/event/event.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extension type="plugin" group="schemaorg" method="upgrade">
+	<name>plg_schemaorg_event</name>
+	<author>Joomla! Project</author>
+	<creationDate>2023-07</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_SCHEMAORG_EVENT_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\Schemaorg\Event</namespace>
+	<files>
+		<folder plugin="event">services</folder>
+		<folder>src</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">language/en-GB/plg_schemaorg_event.ini</language>
+		<language tag="en-GB">language/en-GB/plg_schemaorg_event.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="allowedlist"
+					type="SchemaorgComponentSections"
+					label="JSCHEMAORG_EXTENSION_ALLOWED_LABEL"
+					description="JSCHEMAORG_EXTENSION_ALLOWED_DESCRIPTION"
+					multiple="multiple"
+					layout="joomla.form.field.list-fancy-select"
+				/>
+				<field
+					name="forbiddenlist"
+					type="SchemaorgComponentSections"
+					label="JSCHEMAORG_EXTENSION_FORBIDDEN_LABEL"
+					description="JSCHEMAORG_EXTENSION_FORBIDDEN_DESCRIPTION"
+					multiple="multiple"
+					layout="joomla.form.field.list-fancy-select"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/plugins/schemaorg/event/forms/schemaorg.xml b/plugins/schemaorg/event/forms/schemaorg.xml
new file mode 100755
index 0000000000000..dc5d148f542e5
--- /dev/null
+++ b/plugins/schemaorg/event/forms/schemaorg.xml
@@ -0,0 +1,271 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form>
+	<fields name="schema">
+		<fieldset
+			name="schema"
+			label="PLG_SYSTEM_SCHEMA_FIELD_SCHEMA_LABEL"
+		>
+			<field
+				name="Event"
+				type="subform"
+				showon="schemaType:Event"
+			>
+				<form>
+
+					<field
+						name="@type"
+						type="hidden"
+						default="Event"
+					/>
+
+					<field
+						name="noteEvent"
+						type="note"
+						description="PLG_SCHEMAORG_EVENT_DESCRIPTION_LABEL"
+						class="alert alert-info w-100"
+					/>
+
+					<field
+						name="image"
+						type="media"
+						label="PLG_SCHEMAORG_EVENT_FIELD_IMAGE_LABEL"
+					/>
+
+					<field
+						name="name"
+						type="text"
+						label="PLG_SCHEMAORG_EVENT_FIELD_NAME_LABEL"
+						filter="string"
+						size="30"
+					/>
+
+					<field
+						name="description"
+						type="text"
+						label="PLG_SCHEMAORG_EVENT_FIELD_DESCRIPTION_LABEL"
+						filter="string"
+					/>
+
+					<field
+						name="aggregateRating"
+						type="subform"
+						label="PLG_SCHEMAORG_EVENT_FIELD_AGGREGATE_RATING_LABEL"
+					>
+						<form>
+
+							<field
+								name="@type"
+								type="hidden"
+								default="AggregateRating"
+							/>
+							<field
+								name="ratingValue"
+								type="number"
+								label="PLG_SCHEMAORG_EVENT_FIELD_RATING_VALUE_LABEL"
+								max="5"
+							/>
+							<field
+								name="reviewCount"
+								type="number"
+								label="PLG_SCHEMAORG_EVENT_FIELD_REVIEW_COUNT_LABEL"
+							/>
+
+						</form>
+					</field>
+
+					<field
+						name="startDate"
+						type="calendar"
+						label="PLG_SCHEMAORG_EVENT_FIELD_START_DATE_LABEL"
+						class="input-small"
+						filter="user_utc"
+						showtime="false"
+						todaybutton="true"
+						translateformat="true"
+					/>
+
+					<field
+						name="location"
+						type="subform"
+						label="PLG_SCHEMAORG_EVENT_FIELD_LOCATION_LABEL"
+					>
+						<form>
+
+							<field
+								name="@type"
+								type="hidden"
+								default="Place"
+							/>
+
+							<field
+								name="name"
+								type="text"
+								label="PLG_SCHEMAORG_EVENT_FIELD_LOCATION_NAME_LABEL"
+							/>
+
+							<field
+								name="address"
+								type="subform"
+								label="PLG_SCHEMAORG_EVENT_FIELD_ADDRESS_LABEL"
+							>
+								<form>
+
+									<field
+										name="@type"
+										type="hidden"
+										default="PostalAddress"
+									/>
+
+									<field
+										name="addressLocality"
+										type="text"
+										label="PLG_SCHEMAORG_EVENT_FIELD_LOCALITY_LABEL"
+									/>
+
+									<field
+										name="postalCode"
+										type="text"
+										label="PLG_SCHEMAORG_EVENT_FIELD_POSTAL_CODE_LABEL"
+									/>
+
+									<field
+										name="streetAddress"
+										type="text"
+										label="PLG_SCHEMAORG_EVENT_FIELD_STREET_ADDRESS_LABEL"
+									/>
+
+								</form>
+
+							</field>
+						</form>
+					</field>
+
+					<field
+						name="organizer"
+						type="subform"
+						label="PLG_SCHEMAORG_EVENT_FIELD_ORGANIZER_LABEL"
+						>
+						<form>
+
+							<field
+								name="@type"
+								type="list"
+								label="PLG_SCHEMAORG_EVENT_FIELD_TYPE_LABEL"
+								default="person"
+								>
+								<option value="person">PLG_SCHEMAORG_EVENT_FIELD_PERSON_LABEL</option>
+								<option value="organization">PLG_SCHEMAORG_EVENT_FIELD_ORGANIZATION_LABEL</option>
+							</field>
+
+							<field
+								name="name"
+								type="text"
+								label="PLG_SCHEMAORG_EVENT_FIELD_ORGANIZER_NAME_LABEL"
+								filter="string"
+							/>
+
+							<field
+								name="url"
+								type="url"
+								label="PLG_SCHEMAORG_EVENT_FIELD_URL_LABEL"
+								filter="url"
+								validate="url"
+							/>
+
+							<field
+								name="logo"
+								type="subform"
+								label="PLG_SCHEMAORG_EVENT_FIELD_LOGO_LABEL"
+								showon="@type:organization"
+							>
+								<form>
+
+									<field
+										name="@type"
+										type="hidden"
+										default="ImageObject"
+									/>
+
+									<field
+										name="url"
+										type="media"
+										label="PLG_SCHEMAORG_EVENT_FIELD_URL_LABEL"
+									/>
+
+								</form>
+							</field>
+
+							<field
+								name="email"
+								type="email"
+								label="PLG_SCHEMAORG_EVENT_FIELD_EMAIL_LABEL"
+								validate="email"
+							/>
+
+							<field
+								name="address"
+								type="subform"
+								label="PLG_SCHEMAORG_EVENT_FIELD_ADDRESS_LABEL"
+							>
+								<form>
+
+									<field
+										name="@type"
+										type="hidden"
+										default="PostalAddress"
+									/>
+
+									<field
+										name="addressLocality"
+										type="text"
+										label="PLG_SCHEMAORG_EVENT_FIELD_LOCALITY_LABEL"
+									/>
+
+									<field
+										name="postalCode"
+										type="text"
+										label="PLG_SCHEMAORG_EVENT_FIELD_POSTAL_CODE_LABEL"
+									/>
+
+									<field
+										name="streetAddress"
+										type="text"
+										label="PLG_SCHEMAORG_EVENT_FIELD_STREET_ADDRESS_LABEL"
+									/>
+
+								</form>
+							</field>
+
+						</form>
+					</field>
+
+					<field
+						name="genericField"
+						type="subform"
+						label="PLG_SCHEMAORG_EVENT_FIELD_GENERIC_FIELD_LABEL"
+						multiple="true"
+					>
+						<form>
+							<field
+								name="genericTitle"
+								type="text"
+								label="PLG_SCHEMAORG_EVENT_FIELD_GENERIC_TITLE_LABEL"
+								filter="string"
+								size="30"
+							/>
+							<field
+								name="genericValue"
+								type="text"
+								label="PLG_SCHEMAORG_EVENT_FIELD_GENERIC_VALUE_LABEL"
+								filter="string"
+								size="30"
+							/>
+						</form>
+
+					</field>
+
+				</form>
+			</field>
+		</fieldset>
+	</fields>
+</form>
diff --git a/plugins/schemaorg/event/services/provider.php b/plugins/schemaorg/event/services/provider.php
new file mode 100644
index 0000000000000..015b48013356a
--- /dev/null
+++ b/plugins/schemaorg/event/services/provider.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Schemaorg.event
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\Schemaorg\Event\Extension\Event;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function register(Container $container)
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $dispatcher = $container->get(DispatcherInterface::class);
+                $plugin     = new Event(
+                    $dispatcher,
+                    (array) PluginHelper::getPlugin('schemaorg', 'event')
+                );
+
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/schemaorg/event/src/Extension/Event.php b/plugins/schemaorg/event/src/Extension/Event.php
new file mode 100755
index 0000000000000..5032daddb17d2
--- /dev/null
+++ b/plugins/schemaorg/event/src/Extension/Event.php
@@ -0,0 +1,98 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Schemaorg.event
+ *
+ * @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\Schemaorg\Event\Extension;
+
+use Joomla\CMS\Event\Plugin\System\Schemaorg\BeforeCompileHeadEvent;
+use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\CMS\Schemaorg\SchemaorgPluginTrait;
+use Joomla\CMS\Schemaorg\SchemaorgPrepareDateTrait;
+use Joomla\CMS\Schemaorg\SchemaorgPrepareImageTrait;
+use Joomla\Event\Priority;
+use Joomla\Event\SubscriberInterface;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Schemaorg Plugin
+ *
+ * @since  5.0.0
+ */
+final class Event extends CMSPlugin implements SubscriberInterface
+{
+    use SchemaorgPluginTrait;
+    use SchemaorgPrepareDateTrait;
+    use SchemaorgPrepareImageTrait;
+
+    /**
+     * Load the language file on instantiation.
+     *
+     * @var    boolean
+     * @since  5.0.0
+     */
+    protected $autoloadLanguage = true;
+
+    /**
+     * The name of the schema form
+     *
+     * @var   string
+     * @since 5.0.0
+     */
+    protected $pluginName = 'Event';
+
+    /**
+     * Returns an array of events this subscriber will listen to.
+     *
+     * @return  array
+     *
+     * @since   5.0.0
+     */
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            'onSchemaPrepareForm'       => 'onSchemaPrepareForm',
+            'onSchemaBeforeCompileHead' => ['onSchemaBeforeCompileHead', Priority::BELOW_NORMAL],
+        ];
+    }
+
+    /**
+     * Cleanup all Event types
+     *
+     * @param   BeforeCompileHeadEvent  $event  The given event
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function onSchemaBeforeCompileHead(BeforeCompileHeadEvent $event): void
+    {
+        $schema = $event->getSchema();
+
+        $graph = $schema->get('@graph');
+
+        foreach ($graph as &$entry) {
+            if (!isset($entry['@type']) || $entry['@type'] !== 'Event') {
+                continue;
+            }
+
+            if (!empty($entry['startDate'])) {
+                $entry['startDate'] = $this->prepareDate($entry['startDate']);
+            }
+
+            if (!empty($entry['image'])) {
+                $entry['image'] = $this->prepareImage($entry['image']);
+            }
+        }
+
+        $schema->set('@graph', $graph);
+    }
+}
diff --git a/plugins/schemaorg/jobposting/forms/schemaorg.xml b/plugins/schemaorg/jobposting/forms/schemaorg.xml
new file mode 100755
index 0000000000000..5f4e642885cf6
--- /dev/null
+++ b/plugins/schemaorg/jobposting/forms/schemaorg.xml
@@ -0,0 +1,441 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form>
+	<fields name="schema">
+		<fieldset
+			name="schema"
+			label="PLG_SYSTEM_SCHEMA_FIELD_SCHEMA_LABEL"
+		>
+			<field
+				name="JobPosting"
+				type="subform"
+				showon="schemaType:JobPosting"
+			>
+				<form>
+
+					<field
+						name="@type"
+						type="hidden"
+						default="JobPosting"
+					/>
+
+					<field
+						name="noteJobPost"
+						type="note"
+						description="PLG_SCHEMAORG_JOBPOSTING_DESCRIPTION_LABEL"
+						class="alert alert-info w-100"
+					/>
+
+					<field
+						name="title"
+						type="text"
+						label="PLG_SCHEMAORG_JOBPOSTING_FIELD_TITLE_LABEL"
+						filter="string"
+					/>
+
+					<field
+						name="description"
+						type="text"
+						label="PLG_SCHEMAORG_JOBPOSTING_FIELD_DESCRIPTION_LABEL"
+						filter="string"
+					/>
+
+					<field
+						name="identifier"
+						type="subform"
+						label="PLG_SCHEMAORG_JOBPOSTING_FIELD_IDENTIFIER_LABEL"
+					>
+						<form>
+
+							<field
+								name="@type"
+								type="hidden"
+								default="PropertyValue"
+							/>
+
+							<field
+								name="name"
+								type="text"
+								label="PLG_SCHEMAORG_JOBPOSTING_FIELD_NAME_LABEL"
+								filter="string"
+							/>
+
+							<field
+								name="value"
+								type="text"
+								label="PLG_SCHEMAORG_JOBPOSTING_FIELD_VALUE_LABEL"
+								filter="string"
+							/>
+						</form>
+					</field>
+					<field
+						name="datePosted"
+						type="calendar"
+						label="PLG_SCHEMAORG_JOBPOSTING_FIELD_DATEPOSTED_LABEL"
+						class="input-small"
+						filter="user_utc"
+						showtime="false"
+						todaybutton="true"
+						translateformat="true"
+					/>
+
+					<field
+						name="validThrough"
+						type="calendar"
+						label="PLG_SCHEMAORG_JOBPOSTING_FIELD_VALIDTHROUGH_LABEL"
+						class="input-small"
+						filter="user_utc"
+						showtime="false"
+						todaybutton="true"
+						translateformat="true"
+					/>
+
+					<field
+						name="jobLocationType"
+						type="list"
+						label="PLG_SCHEMAORG_JOBPOSTING_FIELD_JOBLOCATIONTYPE_LABEL"
+						default="0"
+						>
+						<option value=""></option>
+						<option value="Telecommute">PLG_SCHEMAORG_JOBPOSTING_FIELD_TELECOMMUTE_LABEL</option>
+						<option value="Onsite">PLG_SCHEMAORG_JOBPOSTING_FIELD_ONSITE_LABEL</option>
+						<option value="Hybrid">PLG_SCHEMAORG_JOBPOSTING_FIELD_HYBRID_LABEL</option>
+					</field>
+
+					<field
+						name="applicantLocationRequirements"
+						type="subform"
+						label="PLG_SCHEMAORG_JOBPOSTING_FIELD_APPLICANT_LOCATION_REQUIREMENT_LABEL"
+						showon="jobLocationType:Telecommute"
+					>
+						<form>
+
+							<field
+								name="@type"
+								type="hidden"
+								default="Country"
+							/>
+
+							<field
+								name="name"
+								type="text"
+								label="PLG_SCHEMAORG_JOBPOSTING_FIELD_APPLICANT_LOCATION_REQUIREMENT_COUNTRY_LABEL"
+								filter="string"
+							/>
+
+						</form>
+
+					</field>
+
+					<field
+						name="employmentType"
+						type="text"
+						label="PLG_SCHEMAORG_JOBPOSTING_FIELD_EMPLOYMENTTYPE_LABEL"
+						filter="string"
+					/>
+
+					<field
+						name="jobStartDate"
+						type="subform"
+						label="PLG_SCHEMAORG_JOBPOSTING_FIELD_JOBSTARTDATE_LABEL"
+					>
+						<form>
+
+							<field
+								name="@type"
+								type="list"
+								label="PLG_SCHEMAORG_JOBPOSTING_FIELD_JOBSTARTDATE_TYPE_LABEL"
+								default="text"
+								>
+								<option value="text">PLG_SCHEMAORG_JOBPOSTING_FIELD_TEXT_LABEL</option>
+								<option value="Date">PLG_SCHEMAORG_JOBPOSTING_FIELD_DATE_LABEL</option>
+							</field>
+
+							<field
+								name="value"
+								type="calendar"
+								label="PLG_SCHEMAORG_JOBPOSTING_FIELD_JOBSTARTDATE_DATE_LABEL"
+								class="input-small"
+								filter="user_utc"
+								showtime="false"
+								todaybutton="true"
+								translateformat="true"
+								showon="@type:Date"
+							/>
+
+							<field
+								name="text"
+								type="text"
+								label="PLG_SCHEMAORG_JOBPOSTING_FIELD_JOBSTARTDATE_TEXT_LABEL"
+								filter="string"
+								hint="PLG_SCHEMAORG_JOBPOSTING_FIELD_JOBSTARTDATE_TEXT_HINT"
+								showon="@type:text"
+							/>
+						</form>
+					</field>
+					<field
+						name="hiringOrganization"
+						type="subform"
+						label="PLG_SCHEMAORG_JOBPOSTING_FIELD_HIRINGORGANIZATION_LABEL"
+					>
+						<form>
+
+							<field
+								name="@type"
+								type="list"
+								label="PLG_SCHEMAORG_JOBPOSTING_FIELD_HIRINGORGANIZATION_TYPE_LABEL"
+								default="organization"
+								>
+								<option value="person">PLG_SCHEMAORG_JOBPOSTING_FIELD_PERSON_LABEL</option>
+								<option value="organization">PLG_SCHEMAORG_JOBPOSTING_FIELD_ORGANIZATION_LABEL</option>
+							</field>
+
+							<field
+								name="name"
+								type="text"
+								label="PLG_SCHEMAORG_JOBPOSTING_FIELD_HIRINGORGANIZATION_NAME_LABEL"
+								filter="string"
+							/>
+
+							<field
+								name="url"
+								type="url"
+								label="PLG_SCHEMAORG_JOBPOSTING_FIELD_URL_LABEL"
+								filter="url"
+								validate="url"
+							/>
+
+							<field
+								name="logo"
+								type="subform"
+								label="PLG_SCHEMAORG_JOBPOSTING_FIELD_IMAGE_LABEL"
+								showon="@type:organization"
+							>
+								<form>
+
+									<field
+										name="@type"
+										type="hidden"
+										default="ImageObject"
+									/>
+
+									<field
+										name="url"
+										type="media"
+										label="PLG_SCHEMAORG_JOBPOSTING_FIELD_URL_LABEL"
+									/>
+
+								</form>
+							</field>
+							<field
+								name="email"
+								type="email"
+								label="PLG_SCHEMAORG_JOBPOSTING_FIELD_EMAIL_LABEL"
+								validate="email"
+							/>
+
+							<field
+								name="address"
+								type="subform"
+								label="PLG_SCHEMAORG_JOBPOSTING_FIELD_ADDRESS_LABEL"
+							>
+								<form>
+
+									<field
+										name="@type"
+										type="hidden"
+										default="PostalAddress"
+									/>
+
+									<field
+										name="addressLocality"
+										type="text"
+										label="PLG_SCHEMAORG_JOBPOSTING_FIELD_LOCALITY_LABEL"
+									/>
+
+									<field
+										name="postalCode"
+										type="text"
+										label="PLG_SCHEMAORG_JOBPOSTING_FIELD_POSTAL_CODE_LABEL"
+									/>
+
+									<field
+										name="streetAddress"
+										type="text"
+										label="PLG_SCHEMAORG_JOBPOSTING_FIELD_STREET_ADDRESS_LABEL"
+									/>
+
+								</form>
+							</field>
+						</form>
+					</field>
+
+					<field
+						name="jobLocation"
+						type="subform"
+						label="PLG_SCHEMAORG_JOBPOSTING_FIELD_JOBLOCATION_LABEL"
+					>
+						<form>
+
+							<field
+								name="@type"
+								type="hidden"
+								default="Place"
+							/>
+
+							<field
+								name="address"
+								type="subform"
+								label="PLG_SCHEMAORG_JOBPOSTING_FIELD_ADDRESS_LABEL"
+							>
+								<form>
+
+									<field
+										name="@type"
+										type="hidden"
+										default="PostalAddress"
+									/>
+
+									<field
+										name="streetAddress"
+										type="text"
+										label="PLG_SCHEMAORG_JOBPOSTING_FIELD_STREET_ADDRESS_LABEL"
+										filter="string"
+									/>
+
+									<field
+										name="addressLocality"
+										type="text"
+										label="PLG_SCHEMAORG_JOBPOSTING_FIELD_LOCALITY_LABEL"
+										filter="string"
+									/>
+
+									<field
+										name="addressRegion"
+										type="text"
+										label="PLG_SCHEMAORG_JOBPOSTING_FIELD_ADDRESS_REGION_LABEL"
+										filter="string"
+									/>
+
+									<field
+										name="postalCode"
+										type="text"
+										label="PLG_SCHEMAORG_JOBPOSTING_FIELD_POSTAL_CODE_LABEL"
+										filter="string"
+									/>
+
+									<field
+										name="addressCountry"
+										type="text"
+										label="PLG_SCHEMAORG_JOBPOSTING_FIELD_ADDRESS_COUNTRY_LABEL"
+										filter="string"
+									/>
+								</form>
+							</field>
+						</form>
+					</field>
+
+					<field
+						name="baseSalary"
+						label="PLG_SCHEMAORG_JOBPOSTING_FIELD_BASESALARY_LABEL"
+						type="subform"
+					>
+						<form>
+
+							<field
+								name="@type"
+								type="hidden"
+								default="MonetaryAmount"
+							/>
+
+							<field
+								name="currency"
+								type="text"
+								filter="string"
+								label="PLG_SCHEMAORG_JOBPOSTING_FIELD_CURRENCY_LABEL"
+							/>
+
+							<field
+								name="value"
+								type="subform"
+								label="PLG_SCHEMAORG_JOBPOSTING_FIELD_SALARY_VALUE_LABEL"
+							>
+
+							<form>
+
+									<field
+										name="@type"
+										type="hidden"
+										default="QuantitativeValue"
+									/>
+
+									<field
+										name="maxValue"
+										type="text"
+										filter="string"
+										label="PLG_SCHEMAORG_JOBPOSTING_FIELD_MAXVALUE_LABEL"
+									/>
+
+									<field
+										name="minValue"
+										type="text"
+										filter="string"
+										label="PLG_SCHEMAORG_JOBPOSTING_FIELD_MINVALUE_LABEL"
+									/>
+
+									<field
+										name="value"
+										type="text"
+										filter="string"
+										label="PLG_SCHEMAORG_JOBPOSTING_FIELD_VALUE_LABEL"
+									/>
+
+									<field
+										name="unitText"
+										type="list"
+										default="0"
+										label="PLG_SCHEMAORG_JOBPOSTING_FIELD_UNITTEXT_LABEL"
+										>
+										<option value=""></option>
+										<option value="HOUR">PLG_SCHEMAORG_JOBPOSTING_FIELD_BASESALARY_UNIT_OPTION_HOUR</option>
+										<option value="DAY">PLG_SCHEMAORG_JOBPOSTING_FIELD_BASESALARY_UNIT_OPTION_DAY</option>
+										<option value="WEEK">PLG_SCHEMAORG_JOBPOSTING_FIELD_BASESALARY_UNIT_OPTION_WEEK</option>
+										<option value="MONTH">PLG_SCHEMAORG_JOBPOSTING_FIELD_BASESALARY_UNIT_OPTION_MONTH</option>
+										<option value="YEAR">PLG_SCHEMAORG_JOBPOSTING_FIELD_BASESALARY_UNIT_OPTION_YEAR</option>
+									</field>
+
+							</form>
+
+							</field>
+						</form>
+					</field>
+
+					<field
+						name="genericField"
+						type="subform"
+						label="PLG_SCHEMAORG_JOBPOSTING_FIELD_GENERIC_FIELD_LABEL"
+						multiple="true"
+					>
+						<form>
+							<field
+								name="genericTitle"
+								type="text"
+								filter="string"
+								size="30"
+								label="PLG_SCHEMAORG_JOBPOSTING_FIELD_GENERIC_TITLE_LABEL"
+							/>
+							<field
+								name="genericValue"
+								type="text"
+								filter="string"
+								size="30"
+								label="PLG_SCHEMAORG_JOBPOSTING_FIELD_GENERIC_VALUE_LABEL"
+							/>
+						</form>
+
+					</field>
+
+				</form>
+			</field>
+		</fieldset>
+	</fields>
+</form>
diff --git a/plugins/schemaorg/jobposting/jobposting.xml b/plugins/schemaorg/jobposting/jobposting.xml
new file mode 100755
index 0000000000000..d1fa4d0e7232a
--- /dev/null
+++ b/plugins/schemaorg/jobposting/jobposting.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extension type="plugin" group="schemaorg" method="upgrade">
+	<name>plg_schemaorg_jobposting</name>
+	<author>Joomla! Project</author>
+	<creationDate>2023-07</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_SCHEMAORG_JOBPOSTING_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\Schemaorg\JobPosting</namespace>
+	<files>
+		<folder plugin="jobposting">services</folder>
+		<folder>src</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">language/en-GB/plg_schemaorg_jobposting.ini</language>
+		<language tag="en-GB">language/en-GB/plg_schemaorg_jobposting.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="allowedlist"
+					type="SchemaorgComponentSections"
+					label="JSCHEMAORG_EXTENSION_ALLOWED_LABEL"
+					description="JSCHEMAORG_EXTENSION_ALLOWED_DESCRIPTION"
+					multiple="multiple"
+					layout="joomla.form.field.list-fancy-select"
+				/>
+				<field
+					name="forbiddenlist"
+					type="SchemaorgComponentSections"
+					label="JSCHEMAORG_EXTENSION_FORBIDDEN_LABEL"
+					description="JSCHEMAORG_EXTENSION_FORBIDDEN_DESCRIPTION"
+					multiple="multiple"
+					layout="joomla.form.field.list-fancy-select"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
\ No newline at end of file
diff --git a/plugins/schemaorg/jobposting/services/provider.php b/plugins/schemaorg/jobposting/services/provider.php
new file mode 100644
index 0000000000000..3142b80c76548
--- /dev/null
+++ b/plugins/schemaorg/jobposting/services/provider.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Schemaorg.jobposting
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\Schemaorg\JobPosting\Extension\JobPosting;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function register(Container $container)
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $dispatcher = $container->get(DispatcherInterface::class);
+                $plugin     = new JobPosting(
+                    $dispatcher,
+                    (array) PluginHelper::getPlugin('schemaorg', 'jobposting')
+                );
+
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/schemaorg/jobposting/src/Extension/JobPosting.php b/plugins/schemaorg/jobposting/src/Extension/JobPosting.php
new file mode 100755
index 0000000000000..55eb9c9137c79
--- /dev/null
+++ b/plugins/schemaorg/jobposting/src/Extension/JobPosting.php
@@ -0,0 +1,96 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Schemaorg.jobposting
+ *
+ * @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\Schemaorg\JobPosting\Extension;
+
+use Joomla\CMS\Event\Plugin\System\Schemaorg\BeforeCompileHeadEvent;
+use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\CMS\Schemaorg\SchemaorgPluginTrait;
+use Joomla\CMS\Schemaorg\SchemaorgPrepareDateTrait;
+use Joomla\Event\Priority;
+use Joomla\Event\SubscriberInterface;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Schemaorg Plugin
+ *
+ * @since  5.0.0
+ */
+final class JobPosting extends CMSPlugin implements SubscriberInterface
+{
+    use SchemaorgPluginTrait;
+    use SchemaorgPrepareDateTrait;
+
+    /**
+     * Load the language file on instantiation.
+     *
+     * @var    boolean
+     * @since  5.0.0
+     */
+    protected $autoloadLanguage = true;
+
+    /**
+     * The name of the schema form
+     *
+     * @var   string
+     * @since 5.0.0
+     */
+    protected $pluginName = 'JobPosting';
+
+    /**
+     * Returns an array of events this subscriber will listen to.
+     *
+     * @return  array
+     *
+     * @since   5.0.0
+     */
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            'onSchemaPrepareForm'       => 'onSchemaPrepareForm',
+            'onSchemaBeforeCompileHead' => ['onSchemaBeforeCompileHead', Priority::BELOW_NORMAL],
+        ];
+    }
+
+    /**
+     * Cleanup all JobPosting types
+     *
+     * @param   BeforeCompileHeadEvent  $event  The given event
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function onSchemaBeforeCompileHead(BeforeCompileHeadEvent $event)
+    {
+        $schema = $event->getSchema();
+
+        $graph = $schema->get('@graph');
+
+        foreach ($graph as &$entry) {
+            if (!isset($entry['@type']) || $entry['@type'] !== 'JobPosting') {
+                continue;
+            }
+
+            if (!empty($entry['datePosted'])) {
+                $entry['datePosted'] = $this->prepareDate($entry['datePosted']);
+            }
+
+            if (!empty($entry['validThrough'])) {
+                $entry['validThrough'] = $this->prepareDate($entry['validThrough']);
+            }
+        }
+
+        $schema->set('@graph', $graph);
+    }
+}
diff --git a/plugins/schemaorg/organization/forms/schemaorg.xml b/plugins/schemaorg/organization/forms/schemaorg.xml
new file mode 100755
index 0000000000000..c758dae44e3f1
--- /dev/null
+++ b/plugins/schemaorg/organization/forms/schemaorg.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form>
+	<fields name="schema">
+		<fieldset
+			name="schema"
+			label="PLG_SYSTEM_SCHEMA_FIELD_SCHEMA_LABEL"
+		>
+			<field
+				name="Organization"
+				type="subform"
+				showon="schemaType:Organization"
+			>
+				<form>
+
+					<field
+						name="@type"
+						type="hidden"
+						default="Organization"
+					/>
+
+					<field
+						name="noteBook"
+						type="note"
+						description="PLG_SCHEMAORG_ORGANIZATION_DESCRIPTION_LABEL"
+						class="alert alert-info w-100"
+					/>
+
+					<field
+						name="name"
+						type="text"
+						filter="string"
+						label="PLG_SCHEMAORG_ORGANIZATION_FIELD_NAME_LABEL"
+					/>
+
+					<field
+						name="image"
+						type="media"
+						label="PLG_SCHEMAORG_ORGANIZATION_FIELD_LOGO_LABEL"
+					/>
+
+					<field
+						name="url"
+						type="url"
+						label="PLG_SCHEMAORG_ORGANIZATION_FIELD_URL_LABEL"
+						filter="url"
+						validate="url"
+					/>
+
+					<field
+						name="email"
+						type="email"
+						label="PLG_SCHEMAORG_ORGANIZATION_FIELD_EMAIL_LABEL"
+						validate="email"
+					/>
+
+					<field
+						name="address"
+						type="subform"
+						label="PLG_SCHEMAORG_ORGANIZATION_FIELD_ADDRESS_LABEL"
+					>
+						<form>
+
+							<field
+								name="@type"
+								type="hidden"
+								default="PostalAddress"
+							/>
+
+							<field
+								name="addressLocality"
+								type="text"
+								label="PLG_SCHEMAORG_ORGANIZATION_FIELD_LOCALITY_LABEL"
+							/>
+
+							<field
+								name="postalCode"
+								type="text"
+								label="PLG_SCHEMAORG_ORGANIZATION_FIELD_POSTAL_CODE_LABEL"
+							/>
+
+							<field
+								name="streetAddress"
+								type="text"
+								label="PLG_SCHEMAORG_ORGANIZATION_FIELD_STREET_ADDRESS_LABEL"
+							/>
+
+						</form>
+					</field>
+
+					<field
+						name="genericField"
+						type="subform"
+						label="PLG_SCHEMAORG_ORGANIZATION_FIELD_GENERIC_FIELD_LABEL"
+						multiple="true"
+					>
+						<form>
+							<field
+								name="genericTitle"
+								type="text"
+								label="PLG_SCHEMAORG_ORGANIZATION_FIELD_GENERIC_TITLE_LABEL"
+								filter="string"
+								size="30"
+
+							/>
+							<field
+								name="genericValue"
+								type="text"
+								label="PLG_SCHEMAORG_ORGANIZATION_FIELD_GENERIC_VALUE_LABEL"
+								filter="string"
+								size="30"
+							/>
+
+						</form>
+
+					</field>
+
+				</form>
+			</field>
+		</fieldset>
+	</fields>
+</form>
diff --git a/plugins/schemaorg/organization/organization.xml b/plugins/schemaorg/organization/organization.xml
new file mode 100755
index 0000000000000..a4b6d3ade26f5
--- /dev/null
+++ b/plugins/schemaorg/organization/organization.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extension type="plugin" group="schemaorg" method="upgrade">
+	<name>plg_schemaorg_organization</name>
+	<author>Joomla! Project</author>
+	<creationDate>2023-07</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_SCHEMAORG_ORGANIZATION_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\Schemaorg\Organization</namespace>
+	<files>
+		<folder plugin="organization">services</folder>
+		<folder>src</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">language/en-GB/plg_schemaorg_organization.ini</language>
+		<language tag="en-GB">language/en-GB/plg_schemaorg_organization.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="allowedlist"
+					type="SchemaorgComponentSections"
+					label="JSCHEMAORG_EXTENSION_ALLOWED_LABEL"
+					description="JSCHEMAORG_EXTENSION_ALLOWED_DESCRIPTION"
+					multiple="multiple"
+					layout="joomla.form.field.list-fancy-select"
+				/>
+				<field
+					name="forbiddenlist"
+					type="SchemaorgComponentSections"
+					label="JSCHEMAORG_EXTENSION_FORBIDDEN_LABEL"
+					description="JSCHEMAORG_EXTENSION_FORBIDDEN_DESCRIPTION"
+					multiple="multiple"
+					layout="joomla.form.field.list-fancy-select"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
\ No newline at end of file
diff --git a/plugins/schemaorg/organization/services/provider.php b/plugins/schemaorg/organization/services/provider.php
new file mode 100644
index 0000000000000..42a8a05d00c27
--- /dev/null
+++ b/plugins/schemaorg/organization/services/provider.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Schemaorg.organization
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\Schemaorg\Organization\Extension\Organization;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function register(Container $container)
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $dispatcher = $container->get(DispatcherInterface::class);
+                $plugin     = new Organization(
+                    $dispatcher,
+                    (array) PluginHelper::getPlugin('schemaorg', 'organization')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/schemaorg/organization/src/Extension/Organization.php b/plugins/schemaorg/organization/src/Extension/Organization.php
new file mode 100755
index 0000000000000..1ccb7e5f4131c
--- /dev/null
+++ b/plugins/schemaorg/organization/src/Extension/Organization.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Schemaorg.organization
+ *
+ * @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\Schemaorg\Organization\Extension;
+
+use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\CMS\Schemaorg\SchemaorgPluginTrait;
+use Joomla\Event\SubscriberInterface;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Schemaorg Plugin
+ *
+ * @since  5.0.0
+ */
+final class Organization extends CMSPlugin implements SubscriberInterface
+{
+    use SchemaorgPluginTrait;
+
+    /**
+     * Load the language file on instantiation.
+     *
+     * @var    boolean
+     * @since  5.0.0
+     */
+    protected $autoloadLanguage = true;
+
+    /**
+     * The name of the schema form
+     *
+     * @var   string
+     * @since 5.0.0
+     */
+    protected $pluginName = 'Organization';
+}
diff --git a/plugins/schemaorg/person/forms/schemaorg.xml b/plugins/schemaorg/person/forms/schemaorg.xml
new file mode 100755
index 0000000000000..86c85b599b56f
--- /dev/null
+++ b/plugins/schemaorg/person/forms/schemaorg.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form>
+	<fields name="schema">
+		<fieldset
+			name="schema"
+			label="PLG_SYSTEM_SCHEMA_FIELD_SCHEMA_LABEL"
+		>
+			<field
+				name="Person"
+				type="subform"
+				showon="schemaType:Person"
+			>
+				<form>
+
+					<field
+						name="@type"
+						type="hidden"
+						default="Person"
+					/>
+
+					<field
+						name="noteBook"
+						type="note"
+						description="PLG_SCHEMAORG_PERSON_DESCRIPTION_LABEL"
+						class="alert alert-info w-100"
+					/>
+
+					<field
+						name="name"
+						type="text"
+						filter="string"
+						label="PLG_SCHEMAORG_PERSON_FIELD_NAME_LABEL"
+					/>
+
+					<field
+						name="url"
+						type="url"
+						filter="url"
+						validate="url"
+						label="PLG_SCHEMAORG_PERSON_FIELD_URL_LABEL"
+					/>
+
+					<field
+						name="email"
+						type="email"
+						validate="email"
+						label="PLG_SCHEMAORG_PERSON_FIELD_EMAIL_LABEL"
+					/>
+
+					<field
+						name="address"
+						type="subform"
+						label="PLG_SCHEMAORG_PERSON_FIELD_ADDRESS_LABEL"
+					>
+						<form>
+
+							<field
+								name="@type"
+								type="hidden"
+								default="PostalAddress"
+							/>
+
+							<field
+								name="addressLocality"
+								type="text"
+								label="PLG_SCHEMAORG_PERSON_FIELD_LOCALITY_LABEL"
+							/>
+
+							<field
+								name="postalCode"
+								type="text"
+								label="PLG_SCHEMAORG_PERSON_FIELD_POSTAL_CODE_LABEL"
+							/>
+
+							<field
+								name="streetAddress"
+								type="text"
+								label="PLG_SCHEMAORG_PERSON_FIELD_STREET_ADDRESS_LABEL"
+							/>
+
+						</form>
+					</field>
+
+					<field
+						name="genericField"
+						type="subform"
+						label="PLG_SCHEMAORG_PERSON_FIELD_GENERIC_FIELD_LABEL"
+						multiple="true"
+					>
+						<form>
+							<field
+								name="genericTitle"
+								type="text"
+								filter="string"
+								size="30"
+								label="PLG_SCHEMAORG_PERSON_FIELD_GENERIC_TITLE_LABEL"
+							/>
+							<field
+								name="genericValue"
+								type="text"
+								filter="string"
+								size="30"
+								label="PLG_SCHEMAORG_PERSON_FIELD_GENERIC_VALUE_LABEL"
+							/>
+						</form>
+
+					</field>
+
+				</form>
+			</field>
+		</fieldset>
+	</fields>
+</form>
diff --git a/plugins/schemaorg/person/person.xml b/plugins/schemaorg/person/person.xml
new file mode 100755
index 0000000000000..a5ff79f659434
--- /dev/null
+++ b/plugins/schemaorg/person/person.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extension type="plugin" group="schemaorg" method="upgrade">
+	<name>plg_schemaorg_person</name>
+	<author>Joomla! Project</author>
+	<creationDate>2023-07</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_SCHEMAORG_PERSON_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\Schemaorg\Person</namespace>
+	<files>
+		<folder plugin="person">services</folder>
+		<folder>src</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">language/en-GB/plg_schemaorg_person.ini</language>
+		<language tag="en-GB">language/en-GB/plg_schemaorg_person.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="allowedlist"
+					type="SchemaorgComponentSections"
+					label="JSCHEMAORG_EXTENSION_ALLOWED_LABEL"
+					description="JSCHEMAORG_EXTENSION_ALLOWED_DESCRIPTION"
+					multiple="multiple"
+					layout="joomla.form.field.list-fancy-select"
+				/>
+				<field
+					name="forbiddenlist"
+					type="SchemaorgComponentSections"
+					label="JSCHEMAORG_EXTENSION_FORBIDDEN_LABEL"
+					description="JSCHEMAORG_EXTENSION_FORBIDDEN_DESCRIPTION"
+					multiple="multiple"
+					layout="joomla.form.field.list-fancy-select"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
\ No newline at end of file
diff --git a/plugins/schemaorg/person/services/provider.php b/plugins/schemaorg/person/services/provider.php
new file mode 100644
index 0000000000000..1e7954d46b650
--- /dev/null
+++ b/plugins/schemaorg/person/services/provider.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Schemaorg.person
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\Schemaorg\Person\Extension\Person;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function register(Container $container)
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $dispatcher = $container->get(DispatcherInterface::class);
+                $plugin     = new Person(
+                    $dispatcher,
+                    (array) PluginHelper::getPlugin('schemaorg', 'person')
+                );
+
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/schemaorg/person/src/Extension/Person.php b/plugins/schemaorg/person/src/Extension/Person.php
new file mode 100755
index 0000000000000..34a174f7c5c4d
--- /dev/null
+++ b/plugins/schemaorg/person/src/Extension/Person.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Schemaorg.person
+ *
+ * @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\Schemaorg\Person\Extension;
+
+use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\CMS\Schemaorg\SchemaorgPluginTrait;
+use Joomla\Event\SubscriberInterface;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Schemaorg Plugin
+ *
+ * @since  5.0.0
+ */
+final class Person extends CMSPlugin implements SubscriberInterface
+{
+    use SchemaorgPluginTrait;
+
+    /**
+     * Load the language file on instantiation.
+     *
+     * @var    boolean
+     * @since  5.0.0
+     */
+    protected $autoloadLanguage = true;
+
+    /**
+     * The name of the schema form
+     *
+     * @var   string
+     * @since 5.0.0
+     */
+    protected $pluginName = 'Person';
+}
diff --git a/plugins/schemaorg/recipe/forms/duration.xml b/plugins/schemaorg/recipe/forms/duration.xml
new file mode 100755
index 0000000000000..78cbdb5357646
--- /dev/null
+++ b/plugins/schemaorg/recipe/forms/duration.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form>
+    <field
+        name="hour"
+        type="number"
+        label="PLG_SCHEMAORG_RECIPE_FIELD_HOUR_LABEL"
+    />
+
+    <field
+        name="min"
+        type="number"
+        label="PLG_SCHEMAORG_RECIPE_FIELD_MINUTE_LABEL"
+        max="59"
+    />
+</form>
diff --git a/plugins/schemaorg/recipe/forms/schemaorg.xml b/plugins/schemaorg/recipe/forms/schemaorg.xml
new file mode 100755
index 0000000000000..0eac259367580
--- /dev/null
+++ b/plugins/schemaorg/recipe/forms/schemaorg.xml
@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form>
+	<fields name="schema">
+		<fieldset
+			name="schema"
+			label="PLG_SYSTEM_SCHEMA_FIELD_SCHEMA_LABEL"
+		>
+			<field
+				name="Recipe"
+				type="subform"
+				showon="schemaType:Recipe"
+			>
+				<form>
+
+					<field
+						name="@type"
+						type="hidden"
+						default="Recipe"
+					/>
+
+					<field
+						name="noteBook"
+						type="note"
+						description="PLG_SCHEMAORG_RECIPE_DESCRIPTION_LABEL"
+						class="alert alert-info w-100"
+					/>
+
+					<field
+						name="image"
+						type="media"
+						label="PLG_SCHEMAORG_RECIPE_FIELD_IMAGE_LABEL"
+					/>
+
+					<field
+						name="name"
+						type="text"
+						label="PLG_SCHEMAORG_RECIPE_FIELD_NAME_LABEL"
+						filter="string"
+						size="30"
+
+					/>
+
+					<field
+						name="author"
+						type="text"
+						label="PLG_SCHEMAORG_RECIPE_FIELD_AUTHOR_LABEL"
+						filter="string"
+						size="30"
+
+					/>
+
+					<field
+						name="cookTime"
+						type="subform"
+						formsource="plugins\schemaorg\recipe\forms\duration.xml"
+						label="PLG_SCHEMAORG_RECIPE_FIELD_COOK_TIME_LABEL"
+					/>
+
+					<field
+						name="datePublished"
+						type="calendar"
+						label="PLG_SCHEMAORG_RECIPE_FIELD_DATE_PUBLISHED_LABEL"
+						class="input-small"
+						filter="user_utc"
+						showtime="false"
+						todaybutton="true"
+						translateformat="true"
+					/>
+
+					<field
+						name="description"
+						type="text"
+						filter="string"
+						label="PLG_SCHEMAORG_RECIPE_FIELD_DESCRIPTION_LABEL"
+					/>
+
+					<field
+						name="cookingMethod"
+						type="text"
+						filter="string"
+						size="30"
+						label="PLG_SCHEMAORG_RECIPE_FIELD_COOKING_METHOD_LABEL"
+					/>
+
+					<field
+						name="prepTime"
+						type="subform"
+						formsource="plugins\schemaorg\recipe\forms\duration.xml"
+						label="PLG_SCHEMAORG_RECIPE_FIELD_PREPARATION_TIME_LABEL"
+					/>
+
+					<field
+						name="recipeCategory"
+						type="text"
+						filter="string"
+						size="30"
+						label="PLG_SCHEMAORG_RECIPE_FIELD_CATEGORY_LABEL"
+					/>
+
+					<field
+						name="recipeCuisine"
+						type="text"
+						filter="string"
+						size="30"
+						label="PLG_SCHEMAORG_RECIPE_FIELD_CUISINE_LABEL"
+					/>
+
+					<field
+						name="recipeInstructions"
+						type="text"
+						filter="string"
+						size="30"
+						label="PLG_SCHEMAORG_RECIPE_FIELD_INSTRUCTIONS_LABEL"
+					/>
+
+					<field
+						name="recipeYield"
+						type="text"
+						filter="string"
+						size="30"
+						label="PLG_SCHEMAORG_RECIPE_FIELD_YIELD_LABEL"
+					/>
+
+					<field
+						name="suitableForDiet"
+						type="text"
+						filter="string"
+						size="30"
+						label="PLG_SCHEMAORG_RECIPE_FIELD_SUITABLE_FOR_DIET_LABEL"
+					/>
+
+					<field
+						name="recipeIngredient"
+						type="subform"
+						label="PLG_SCHEMAORG_RECIPE_FIELD_INGREDIENTS_LABEL"
+						multiple="true"
+						min="1"
+					>
+						<form>
+							<field
+								name="ingredient"
+								type="text"
+								hiddenLabel="true"
+							/>
+						</form>
+					</field>
+
+					<field
+						name="nutrition"
+						type="subform"
+						label="PLG_SCHEMAORG_RECIPE_FIELD_NUTRITION_LABEL"
+					>
+
+						<form>
+							<field
+								name="@type"
+								type="hidden"
+								default="NutritionInformation"
+							/>
+
+							<field
+								name="calories"
+								type="text"
+								filter="string"
+								label="PLG_SCHEMAORG_RECIPE_FIELD_CALORIES_LABEL"
+							/>
+
+							<field
+								name="carbohydrateContent"
+								type="text"
+								filter="string"
+								label="PLG_SCHEMAORG_RECIPE_FIELD_CARBOHYDRATE_LABEL"
+							/>
+
+							<field
+								name="cholesterolContent"
+								type="text"
+								filter="string"
+								label="PLG_SCHEMAORG_RECIPE_FIELD_CHOLESTEROL_CONTENT_LABEL"
+							/>
+
+							<field
+								name="fatContent"
+								type="text"
+								filter="string"
+								label="PLG_SCHEMAORG_RECIPE_FIELD_FAT_LABEL"
+							/>
+
+							<field
+								name="fiberContent"
+								type="text"
+								filter="string"
+								label="PLG_SCHEMAORG_RECIPE_FIELD_FIBER_LABEL"
+							/>
+
+							<field
+								name="proteinContent"
+								type="text"
+								filter="string"
+								label="PLG_SCHEMAORG_RECIPE_FIELD_PROTEIN_LABEL"
+							/>
+
+							<field
+								name="saturatedFatContent"
+								type="text"
+								filter="string"
+								label="PLG_SCHEMAORG_RECIPE_FIELD_SATURATED_FAT_LABEL"
+							/>
+
+							<field
+								name="sodiumContent"
+								type="text"
+								filter="string"
+								label="PLG_SCHEMAORG_RECIPE_FIELD_SODIUM_LABEL"
+							/>
+
+							<field
+								name="sugarContent"
+								type="text"
+								filter="string"
+								label="PLG_SCHEMAORG_RECIPE_FIELD_SUGAR_LABEL"
+							/>
+
+							<field
+								name="transFatContent"
+								type="text"
+								filter="string"
+								label="PLG_SCHEMAORG_RECIPE_FIELD_TRANS_FAT_LABEL"
+							/>
+
+							<field
+								name="unsaturatedFatContent"
+								type="text"
+								filter="string"
+								label="PLG_SCHEMAORG_RECIPE_FIELD_UNSATURATED_FAT_LABEL"
+							/>
+
+							<field
+								name="servingSize"
+								type="text"
+								filter="string"
+								label="PLG_SCHEMAORG_RECIPE_FIELD_SERVING_SIZE_LABEL"
+							/>
+						</form>
+					</field>
+
+					<field
+						name="genericField"
+						type="subform"
+						label="PLG_SCHEMAORG_RECIPE_FIELD_GENERIC_FIELD_LABEL"
+						multiple="true"
+					>
+						<form>
+							<field
+								name="genericTitle"
+								type="text"
+								filter="string"
+								size="30"
+								label="PLG_SCHEMAORG_RECIPE_FIELD_GENERIC_TITLE_LABEL"
+							/>
+							<field
+								name="genericValue"
+								type="text"
+								filter="string"
+								size="30"
+								label="PLG_SCHEMAORG_RECIPE_FIELD_GENERIC_VALUE_LABEL"
+							/>
+						</form>
+
+					</field>
+
+				</form>
+			</field>
+		</fieldset>
+	</fields>
+</form>
diff --git a/plugins/schemaorg/recipe/recipe.xml b/plugins/schemaorg/recipe/recipe.xml
new file mode 100755
index 0000000000000..d1f72547082f5
--- /dev/null
+++ b/plugins/schemaorg/recipe/recipe.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extension type="plugin" group="schemaorg" method="upgrade">
+	<name>plg_schemaorg_recipe</name>
+	<author>Joomla! Project</author>
+	<creationDate>2023-07</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_SCHEMAORG_RECIPE_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\Schemaorg\Recipe</namespace>
+	<files>
+		<folder plugin="recipe">services</folder>
+		<folder>src</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">language/en-GB/plg_schemaorg_recipe.ini</language>
+		<language tag="en-GB">language/en-GB/plg_schemaorg_recipe.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="allowedlist"
+					type="SchemaorgComponentSections"
+					label="JSCHEMAORG_EXTENSION_ALLOWED_LABEL"
+					description="JSCHEMAORG_EXTENSION_ALLOWED_DESCRIPTION"
+					multiple="multiple"
+					layout="joomla.form.field.list-fancy-select"
+				/>
+				<field
+					name="forbiddenlist"
+					type="SchemaorgComponentSections"
+					label="JSCHEMAORG_EXTENSION_FORBIDDEN_LABEL"
+					description="JSCHEMAORG_EXTENSION_FORBIDDEN_DESCRIPTION"
+					multiple="multiple"
+					layout="joomla.form.field.list-fancy-select"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
\ No newline at end of file
diff --git a/plugins/schemaorg/recipe/services/provider.php b/plugins/schemaorg/recipe/services/provider.php
new file mode 100644
index 0000000000000..e38a1189486aa
--- /dev/null
+++ b/plugins/schemaorg/recipe/services/provider.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Schemaorg.recipe
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\Schemaorg\Recipe\Extension\Recipe;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function register(Container $container)
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $dispatcher = $container->get(DispatcherInterface::class);
+                $plugin     = new Recipe(
+                    $dispatcher,
+                    (array) PluginHelper::getPlugin('schemaorg', 'recipe')
+                );
+
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/schemaorg/recipe/src/Extension/Recipe.php b/plugins/schemaorg/recipe/src/Extension/Recipe.php
new file mode 100755
index 0000000000000..8a35d2623a8d4
--- /dev/null
+++ b/plugins/schemaorg/recipe/src/Extension/Recipe.php
@@ -0,0 +1,121 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Schemaorg.recipe
+ *
+ * @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\Schemaorg\Recipe\Extension;
+
+use Joomla\CMS\Event\Plugin\System\Schemaorg\BeforeCompileHeadEvent;
+use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\CMS\Schemaorg\SchemaorgPluginTrait;
+use Joomla\CMS\Schemaorg\SchemaorgPrepareDateTrait;
+use Joomla\CMS\Schemaorg\SchemaorgPrepareDurationTrait;
+use Joomla\Event\Priority;
+use Joomla\Event\SubscriberInterface;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Schemaorg Plugin
+ *
+ * @since  5.0.0
+ */
+final class Recipe extends CMSPlugin implements SubscriberInterface
+{
+    use SchemaorgPluginTrait;
+    use SchemaorgPrepareDateTrait;
+    use SchemaorgPrepareDurationTrait;
+
+    /**
+     * Load the language file on instantiation.
+     *
+     * @var    boolean
+     * @since  5.0.0
+     */
+    protected $autoloadLanguage = true;
+
+    /**
+     * The name of the schema form
+     *
+     * @var   string
+     * @since 5.0.0
+     */
+    protected $pluginName = 'Recipe';
+
+    /**
+     * Returns an array of events this subscriber will listen to.
+     *
+     * @return  array
+     *
+     * @since   5.0.0
+     */
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            'onSchemaPrepareForm'       => 'onSchemaPrepareForm',
+            'onSchemaBeforeCompileHead' => ['onSchemaBeforeCompileHead', Priority::BELOW_NORMAL],
+        ];
+    }
+
+    /**
+     * Cleanup all Recipe types
+     *
+     * @param   BeforeCompileHeadEvent  $event  The given event
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function onSchemaBeforeCompileHead(BeforeCompileHeadEvent $event)
+    {
+        $schema = $event->getSchema();
+
+        $graph = $schema->get('@graph');
+
+        foreach ($graph as &$entry) {
+            if (!isset($entry['@type']) || $entry['@type'] !== 'Recipe') {
+                continue;
+            }
+
+            if (!empty($entry['datePublished'])) {
+                $entry['datePublished'] = $this->prepareDate($entry['datePublished']);
+            }
+
+            if (!empty($entry['cookTime'])) {
+                $entry['cookTime'] = $this->prepareDuration($entry['cookTime']);
+            }
+
+            if (!empty($entry['prepTime'])) {
+                $entry['prepTime'] = $this->prepareDuration($entry['prepTime']);
+            }
+
+            // Clean recipeIngredient
+            if (isset($entry['recipeIngredient']) && is_array($entry['recipeIngredient'])) {
+                $result = [];
+
+                foreach ($entry['recipeIngredient'] as $key => $value) {
+                    if (is_array($value)) {
+                        foreach ($value as $k => $v) {
+                            $result[] = $v;
+                        }
+
+                        continue;
+                    }
+
+                    $result[] = $value;
+                }
+
+                $entry['recipeIngredient'] = !empty($result) ? $result : null;
+            }
+        }
+
+        $schema->set('@graph', $graph);
+    }
+}
diff --git a/plugins/system/accessibility/accessibility.xml b/plugins/system/accessibility/accessibility.xml
index 8483f04a69988..94f4dfd458019 100644
--- a/plugins/system/accessibility/accessibility.xml
+++ b/plugins/system/accessibility/accessibility.xml
@@ -9,8 +9,10 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>4.0.0</version>
 	<description>PLG_SYSTEM_ACCESSIBILITY_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\System\Accessibility</namespace>
 	<files>
-		<filename plugin="accessibility">accessibility.php</filename>
+		<folder plugin="accessibility">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages folder="admin">
 		<language tag="en-GB">language/en-GB/plg_system_accessibility.ini</language>
diff --git a/plugins/system/accessibility/services/provider.php b/plugins/system/accessibility/services/provider.php
new file mode 100644
index 0000000000000..62ca8d2354184
--- /dev/null
+++ b/plugins/system/accessibility/services/provider.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.accessibility
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\System\Accessibility\Extension\Accessibility;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new Accessibility(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('system', 'accessibility')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/system/accessibility/accessibility.php b/plugins/system/accessibility/src/Extension/Accessibility.php
similarity index 52%
rename from plugins/system/accessibility/accessibility.php
rename to plugins/system/accessibility/src/Extension/Accessibility.php
index 20827f154cd5f..d1b9912d3d1ec 100644
--- a/plugins/system/accessibility/accessibility.php
+++ b/plugins/system/accessibility/src/Extension/Accessibility.php
@@ -6,12 +6,10 @@
  *
  * @copyright   (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
+namespace Joomla\Plugin\System\Accessibility\Extension;
+
 use Joomla\CMS\Plugin\CMSPlugin;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -23,15 +21,8 @@
  *
  * @since  4.0.0
  */
-class PlgSystemAccessibility extends CMSPlugin
+final class Accessibility extends CMSPlugin
 {
-    /**
-     * @var    \Joomla\CMS\Application\CMSApplication
-     *
-     * @since  4.0.0
-     */
-    protected $app;
-
     /**
      * Add the javascript for the accessibility menu
      *
@@ -43,19 +34,19 @@ public function onBeforeCompileHead()
     {
         $section = $this->params->get('section', 'administrator');
 
-        if ($section !== 'both' && $this->app->isClient($section) !== true) {
+        if ($section !== 'both' && $this->getApplication()->isClient($section) !== true) {
             return;
         }
 
         // Get the document object.
-        $document = $this->app->getDocument();
+        $document = $this->getApplication()->getDocument();
 
         if ($document->getType() !== 'html') {
             return;
         }
 
         // Are we in a modal?
-        if ($this->app->getInput()->get('tmpl', '', 'cmd') === 'component') {
+        if ($this->getApplication()->getInput()->get('tmpl', '', 'cmd') === 'component') {
             return;
         }
 
@@ -63,10 +54,10 @@ public function onBeforeCompileHead()
         $this->loadLanguage();
 
         // Determine if it is an LTR or RTL language
-        $direction = Factory::getLanguage()->isRtl() ? 'right' : 'left';
+        $direction = $this->getApplication()->getLanguage()->isRtl() ? 'right' : 'left';
 
         // Detect the current active language
-        $lang = Factory::getLanguage()->getTag();
+        $lang = $this->getApplication()->getLanguage()->getTag();
 
         /**
         * Add strings for translations in Javascript.
@@ -76,20 +67,20 @@ public function onBeforeCompileHead()
             'accessibility-options',
             [
                 'labels' => [
-                    'menuTitle'           => Text::_('PLG_SYSTEM_ACCESSIBILITY_MENU_TITLE'),
-                    'increaseText'        => Text::_('PLG_SYSTEM_ACCESSIBILITY_INCREASE_TEXT'),
-                    'decreaseText'        => Text::_('PLG_SYSTEM_ACCESSIBILITY_DECREASE_TEXT'),
-                    'increaseTextSpacing' => Text::_('PLG_SYSTEM_ACCESSIBILITY_INCREASE_SPACING'),
-                    'decreaseTextSpacing' => Text::_('PLG_SYSTEM_ACCESSIBILITY_DECREASE_SPACING'),
-                    'invertColors'        => Text::_('PLG_SYSTEM_ACCESSIBILITY_INVERT_COLORS'),
-                    'grayHues'            => Text::_('PLG_SYSTEM_ACCESSIBILITY_GREY'),
-                    'underlineLinks'      => Text::_('PLG_SYSTEM_ACCESSIBILITY_UNDERLINE'),
-                    'bigCursor'           => Text::_('PLG_SYSTEM_ACCESSIBILITY_CURSOR'),
-                    'readingGuide'        => Text::_('PLG_SYSTEM_ACCESSIBILITY_READING'),
-                    'textToSpeech'        => Text::_('PLG_SYSTEM_ACCESSIBILITY_TTS'),
-                    'speechToText'        => Text::_('PLG_SYSTEM_ACCESSIBILITY_STT'),
-                    'resetTitle'          => Text::_('PLG_SYSTEM_ACCESSIBILITY_RESET'),
-                    'closeTitle'          => Text::_('PLG_SYSTEM_ACCESSIBILITY_CLOSE'),
+                    'menuTitle'           => $this->getApplication()->getLanguage()->_('PLG_SYSTEM_ACCESSIBILITY_MENU_TITLE'),
+                    'increaseText'        => $this->getApplication()->getLanguage()->_('PLG_SYSTEM_ACCESSIBILITY_INCREASE_TEXT'),
+                    'decreaseText'        => $this->getApplication()->getLanguage()->_('PLG_SYSTEM_ACCESSIBILITY_DECREASE_TEXT'),
+                    'increaseTextSpacing' => $this->getApplication()->getLanguage()->_('PLG_SYSTEM_ACCESSIBILITY_INCREASE_SPACING'),
+                    'decreaseTextSpacing' => $this->getApplication()->getLanguage()->_('PLG_SYSTEM_ACCESSIBILITY_DECREASE_SPACING'),
+                    'invertColors'        => $this->getApplication()->getLanguage()->_('PLG_SYSTEM_ACCESSIBILITY_INVERT_COLORS'),
+                    'grayHues'            => $this->getApplication()->getLanguage()->_('PLG_SYSTEM_ACCESSIBILITY_GREY'),
+                    'underlineLinks'      => $this->getApplication()->getLanguage()->_('PLG_SYSTEM_ACCESSIBILITY_UNDERLINE'),
+                    'bigCursor'           => $this->getApplication()->getLanguage()->_('PLG_SYSTEM_ACCESSIBILITY_CURSOR'),
+                    'readingGuide'        => $this->getApplication()->getLanguage()->_('PLG_SYSTEM_ACCESSIBILITY_READING'),
+                    'textToSpeech'        => $this->getApplication()->getLanguage()->_('PLG_SYSTEM_ACCESSIBILITY_TTS'),
+                    'speechToText'        => $this->getApplication()->getLanguage()->_('PLG_SYSTEM_ACCESSIBILITY_STT'),
+                    'resetTitle'          => $this->getApplication()->getLanguage()->_('PLG_SYSTEM_ACCESSIBILITY_RESET'),
+                    'closeTitle'          => $this->getApplication()->getLanguage()->_('PLG_SYSTEM_ACCESSIBILITY_CLOSE'),
                 ],
                 'icon' => [
                     'position' => [
diff --git a/plugins/system/actionlogs/actionlogs.xml b/plugins/system/actionlogs/actionlogs.xml
index d7b04c5416e62..6bb24222ccce7 100644
--- a/plugins/system/actionlogs/actionlogs.xml
+++ b/plugins/system/actionlogs/actionlogs.xml
@@ -9,34 +9,14 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>3.9.0</version>
 	<description>PLG_SYSTEM_ACTIONLOGS_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\System\ActionLogs</namespace>
 	<files>
-		<filename plugin="actionlogs">actionlogs.php</filename>
 		<folder>forms</folder>
+		<folder plugin="actionlogs">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_system_actionlogs.ini</language>
 		<language tag="en-GB">language/en-GB/plg_system_actionlogs.sys.ini</language>
 	</languages>
-	<config>
-		<fields name="params">
-			<fieldset name="basic">
-				<field
-					name="logDeletePeriod"
-					type="number"
-					label="PLG_SYSTEM_ACTIONLOGS_LOG_DELETE_PERIOD"
-					description="PLG_SYSTEM_ACTIONLOGS_LOG_DELETE_PERIOD_DESC"
-					default="0"
-					min="0"
-					filter="int"
-					validate="number"
-				/>
-				<field
-					name="lastrun"
-					type="hidden"
-					default="0"
-					filter="integer"
-				/>
-			</fieldset>
-		</fields>
-	</config>
 </extension>
diff --git a/plugins/system/actionlogs/services/provider.php b/plugins/system/actionlogs/services/provider.php
new file mode 100644
index 0000000000000..57fe92a2ba06c
--- /dev/null
+++ b/plugins/system/actionlogs/services/provider.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.actionlogs
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\User\UserFactoryInterface;
+use Joomla\Database\DatabaseInterface;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\System\ActionLogs\Extension\ActionLogs;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin = new ActionLogs(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('system', 'actionlogs')
+                );
+                $plugin->setApplication(Factory::getApplication());
+                $plugin->setDatabase($container->get(DatabaseInterface::class));
+                $plugin->setUserFactory($container->get(UserFactoryInterface::class));
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/system/actionlogs/actionlogs.php b/plugins/system/actionlogs/src/Extension/ActionLogs.php
similarity index 63%
rename from plugins/system/actionlogs/actionlogs.php
rename to plugins/system/actionlogs/src/Extension/ActionLogs.php
index f9e16d363840b..22e0a8c1d14f2 100644
--- a/plugins/system/actionlogs/actionlogs.php
+++ b/plugins/system/actionlogs/src/Extension/ActionLogs.php
@@ -6,21 +6,21 @@
  *
  * @copyright   (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
-use Joomla\CMS\Cache\Cache;
-use Joomla\CMS\Factory;
+namespace Joomla\Plugin\System\ActionLogs\Extension;
+
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Plugin\PluginHelper;
-use Joomla\CMS\User\User;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\Component\Actionlogs\Administrator\Helper\ActionlogsHelper;
+use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Database\Exception\ExecutionFailureException;
 use Joomla\Database\ParameterType;
+use Joomla\Event\DispatcherInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -31,33 +31,22 @@
  *
  * @since  3.9.0
  */
-class PlgSystemActionLogs extends CMSPlugin
+final class ActionLogs extends CMSPlugin
 {
-    /**
-     * @var    \Joomla\CMS\Application\CMSApplication
-     *
-     * @since  3.9.0
-     */
-    protected $app;
-
-    /**
-     * @var    \Joomla\Database\DatabaseDriver
-     *
-     * @since  3.9.0
-     */
-    protected $db;
+    use DatabaseAwareTrait;
+    use UserFactoryAwareTrait;
 
     /**
      * Constructor.
      *
-     * @param   object  $subject  The object to observe.
-     * @param   array   $config   An optional associative array of configuration settings.
+     * @param   DispatcherInterface  $dispatcher   The dispatcher
+     * @param   array                $config       An optional associative array of configuration settings
      *
      * @since   3.9.0
      */
-    public function __construct(&$subject, $config)
+    public function __construct(DispatcherInterface $dispatcher, array $config)
     {
-        parent::__construct($subject, $config);
+        parent::__construct($dispatcher, $config);
 
         // Import actionlog plugin group so that these plugins will be triggered for events
         PluginHelper::importPlugin('actionlog');
@@ -86,7 +75,7 @@ public function onAfterInitialise()
      *
      * @since   3.9.0
      *
-     * @throws  Exception
+     * @throws  \Exception
      */
     public function onContentPrepareForm(Form $form, $data)
     {
@@ -105,15 +94,14 @@ public function onContentPrepareForm(Form $form, $data)
          * We only allow users who have Super User permission to change this setting for themselves or for other
          * users who have the same Super User permission
          */
+        $user = $this->getApplication()->getIdentity();
 
-        $user = Factory::getUser();
-
-        if (!$user->authorise('core.admin')) {
+        if (!$user || !$user->authorise('core.admin')) {
             return true;
         }
 
         // If we are on the save command, no data is passed to $data variable, we need to get it directly from request
-        $jformData = $this->app->getInput()->get('jform', [], 'array');
+        $jformData = $this->getApplication()->getInput()->get('jform', [], 'array');
 
         if ($jformData && !$data) {
             $data = $jformData;
@@ -123,13 +111,13 @@ public function onContentPrepareForm(Form $form, $data)
             $data = (object) $data;
         }
 
-        if (empty($data->id) || !User::getInstance($data->id)->authorise('core.admin')) {
+        if (empty($data->id) || !$this->getUserFactory()->loadUserById($data->id)->authorise('core.admin')) {
             return true;
         }
 
-        Form::addFormPath(__DIR__ . '/forms');
+        Form::addFormPath(JPATH_PLUGINS . '/' . $this->_type . '/' . $this->_name . '/forms');
 
-        if ((!PluginHelper::isEnabled('actionlog', 'joomla')) && (Factory::getApplication()->isClient('administrator'))) {
+        if ((!PluginHelper::isEnabled('actionlog', 'joomla')) && ($this->getApplication()->isClient('administrator'))) {
             $form->loadFile('information', false);
 
             return true;
@@ -164,11 +152,11 @@ public function onContentPrepareData($context, $data)
             $data = (object) $data;
         }
 
-        if (!User::getInstance($data->id)->authorise('core.admin')) {
+        if (empty($data->id) || !$this->getUserFactory()->loadUserById($data->id)->authorise('core.admin')) {
             return true;
         }
 
-        $db = $this->db;
+        $db = $this->getDatabase();
         $id = (int) $data->id;
 
         $query = $db->getQuery(true)
@@ -187,7 +175,7 @@ public function onContentPrepareData($context, $data)
             return true;
         }
 
-        $data->actionlogs                       = new stdClass();
+        $data->actionlogs                       = new \stdClass();
         $data->actionlogs->actionlogsNotify     = $values->notify;
         $data->actionlogs->actionlogsExtensions = $values->extensions;
 
@@ -202,129 +190,6 @@ public function onContentPrepareData($context, $data)
         return true;
     }
 
-    /**
-     * Runs after the HTTP response has been sent to the client and delete log records older than certain days
-     *
-     * @return  void
-     *
-     * @since   3.9.0
-     */
-    public function onAfterRespond()
-    {
-        $daysToDeleteAfter = (int) $this->params->get('logDeletePeriod', 0);
-
-        if ($daysToDeleteAfter <= 0) {
-            return;
-        }
-
-        // The delete frequency will be once per day
-        $deleteFrequency = 3600 * 24;
-
-        // Do we need to run? Compare the last run timestamp stored in the plugin's options with the current
-        // timestamp. If the difference is greater than the cache timeout we shall not execute again.
-        $now  = time();
-        $last = (int) $this->params->get('lastrun', 0);
-
-        if (abs($now - $last) < $deleteFrequency) {
-            return;
-        }
-
-        // Update last run status
-        $this->params->set('lastrun', $now);
-
-        $db     = $this->db;
-        $params = $this->params->toString('JSON');
-        $query  = $db->getQuery(true)
-            ->update($db->quoteName('#__extensions'))
-            ->set($db->quoteName('params') . ' = :params')
-            ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
-            ->where($db->quoteName('folder') . ' = ' . $db->quote('system'))
-            ->where($db->quoteName('element') . ' = ' . $db->quote('actionlogs'))
-            ->bind(':params', $params);
-
-        try {
-            // Lock the tables to prevent multiple plugin executions causing a race condition
-            $db->lockTable('#__extensions');
-        } catch (Exception $e) {
-            // If we can't lock the tables it's too risky to continue execution
-            return;
-        }
-
-        try {
-            // Update the plugin parameters
-            $result = $db->setQuery($query)->execute();
-
-            $this->clearCacheGroups(['com_plugins'], [0, 1]);
-        } catch (Exception $exc) {
-            // If we failed to execute
-            $db->unlockTables();
-            $result = false;
-        }
-
-        try {
-            // Unlock the tables after writing
-            $db->unlockTables();
-        } catch (Exception $e) {
-            // If we can't lock the tables assume we have somehow failed
-            $result = false;
-        }
-
-        // Abort on failure
-        if (!$result) {
-            return;
-        }
-
-        $daysToDeleteAfter = (int) $this->params->get('logDeletePeriod', 0);
-        $now               = Factory::getDate()->toSql();
-
-        if ($daysToDeleteAfter > 0) {
-            $days = -1 * $daysToDeleteAfter;
-
-            $query->clear()
-                ->delete($db->quoteName('#__action_logs'))
-                ->where($db->quoteName('log_date') . ' < ' . $query->dateAdd($db->quote($now), $days, 'DAY'));
-
-            $db->setQuery($query);
-
-            try {
-                $db->execute();
-            } catch (RuntimeException $e) {
-                // Ignore it
-                return;
-            }
-        }
-    }
-
-    /**
-     * Clears cache groups. We use it to clear the plugins cache after we update the last run timestamp.
-     *
-     * @param   array  $clearGroups   The cache groups to clean
-     * @param   array  $cacheClients  The cache clients (site, admin) to clean
-     *
-     * @return  void
-     *
-     * @since   3.9.0
-     */
-    private function clearCacheGroups(array $clearGroups, array $cacheClients = [0, 1])
-    {
-        foreach ($clearGroups as $group) {
-            foreach ($cacheClients as $clientId) {
-                try {
-                    $options = [
-                        'defaultgroup' => $group,
-                        'cachebase'    => $clientId ? JPATH_ADMINISTRATOR . '/cache' :
-                            Factory::getApplication()->get('cache_path', JPATH_SITE . '/cache'),
-                    ];
-
-                    $cache = Cache::getInstance('callback', $options);
-                    $cache->clean();
-                } catch (Exception $e) {
-                    // Ignore it
-                }
-            }
-        }
-    }
-
     /**
      * Utility method to act on a user after it has been saved.
      *
@@ -344,12 +209,12 @@ public function onUserAfterSave($user, $isNew, $success, $msg): void
         }
 
         // Clear access rights in case user groups were changed.
-        $userObject = new User($user['id']);
+        $userObject = $this->getUserFactory()->loadUserById($user['id']);
         $userObject->clearAccessRights();
 
         $authorised = $userObject->authorise('core.admin');
         $userid     = (int) $user['id'];
-        $db         = $this->db;
+        $db         = $this->getDatabase();
 
         $query = $db->getQuery(true)
             ->select('COUNT(*)')
@@ -436,7 +301,7 @@ public function onUserAfterDelete($user, $success, $msg): void
             return;
         }
 
-        $db     = $this->db;
+        $db     = $this->getDatabase();
         $userid = (int) $user['id'];
 
         $query = $db->getQuery(true)
@@ -481,9 +346,6 @@ public static function renderActionlogsExtensions($extensions)
             return Text::_('JNONE');
         }
 
-        // Load the helper.
-        JLoader::register('ActionlogsHelper', JPATH_ADMINISTRATOR . '/components/com_actionlogs/helpers/actionlogs.php');
-
         foreach ($extensions as &$extension) {
             // Load extension language files and translate extension name.
             ActionlogsHelper::loadTranslationFiles($extension);
diff --git a/plugins/system/cache/src/Extension/Cache.php b/plugins/system/cache/src/Extension/Cache.php
index 80dcf861790e9..6e0a2fb34ad53 100644
--- a/plugins/system/cache/src/Extension/Cache.php
+++ b/plugins/system/cache/src/Extension/Cache.php
@@ -13,6 +13,7 @@
 use Joomla\CMS\Cache\CacheController;
 use Joomla\CMS\Cache\CacheControllerFactoryInterface;
 use Joomla\CMS\Document\FactoryInterface as DocumentFactoryInterface;
+use Joomla\CMS\Event\AbstractEvent;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Profiler\Profiler;
@@ -77,32 +78,32 @@ final class Cache extends CMSPlugin implements SubscriberInterface
     /**
      * Constructor
      *
-     * @param   DispatcherInterface              $subject                 The object to observe
-     * @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).
-     * @param   DocumentFactoryInterface         $documentFactory         The application's
-     *                                                                    document factory
-     * @param   CacheControllerFactoryInterface  $cacheControllerFactory  Cache controller factory
-     * @param   Profiler|null                    $profiler                The application profiler
-     * @param   SiteRouter|null                  $router                  The frontend router
+     * @param   DispatcherInterface              $dispatcher                 The object to observe
+     * @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).
+     * @param   DocumentFactoryInterface         $documentFactory            The application's
+     *                                                                       document factory
+     * @param   CacheControllerFactoryInterface  $cacheControllerFactory     Cache controller factory
+     * @param   Profiler|null                    $profiler                   The application profiler
+     * @param   SiteRouter|null                  $router                     The frontend router
      *
      * @since   4.2.0
      */
     public function __construct(
-        &$subject,
-        $config,
+        DispatcherInterface $dispatcher,
+        array $config,
         DocumentFactoryInterface $documentFactory,
         CacheControllerFactoryInterface $cacheControllerFactory,
         ?Profiler $profiler,
         ?SiteRouter $router
     ) {
-        parent::__construct($subject, $config);
+        parent::__construct($dispatcher, $config);
 
         $this->documentFactory        = $documentFactory;
         $this->cacheControllerFactory = $cacheControllerFactory;
@@ -177,7 +178,12 @@ public function onAfterRoute(Event $event)
                 $this->profiler->mark('afterCache');
             }
 
-            $this->getApplication()->triggerEvent('onAfterRespond');
+            $this->getDispatcher()->dispatch('onAfterRespond', AbstractEvent::create(
+                'onAfterRespond',
+                [
+                    'subject' => $this->getApplication(),
+                ]
+            ));
         }
 
         // Closes the application.
diff --git a/plugins/system/debug/debug.xml b/plugins/system/debug/debug.xml
index 45d44da02dbd2..e279465778950 100644
--- a/plugins/system/debug/debug.xml
+++ b/plugins/system/debug/debug.xml
@@ -11,7 +11,7 @@
 	<description>PLG_DEBUG_XML_DESCRIPTION</description>
 	<namespace path="src">Joomla\Plugin\System\Debug</namespace>
 	<files>
-		<filename plugin="debug">debug.php</filename>
+		<folder plugin="debug">services</folder>
 		<folder>src</folder>
 	</files>
 	<languages>
diff --git a/plugins/system/debug/services/provider.php b/plugins/system/debug/services/provider.php
new file mode 100644
index 0000000000000..8914623efe1e8
--- /dev/null
+++ b/plugins/system/debug/services/provider.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.debug
+ *
+ * @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\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\Event\DispatcherInterface;
+use Joomla\Plugin\System\Debug\Extension\Debug;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                return new Debug(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('system', 'debug'),
+                    Factory::getApplication(),
+                    $container->get(DatabaseInterface::class)
+                );
+            }
+        );
+    }
+};
diff --git a/plugins/system/debug/src/DataCollector/RequestDataCollector.php b/plugins/system/debug/src/DataCollector/RequestDataCollector.php
index 449d861de77d7..3dfd2a11ec72c 100644
--- a/plugins/system/debug/src/DataCollector/RequestDataCollector.php
+++ b/plugins/system/debug/src/DataCollector/RequestDataCollector.php
@@ -10,6 +10,8 @@
 
 namespace Joomla\Plugin\System\Debug\DataCollector;
 
+use Joomla\Plugin\System\Debug\Extension\Debug;
+
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
@@ -39,8 +41,13 @@ public function collect()
 
                 $data = $GLOBALS[$var];
 
+                // Replace Joomla session data from session data, it will be collected by SessionCollector
+                if ($var === '_SESSION' && !empty($data['joomla'])) {
+                    $data['joomla'] = '***redacted***';
+                }
+
                 array_walk_recursive($data, static function (&$value, $key) {
-                    if (!preg_match(\PlgSystemDebug::PROTECTED_COLLECTOR_KEYS, $key)) {
+                    if (!preg_match(Debug::PROTECTED_COLLECTOR_KEYS, $key)) {
                         return;
                     }
 
diff --git a/plugins/system/debug/src/DataCollector/SessionCollector.php b/plugins/system/debug/src/DataCollector/SessionCollector.php
index 5b05379356fc9..c1b166e6c38a9 100644
--- a/plugins/system/debug/src/DataCollector/SessionCollector.php
+++ b/plugins/system/debug/src/DataCollector/SessionCollector.php
@@ -12,6 +12,7 @@
 
 use Joomla\CMS\Factory;
 use Joomla\Plugin\System\Debug\AbstractDataCollector;
+use Joomla\Plugin\System\Debug\Extension\Debug;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -46,7 +47,7 @@ public function collect()
 
         // redact value of potentially secret keys
         array_walk_recursive($sessionData, static function (&$value, $key) {
-            if (!preg_match(\PlgSystemDebug::PROTECTED_COLLECTOR_KEYS, $key)) {
+            if (!preg_match(Debug::PROTECTED_COLLECTOR_KEYS, $key)) {
                 return;
             }
 
diff --git a/plugins/system/debug/debug.php b/plugins/system/debug/src/Extension/Debug.php
similarity index 88%
rename from plugins/system/debug/debug.php
rename to plugins/system/debug/src/Extension/Debug.php
index 87b4b994addc4..f08d726c3ee73 100644
--- a/plugins/system/debug/debug.php
+++ b/plugins/system/debug/src/Extension/Debug.php
@@ -2,14 +2,14 @@
 
 /**
  * @package     Joomla.Plugin
- * @subpackage  System.Debug
+ * @subpackage  System.debug
  *
  * @copyright   (C) 2006 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
+namespace Joomla\Plugin\System\Debug\Extension;
+
 use DebugBar\DataCollector\MemoryCollector;
 use DebugBar\DataCollector\MessagesCollector;
 use DebugBar\DebugBar;
@@ -17,13 +17,16 @@
 use Joomla\Application\ApplicationEvents;
 use Joomla\CMS\Application\CMSApplicationInterface;
 use Joomla\CMS\Document\HtmlDocument;
+use Joomla\CMS\Event\Plugin\AjaxEvent;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Log\LogEntry;
+use Joomla\CMS\Log\Logger\InMemoryLogger;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Profiler\Profiler;
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
-use Joomla\Database\DatabaseDriver;
+use Joomla\Database\DatabaseAwareTrait;
+use Joomla\Database\DatabaseInterface;
 use Joomla\Database\Event\ConnectionEvent;
 use Joomla\Event\DispatcherInterface;
 use Joomla\Event\SubscriberInterface;
@@ -49,8 +52,10 @@
  *
  * @since  1.5
  */
-class PlgSystemDebug extends CMSPlugin implements SubscriberInterface
+final class Debug extends CMSPlugin implements SubscriberInterface
 {
+    use DatabaseAwareTrait;
+
     /**
      * List of protected keys that will be redacted in multiple data collected
      *
@@ -106,22 +111,6 @@ class PlgSystemDebug extends CMSPlugin implements SubscriberInterface
      */
     private $totalQueries = 0;
 
-    /**
-     * Application object.
-     *
-     * @var    CMSApplicationInterface
-     * @since  3.3
-     */
-    protected $app;
-
-    /**
-     * Database object.
-     *
-     * @var    DatabaseDriver
-     * @since  3.8.0
-     */
-    protected $db;
-
     /**
      * @var DebugBar
      * @since 4.0.0
@@ -172,54 +161,57 @@ public static function getSubscribedEvents(): array
     }
 
     /**
-     * Constructor.
-     *
-     * @param   DispatcherInterface  &$subject  The object to observe.
-     * @param   array                $config    An optional associative array of configuration settings.
+     * @param   DispatcherInterface      $dispatcher  The object to observe -- event dispatcher.
+     * @param   array                    $config      An optional associative array of configuration settings.
+     * @param   CMSApplicationInterface  $app         The app
+     * @param   DatabaseInterface        $db          The db
      *
      * @since   1.5
      */
-    public function __construct(&$subject, $config)
+    public function __construct(DispatcherInterface $dispatcher, array $config, CMSApplicationInterface $app, DatabaseInterface $db)
     {
-        parent::__construct($subject, $config);
+        parent::__construct($dispatcher, $config);
+
+        $this->setApplication($app);
+        $this->setDatabase($db);
 
-        $this->debugLang = $this->app->get('debug_lang');
+        $this->debugLang = $this->getApplication()->get('debug_lang');
 
         // Skip the plugin if debug is off
-        if (!$this->debugLang && !$this->app->get('debug')) {
+        if (!$this->debugLang && !$this->getApplication()->get('debug')) {
             return;
         }
 
-        $this->app->getConfig()->set('gzip', false);
+        $this->getApplication()->getConfig()->set('gzip', false);
         ob_start();
         ob_implicit_flush(false);
 
         /** @var \Joomla\Database\Monitor\DebugMonitor */
-        $this->queryMonitor = $this->db->getMonitor();
+        $this->queryMonitor = $this->getDatabase()->getMonitor();
 
         if (!$this->params->get('queries', 1)) {
             // Remove the database driver monitor
-            $this->db->setMonitor(null);
+            $this->getDatabase()->setMonitor(null);
         }
 
         $this->debugBar = new DebugBar();
 
         // Check whether we want to track the request history for future use.
         if ($this->params->get('track_request_history', false)) {
-            $storagePath = JPATH_CACHE . '/plg_system_debug_' . $this->app->getName();
+            $storagePath = JPATH_CACHE . '/plg_system_debug_' . $this->getApplication()->getName();
             $this->debugBar->setStorage(new FileStorage($storagePath));
         }
 
-        $this->debugBar->setHttpDriver(new JoomlaHttpDriver($this->app));
+        $this->debugBar->setHttpDriver(new JoomlaHttpDriver($this->getApplication()));
 
-        $this->isAjax = $this->app->getInput()->get('option') === 'com_ajax'
-            && $this->app->getInput()->get('plugin') === 'debug' && $this->app->getInput()->get('group') === 'system';
+        $this->isAjax = $this->getApplication()->getInput()->get('option') === 'com_ajax'
+            && $this->getApplication()->getInput()->get('plugin') === 'debug' && $this->getApplication()->getInput()->get('group') === 'system';
 
         $this->showLogs = (bool) $this->params->get('logs', true);
 
         // Log deprecated class aliases
-        if ($this->showLogs && $this->app->get('log_deprecated')) {
-            foreach (JLoader::getDeprecatedAliases() as $deprecation) {
+        if ($this->showLogs && $this->getApplication()->get('log_deprecated')) {
+            foreach (\JLoader::getDeprecatedAliases() as $deprecation) {
                 Log::add(
                     sprintf(
                         '%1$s has been aliased to %2$s and the former class name is deprecated. The alias will be removed in %3$s.',
@@ -244,9 +236,9 @@ public function __construct(&$subject, $config)
     public function onBeforeCompileHead()
     {
         // Only if debugging or language debug is enabled.
-        if ((JDEBUG || $this->debugLang) && $this->isAuthorisedDisplayDebug() && $this->app->getDocument() instanceof HtmlDocument) {
+        if ((JDEBUG || $this->debugLang) && $this->isAuthorisedDisplayDebug() && $this->getApplication()->getDocument() instanceof HtmlDocument) {
             // Use our own jQuery and fontawesome instead of the debug bar shipped version
-            $assetManager = $this->app->getDocument()->getWebAssetManager();
+            $assetManager = $this->getApplication()->getDocument()->getWebAssetManager();
             $assetManager->registerAndUseStyle(
                 'plg.system.debug',
                 'plg_system_debug/debug.css',
@@ -265,7 +257,7 @@ public function onBeforeCompileHead()
 
         // Disable asset media version if needed.
         if (JDEBUG && (int) $this->params->get('refresh_assets', 1) === 0) {
-            $this->app->getDocument()->setMediaVersion('');
+            $this->getApplication()->getDocument()->setMediaVersion('');
         }
     }
 
@@ -313,7 +305,7 @@ public function onAfterRespond()
 
             if ($this->params->get('queries', 1)) {
                 // Call $db->disconnect() here to trigger the onAfterDisconnect() method here in this class!
-                $this->db->disconnect();
+                $this->getDatabase()->disconnect();
                 $this->debugBar->addCollector(new QueryCollector($this->params, $this->queryMonitor, $this->sqlShowProfileEach, $this->explains));
             }
 
@@ -329,7 +321,7 @@ public function onAfterRespond()
         }
 
         // Only render for HTML output.
-        if (!($this->app->getDocument() instanceof HtmlDocument)) {
+        if (!($this->getApplication()->getDocument() instanceof HtmlDocument)) {
             $this->debugBar->stackData();
 
             return;
@@ -373,13 +365,13 @@ public function onAfterRespond()
     /**
      * AJAX handler
      *
-     * @param Joomla\Event\Event $event
+     * @param AjaxEvent $event
      *
      * @return  void
      *
      * @since  4.0.0
      */
-    public function onAjaxDebug($event)
+    public function onAjaxDebug(AjaxEvent $event)
     {
         // Do not render if debugging or language debug is not enabled.
         if (!JDEBUG && !$this->debugLang) {
@@ -391,13 +383,12 @@ public function onAjaxDebug($event)
             return;
         }
 
-        switch ($this->app->getInput()->get('action')) {
+        switch ($this->getApplication()->getInput()->get('action')) {
             case 'openhandler':
-                $result  = $event['result'] ?: [];
                 $handler = new OpenHandler($this->debugBar);
+                $result  = $handler->handle($this->getApplication()->getInput()->request->getArray(), false, false);
 
-                $result[]        = $handler->handle($this->app->getInput()->request->getArray(), false, false);
-                $event['result'] = $result;
+                $event->addResult($result);
         }
     }
 
@@ -420,7 +411,7 @@ private function isAuthorisedDisplayDebug(): bool
         $filterGroups = (array) $this->params->get('filter_groups', []);
 
         if (!empty($filterGroups)) {
-            $userGroups = $this->app->getIdentity()->get('groups');
+            $userGroups = $this->getApplication()->getIdentity()->get('groups');
 
             if (!array_intersect($filterGroups, $userGroups)) {
                 $result = false;
@@ -477,7 +468,7 @@ public function onAfterDisconnect(ConnectionEvent $event)
                 } else {
                     $this->sqlShowProfileEach[0] = [['Error' => 'MySql have_profiling = off']];
                 }
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 $this->sqlShowProfileEach[0] = [['Error' => $e->getMessage()]];
             }
         }
@@ -506,7 +497,7 @@ public function onAfterDisconnect(ConnectionEvent $event)
                         }
 
                         $this->explains[$k] = $db->setQuery($queryInstance)->loadAssocList();
-                    } catch (Exception $e) {
+                    } catch (\Exception $e) {
                         $this->explains[$k] = [['error' => $e->getMessage()]];
                     }
                 }
@@ -546,7 +537,7 @@ public function logger(LogEntry $entry)
     private function collectLogs(): self
     {
         $loggerOptions = ['group' => 'default'];
-        $logger        = new Joomla\CMS\Log\Logger\InMemoryLogger($loggerOptions);
+        $logger        = new InMemoryLogger($loggerOptions);
         $logEntries    = $logger->getCollectedEntries();
 
         if (!$this->logEntries && !$logEntries) {
@@ -557,7 +548,7 @@ private function collectLogs(): self
             $logEntries = array_merge($logEntries, $this->logEntries);
         }
 
-        $logDeprecated     = $this->app->get('log_deprecated', 0);
+        $logDeprecated     = $this->getApplication()->get('log_deprecated', 0);
         $logDeprecatedCore = $this->params->get('log-deprecated-core', 0);
 
         $this->debugBar->addCollector(new MessagesCollector('log'));
@@ -708,6 +699,6 @@ public function onBeforeRespond(): void
         // Add the access entry
         $metrics .= 'Access;dur=' . $accessTime . ';desc="Access"';
 
-        $this->app->setHeader('Server-Timing', $metrics);
+        $this->getApplication()->setHeader('Server-Timing', $metrics);
     }
 }
diff --git a/plugins/system/debug/src/JoomlaHttpDriver.php b/plugins/system/debug/src/JoomlaHttpDriver.php
index ca0c128a21680..afdae2ea2880f 100644
--- a/plugins/system/debug/src/JoomlaHttpDriver.php
+++ b/plugins/system/debug/src/JoomlaHttpDriver.php
@@ -11,10 +11,8 @@
 namespace Joomla\Plugin\System\Debug;
 
 use DebugBar\HttpDriverInterface;
-use Joomla\Application\SessionAwareWebApplicationInterface;
 use Joomla\Application\WebApplicationInterface;
 use Joomla\CMS\Application\CMSApplicationInterface;
-use Joomla\CMS\Session\Session;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -34,13 +32,6 @@ final class JoomlaHttpDriver implements HttpDriverInterface
      */
     private $app;
 
-    /**
-     * @var Session
-     *
-     * @since   4.1.5
-     */
-    private $session;
-
     /**
      * @var array
      *
@@ -58,10 +49,6 @@ final class JoomlaHttpDriver implements HttpDriverInterface
     public function __construct(CMSApplicationInterface $app)
     {
         $this->app = $app;
-
-        if ($app instanceof SessionAwareWebApplicationInterface) {
-            $this->session = $app->getSession();
-        }
     }
 
     /**
@@ -89,7 +76,7 @@ public function setHeaders(array $headers)
      */
     public function isSessionStarted()
     {
-        return $this->session ? $this->session->isStarted() : true;
+        return true;
     }
 
     /**
@@ -102,11 +89,7 @@ public function isSessionStarted()
      */
     public function setSessionValue($name, $value)
     {
-        if ($this->session) {
-            $this->session->set($name, $value);
-        } else {
-            $this->dummySession[$name] = $value;
-        }
+        $this->dummySession[$name] = $value;
     }
 
     /**
@@ -120,7 +103,7 @@ public function setSessionValue($name, $value)
      */
     public function hasSessionValue($name)
     {
-        return $this->session ? $this->session->has($name) : array_key_exists($name, $this->dummySession);
+        return array_key_exists($name, $this->dummySession);
     }
 
     /**
@@ -134,10 +117,6 @@ public function hasSessionValue($name)
      */
     public function getSessionValue($name)
     {
-        if ($this->session) {
-            return $this->session->get($name);
-        }
-
         return $this->dummySession[$name] ?? null;
     }
 
@@ -150,10 +129,6 @@ public function getSessionValue($name)
      */
     public function deleteSessionValue($name)
     {
-        if ($this->session) {
-            $this->session->remove($name);
-        } else {
-            unset($this->dummySession[$name]);
-        }
+        unset($this->dummySession[$name]);
     }
 }
diff --git a/plugins/system/fields/fields.xml b/plugins/system/fields/fields.xml
index 93c724dcbaf6c..c2973078b5b42 100644
--- a/plugins/system/fields/fields.xml
+++ b/plugins/system/fields/fields.xml
@@ -9,8 +9,10 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>3.7.0</version>
 	<description>PLG_SYSTEM_FIELDS_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\System\Fields</namespace>
 	<files>
-		<filename plugin="fields">fields.php</filename>
+		<folder plugin="fields">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_system_fields.ini</language>
diff --git a/plugins/system/fields/services/provider.php b/plugins/system/fields/services/provider.php
new file mode 100644
index 0000000000000..aad32ffb11b5a
--- /dev/null
+++ b/plugins/system/fields/services/provider.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.fields
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\User\UserFactoryInterface;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\System\Fields\Extension\Fields;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new Fields(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('system', 'fields')
+                );
+                $plugin->setApplication(Factory::getApplication());
+                $plugin->setUserFactory($container->get(UserFactoryInterface::class));
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/system/fields/fields.php b/plugins/system/fields/src/Extension/Fields.php
similarity index 80%
rename from plugins/system/fields/fields.php
rename to plugins/system/fields/src/Extension/Fields.php
index 150f6d136b63b..957674b431f73 100644
--- a/plugins/system/fields/fields.php
+++ b/plugins/system/fields/src/Extension/Fields.php
@@ -2,18 +2,19 @@
 
 /**
  * @package     Joomla.Plugin
- * @subpackage  System.Fields
+ * @subpackage  System.fields
  *
  * @copyright   (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
-use Joomla\CMS\Factory;
-use Joomla\CMS\Form\Form;
+namespace Joomla\Plugin\System\Fields\Extension;
+
+use Joomla\CMS\Event\Content;
+use Joomla\CMS\Event\Model;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\Component\Fields\Administrator\Helper\FieldsHelper;
 use Joomla\Registry\Registry;
 
@@ -26,8 +27,10 @@
  *
  * @since  3.7
  */
-class PlgSystemFields extends CMSPlugin
+final class Fields extends CMSPlugin
 {
+    use UserFactoryAwareTrait;
+
     /**
      * Load the language file on instantiation.
      *
@@ -39,16 +42,18 @@ class PlgSystemFields extends CMSPlugin
     /**
      * Normalizes the request data.
      *
-     * @param   string  $context  The context
-     * @param   object  $data     The object
-     * @param   Form    $form     The form
+     * @param   Model\NormaliseRequestDataEvent  $event  The event object
      *
      * @return  void
      *
      * @since   3.8.7
      */
-    public function onContentNormaliseRequestData($context, $data, Form $form)
+    public function onContentNormaliseRequestData(Model\NormaliseRequestDataEvent $event)
     {
+        $context = $event->getContext();
+        $data    = $event->getData();
+        $form    = $event->getForm();
+
         if (!FieldsHelper::extract($context, $data)) {
             return;
         }
@@ -127,7 +132,7 @@ public function onContentAfterSave($context, $item, $isNew, $data = []): void
         // Loading the model
 
         /** @var \Joomla\Component\Fields\Administrator\Model\FieldModel $model */
-        $model = Factory::getApplication()->bootComponent('com_fields')->getMVCFactory()
+        $model = $this->getApplication()->bootComponent('com_fields')->getMVCFactory()
             ->createModel('Field', 'Administrator', ['ignore_request' => true]);
 
         // Loop over the fields
@@ -175,9 +180,9 @@ public function onUserAfterSave($userData, $isNew, $success, $msg): void
             return;
         }
 
-        $user = Factory::getUser($userData['id']);
+        $user = $this->getUserFactory()->loadUserById($userData['id']);
 
-        $task = Factory::getApplication()->getInput()->getCmd('task');
+        $task = $this->getApplication()->getInput()->getCmd('task');
 
         // Skip fields save when we activate a user, because we will lose the saved data
         if (in_array($task, ['activate', 'block', 'unblock'])) {
@@ -192,7 +197,7 @@ public function onUserAfterSave($userData, $isNew, $success, $msg): void
      * The delete event.
      *
      * @param   string    $context  The context
-     * @param   stdClass  $item     The item
+     * @param   \stdClass  $item     The item
      *
      * @return  void
      *
@@ -214,7 +219,7 @@ public function onContentAfterDelete($context, $item): void
         $context = $parts[0] . '.' . $parts[1];
 
         /** @var \Joomla\Component\Fields\Administrator\Model\FieldModel $model */
-        $model = Factory::getApplication()->bootComponent('com_fields')->getMVCFactory()
+        $model = $this->getApplication()->bootComponent('com_fields')->getMVCFactory()
             ->createModel('Field', 'Administrator', ['ignore_request' => true]);
         $model->cleanupValues($context, $item->id);
     }
@@ -222,7 +227,7 @@ public function onContentAfterDelete($context, $item): void
     /**
      * The user delete event.
      *
-     * @param   stdClass  $user    The context
+     * @param   \stdClass  $user    The context
      * @param   boolean   $success Is success
      * @param   string    $msg     The message
      *
@@ -232,7 +237,7 @@ public function onContentAfterDelete($context, $item): void
      */
     public function onUserAfterDelete($user, $success, $msg): void
     {
-        $item     = new stdClass();
+        $item     = new \stdClass();
         $item->id = $user['id'];
 
         $this->onContentAfterDelete('com_users.user', $item);
@@ -241,21 +246,22 @@ public function onUserAfterDelete($user, $success, $msg): void
     /**
      * The form event.
      *
-     * @param   Form      $form  The form
-     * @param   stdClass  $data  The data
+     * @param   Model\PrepareFormEvent  $event  The event object
      *
-     * @return  boolean
+     * @return  void
      *
      * @since   3.7.0
      */
-    public function onContentPrepareForm(Form $form, $data)
+    public function onContentPrepareForm(Model\PrepareFormEvent $event)
     {
+        $form    = $event->getForm();
+        $data    = $event->getData();
         $context = $form->getName();
 
         // When a category is edited, the context is com_categories.categorycom_content
         if (strpos($context, 'com_categories.category') === 0) {
             $context = str_replace('com_categories.category', '', $context) . '.categories';
-            $data    = $data ?: Factory::getApplication()->getInput()->get('jform', [], 'array');
+            $data    = $data ?: $this->getApplication()->getInput()->get('jform', [], 'array');
 
             // Set the catid on the category to get only the fields which belong to this category
             if (is_array($data) && array_key_exists('id', $data)) {
@@ -270,10 +276,10 @@ public function onContentPrepareForm(Form $form, $data)
         $parts = FieldsHelper::extract($context, $form);
 
         if (!$parts) {
-            return true;
+            return;
         }
 
-        $input = Factory::getApplication()->getInput();
+        $input = $this->getApplication()->getInput();
 
         // If we are on the save command we need the actual data
         $jformData = $input->get('jform', [], 'array');
@@ -287,66 +293,55 @@ public function onContentPrepareForm(Form $form, $data)
         }
 
         FieldsHelper::prepareForm($parts[0] . '.' . $parts[1], $form, $data);
-
-        return true;
     }
 
     /**
      * The display event.
      *
-     * @param   string    $context     The context
-     * @param   stdClass  $item        The item
-     * @param   Registry  $params      The params
-     * @param   integer   $limitstart  The start
+     * @param   Content\AfterTitleEvent  $event  The event object
      *
-     * @return  string
+     * @return  void
      *
      * @since   3.7.0
      */
-    public function onContentAfterTitle($context, $item, $params, $limitstart = 0)
+    public function onContentAfterTitle(Content\AfterTitleEvent $event)
     {
-        return $this->display($context, $item, $params, 1);
+        $event->addResult($this->display($event->getContext(), $event->getItem(), $event->getParams(), 1));
     }
 
     /**
      * The display event.
      *
-     * @param   string    $context     The context
-     * @param   stdClass  $item        The item
-     * @param   Registry  $params      The params
-     * @param   integer   $limitstart  The start
+     * @param   Content\BeforeDisplayEvent  $event  The event object
      *
-     * @return  string
+     * @return  void
      *
      * @since   3.7.0
      */
-    public function onContentBeforeDisplay($context, $item, $params, $limitstart = 0)
+    public function onContentBeforeDisplay(Content\BeforeDisplayEvent $event)
     {
-        return $this->display($context, $item, $params, 2);
+        $event->addResult($this->display($event->getContext(), $event->getItem(), $event->getParams(), 2));
     }
 
     /**
      * The display event.
      *
-     * @param   string    $context     The context
-     * @param   stdClass  $item        The item
-     * @param   Registry  $params      The params
-     * @param   integer   $limitstart  The start
+     * @param   Content\AfterDisplayEvent  $event  The event object
      *
-     * @return  string
+     * @return  void
      *
      * @since   3.7.0
      */
-    public function onContentAfterDisplay($context, $item, $params, $limitstart = 0)
+    public function onContentAfterDisplay(Content\AfterDisplayEvent $event)
     {
-        return $this->display($context, $item, $params, 3);
+        $event->addResult($this->display($event->getContext(), $event->getItem(), $event->getParams(), 3));
     }
 
     /**
      * Performs the display event.
      *
      * @param   string    $context      The context
-     * @param   stdClass  $item         The item
+     * @param   \stdClass  $item         The item
      * @param   Registry  $params       The params
      * @param   integer   $displayType  The type
      *
@@ -384,10 +379,8 @@ private function display($context, $item, $params, $displayType)
         $fields = FieldsHelper::getFields($context, $item, $displayType);
 
         if ($fields) {
-            $app = Factory::getApplication();
-
-            if ($app->isClient('site') && Multilanguage::isEnabled() && isset($item->language) && $item->language === '*') {
-                $lang = $app->getLanguage()->getTag();
+            if ($this->getApplication()->isClient('site') && Multilanguage::isEnabled() && isset($item->language) && $item->language === '*') {
+                $lang = $this->getApplication()->getLanguage()->getTag();
 
                 foreach ($fields as $key => $field) {
                     if ($field->language === '*' || $field->language == $lang) {
@@ -429,15 +422,17 @@ private function display($context, $item, $params, $displayType)
     /**
      * Performs the display event.
      *
-     * @param   string    $context  The context
-     * @param   stdClass  $item     The item
+     * @param   Content\ContentPrepareEvent  $event  The event object
      *
      * @return  void
      *
      * @since   3.7.0
      */
-    public function onContentPrepare($context, $item)
+    public function onContentPrepare(Content\ContentPrepareEvent $event)
     {
+        $context = $event->getContext();
+        $item    = $event->getItem();
+
         // Check property exists (avoid costly & useless recreation), if need to recreate them, just unset the property!
         if (isset($item->jcfields)) {
             return;
@@ -474,7 +469,7 @@ public function onContentPrepare($context, $item)
     /**
      * Prepares a tag item to be ready for com_fields.
      *
-     * @param   stdClass  $item  The item
+     * @param   \stdClass  $item  The item
      *
      * @return  object
      *
diff --git a/plugins/system/guidedtours/guidedtours.xml b/plugins/system/guidedtours/guidedtours.xml
index 5fe7238e1ed5b..a94cc3b44183b 100644
--- a/plugins/system/guidedtours/guidedtours.xml
+++ b/plugins/system/guidedtours/guidedtours.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<extension version="4.0" type="plugin" group="system" method="upgrade">
-    <name>plg_system_guidedtours</name>
-    <author>Joomla! Project</author>
-    <creationDate>2023-02</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>4.3.0</version>
-    <description>PLG_SYSTEM_GUIDEDTOURS_DESCRIPTION</description>
+<extension type="plugin" group="system" method="upgrade">
+	<name>plg_system_guidedtours</name>
+	<author>Joomla! Project</author>
+	<creationDate>2023-02</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>4.3.0</version>
+	<description>PLG_SYSTEM_GUIDEDTOURS_DESCRIPTION</description>
 	<namespace path="src">Joomla\Plugin\System\GuidedTours</namespace>
-    <files>
-		<folder>services</folder>
+	<files>
+		<folder plugin="guidedtours">services</folder>
 		<folder>src</folder>
-    </files>
-    <languages>
-        <language tag="en-GB">language/en-GB/plg_system_guidedtours.ini</language>
-        <language tag="en-GB">language/en-GB/plg_system_guidedtours.sys.ini</language>
-    </languages>
+	</files>
+	<languages>
+		<language tag="en-GB">language/en-GB/plg_system_guidedtours.ini</language>
+		<language tag="en-GB">language/en-GB/plg_system_guidedtours.sys.ini</language>
+	</languages>
 </extension>
diff --git a/plugins/system/guidedtours/services/provider.php b/plugins/system/guidedtours/services/provider.php
index 256cd38c939eb..10ebbfa80bc44 100644
--- a/plugins/system/guidedtours/services/provider.php
+++ b/plugins/system/guidedtours/services/provider.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\Application\ApplicationInterface;
 use Joomla\CMS\Extension\PluginInterface;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\PluginHelper;
@@ -35,11 +34,10 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $app        = Factory::getApplication();
 
                 $plugin = new GuidedTours(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('system', 'guidedtours'),
                     $app->isClient('administrator')
                 );
diff --git a/plugins/system/guidedtours/src/Extension/GuidedTours.php b/plugins/system/guidedtours/src/Extension/GuidedTours.php
index fac0b2a210259..0c73365ba8f10 100644
--- a/plugins/system/guidedtours/src/Extension/GuidedTours.php
+++ b/plugins/system/guidedtours/src/Extension/GuidedTours.php
@@ -66,18 +66,18 @@ final class GuidedTours extends CMSPlugin implements SubscriberInterface
     /**
      * Constructor
      *
-     * @param   DispatcherInterface  $subject  The object to observe
-     * @param   array                $config   An optional associative array of configuration settings.
-     * @param   boolean              $enabled  An internal flag whether plugin should listen any event.
+     * @param   DispatcherInterface  $dispatcher  The object to observe
+     * @param   array                $config      An optional associative array of configuration settings.
+     * @param   boolean              $enabled     An internal flag whether plugin should listen any event.
      *
      * @since   4.3.0
      */
-    public function __construct($subject, array $config = [], bool $enabled = false)
+    public function __construct(DispatcherInterface $dispatcher, array $config = [], bool $enabled = false)
     {
         $this->autoloadLanguage = $enabled;
         self::$enabled          = $enabled;
 
-        parent::__construct($subject, $config);
+        parent::__construct($dispatcher, $config);
     }
 
     /**
@@ -104,17 +104,16 @@ public static function getSubscribedEvents(): array
      */
     public function startTour(Event $event)
     {
-        $tourId = (int) $this->getApplication()->getInput()->getInt('id');
+        $tourId  = (int) $this->getApplication()->getInput()->getInt('id');
+        $tourUid = $this->getApplication()->getInput()->getString('uid', '');
+        $tourUid = $tourUid !== '' ? urldecode($tourUid) : '';
 
-        $activeTourId = null;
-        $tour         = null;
+        $tour = null;
 
         if ($tourId > 0) {
             $tour = $this->getTour($tourId);
-
-            if (!empty($tour->id)) {
-                $activeTourId = $tour->id;
-            }
+        } elseif ($tourUid !== '') {
+            $tour = $this->getTour($tourUid);
         }
 
         $event->setArgument('result', $tour ?? new \stdClass());
@@ -156,18 +155,16 @@ public function onBeforeCompileHead()
     /**
      * Get a tour and its steps or null if not found
      *
-     * @param   integer  $tourId  The ID of the tour to load
+     * @param   integer|string  $tourId  The ID or Uid of the tour to load
      *
      * @return null|object
      *
      * @since   4.3.0
      */
-    private function getTour(int $tourId)
+    private function getTour($tourId)
     {
         $app = $this->getApplication();
 
-        $user = $app->getIdentity();
-
         $factory = $app->bootComponent('com_guidedtours')->getMVCFactory();
 
         $tourModel = $factory->createModel(
@@ -178,6 +175,25 @@ private function getTour(int $tourId)
 
         $item = $tourModel->getItem($tourId);
 
+        return $this->processTour($item);
+    }
+
+    /**
+     * Return a tour and its steps or null if not found
+     *
+     * @param   TourTable  $item  The tour to load
+     *
+     * @return null|object
+     *
+     * @since   5.0.0
+     */
+    private function processTour($item)
+    {
+        $app = $this->getApplication();
+
+        $user    = $app->getIdentity();
+        $factory = $app->bootComponent('com_guidedtours')->getMVCFactory();
+
         if (empty($item->id) || $item->published < 1 || !in_array($item->access, $user->getAuthorisedViewLevels())) {
             return null;
         }
@@ -205,8 +221,8 @@ private function getTour(int $tourId)
         $temp = new \stdClass();
 
         $temp->id          = 0;
-        $temp->title       = Text::_($item->title);
-        $temp->description = Text::_($item->description);
+        $temp->title       = $this->getApplication()->getLanguage()->_($item->title);
+        $temp->description = $this->getApplication()->getLanguage()->_($item->description);
         $temp->url         = $item->url;
 
         // Replace 'images/' to '../images/' when using an image from /images in backend.
@@ -218,13 +234,15 @@ private function getTour(int $tourId)
             $temp = new \stdClass();
 
             $temp->id               = $i + 1;
-            $temp->title            = Text::_($step->title);
-            $temp->description      = Text::_($step->description);
+            $temp->title            = $this->getApplication()->getLanguage()->_($step->title);
+            $temp->description      = $this->getApplication()->getLanguage()->_($step->description);
             $temp->position         = $step->position;
             $temp->target           = $step->target;
             $temp->type             = $this->stepType[$step->type];
             $temp->interactive_type = $this->stepInteractiveType[$step->interactive_type];
             $temp->url              = $step->url;
+            $temp->tour_id          = $step->tour_id;
+            $temp->step_id          = $step->id;
 
             // Replace 'images/' to '../images/' when using an image from /images in backend.
             $temp->description = preg_replace('*src\=\"(?!administrator\/)images/*', 'src="../images/', $temp->description);
diff --git a/plugins/system/highlight/highlight.xml b/plugins/system/highlight/highlight.xml
index f3542aba8ec9b..02baf3122c569 100644
--- a/plugins/system/highlight/highlight.xml
+++ b/plugins/system/highlight/highlight.xml
@@ -9,8 +9,10 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>3.0.0</version>
 	<description>PLG_SYSTEM_HIGHLIGHT_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\System\Highlight</namespace>
 	<files>
-		<filename plugin="highlight">highlight.php</filename>
+		<folder plugin="highlight">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_system_highlight.ini</language>
diff --git a/plugins/system/highlight/services/provider.php b/plugins/system/highlight/services/provider.php
new file mode 100644
index 0000000000000..dac70279823fe
--- /dev/null
+++ b/plugins/system/highlight/services/provider.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.highlight
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\System\Highlight\Extension\Highlight;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new Highlight(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('system', 'highlight')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/system/highlight/highlight.php b/plugins/system/highlight/src/Extension/Highlight.php
similarity index 84%
rename from plugins/system/highlight/highlight.php
rename to plugins/system/highlight/src/Extension/Highlight.php
index 0121ccbde6594..15cb84d5f3537 100644
--- a/plugins/system/highlight/highlight.php
+++ b/plugins/system/highlight/src/Extension/Highlight.php
@@ -2,16 +2,15 @@
 
 /**
  * @package     Joomla.Plugin
- * @subpackage  System.Highlight
+ * @subpackage  System.highlight
  *
  * @copyright   (C) 2011 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
+namespace Joomla\Plugin\System\Highlight\Extension;
+
 use Joomla\CMS\Component\ComponentHelper;
-use Joomla\CMS\Factory;
 use Joomla\CMS\Filter\InputFilter;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\Component\Finder\Administrator\Indexer\Result;
@@ -25,16 +24,8 @@
  *
  * @since  2.5
  */
-class PlgSystemHighlight extends CMSPlugin
+final class Highlight extends CMSPlugin
 {
-    /**
-     * Application object.
-     *
-     * @var    \Joomla\CMS\Application\CMSApplication
-     * @since  3.7.0
-     */
-    protected $app;
-
     /**
      * Method to catch the onAfterDispatch event.
      *
@@ -49,12 +40,12 @@ class PlgSystemHighlight extends CMSPlugin
     public function onAfterDispatch()
     {
         // Check that we are in the site application.
-        if (!$this->app->isClient('site')) {
+        if (!$this->getApplication()->isClient('site')) {
             return;
         }
 
         // Set the variables.
-        $input     = $this->app->getInput();
+        $input     = $this->getApplication()->getInput();
         $extension = $input->get('option', '', 'cmd');
 
         // Check if the highlighter is enabled.
@@ -63,7 +54,7 @@ public function onAfterDispatch()
         }
 
         // Check if the highlighter should be activated in this environment.
-        if ($input->get('tmpl', '', 'cmd') === 'component' || $this->app->getDocument()->getType() !== 'html') {
+        if ($input->get('tmpl', '', 'cmd') === 'component' || $this->getApplication()->getDocument()->getType() !== 'html') {
             return;
         }
 
@@ -85,10 +76,11 @@ public function onAfterDispatch()
             $cleanTerms[] = htmlspecialchars($filter->clean($term, 'string'));
         }
 
+        /** @var \Joomla\CMS\Document\HtmlDocument $doc */
+        $doc = $this->getApplication()->getDocument();
+
         // Activate the highlighter.
         if (!empty($cleanTerms)) {
-            $doc = Factory::getDocument();
-
             $doc->getWebAssetManager()->useScript('highlight');
             $doc->addScriptOptions(
                 'highlight',
@@ -100,8 +92,6 @@ public function onAfterDispatch()
         }
 
         // Adjust the component buffer.
-        /** @var \Joomla\CMS\Document\HtmlDocument $doc */
-        $doc = $this->app->getDocument();
         $buf = $doc->getBuffer('component');
         $buf = '<div class="js-highlight">' . $buf . '</div>';
         $doc->setBuffer($buf, 'component');
@@ -111,7 +101,7 @@ public function onAfterDispatch()
      * Method to catch the onFinderResult event.
      *
      * @param   Result  $item   The search result
-     * @param   array   $query  The search query of this result
+     * @param   object  $query  The search query of this result
      *
      * @return  void
      *
diff --git a/plugins/system/httpheaders/httpheaders.xml b/plugins/system/httpheaders/httpheaders.xml
index fe709d1add099..46199572adfe5 100644
--- a/plugins/system/httpheaders/httpheaders.xml
+++ b/plugins/system/httpheaders/httpheaders.xml
@@ -9,9 +9,11 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>4.0.0</version>
 	<description>PLG_SYSTEM_HTTPHEADERS_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\System\Httpheaders</namespace>
 	<files>
 		<folder>postinstall</folder>
-		<filename plugin="httpheaders">httpheaders.php</filename>
+		<folder plugin="httpheaders">services</folder>
+		<folder>src</folder>
 	</files>
 	<config>
 		<fields name="params">
diff --git a/plugins/system/httpheaders/services/provider.php b/plugins/system/httpheaders/services/provider.php
new file mode 100644
index 0000000000000..20d631c0b05a7
--- /dev/null
+++ b/plugins/system/httpheaders/services/provider.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.httpheaders
+ *
+ * @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\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\Event\DispatcherInterface;
+use Joomla\Plugin\System\Httpheaders\Extension\Httpheaders;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new Httpheaders(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('system', 'httpheaders'),
+                    Factory::getApplication()
+                );
+                $plugin->setDatabase($container->get(DatabaseInterface::class));
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/system/httpheaders/httpheaders.php b/plugins/system/httpheaders/src/Extension/Httpheaders.php
similarity index 89%
rename from plugins/system/httpheaders/httpheaders.php
rename to plugins/system/httpheaders/src/Extension/Httpheaders.php
index 6385b1ff85b66..3fae7cdc3e211 100644
--- a/plugins/system/httpheaders/httpheaders.php
+++ b/plugins/system/httpheaders/src/Extension/Httpheaders.php
@@ -2,18 +2,18 @@
 
 /**
  * @package     Joomla.Plugin
- * @subpackage  System.HttpHeaders
+ * @subpackage  System.httpheaders
  *
  * @copyright   (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
-use Joomla\CMS\Application\CMSApplication;
+namespace Joomla\Plugin\System\Httpheaders\Extension;
+
+use Joomla\CMS\Application\CMSApplicationInterface;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Uri\Uri;
-use Joomla\Database\DatabaseDriver;
+use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Event\DispatcherInterface;
 use Joomla\Event\Event;
 use Joomla\Event\SubscriberInterface;
@@ -27,23 +27,9 @@
  *
  * @since  4.0.0
  */
-class PlgSystemHttpHeaders extends CMSPlugin implements SubscriberInterface
+final class Httpheaders extends CMSPlugin implements SubscriberInterface
 {
-    /**
-     * Application object.
-     *
-     * @var    CMSApplication
-     * @since  4.0.0
-     */
-    protected $app;
-
-    /**
-     * Database object.
-     *
-     * @var    DatabaseDriver
-     * @since  4.0.0
-     */
-    protected $db;
+    use DatabaseAwareTrait;
 
     /**
      * The generated csp nonce value
@@ -133,16 +119,17 @@ class PlgSystemHttpHeaders extends CMSPlugin implements SubscriberInterface
     ];
 
     /**
-     * Constructor.
-     *
-     * @param   DispatcherInterface  $subject  The object to observe.
-     * @param   array                $config   An optional associative array of configuration settings.
+     * @param   DispatcherInterface      $dispatcher  The object to observe -- event dispatcher.
+     * @param   array                    $config      An optional associative array of configuration settings.
+     * @param   CMSApplicationInterface  $app         The app
      *
      * @since   4.0.0
      */
-    public function __construct(&$subject, $config)
+    public function __construct(DispatcherInterface $dispatcher, array $config, CMSApplicationInterface $app)
     {
-        parent::__construct($subject, $config);
+        parent::__construct($dispatcher, $config);
+
+        $this->setApplication($app);
 
         $nonceEnabled = (int) $this->params->get('nonce_enabled', 0);
 
@@ -152,7 +139,7 @@ public function __construct(&$subject, $config)
         }
 
         // Set the nonce, when not set we set it to NULL which is checked down the line
-        $this->app->set('csp_nonce', $this->cspNonce);
+        $this->getApplication()->set('csp_nonce', $this->cspNonce);
     }
 
     /**
@@ -180,7 +167,7 @@ public static function getSubscribedEvents(): array
     public function applyHashesToCspRule(Event $event): void
     {
         // CSP is only relevant on html pages. Let's early exit here.
-        if ($this->app->getDocument()->getType() !== 'html') {
+        if ($this->getApplication()->getDocument()->getType() !== 'html') {
             return;
         }
 
@@ -192,7 +179,7 @@ public function applyHashesToCspRule(Event $event): void
             return;
         }
 
-        $headData     = $this->app->getDocument()->getHeadData();
+        $headData     = $this->getApplication()->getDocument()->getHeadData();
         $scriptHashes = [];
         $styleHashes  = [];
 
@@ -219,7 +206,7 @@ public function applyHashesToCspRule(Event $event): void
         }
 
         // Replace the hashes in the csp header when set.
-        $headers = $this->app->getHeaders();
+        $headers = $this->getApplication()->getHeaders();
 
         foreach ($headers as $id => $headerConfiguration) {
             if (
@@ -240,7 +227,7 @@ public function applyHashesToCspRule(Event $event): void
                     $newHeaderValue = str_replace('{style-hashes}', '', $newHeaderValue);
                 }
 
-                $this->app->setHeader($headerConfiguration['name'], $newHeaderValue, true);
+                $this->getApplication()->setHeader($headerConfiguration['name'], $newHeaderValue, true);
             }
         }
     }
@@ -262,7 +249,7 @@ public function setHttpHeaders(Event $event): void
         $cspClient  = (string) $this->params->get('contentsecuritypolicy_client', 'site');
 
         // Check whether CSP is enabled and enabled by the current client
-        if ($cspEnabled && ($this->app->isClient($cspClient) || $cspClient === 'both')) {
+        if ($cspEnabled && ($this->getApplication()->isClient($cspClient) || $cspClient === 'both')) {
             $this->setCspHeader();
         }
     }
@@ -290,7 +277,7 @@ private function setCspHeader(): void
 
         foreach ($cspValues as $cspValue) {
             // Handle the client settings foreach header
-            if (!$this->app->isClient($cspValue->client) && $cspValue->client != 'both') {
+            if (!$this->getApplication()->isClient($cspValue->client) && $cspValue->client != 'both') {
                 continue;
             }
 
@@ -353,7 +340,7 @@ private function setCspHeader(): void
             return;
         }
 
-        $this->app->setHeader($cspHeader, trim(implode('; ', $newCspValues)));
+        $this->getApplication()->setHeader($cspHeader, trim(implode('; ', $newCspValues)));
     }
 
     /**
@@ -455,11 +442,11 @@ private function setStaticHeaders(): void
             $header          = $headerAndClient[0];
             $client          = $headerAndClient[1] ?? 'both';
 
-            if (!$this->app->isClient($client) && $client != 'both') {
+            if (!$this->getApplication()->isClient($client) && $client != 'both') {
                 continue;
             }
 
-            $this->app->setHeader($header, $value, true);
+            $this->getApplication()->setHeader($header, $value, true);
         }
     }
 }
diff --git a/plugins/system/jooa11y/jooa11y.xml b/plugins/system/jooa11y/jooa11y.xml
index c63d75b6172df..eb40c363d6ce3 100644
--- a/plugins/system/jooa11y/jooa11y.xml
+++ b/plugins/system/jooa11y/jooa11y.xml
@@ -9,8 +9,10 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>4.2.0</version>
 	<description>PLG_SYSTEM_JOOA11Y_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\System\Jooa11y</namespace>
 	<files>
-		<filename plugin="jooa11y">jooa11y.php</filename>
+		<folder plugin="jooa11y">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_system_jooa11y.ini</language>
diff --git a/plugins/system/jooa11y/services/provider.php b/plugins/system/jooa11y/services/provider.php
new file mode 100644
index 0000000000000..156e063fd1191
--- /dev/null
+++ b/plugins/system/jooa11y/services/provider.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.jooa11y
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+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 {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new Jooa11y(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('system', 'jooa11y')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/system/jooa11y/jooa11y.php b/plugins/system/jooa11y/src/Extension/Jooa11y.php
similarity index 91%
rename from plugins/system/jooa11y/jooa11y.php
rename to plugins/system/jooa11y/src/Extension/Jooa11y.php
index 83f2d5ab83fdd..beea24c74bf42 100644
--- a/plugins/system/jooa11y/jooa11y.php
+++ b/plugins/system/jooa11y/src/Extension/Jooa11y.php
@@ -6,12 +6,10 @@
  *
  * @copyright   (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
-use Joomla\CMS\Application\CMSApplicationInterface;
-use Joomla\CMS\Factory;
+namespace Joomla\Plugin\System\Jooa11y\Extension;
+
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\Event\SubscriberInterface;
@@ -25,16 +23,8 @@
  *
  * @since  4.1.0
  */
-class PlgSystemJooa11y extends CMSPlugin implements SubscriberInterface
+final class Jooa11y extends CMSPlugin implements SubscriberInterface
 {
-    /**
-     * Application object.
-     *
-     * @var    CMSApplicationInterface
-     * @since  4.1.0
-     */
-    protected $app;
-
     /**
      * Affects constructor behavior. If true, language files will be loaded automatically.
      *
@@ -54,14 +44,7 @@ class PlgSystemJooa11y extends CMSPlugin implements SubscriberInterface
      */
     public static function getSubscribedEvents(): array
     {
-        $mapping = [];
-
-        // Only trigger in frontend
-        if (Factory::getApplication()->isClient('site')) {
-            $mapping['onBeforeCompileHead'] = 'initJooa11y';
-        }
-
-        return $mapping;
+        return ['onBeforeCompileHead' => 'initJooa11y'];
     }
 
     /**
@@ -83,7 +66,7 @@ private function isAuthorisedDisplayChecker(): bool
         $filterGroups = (array) $this->params->get('filter_groups', []);
 
         if (!empty($filterGroups)) {
-            $userGroups = $this->app->getIdentity()->get('groups');
+            $userGroups = $this->getApplication()->getIdentity()->get('groups');
 
             if (!array_intersect($filterGroups, $userGroups)) {
                 $result = false;
@@ -106,8 +89,12 @@ private function isAuthorisedDisplayChecker(): bool
      */
     public function initJooa11y()
     {
+        if (!$this->getApplication()->isClient('site')) {
+            return;
+        }
+
         // Check if we are in a preview modal or the plugin has enforced loading
-        $showJooa11y = $this->app->getInput()->get('jooa11y', $this->params->get('showAlways', 0));
+        $showJooa11y = $this->getApplication()->getInput()->get('jooa11y', $this->params->get('showAlways', 0));
 
         // Load the checker if authorised
         if (!$showJooa11y || !$this->isAuthorisedDisplayChecker()) {
@@ -115,13 +102,7 @@ public function initJooa11y()
         }
 
         // Get the document object.
-        $document = $this->app->getDocument();
-
-        // Determine if it is an LTR or RTL language
-        $direction = Factory::getLanguage()->isRtl() ? 'right' : 'left';
-
-        // Detect the current active language
-        $lang = Factory::getLanguage()->getTag();
+        $document = $this->getApplication()->getDocument();
 
         // Add plugin settings from the xml
         $document->addScriptOptions(
diff --git a/plugins/system/languagecode/languagecode.xml b/plugins/system/languagecode/languagecode.xml
index a8bdf6e8f235e..7a92b405bf58c 100644
--- a/plugins/system/languagecode/languagecode.xml
+++ b/plugins/system/languagecode/languagecode.xml
@@ -9,8 +9,10 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>3.0.0</version>
 	<description>PLG_SYSTEM_LANGUAGECODE_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\System\LanguageCode</namespace>
 	<files>
-		<filename plugin="languagecode">languagecode.php</filename>
+		<folder plugin="languagecode">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_system_languagecode.ini</language>
diff --git a/plugins/system/languagecode/services/provider.php b/plugins/system/languagecode/services/provider.php
new file mode 100644
index 0000000000000..4c0a5dd973100
--- /dev/null
+++ b/plugins/system/languagecode/services/provider.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.languagecode
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\System\LanguageCode\Extension\LanguageCode;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new LanguageCode(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('system', 'languagecode')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/system/languagecode/languagecode.php b/plugins/system/languagecode/src/Extension/LanguageCode.php
similarity index 90%
rename from plugins/system/languagecode/languagecode.php
rename to plugins/system/languagecode/src/Extension/LanguageCode.php
index 37bc345080d43..27420df0660d7 100644
--- a/plugins/system/languagecode/languagecode.php
+++ b/plugins/system/languagecode/src/Extension/LanguageCode.php
@@ -6,10 +6,10 @@
  *
  * @copyright   (C) 2011 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
+namespace Joomla\Plugin\System\LanguageCode\Extension;
+
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
@@ -24,16 +24,8 @@
  *
  * @since  2.5
  */
-class PlgSystemLanguagecode extends CMSPlugin
+final class LanguageCode extends CMSPlugin
 {
-    /**
-     * Application object
-     *
-     * @var    \Joomla\CMS\Application\CMSApplication
-     * @since  4.0.0
-     */
-    protected $app;
-
     /**
      * Plugin that changes the language code used in the <html /> tag.
      *
@@ -44,12 +36,12 @@ class PlgSystemLanguagecode extends CMSPlugin
     public function onAfterRender()
     {
         // Use this plugin only in site application.
-        if ($this->app->isClient('site')) {
+        if ($this->getApplication()->isClient('site')) {
             // Get the response body.
-            $body = $this->app->getBody();
+            $body = $this->getApplication()->getBody();
 
             // Get the current language code.
-            $code = $this->app->getDocument()->getLanguage();
+            $code = $this->getApplication()->getDocument()->getLanguage();
 
             // Get the new code.
             $new_code  = $this->params->get($code);
@@ -105,7 +97,7 @@ public function onAfterRender()
                 }
             }
 
-            $this->app->setBody(preg_replace($patterns, $replace, $body));
+            $this->getApplication()->setBody(preg_replace($patterns, $replace, $body));
         }
     }
 
diff --git a/plugins/system/languagefilter/languagefilter.xml b/plugins/system/languagefilter/languagefilter.xml
index 6be593dfb1129..fb697bde69a9f 100644
--- a/plugins/system/languagefilter/languagefilter.xml
+++ b/plugins/system/languagefilter/languagefilter.xml
@@ -9,8 +9,10 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>3.0.0</version>
 	<description>PLG_SYSTEM_LANGUAGEFILTER_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\System\LanguageFilter</namespace>
 	<files>
-		<filename plugin="languagefilter">languagefilter.php</filename>
+		<folder plugin="languagefilter">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_system_languagefilter.ini</language>
diff --git a/plugins/system/languagefilter/services/provider.php b/plugins/system/languagefilter/services/provider.php
new file mode 100644
index 0000000000000..f952f98ee621d
--- /dev/null
+++ b/plugins/system/languagefilter/services/provider.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.languagefilter
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\LanguageFactoryInterface;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\Router\SiteRouter;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\System\LanguageFilter\Extension\LanguageFilter;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin = new LanguageFilter(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('system', 'languagefilter'),
+                    Factory::getApplication(),
+                    $container->get(LanguageFactoryInterface::class)
+                );
+                $plugin->setSiteRouter($container->get(SiteRouter::class));
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/system/languagefilter/languagefilter.php b/plugins/system/languagefilter/src/Extension/LanguageFilter.php
similarity index 81%
rename from plugins/system/languagefilter/languagefilter.php
rename to plugins/system/languagefilter/src/Extension/LanguageFilter.php
index 1557cd57cc5f2..66716be0246e5 100644
--- a/plugins/system/languagefilter/languagefilter.php
+++ b/plugins/system/languagefilter/src/Extension/LanguageFilter.php
@@ -6,27 +6,28 @@
  *
  * @copyright   (C) 2010 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
+namespace Joomla\Plugin\System\LanguageFilter\Extension;
+
 use Joomla\CMS\Application\ApplicationHelper;
-use Joomla\CMS\Application\CMSWebApplicationInterface;
+use Joomla\CMS\Application\CMSApplicationInterface;
 use Joomla\CMS\Association\AssociationServiceInterface;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filesystem\Folder;
 use Joomla\CMS\Language\Associations;
-use Joomla\CMS\Language\Language;
+use Joomla\CMS\Language\LanguageFactoryInterface;
 use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Multilanguage;
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Router\Router;
-use Joomla\CMS\Router\SiteRouter;
+use Joomla\CMS\Router\SiteRouterAwareTrait;
 use Joomla\CMS\Uri\Uri;
 use Joomla\Component\Menus\Administrator\Helper\MenusHelper;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Filesystem\Path;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 
@@ -39,8 +40,10 @@
  *
  * @since  1.6
  */
-class PlgSystemLanguageFilter extends CMSPlugin
+final class LanguageFilter extends CMSPlugin
 {
+    use SiteRouterAwareTrait;
+
     /**
      * The routing mode.
      *
@@ -90,34 +93,45 @@ class PlgSystemLanguageFilter extends CMSPlugin
     private $user_lang_code;
 
     /**
-     * Application object.
+     * The language factory
+     *
+     * @var   LanguageFactoryInterface
      *
-     * @var    CMSWebApplicationInterface
-     * @since  3.3
+     * @since 4.4.0
      */
-    protected $app;
+    private $languageFactory;
 
     /**
      * Constructor.
      *
-     * @param   object  &$subject  The object to observe
-     * @param   array   $config    An optional associative array of configuration settings.
+     * @param   DispatcherInterface       $dispatcher       The dispatcher
+     * @param   array                     $config           An optional associative array of configuration settings
+     * @param   CMSApplicationInterface   $app              The language factory
+     * @param   LanguageFactoryInterface  $languageFactory  The language factory
      *
-     * @since   1.6
+     * @since   1.6.0
      */
-    public function __construct(&$subject, $config)
-    {
-        parent::__construct($subject, $config);
+    public function __construct(
+        DispatcherInterface $dispatcher,
+        array $config,
+        CMSApplicationInterface $app,
+        LanguageFactoryInterface $languageFactory
+    ) {
+        parent::__construct($dispatcher, $config);
+
+        $this->languageFactory = $languageFactory;
+
+        $this->setApplication($app);
 
         // Setup language data.
-        $this->mode_sef     = $this->app->get('sef', 0);
+        $this->mode_sef     = $this->getApplication()->get('sef', 0);
         $this->sefs         = LanguageHelper::getLanguages('sef');
         $this->lang_codes   = LanguageHelper::getLanguages('lang_code');
         $this->default_lang = ComponentHelper::getParams('com_languages')->get('site', 'en-GB');
 
         // If language filter plugin is executed in a site page.
-        if ($this->app->isClient('site')) {
-            $levels = $this->app->getIdentity()->getAuthorisedViewLevels();
+        if ($this->getApplication()->isClient('site')) {
+            $levels = $this->getApplication()->getIdentity()->getAuthorisedViewLevels();
 
             foreach ($this->sefs as $sef => $language) {
                 // @todo: In Joomla 2.5.4 and earlier access wasn't set. Non modified Content Languages got 0 as access value
@@ -152,9 +166,7 @@ public function __construct(&$subject, $config)
      */
     public function onAfterInitialise()
     {
-        // We need to make sure we are always using the site router, even if the language plugin is executed in admin app.
-        // Router can be injected when turned into a DI built plugin
-        $router = Factory::getContainer()->get(SiteRouter::class);
+        $router = $this->getSiteRouter();
 
         // Attach build rules for language SEF.
         $router->attachBuildRule([$this, 'preprocessBuildRule'], Router::PROCESS_BEFORE);
@@ -180,8 +192,8 @@ public function onAfterInitialise()
     public function onAfterRoute()
     {
         // Add custom site name.
-        if ($this->app->isClient('site') && isset($this->lang_codes[$this->current_lang]) && $this->lang_codes[$this->current_lang]->sitename) {
-            $this->app->set('sitename', $this->lang_codes[$this->current_lang]->sitename);
+        if ($this->getApplication()->isClient('site') && isset($this->lang_codes[$this->current_lang]) && $this->lang_codes[$this->current_lang]->sitename) {
+            $this->getApplication()->set('sitename', $this->lang_codes[$this->current_lang]->sitename);
         }
     }
 
@@ -370,10 +382,10 @@ public function parseRule(&$router, &$uri)
         // 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 (
-            $this->app->getInput()->getMethod() === 'POST'
-            || $this->app->getInput()->get('nolangfilter', 0) == 1
-            || count($this->app->getInput()->post) > 0
-            || count($this->app->getInput()->files) > 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
         ) {
             $found = true;
 
@@ -420,7 +432,7 @@ public function parseRule(&$router, &$uri)
 
                 $uri->setPath($path);
 
-                if (!$this->app->get('sef_rewrite')) {
+                if (!$this->getApplication()->get('sef_rewrite')) {
                     $uri->setPath('index.php/' . $uri->getPath());
                 }
 
@@ -438,26 +450,26 @@ public function parseRule(&$router, &$uri)
                 $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->app->setHeader('Expires', 'Wed, 17 Aug 2005 00:00:00 GMT', true);
-                $this->app->setHeader('Last-Modified', gmdate('D, d M Y H:i:s') . ' GMT', true);
-                $this->app->setHeader('Cache-Control', 'no-store, no-cache, must-revalidate', false);
-                $this->app->sendHeaders();
+                $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();
             }
 
             // Redirect to language.
-            $this->app->redirect($redirectUri, $redirectHttpCode);
+            $this->getApplication()->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.
-        $this->app->getInput()->set('language', $lang_code);
-        $this->app->set('language', $lang_code);
-        $language = $this->app->getLanguage();
+        $this->getApplication()->getInput()->set('language', $lang_code);
+        $this->getApplication()->set('language', $lang_code);
+        $language = $this->getApplication()->getLanguage();
 
         if ($language->getTag() !== $lang_code) {
-            $language_new = Language::getInstance($lang_code, (bool) $this->app->get('debug_lang'));
+            $language_new = $this->languageFactory->createLanguage($lang_code, (bool) $this->getApplication()->get('debug_lang'));
 
             foreach ($language->getPaths() as $extension => $files) {
                 if (strpos($extension, 'plg_system') !== false) {
@@ -473,7 +485,7 @@ public function parseRule(&$router, &$uri)
             }
 
             Factory::$language = $language_new;
-            $this->app->loadLanguage($language_new);
+            $this->getApplication()->loadLanguage($language_new);
         }
 
         // Create a cookie.
@@ -494,8 +506,8 @@ public function onPrivacyCollectAdminCapabilities()
         $this->loadLanguage();
 
         return [
-            Text::_('PLG_SYSTEM_LANGUAGEFILTER') => [
-                Text::_('PLG_SYSTEM_LANGUAGEFILTER_PRIVACY_CAPABILITY_LANGUAGE_COOKIE'),
+            $this->getApplication()->getLanguage()->_('PLG_SYSTEM_LANGUAGEFILTER') => [
+                $this->getApplication()->getLanguage()->_('PLG_SYSTEM_LANGUAGEFILTER_PRIVACY_CAPABILITY_LANGUAGE_COOKIE'),
             ],
         ];
     }
@@ -550,13 +562,13 @@ public function onUserAfterSave($user, $isnew, $success, $msg): void
             }
 
             if ($lang_code === $this->user_lang_code || !isset($this->lang_codes[$lang_code])) {
-                if ($this->app->isClient('site')) {
-                    $this->app->setUserState('com_users.edit.profile.redirect', null);
+                if ($this->getApplication()->isClient('site')) {
+                    $this->getApplication()->setUserState('com_users.edit.profile.redirect', null);
                 }
             } else {
-                if ($this->app->isClient('site')) {
-                    $this->app->setUserState('com_users.edit.profile.redirect', 'index.php?Itemid='
-                        . $this->app->getMenu()->getDefault($lang_code)->id . '&lang=' . $this->lang_codes[$lang_code]->sef);
+                if ($this->getApplication()->isClient('site')) {
+                    $this->getApplication()->setUserState('com_users.edit.profile.redirect', 'index.php?Itemid='
+                        . $this->getApplication()->getMenu()->getDefault($lang_code)->id . '&lang=' . $this->lang_codes[$lang_code]->sef);
 
                     // Create a cookie.
                     $this->setLanguageCookie($lang_code);
@@ -577,8 +589,8 @@ public function onUserAfterSave($user, $isnew, $success, $msg): void
      */
     public function onUserLogin($user, $options = [])
     {
-        if ($this->app->isClient('site')) {
-            $menu = $this->app->getMenu();
+        if ($this->getApplication()->isClient('site')) {
+            $menu = $this->getApplication()->getMenu();
 
             if ($this->params->get('automatic_change', 1)) {
                 $assoc     = Associations::isEnabled();
@@ -617,7 +629,7 @@ public function onUserLogin($user, $options = [])
                     }
 
                     // Retrieves the Itemid from a login form.
-                    $uri = new Uri($this->app->getUserState('users.login.form.return'));
+                    $uri = new Uri($this->getApplication()->getUserState('users.login.form.return'));
 
                     if ($uri->getVar('Itemid')) {
                         // The login form contains a menu item redirection. Try to get associations from that menu item.
@@ -628,7 +640,7 @@ public function onUserLogin($user, $options = [])
 
                         if (isset($associations[$lang_code]) && $menu->getItem($associations[$lang_code])) {
                             $associationItemid = $associations[$lang_code];
-                            $this->app->setUserState('users.login.form.return', 'index.php?Itemid=' . $associationItemid);
+                            $this->getApplication()->setUserState('users.login.form.return', 'index.php?Itemid=' . $associationItemid);
                             $foundAssociation = true;
                         }
                     } elseif (isset($associations[$lang_code]) && $menu->getItem($associations[$lang_code])) {
@@ -638,14 +650,14 @@ public function onUserLogin($user, $options = [])
                          * We redirect to the user preferred site language associated page.
                          */
                         $associationItemid = $associations[$lang_code];
-                        $this->app->setUserState('users.login.form.return', 'index.php?Itemid=' . $associationItemid);
+                        $this->getApplication()->setUserState('users.login.form.return', 'index.php?Itemid=' . $associationItemid);
                         $foundAssociation = true;
                     } elseif ($active->home) {
                         // We are on a Home page, we redirect to the user preferred site language Home page.
                         $item = $menu->getDefault($lang_code);
 
                         if ($item && $item->language !== $active->language && $item->language !== '*') {
-                            $this->app->setUserState('users.login.form.return', 'index.php?Itemid=' . $item->id);
+                            $this->getApplication()->setUserState('users.login.form.return', 'index.php?Itemid=' . $item->id);
                             $foundAssociation = true;
                         }
                     }
@@ -659,11 +671,11 @@ public function onUserLogin($user, $options = [])
                     $this->setLanguageCookie($lang_code);
 
                     // Change the language code.
-                    Factory::getContainer()->get(\Joomla\CMS\Language\LanguageFactoryInterface::class)->createLanguage($lang_code);
+                    $this->languageFactory->createLanguage($lang_code);
                 }
             } else {
-                if ($this->app->getUserState('users.login.form.return')) {
-                    $this->app->setUserState('users.login.form.return', Route::_($this->app->getUserState('users.login.form.return'), false));
+                if ($this->getApplication()->getUserState('users.login.form.return')) {
+                    $this->getApplication()->setUserState('users.login.form.return', Route::_($this->getApplication()->getUserState('users.login.form.return'), false));
                 }
             }
         }
@@ -678,20 +690,20 @@ public function onUserLogin($user, $options = [])
      */
     public function onAfterDispatch()
     {
-        $doc = $this->app->getDocument();
+        $doc = $this->getApplication()->getDocument();
 
-        if ($this->app->isClient('site') && $this->params->get('alternate_meta', 1) && $doc->getType() === 'html') {
+        if ($this->getApplication()->isClient('site') && $this->params->get('alternate_meta', 1) && $doc->getType() === 'html') {
             $languages             = $this->lang_codes;
             $homes                 = Multilanguage::getSiteHomePages();
-            $menu                  = $this->app->getMenu();
+            $menu                  = $this->getApplication()->getMenu();
             $active                = $menu->getActive();
-            $levels                = $this->app->getIdentity()->getAuthorisedViewLevels();
+            $levels                = $this->getApplication()->getIdentity()->getAuthorisedViewLevels();
             $remove_default_prefix = $this->params->get('remove_default_prefix', 0);
             $server                = Uri::getInstance()->toString(['scheme', 'host', 'port']);
             $is_home               = false;
 
             // Router can be injected when turned into a DI built plugin
-            $currentInternalUrl    = 'index.php?' . http_build_query(Factory::getContainer()->get(SiteRouter::class)->getVars());
+            $currentInternalUrl    = 'index.php?' . http_build_query($this->getSiteRouter()->getVars());
 
             if ($active) {
                 $active_link  = Route::_($active->link . '&Itemid=' . $active->id);
@@ -708,15 +720,15 @@ public function onAfterDispatch()
             }
 
             // Load component associations.
-            $option = $this->app->getInput()->get('option');
+            $option = $this->getApplication()->getInput()->get('option');
 
-            $component = $this->app->bootComponent($option);
+            $component = $this->getApplication()->bootComponent($option);
 
             if ($component instanceof AssociationServiceInterface) {
                 $cassociations = $component->getAssociationsExtension()->getAssociationsForItem();
             } else {
                 $cName = ucfirst(substr($option, 4)) . 'HelperAssociation';
-                JLoader::register($cName, \Joomla\CMS\Filesystem\Path::clean(JPATH_SITE . '/components/' . $option . '/helpers/association.php'));
+                \JLoader::register($cName, Path::clean(JPATH_SITE . '/components/' . $option . '/helpers/association.php'));
 
                 if (class_exists($cName) && is_callable([$cName, 'getAssociations'])) {
                     $cassociations = call_user_func([$cName, 'getAssociations']);
@@ -800,20 +812,20 @@ private function setLanguageCookie($languageCode)
         // If is set to use language cookie for a year in plugin params, save the user language in a new cookie.
         if ((int) $this->params->get('lang_cookie', 0) === 1) {
             // Create a cookie with one year lifetime.
-            $this->app->getInput()->cookie->set(
+            $this->getApplication()->getInput()->cookie->set(
                 ApplicationHelper::getHash('language'),
                 $languageCode,
                 [
                     'expires'  => time() + 365 * 86400,
-                    'path'     => $this->app->get('cookie_path', '/'),
-                    'domain'   => $this->app->get('cookie_domain', ''),
-                    'secure'   => $this->app->isHttpsForced(),
+                    'path'     => $this->getApplication()->get('cookie_path', '/'),
+                    'domain'   => $this->getApplication()->get('cookie_domain', ''),
+                    'secure'   => $this->getApplication()->isHttpsForced(),
                     'httponly' => true,
                 ]
             );
         } else {
             // If not, set the user language in the session (that is already saved in a cookie).
-            $this->app->getSession()->set('plg_system_languagefilter.language', $languageCode);
+            $this->getApplication()->getSession()->set('plg_system_languagefilter.language', $languageCode);
         }
     }
 
@@ -828,10 +840,10 @@ private function getLanguageCookie()
     {
         // Is is set to use a year language cookie in plugin params, get the user language from the cookie.
         if ((int) $this->params->get('lang_cookie', 0) === 1) {
-            $languageCode = $this->app->getInput()->cookie->get(ApplicationHelper::getHash('language'));
+            $languageCode = $this->getApplication()->getInput()->cookie->get(ApplicationHelper::getHash('language'));
         } else {
             // Else get the user language from the session.
-            $languageCode = $this->app->getSession()->get('plg_system_languagefilter.language');
+            $languageCode = $this->getApplication()->getSession()->get('plg_system_languagefilter.language');
         }
 
         // Let's be sure we got a valid language code. Fallback to null.
diff --git a/plugins/system/log/log.xml b/plugins/system/log/log.xml
index ad20532eff5c1..23b7ded677560 100644
--- a/plugins/system/log/log.xml
+++ b/plugins/system/log/log.xml
@@ -9,8 +9,10 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>3.0.0</version>
 	<description>PLG_LOG_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\System\Log</namespace>
 	<files>
-		<filename plugin="log">log.php</filename>
+		<folder plugin="log">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_system_log.ini</language>
diff --git a/plugins/system/log/services/provider.php b/plugins/system/log/services/provider.php
new file mode 100644
index 0000000000000..7ac977585d111
--- /dev/null
+++ b/plugins/system/log/services/provider.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.log
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\System\Log\Extension\Log;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new Log(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('system', 'log')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/system/log/log.php b/plugins/system/log/src/Extension/Log.php
similarity index 86%
rename from plugins/system/log/log.php
rename to plugins/system/log/src/Extension/Log.php
index 708021c01186d..b0d16a75a6ed6 100644
--- a/plugins/system/log/log.php
+++ b/plugins/system/log/src/Extension/Log.php
@@ -6,12 +6,12 @@
  *
  * @copyright   (C) 2007 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
+namespace Joomla\Plugin\System\Log\Extension;
+
 use Joomla\CMS\Authentication\Authentication;
-use Joomla\CMS\Log\Log;
+use Joomla\CMS\Log\Log as Logger;
 use Joomla\CMS\Plugin\CMSPlugin;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -23,7 +23,7 @@
  *
  * @since  1.5
  */
-class PlgSystemLog extends CMSPlugin
+final class Log extends CMSPlugin
 {
     /**
      * Called if user fails to be logged in.
@@ -60,11 +60,11 @@ public function onUserLoginFailure($response)
                 break;
         }
 
-        Log::addLogger([], Log::INFO);
+        Logger::addLogger([], Logger::INFO);
 
         try {
-            Log::add($errorlog['comment'], Log::INFO, $errorlog['status']);
-        } catch (Exception $e) {
+            Logger::add($errorlog['comment'], Logger::INFO, $errorlog['status']);
+        } catch (\Exception $e) {
             // If the log file is unwriteable during login then we should not go to the error page
             return;
         }
diff --git a/plugins/system/logout/logout.xml b/plugins/system/logout/logout.xml
index a84b1d5b6b627..d9a1d6b4b9b17 100644
--- a/plugins/system/logout/logout.xml
+++ b/plugins/system/logout/logout.xml
@@ -9,8 +9,10 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>3.0.0</version>
 	<description>PLG_SYSTEM_LOGOUT_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\System\Logout</namespace>
 	<files>
-		<filename plugin="logout">logout.php</filename>
+		<folder plugin="logout">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_system_logout.ini</language>
diff --git a/plugins/system/logout/services/provider.php b/plugins/system/logout/services/provider.php
new file mode 100644
index 0000000000000..dc26ead1001f2
--- /dev/null
+++ b/plugins/system/logout/services/provider.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.logout
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\System\Logout\Extension\Logout;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                return new Logout(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('system', 'logout'),
+                    Factory::getApplication()
+                );
+            }
+        );
+    }
+};
diff --git a/plugins/system/logout/logout.php b/plugins/system/logout/src/Extension/Logout.php
similarity index 54%
rename from plugins/system/logout/logout.php
rename to plugins/system/logout/src/Extension/Logout.php
index 85af72dbfcca1..3d66dd60ae65d 100644
--- a/plugins/system/logout/logout.php
+++ b/plugins/system/logout/src/Extension/Logout.php
@@ -6,12 +6,14 @@
  *
  * @copyright   (C) 2010 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
+namespace Joomla\Plugin\System\Logout\Extension;
+
 use Joomla\CMS\Application\ApplicationHelper;
+use Joomla\CMS\Application\CMSApplicationInterface;
 use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\Event\DispatcherInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -22,15 +24,8 @@
  *
  * @since  1.6
  */
-class PlgSystemLogout extends CMSPlugin
+final class Logout extends CMSPlugin
 {
-    /**
-     * @var    \Joomla\CMS\Application\CMSApplication
-     *
-     * @since  3.7.3
-     */
-    protected $app;
-
     /**
      * Load the language file on instantiation.
      *
@@ -41,30 +36,33 @@ class PlgSystemLogout extends CMSPlugin
     protected $autoloadLanguage = true;
 
     /**
-     * @param   object  &$subject  The object to observe -- event dispatcher.
-     * @param   object  $config    An optional associative array of configuration settings.
+     * @param   DispatcherInterface      $dispatcher  The object to observe -- event dispatcher.
+     * @param   array                    $config      An optional associative array of configuration settings.
+     * @param   CMSApplicationInterface  $app         The object to observe -- event dispatcher.
      *
      * @since   1.6
      */
-    public function __construct(&$subject, $config)
+    public function __construct(DispatcherInterface $dispatcher, array $config, CMSApplicationInterface $app)
     {
-        parent::__construct($subject, $config);
+        parent::__construct($dispatcher, $config);
+
+        $this->setApplication($app);
 
         // If we are on admin don't process.
-        if (!$this->app->isClient('site')) {
+        if (!$this->getApplication()->isClient('site')) {
             return;
         }
 
         $hash  = ApplicationHelper::getHash('PlgSystemLogout');
 
-        if ($this->app->getInput()->cookie->getString($hash)) {
+        if ($this->getApplication()->getInput()->cookie->getString($hash)) {
             // Destroy the cookie.
-            $this->app->getInput()->cookie->set(
+            $this->getApplication()->getInput()->cookie->set(
                 $hash,
                 '',
                 1,
-                $this->app->get('cookie_path', '/'),
-                $this->app->get('cookie_domain', '')
+                $this->getApplication()->get('cookie_path', '/'),
+                $this->getApplication()->get('cookie_domain', '')
             );
         }
     }
@@ -81,15 +79,15 @@ public function __construct(&$subject, $config)
      */
     public function onUserLogout($user, $options = [])
     {
-        if ($this->app->isClient('site')) {
+        if ($this->getApplication()->isClient('site')) {
             // Create the cookie.
-            $this->app->getInput()->cookie->set(
+            $this->getApplication()->getInput()->cookie->set(
                 ApplicationHelper::getHash('PlgSystemLogout'),
                 true,
                 time() + 86400,
-                $this->app->get('cookie_path', '/'),
-                $this->app->get('cookie_domain', ''),
-                $this->app->isHttpsForced(),
+                $this->getApplication()->get('cookie_path', '/'),
+                $this->getApplication()->get('cookie_domain', ''),
+                $this->getApplication()->isHttpsForced(),
                 true
             );
         }
diff --git a/plugins/system/logrotation/logrotation.php b/plugins/system/logrotation/logrotation.php
deleted file mode 100644
index 2b0182005c0f9..0000000000000
--- a/plugins/system/logrotation/logrotation.php
+++ /dev/null
@@ -1,250 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Plugin
- * @subpackage  System.logrotation
- *
- * @copyright   (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
- */
-
-use Joomla\CMS\Cache\Cache;
-use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Folder;
-use Joomla\CMS\Plugin\CMSPlugin;
-use Joomla\Filesystem\File;
-use Joomla\Filesystem\Path;
-
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-
-/**
- * Joomla! Log Rotation plugin
- *
- * Rotate the log files created by Joomla core
- *
- * @since  3.9.0
- */
-class PlgSystemLogrotation extends CMSPlugin
-{
-    /**
-     * Load the language file on instantiation.
-     *
-     * @var    boolean
-     *
-     * @since  3.9.0
-     */
-    protected $autoloadLanguage = true;
-
-    /**
-     * @var    \Joomla\CMS\Application\CMSApplication
-     *
-     * @since  3.9.0
-     */
-    protected $app;
-
-    /**
-     * @var    \Joomla\Database\DatabaseDriver
-     *
-     * @since  3.9.0
-     */
-    protected $db;
-
-    /**
-     * The log check and rotation code is triggered after the page has fully rendered.
-     *
-     * @return  void
-     *
-     * @since   3.9.0
-     */
-    public function onAfterRender()
-    {
-        // Get the timeout as configured in plugin parameters
-
-        /** @var \Joomla\Registry\Registry $params */
-        $cache_timeout = (int) $this->params->get('cachetimeout', 30);
-        $cache_timeout = 24 * 3600 * $cache_timeout;
-        $logsToKeep    = (int) $this->params->get('logstokeep', 1);
-
-        // Do we need to run? Compare the last run timestamp stored in the plugin's options with the current
-        // timestamp. If the difference is greater than the cache timeout we shall not execute again.
-        $now  = time();
-        $last = (int) $this->params->get('lastrun', 0);
-
-        if ((abs($now - $last) < $cache_timeout)) {
-            return;
-        }
-
-        // Update last run status
-        $this->params->set('lastrun', $now);
-
-        $paramsJson = $this->params->toString('JSON');
-        $db         = $this->db;
-        $query      = $db->getQuery(true)
-            ->update($db->quoteName('#__extensions'))
-            ->set($db->quoteName('params') . ' = :params')
-            ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
-            ->where($db->quoteName('folder') . ' = ' . $db->quote('system'))
-            ->where($db->quoteName('element') . ' = ' . $db->quote('logrotation'))
-            ->bind(':params', $paramsJson);
-
-        try {
-            // Lock the tables to prevent multiple plugin executions causing a race condition
-            $db->lockTable('#__extensions');
-        } catch (Exception $e) {
-            // If we can't lock the tables it's too risky to continue execution
-            return;
-        }
-
-        try {
-            // Update the plugin parameters
-            $result = $db->setQuery($query)->execute();
-
-            $this->clearCacheGroups(['com_plugins'], [0, 1]);
-        } catch (Exception $exc) {
-            // If we failed to execute
-            $db->unlockTables();
-            $result = false;
-        }
-
-        try {
-            // Unlock the tables after writing
-            $db->unlockTables();
-        } catch (Exception $e) {
-            // If we can't lock the tables assume we have somehow failed
-            $result = false;
-        }
-
-        // Abort on failure
-        if (!$result) {
-            return;
-        }
-
-        // Get the log path
-        $logPath = Path::clean($this->app->get('log_path'));
-
-        // Invalid path, stop processing further
-        if (!is_dir($logPath)) {
-            return;
-        }
-
-        $logFiles = $this->getLogFiles($logPath);
-
-        // Sort log files by version number in reserve order
-        krsort($logFiles, SORT_NUMERIC);
-
-        foreach ($logFiles as $version => $files) {
-            if ($version >= $logsToKeep) {
-                // Delete files which has version greater than or equals $logsToKeep
-                foreach ($files as $file) {
-                    File::delete($logPath . '/' . $file);
-                }
-            } else {
-                // For files which has version smaller than $logsToKeep, rotate (increase version number)
-                foreach ($files as $file) {
-                    $this->rotate($logPath, $file, $version);
-                }
-            }
-        }
-    }
-
-    /**
-     * Get log files from log folder
-     *
-     * @param   string  $path  The folder to get log files
-     *
-     * @return  array   The log files in the given path grouped by version number (not rotated files has number 0)
-     *
-     * @since   3.9.0
-     */
-    private function getLogFiles($path)
-    {
-        $logFiles = [];
-        $files    = Folder::files($path, '\.php$');
-
-        foreach ($files as $file) {
-            $parts    = explode('.', $file);
-
-            /*
-             * Rotated log file has this filename format [VERSION].[FILENAME].php. So if $parts has at least 3 elements
-             * and the first element is a number, we know that it's a rotated file and can get it's current version
-             */
-            if (count($parts) >= 3 && is_numeric($parts[0])) {
-                $version = (int) $parts[0];
-            } else {
-                $version = 0;
-            }
-
-            if (!isset($logFiles[$version])) {
-                $logFiles[$version] = [];
-            }
-
-            $logFiles[$version][] = $file;
-        }
-
-        return $logFiles;
-    }
-
-    /**
-     * Method to rotate (increase version) of a log file
-     *
-     * @param   string  $path            Path to file to rotate
-     * @param   string  $filename        Name of file to rotate
-     * @param   int     $currentVersion  The current version number
-     *
-     * @return  void
-     *
-     * @since   3.9.0
-     */
-    private function rotate($path, $filename, $currentVersion)
-    {
-        if ($currentVersion === 0) {
-            $rotatedFile = $path . '/1.' . $filename;
-        } else {
-            /*
-             * Rotated log file has this filename format [VERSION].[FILENAME].php. To rotate it, we just need to explode
-             * the filename into an array, increase value of first element (keep version) and implode it back to get the
-             * rotated file name
-             */
-            $parts    = explode('.', $filename);
-            $parts[0] = $currentVersion + 1;
-
-            $rotatedFile = $path . '/' . implode('.', $parts);
-        }
-
-        File::move($path . '/' . $filename, $rotatedFile);
-    }
-
-    /**
-     * Clears cache groups. We use it to clear the plugins cache after we update the last run timestamp.
-     *
-     * @param   array  $clearGroups   The cache groups to clean
-     * @param   array  $cacheClients  The cache clients (site, admin) to clean
-     *
-     * @return  void
-     *
-     * @since   3.9.0
-     */
-    private function clearCacheGroups(array $clearGroups, array $cacheClients = [0, 1])
-    {
-        foreach ($clearGroups as $group) {
-            foreach ($cacheClients as $client_id) {
-                try {
-                    $options = [
-                        'defaultgroup' => $group,
-                        'cachebase'    => $client_id ? JPATH_ADMINISTRATOR . '/cache' :
-                            Factory::getApplication()->get('cache_path', JPATH_SITE . '/cache'),
-                    ];
-
-                    $cache = Cache::getInstance('callback', $options);
-                    $cache->clean();
-                } catch (Exception $e) {
-                    // Ignore it
-                }
-            }
-        }
-    }
-}
diff --git a/plugins/system/logrotation/logrotation.xml b/plugins/system/logrotation/logrotation.xml
deleted file mode 100644
index 248c4be6ab02d..0000000000000
--- a/plugins/system/logrotation/logrotation.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<extension type="plugin" group="system" method="upgrade">
-	<name>plg_system_logrotation</name>
-	<author>Joomla! Project</author>
-	<creationDate>2018-05</creationDate>
-	<copyright>(C) 2018 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>3.9.0</version>
-	<description>PLG_SYSTEM_LOGROTATION_XML_DESCRIPTION</description>
-	<files>
-		<filename plugin="logrotation">logrotation.php</filename>
-	</files>
-	<languages folder="language">
-		<language tag="en-GB">language/en-GB/plg_system_logrotation.ini</language>
-		<language tag="en-GB">language/en-GB/plg_system_logrotation.sys.ini</language>
-	</languages>
-	<config>
-		<fields name="params">
-			<fieldset name="basic">
-				<field
-					name="cachetimeout"
-					type="integer"
-					label="PLG_SYSTEM_LOGROTATION_CACHETIMEOUT_LABEL"
-					first="0"
-					last="120"
-					step="1"
-					default="30"
-					filter="int"
-					validate="number"
-				/>
-
-				<field
-					name="logstokeep"
-					type="integer"
-					label="PLG_SYSTEM_LOGROTATION_LOGSTOKEEP_LABEL"
-					first="1"
-					last="10"
-					step="1"
-					default="1"
-					filter="int"
-					validate="number"
-				/>
-
-				<field
-					name="lastrun"
-					type="hidden"
-					default="0"
-					filter="integer"
-				/>
-			</fieldset>
-		</fields>
-	</config>
-</extension>
diff --git a/plugins/system/privacyconsent/privacyconsent.xml b/plugins/system/privacyconsent/privacyconsent.xml
index 76f115266cb30..6c47d949ef517 100644
--- a/plugins/system/privacyconsent/privacyconsent.xml
+++ b/plugins/system/privacyconsent/privacyconsent.xml
@@ -11,8 +11,8 @@
 	<description>PLG_SYSTEM_PRIVACYCONSENT_XML_DESCRIPTION</description>
 	<namespace path="src">Joomla\Plugin\System\PrivacyConsent</namespace>
 	<files>
-		<filename plugin="privacyconsent">privacyconsent.php</filename>
 		<folder>forms</folder>
+		<folder plugin="privacyconsent">services</folder>
 		<folder>src</folder>
 	</files>
 	<languages>
@@ -78,65 +78,6 @@
 					filter="html"
 				/>
 			</fieldset>
-			<fieldset
-				name="expiration"
-				label="PLG_SYSTEM_PRIVACYCONSENT_EXPIRATION_FIELDSET_LABEL"
-			>
-				<field
-					name="enabled"
-					type="radio"
-					label="PLG_SYSTEM_PRIVACYCONSENT_FIELD_ENABLED_LABEL"
-					description="PLG_SYSTEM_PRIVACYCONSENT_FIELD_ENABLED_DESC"
-					layout="joomla.form.field.radio.switcher"
-					default="0"
-					filter="integer"
-					>
-					<option value="0">JNO</option>
-					<option value="1">JYES</option>
-				</field>
-				<field
-					name="cachetimeout"
-					type="integer"
-					label="PLG_SYSTEM_PRIVACYCONSENT_CACHETIMEOUT_LABEL"
-					description="PLG_SYSTEM_PRIVACYCONSENT_CACHETIMEOUT_DESC"
-					first="0"
-					last="120"
-					step="1"
-					default="30"
-					filter="int"
-					validate="number"
-				/>
-				<field
-					name="consentexpiration"
-					type="integer"
-					label="PLG_SYSTEM_PRIVACYCONSENT_CONSENTEXPIRATION_LABEL"
-					description="PLG_SYSTEM_PRIVACYCONSENT_CONSENTEXPIRATION_DESC"
-					first="180"
-					last="720"
-					step="30"
-					default="360"
-					filter="int"
-					validate="number"
-				/>
-				<field
-					name="remind"
-					type="integer"
-					label="PLG_SYSTEM_PRIVACYCONSENT_REMINDBEFORE_LABEL"
-					description="PLG_SYSTEM_PRIVACYCONSENT_REMINDBEFORE_DESC"
-					first="0"
-					last="120"
-					step="1"
-					default="30"
-					filter="int"
-					validate="number"
-				/>
-				<field
-					name="lastrun"
-					type="hidden"
-					default="0"
-					filter="integer"
-				/>
-			</fieldset>
 		</fields>
 	</config>
 </extension>
diff --git a/plugins/system/privacyconsent/services/provider.php b/plugins/system/privacyconsent/services/provider.php
new file mode 100644
index 0000000000000..a400fce7f31e0
--- /dev/null
+++ b/plugins/system/privacyconsent/services/provider.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.privacyconsent
+ *
+ * @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\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\Event\DispatcherInterface;
+use Joomla\Plugin\System\PrivacyConsent\Extension\PrivacyConsent;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new PrivacyConsent(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('system', 'privacyconsent')
+                );
+                $plugin->setApplication(Factory::getApplication());
+                $plugin->setDatabase($container->get(DatabaseInterface::class));
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/system/privacyconsent/privacyconsent.php b/plugins/system/privacyconsent/src/Extension/PrivacyConsent.php
similarity index 51%
rename from plugins/system/privacyconsent/privacyconsent.php
rename to plugins/system/privacyconsent/src/Extension/PrivacyConsent.php
index 7342078b9cfd1..177da62fc5ed6 100644
--- a/plugins/system/privacyconsent/privacyconsent.php
+++ b/plugins/system/privacyconsent/src/Extension/PrivacyConsent.php
@@ -6,29 +6,22 @@
  *
  * @copyright   (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
-use Joomla\CMS\Application\ApplicationHelper;
-use Joomla\CMS\Cache\Cache;
+namespace Joomla\Plugin\System\PrivacyConsent\Extension;
+
+use Joomla\CMS\Event\Privacy\CheckPrivacyPolicyPublishedEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Form\FormHelper;
 use Joomla\CMS\Language\Associations;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Mail\Exception\MailDisabledException;
-use Joomla\CMS\Mail\MailTemplate;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Router\Route;
-use Joomla\CMS\Uri\Uri;
-use Joomla\CMS\User\UserHelper;
 use Joomla\Component\Actionlogs\Administrator\Model\ActionlogModel;
-use Joomla\Component\Messages\Administrator\Model\MessageModel;
-use Joomla\Database\Exception\ExecutionFailureException;
+use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Database\ParameterType;
 use Joomla\Utilities\ArrayHelper;
-use PHPMailer\PHPMailer\Exception as phpmailerException;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -39,8 +32,10 @@
  *
  * @since  3.9.0
  */
-class PlgSystemPrivacyconsent extends CMSPlugin
+final class PrivacyConsent extends CMSPlugin
 {
+    use DatabaseAwareTrait;
+
     /**
      * Load the language file on instantiation.
      *
@@ -49,22 +44,6 @@ class PlgSystemPrivacyconsent extends CMSPlugin
      */
     protected $autoloadLanguage = true;
 
-    /**
-     * Application object.
-     *
-     * @var    \Joomla\CMS\Application\CMSApplication
-     * @since  3.9.0
-     */
-    protected $app;
-
-    /**
-     * Database object.
-     *
-     * @var    \Joomla\Database\DatabaseDriver
-     * @since  3.9.0
-     */
-    protected $db;
-
     /**
      * Adds additional fields to the user editing form
      *
@@ -95,7 +74,7 @@ public function onContentPrepareForm(Form $form, $data)
 
         // Add the privacy policy fields to the form.
         FormHelper::addFieldPrefix('Joomla\\Plugin\\System\\PrivacyConsent\\Field');
-        FormHelper::addFormPath(__DIR__ . '/forms');
+        FormHelper::addFormPath(JPATH_PLUGINS . '/' . $this->_type . '/' . $this->_name . '/forms');
         $form->loadFile('privacyconsent');
 
         $privacyType = $this->params->get('privacy_type', 'article');
@@ -117,12 +96,12 @@ public function onContentPrepareForm(Form $form, $data)
      * @return  boolean
      *
      * @since   3.9.0
-     * @throws  InvalidArgumentException on missing required data.
+     * @throws  \InvalidArgumentException on missing required data.
      */
     public function onUserBeforeSave($user, $isNew, $data)
     {
         // // Only check for front-end user creation/update profile
-        if ($this->app->isClient('administrator')) {
+        if ($this->getApplication()->isClient('administrator')) {
             return true;
         }
 
@@ -134,7 +113,7 @@ public function onUserBeforeSave($user, $isNew, $data)
         }
 
         // Check that the privacy is checked if required ie only in registration from frontend.
-        $input  = $this->app->getInput();
+        $input  = $this->getApplication()->getInput();
         $option = $input->get('option');
         $task   = $input->post->get('task');
         $form   = $input->post->get('jform', [], 'array');
@@ -143,7 +122,7 @@ public function onUserBeforeSave($user, $isNew, $data)
             $option == 'com_users' && in_array($task, ['registration.register', 'profile.save'])
             && empty($form['privacyconsent']['privacy'])
         ) {
-            throw new InvalidArgumentException(Text::_('PLG_SYSTEM_PRIVACYCONSENT_FIELD_ERROR'));
+            throw new \InvalidArgumentException($this->getApplication()->getLanguage()->_('PLG_SYSTEM_PRIVACYCONSENT_FIELD_ERROR'));
         }
 
         return true;
@@ -164,7 +143,7 @@ public function onUserBeforeSave($user, $isNew, $data)
     public function onUserAfterSave($data, $isNew, $result, $error): void
     {
         // Only create an entry on front-end user creation/update profile
-        if ($this->app->isClient('administrator')) {
+        if ($this->getApplication()->isClient('administrator')) {
             return;
         }
 
@@ -176,7 +155,7 @@ public function onUserAfterSave($data, $isNew, $result, $error): void
             return;
         }
 
-        $input  = $this->app->getInput();
+        $input  = $this->getApplication()->getInput();
         $option = $input->get('option');
         $task   = $input->post->get('task');
         $form   = $input->post->get('jform', [], 'array');
@@ -203,8 +182,8 @@ public function onUserAfterSave($data, $isNew, $result, $error): void
             ];
 
             try {
-                $this->db->insertObject('#__privacy_consents', $userNote);
-            } catch (Exception $e) {
+                $this->getDatabase()->insertObject('#__privacy_consents', $userNote);
+            } catch (\Exception $e) {
                 // Do nothing if the save fails
             }
 
@@ -221,7 +200,7 @@ public function onUserAfterSave($data, $isNew, $result, $error): void
             ];
 
             /** @var ActionlogModel $model */
-            $model = $this->app->bootComponent('com_actionlogs')->getMVCFactory()->createModel('Actionlog', 'Administrator');
+            $model = $this->getApplication()->bootComponent('com_actionlogs')->getMVCFactory()->createModel('Actionlog', 'Administrator');
             $model->addLog([$message], 'PLG_SYSTEM_PRIVACYCONSENT_CONSENT', 'plg_system_privacyconsent', $userId);
         }
     }
@@ -249,16 +228,12 @@ public function onUserAfterDelete($user, $success, $msg): void
 
         if ($userId) {
             // Remove user's consent
-            try {
-                $query = $this->db->getQuery(true)
-                    ->delete($this->db->quoteName('#__privacy_consents'))
-                    ->where($this->db->quoteName('user_id') . ' = :userid')
-                    ->bind(':userid', $userId, ParameterType::INTEGER);
-                $this->db->setQuery($query);
-                $this->db->execute();
-            } catch (Exception $e) {
-                $this->_subject->setError($e->getMessage());
-            }
+            $query = $this->getDatabase()->getQuery(true)
+                ->delete($this->getDatabase()->quoteName('#__privacy_consents'))
+                ->where($this->getDatabase()->quoteName('user_id') . ' = :userid')
+                ->bind(':userid', $userId, ParameterType::INTEGER);
+            $this->getDatabase()->setQuery($query);
+            $this->getDatabase()->execute();
         }
     }
 
@@ -273,11 +248,11 @@ public function onUserAfterDelete($user, $success, $msg): void
     public function onAfterRoute()
     {
         // Run this in frontend only
-        if ($this->app->isClient('administrator')) {
+        if (!$this->getApplication()->isClient('site')) {
             return;
         }
 
-        $userId = Factory::getUser()->id;
+        $userId = $this->getApplication()->getIdentity()->id;
 
         // Check to see whether user already consented, if not, redirect to user profile page
         if ($userId > 0) {
@@ -286,7 +261,7 @@ public function onAfterRoute()
                 return;
             }
 
-            $input  = $this->app->getInput();
+            $input  = $this->getApplication()->getInput();
             $option = $input->getCmd('option');
             $task   = $input->get('task', '');
             $view   = $input->getString('view', '');
@@ -318,23 +293,26 @@ public function onAfterRoute()
             }
 
             // Redirect to com_users profile edit
-            $this->app->enqueueMessage($this->getRedirectMessage(), 'notice');
+            $this->getApplication()->enqueueMessage($this->getRedirectMessage(), 'notice');
             $link = 'index.php?option=com_users&view=profile&layout=edit';
-            $this->app->redirect(Route::_($link, false));
+            $this->getApplication()->redirect(Route::_($link, false));
         }
     }
 
     /**
      * Event to specify whether a privacy policy has been published.
      *
-     * @param   array  &$policy  The privacy policy status data, passed by reference, with keys "published", "editLink" and "articlePublished".
+     * @param   CheckPrivacyPolicyPublishedEvent  $event  The privacy policy status event.
      *
      * @return  void
      *
      * @since   3.9.0
      */
-    public function onPrivacyCheckPrivacyPolicyPublished(&$policy)
+    public function onPrivacyCheckPrivacyPolicyPublished(CheckPrivacyPolicyPublishedEvent $event)
     {
+        // Data, with keys "published", "editLink" and "articlePublished".
+        $policy = $event->getPolicyInfo();
+
         // If another plugin has already indicated a policy is published, we won't change anything here
         if ($policy['published']) {
             return;
@@ -347,14 +325,14 @@ public function onPrivacyCheckPrivacyPolicyPublished(&$policy)
         }
 
         // Check if the article exists in database and is published
-        $query = $this->db->getQuery(true)
-            ->select($this->db->quoteName(['id', 'state']))
-            ->from($this->db->quoteName('#__content'))
-            ->where($this->db->quoteName('id') . ' = :id')
+        $query = $this->getDatabase()->getQuery(true)
+            ->select($this->getDatabase()->quoteName(['id', 'state']))
+            ->from($this->getDatabase()->quoteName('#__content'))
+            ->where($this->getDatabase()->quoteName('id') . ' = :id')
             ->bind(':id', $articleId, ParameterType::INTEGER);
-        $this->db->setQuery($query);
+        $this->getDatabase()->setQuery($query);
 
-        $article = $this->db->loadObject();
+        $article = $this->getDatabase()->loadObject();
 
         // Check if the article exists
         if (!$article) {
@@ -382,7 +360,7 @@ private function getRedirectMessage()
         $messageOnRedirect = trim($this->params->get('messageOnRedirect', ''));
 
         if (empty($messageOnRedirect)) {
-            return Text::_('PLG_SYSTEM_PRIVACYCONSENT_REDIRECT_MESSAGE_DEFAULT');
+            return $this->getApplication()->getLanguage()->_('PLG_SYSTEM_PRIVACYCONSENT_REDIRECT_MESSAGE_DEFAULT');
         }
 
         return $messageOnRedirect;
@@ -400,7 +378,7 @@ private function getRedirectMessage()
     private function isUserConsented($userId)
     {
         $userId = (int) $userId;
-        $db     = $this->db;
+        $db     = $this->getDatabase();
         $query  = $db->getQuery(true);
 
         $query->select('COUNT(*)')
@@ -428,7 +406,7 @@ private function getPrivacyArticleId()
 
         if ($privacyArticleId > 0 && Associations::isEnabled()) {
             $privacyAssociated = Associations::getAssociations('com_content', '#__content', 'com_content.item', $privacyArticleId);
-            $currentLang       = Factory::getLanguage()->getTag();
+            $currentLang       = $this->getApplication()->getLanguage()->getTag();
 
             if (isset($privacyAssociated[$currentLang])) {
                 $privacyArticleId = $privacyAssociated[$currentLang]->id;
@@ -452,7 +430,7 @@ private function getPrivacyItemId()
 
         if ($itemId > 0 && Associations::isEnabled()) {
             $privacyAssociated = Associations::getAssociations('com_menus', '#__menu', 'com_menus.item', $itemId, 'id', '', '');
-            $currentLang       = Factory::getLanguage()->getTag();
+            $currentLang       = $this->getApplication()->getTag();
 
             if (isset($privacyAssociated[$currentLang])) {
                 $itemId = $privacyAssociated[$currentLang]->id;
@@ -461,252 +439,4 @@ private function getPrivacyItemId()
 
         return $itemId;
     }
-
-    /**
-     * The privacy consent expiration check code is triggered after the page has fully rendered.
-     *
-     * @return  void
-     *
-     * @since   3.9.0
-     */
-    public function onAfterRender()
-    {
-        if (!$this->params->get('enabled', 0)) {
-            return;
-        }
-
-        $cacheTimeout = (int) $this->params->get('cachetimeout', 30);
-        $cacheTimeout = 24 * 3600 * $cacheTimeout;
-
-        // Do we need to run? Compare the last run timestamp stored in the plugin's options with the current
-        // timestamp. If the difference is greater than the cache timeout we shall not execute again.
-        $now  = time();
-        $last = (int) $this->params->get('lastrun', 0);
-
-        if ((abs($now - $last) < $cacheTimeout)) {
-            return;
-        }
-
-        // Update last run status
-        $this->params->set('lastrun', $now);
-
-        $paramsJson = $this->params->toString('JSON');
-        $db         = $this->db;
-        $query      = $db->getQuery(true)
-            ->update($db->quoteName('#__extensions'))
-            ->set($db->quoteName('params') . ' = :params')
-            ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
-            ->where($db->quoteName('folder') . ' = ' . $db->quote('system'))
-            ->where($db->quoteName('element') . ' = ' . $db->quote('privacyconsent'))
-            ->bind(':params', $paramsJson);
-
-        try {
-            // Lock the tables to prevent multiple plugin executions causing a race condition
-            $db->lockTable('#__extensions');
-        } catch (Exception $e) {
-            // If we can't lock the tables it's too risky to continue execution
-            return;
-        }
-
-        try {
-            // Update the plugin parameters
-            $result = $db->setQuery($query)->execute();
-            $this->clearCacheGroups(['com_plugins'], [0, 1]);
-        } catch (Exception $exc) {
-            // If we failed to execute
-            $db->unlockTables();
-            $result = false;
-        }
-
-        try {
-            // Unlock the tables after writing
-            $db->unlockTables();
-        } catch (Exception $e) {
-            // If we can't lock the tables assume we have somehow failed
-            $result = false;
-        }
-
-        // Abort on failure
-        if (!$result) {
-            return;
-        }
-
-        // Delete the expired privacy consents
-        $this->invalidateExpiredConsents();
-
-        // Remind for privacy consents near to expire
-        $this->remindExpiringConsents();
-    }
-
-    /**
-     * Method to send the remind for privacy consents renew
-     *
-     * @return  integer
-     *
-     * @since   3.9.0
-     */
-    private function remindExpiringConsents()
-    {
-        // Load the parameters.
-        $expire   = (int) $this->params->get('consentexpiration', 365);
-        $remind   = (int) $this->params->get('remind', 30);
-        $now      = Factory::getDate()->toSql();
-        $period   = '-' . ($expire - $remind);
-        $db       = $this->db;
-        $query    = $db->getQuery(true);
-
-        $query->select($db->quoteName(['r.id', 'r.user_id', 'u.email']))
-            ->from($db->quoteName('#__privacy_consents', 'r'))
-            ->join('LEFT', $db->quoteName('#__users', 'u'), $db->quoteName('u.id') . ' = ' . $db->quoteName('r.user_id'))
-            ->where($db->quoteName('subject') . ' = ' . $db->quote('PLG_SYSTEM_PRIVACYCONSENT_SUBJECT'))
-            ->where($db->quoteName('remind') . ' = 0')
-            ->where($query->dateAdd($db->quote($now), $period, 'DAY') . ' > ' . $db->quoteName('created'));
-
-        try {
-            $users = $db->setQuery($query)->loadObjectList();
-        } catch (ExecutionFailureException $exception) {
-            return false;
-        }
-
-        $app      = Factory::getApplication();
-        $linkMode = $app->get('force_ssl', 0) == 2 ? Route::TLS_FORCE : Route::TLS_IGNORE;
-
-        foreach ($users as $user) {
-            $token       = ApplicationHelper::getHash(UserHelper::genRandomPassword());
-            $hashedToken = UserHelper::hashPassword($token);
-
-            // The mail
-            try {
-                $templateData = [
-                    'sitename' => $app->get('sitename'),
-                    'url'      => Uri::root(),
-                    'tokenurl' => Route::link('site', 'index.php?option=com_privacy&view=remind&remind_token=' . $token, false, $linkMode, true),
-                    'formurl'  => Route::link('site', 'index.php?option=com_privacy&view=remind', false, $linkMode, true),
-                    'token'    => $token,
-                ];
-
-                $mailer = new MailTemplate('plg_system_privacyconsent.request.reminder', $app->getLanguage()->getTag());
-                $mailer->addTemplateData($templateData);
-                $mailer->addRecipient($user->email);
-
-                $mailResult = $mailer->send();
-
-                if ($mailResult === false) {
-                    return false;
-                }
-
-                $userId = (int) $user->id;
-
-                // Update the privacy_consents item to not send the reminder again
-                $query->clear()
-                    ->update($db->quoteName('#__privacy_consents'))
-                    ->set($db->quoteName('remind') . ' = 1')
-                    ->set($db->quoteName('token') . ' = :token')
-                    ->where($db->quoteName('id') . ' = :userid')
-                    ->bind(':token', $hashedToken)
-                    ->bind(':userid', $userId, ParameterType::INTEGER);
-                $db->setQuery($query);
-
-                try {
-                    $db->execute();
-                } catch (RuntimeException $e) {
-                    return false;
-                }
-            } catch (MailDisabledException | phpmailerException $exception) {
-                return false;
-            }
-        }
-    }
-
-    /**
-     * Method to delete the expired privacy consents
-     *
-     * @return  boolean
-     *
-     * @since   3.9.0
-     */
-    private function invalidateExpiredConsents()
-    {
-        // Load the parameters.
-        $expire = (int) $this->params->get('consentexpiration', 365);
-        $now    = Factory::getDate()->toSql();
-        $period = '-' . $expire;
-        $db     = $this->db;
-        $query  = $db->getQuery(true);
-
-        $query->select($db->quoteName(['id', 'user_id']))
-            ->from($db->quoteName('#__privacy_consents'))
-            ->where($query->dateAdd($db->quote($now), $period, 'DAY') . ' > ' . $db->quoteName('created'))
-            ->where($db->quoteName('subject') . ' = ' . $db->quote('PLG_SYSTEM_PRIVACYCONSENT_SUBJECT'))
-            ->where($db->quoteName('state') . ' = 1');
-
-        $db->setQuery($query);
-
-        try {
-            $users = $db->loadObjectList();
-        } catch (RuntimeException $e) {
-            return false;
-        }
-
-        // Do not process further if no expired consents found
-        if (empty($users)) {
-            return true;
-        }
-
-        // Push a notification to the site's super users
-        /** @var MessageModel $messageModel */
-        $messageModel = $this->app->bootComponent('com_messages')->getMVCFactory()->createModel('Message', 'Administrator');
-
-        foreach ($users as $user) {
-            $userId = (int) $user->id;
-            $query  = $db->getQuery(true)
-                ->update($db->quoteName('#__privacy_consents'))
-                ->set($db->quoteName('state') . ' = 0')
-                ->where($db->quoteName('id') . ' = :userid')
-                ->bind(':userid', $userId, ParameterType::INTEGER);
-            $db->setQuery($query);
-
-            try {
-                $db->execute();
-            } catch (RuntimeException $e) {
-                return false;
-            }
-
-            $messageModel->notifySuperUsers(
-                Text::_('PLG_SYSTEM_PRIVACYCONSENT_NOTIFICATION_USER_PRIVACY_EXPIRED_SUBJECT'),
-                Text::sprintf('PLG_SYSTEM_PRIVACYCONSENT_NOTIFICATION_USER_PRIVACY_EXPIRED_MESSAGE', Factory::getUser($user->user_id)->username)
-            );
-        }
-
-        return true;
-    }
-    /**
-     * Clears cache groups. We use it to clear the plugins cache after we update the last run timestamp.
-     *
-     * @param   array  $clearGroups   The cache groups to clean
-     * @param   array  $cacheClients  The cache clients (site, admin) to clean
-     *
-     * @return  void
-     *
-     * @since    3.9.0
-     */
-    private function clearCacheGroups(array $clearGroups, array $cacheClients = [0, 1])
-    {
-        foreach ($clearGroups as $group) {
-            foreach ($cacheClients as $client_id) {
-                try {
-                    $options = [
-                        'defaultgroup' => $group,
-                        'cachebase'    => $client_id ? JPATH_ADMINISTRATOR . '/cache' :
-                            Factory::getApplication()->get('cache_path', JPATH_SITE . '/cache'),
-                    ];
-
-                    $cache = Cache::getInstance('callback', $options);
-                    $cache->clean();
-                } catch (Exception $e) {
-                    // Ignore it
-                }
-            }
-        }
-    }
 }
diff --git a/plugins/system/redirect/redirect.xml b/plugins/system/redirect/redirect.xml
index 3d952b5226872..b522b0c2d747b 100644
--- a/plugins/system/redirect/redirect.xml
+++ b/plugins/system/redirect/redirect.xml
@@ -9,9 +9,11 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>3.0.0</version>
 	<description>PLG_SYSTEM_REDIRECT_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\System\Redirect</namespace>
 	<files>
 		<folder>form</folder>
-		<filename plugin="redirect">redirect.php</filename>
+		<folder plugin="redirect">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_system_redirect.ini</language>
diff --git a/plugins/system/redirect/services/provider.php b/plugins/system/redirect/services/provider.php
new file mode 100644
index 0000000000000..4ca8dbc324bf2
--- /dev/null
+++ b/plugins/system/redirect/services/provider.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.redirect
+ *
+ * @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\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\Event\DispatcherInterface;
+use Joomla\Plugin\System\Redirect\Extension\Redirect;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new Redirect(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('system', 'redirect')
+                );
+                $plugin->setApplication(Factory::getApplication());
+                $plugin->setDatabase($container->get(DatabaseInterface::class));
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/system/redirect/redirect.php b/plugins/system/redirect/src/Extension/Redirect.php
similarity index 83%
rename from plugins/system/redirect/redirect.php
rename to plugins/system/redirect/src/Extension/Redirect.php
index 8a559e4dead26..95900e40e9421 100644
--- a/plugins/system/redirect/redirect.php
+++ b/plugins/system/redirect/src/Extension/Redirect.php
@@ -6,18 +6,17 @@
  *
  * @copyright   (C) 2009 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
+namespace Joomla\Plugin\System\Redirect\Extension;
+
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Event\ErrorEvent;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Uri\Uri;
-use Joomla\Database\DatabaseInterface;
+use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Database\ParameterType;
 use Joomla\Event\SubscriberInterface;
 use Joomla\String\StringHelper;
@@ -31,8 +30,10 @@
  *
  * @since  1.6
  */
-class PlgSystemRedirect extends CMSPlugin implements SubscriberInterface
+final class Redirect extends CMSPlugin implements SubscriberInterface
 {
+    use DatabaseAwareTrait;
+
     /**
      * Affects constructor behavior. If true, language files will be loaded automatically.
      *
@@ -41,14 +42,6 @@ class PlgSystemRedirect extends CMSPlugin implements SubscriberInterface
      */
     protected $autoloadLanguage = false;
 
-    /**
-     * Database object.
-     *
-     * @var    DatabaseInterface
-     * @since  4.0.0
-     */
-    protected $db;
-
     /**
      * Returns an array of events this subscriber will listen to.
      *
@@ -58,9 +51,7 @@ class PlgSystemRedirect extends CMSPlugin implements SubscriberInterface
      */
     public static function getSubscribedEvents(): array
     {
-        return [
-            'onError' => 'handleError',
-        ];
+        return ['onError' => 'handleError'];
     }
 
     /**
@@ -138,12 +129,12 @@ public function handleError(ErrorEvent $event)
             return;
         }
 
-        $query = $this->db->getQuery(true);
+        $query = $this->getDatabase()->getQuery(true);
 
         $query->select('*')
-            ->from($this->db->quoteName('#__redirect_links'))
+            ->from($this->getDatabase()->quoteName('#__redirect_links'))
             ->whereIn(
-                $this->db->quoteName('old_url'),
+                $this->getDatabase()->quoteName('old_url'),
                 [
                     $url,
                     $urlRel,
@@ -161,14 +152,14 @@ public function handleError(ErrorEvent $event)
                 ParameterType::STRING
             );
 
-        $this->db->setQuery($query);
+        $this->getDatabase()->setQuery($query);
 
         $redirect = null;
 
         try {
-            $redirects = $this->db->loadAssocList();
-        } catch (Exception $e) {
-            $event->setError(new Exception(Text::_('PLG_SYSTEM_REDIRECT_ERROR_UPDATING_DATABASE'), 500, $e));
+            $redirects = $this->getDatabase()->loadAssocList();
+        } catch (\Exception $e) {
+            $event->setError(new \Exception($this->getApplication()->getLanguage()->_('PLG_SYSTEM_REDIRECT_ERROR_UPDATING_DATABASE'), 500, $e));
 
             return;
         }
@@ -227,15 +218,15 @@ public function handleError(ErrorEvent $event)
                 $redirect->hits++;
 
                 try {
-                    $this->db->updateObject('#__redirect_links', $redirect, 'id');
-                } catch (Exception $e) {
+                    $this->getDatabase()->updateObject('#__redirect_links', $redirect, 'id');
+                } catch (\Exception $e) {
                     // We don't log issues for now
                 }
 
                 $app->redirect($destination, (int) $redirect->header);
             }
 
-            $event->setError(new RuntimeException($event->getError()->getMessage(), $redirect->header, $event->getError()));
+            $event->setError(new \RuntimeException($event->getError()->getMessage(), $redirect->header, $event->getError()));
         } elseif ($redirect === null) {
             // No redirect object was found so we create an entry in the redirect table
             if ((bool) $this->params->get('collect_urls', 1)) {
@@ -256,9 +247,9 @@ public function handleError(ErrorEvent $event)
                 ];
 
                 try {
-                    $this->db->insertObject('#__redirect_links', $data, 'id');
-                } catch (Exception $e) {
-                    $event->setError(new Exception(Text::_('PLG_SYSTEM_REDIRECT_ERROR_UPDATING_DATABASE'), 500, $e));
+                    $this->getDatabase()->insertObject('#__redirect_links', $data, 'id');
+                } catch (\Exception $e) {
+                    $event->setError(new \Exception($this->getApplication()->getLanguage()->_('PLG_SYSTEM_REDIRECT_ERROR_UPDATING_DATABASE'), 500, $e));
 
                     return;
                 }
@@ -268,9 +259,9 @@ public function handleError(ErrorEvent $event)
             $redirect->hits++;
 
             try {
-                $this->db->updateObject('#__redirect_links', $redirect, ['id']);
-            } catch (Exception $e) {
-                $event->setError(new Exception(Text::_('PLG_SYSTEM_REDIRECT_ERROR_UPDATING_DATABASE'), 500, $e));
+                $this->getDatabase()->updateObject('#__redirect_links', $redirect, ['id']);
+            } catch (\Exception $e) {
+                $event->setError(new \Exception($this->getApplication()->getLanguage()->_('PLG_SYSTEM_REDIRECT_ERROR_UPDATING_DATABASE'), 500, $e));
 
                 return;
             }
diff --git a/plugins/system/remember/remember.xml b/plugins/system/remember/remember.xml
index 17982026f491a..6ecf07d33244a 100644
--- a/plugins/system/remember/remember.xml
+++ b/plugins/system/remember/remember.xml
@@ -9,8 +9,10 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>3.0.0</version>
 	<description>PLG_REMEMBER_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\System\Remember</namespace>
 	<files>
-		<filename plugin="remember">remember.php</filename>
+		<folder plugin="remember">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_system_remember.ini</language>
diff --git a/plugins/system/remember/services/provider.php b/plugins/system/remember/services/provider.php
new file mode 100644
index 0000000000000..5a6fc0a333aad
--- /dev/null
+++ b/plugins/system/remember/services/provider.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.remember
+ *
+ * @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\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\Event\DispatcherInterface;
+use Joomla\Plugin\System\Remember\Extension\Remember;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new Remember(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('system', 'remember')
+                );
+                $plugin->setApplication(Factory::getApplication());
+                $plugin->setDatabase($container->get(DatabaseInterface::class));
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/system/remember/remember.php b/plugins/system/remember/src/Extension/Remember.php
similarity index 80%
rename from plugins/system/remember/remember.php
rename to plugins/system/remember/src/Extension/Remember.php
index 15484186fda9e..52790f1142a96 100644
--- a/plugins/system/remember/remember.php
+++ b/plugins/system/remember/src/Extension/Remember.php
@@ -6,14 +6,15 @@
  *
  * @copyright   (C) 2007 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
+namespace Joomla\Plugin\System\Remember\Extension;
+
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\User\UserHelper;
+use Joomla\Database\DatabaseAwareTrait;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -24,22 +25,9 @@
  *
  * @since  1.5
  */
-
-class PlgSystemRemember extends CMSPlugin
+final class Remember extends CMSPlugin
 {
-    /**
-     * @var    \Joomla\CMS\Application\CMSApplication
-     *
-     * @since  3.2
-     */
-    protected $app;
-
-    /**
-     * @var    \Joomla\Database\DatabaseDriver
-     *
-     * @since  4.0.0
-     */
-    protected $db;
+    use DatabaseAwareTrait;
 
     /**
      * Remember me method to run onAfterInitialise
@@ -54,17 +42,17 @@ class PlgSystemRemember extends CMSPlugin
     public function onAfterInitialise()
     {
         // No remember me for admin.
-        if ($this->app->isClient('administrator')) {
+        if (!$this->getApplication()->isClient('site')) {
             return;
         }
 
         // Check for a cookie if user is not logged in
-        if ($this->app->getIdentity()->get('guest')) {
+        if ($this->getApplication()->getIdentity()->guest) {
             $cookieName = 'joomla_remember_me_' . UserHelper::getShortHashedUserAgent();
 
             // Check for the cookie
-            if ($this->app->getInput()->cookie->get($cookieName)) {
-                $this->app->login(['username' => ''], ['silent' => true]);
+            if ($this->getApplication()->getInput()->cookie->get($cookieName)) {
+                $this->getApplication()->login(['username' => ''], ['silent' => true]);
             }
         }
     }
@@ -80,14 +68,14 @@ public function onAfterInitialise()
     public function onUserLogout($user, $options)
     {
         // No remember me for admin
-        if ($this->app->isClient('administrator')) {
+        if (!$this->getApplication()->isClient('site')) {
             return true;
         }
 
         $cookieName = 'joomla_remember_me_' . UserHelper::getShortHashedUserAgent();
 
         // Check for the cookie
-        if ($this->app->getInput()->cookie->get($cookieName)) {
+        if ($this->getApplication()->getInput()->cookie->get($cookieName)) {
             // Make sure authentication group is loaded to process onUserAfterLogout event
             PluginHelper::importPlugin('authentication');
         }
@@ -120,7 +108,7 @@ public function onUserBeforeSave($user, $isnew, $data)
         }
 
         // But now, we need to do something - Delete all tokens for this user!
-        $db    = $this->db;
+        $db    = $this->getDatabase();
         $query = $db->getQuery(true)
             ->delete($db->quoteName('#__user_keys'))
             ->where($db->quoteName('user_id') . ' = :userid')
@@ -128,7 +116,7 @@ public function onUserBeforeSave($user, $isnew, $data)
 
         try {
             $db->setQuery($query)->execute();
-        } catch (RuntimeException $e) {
+        } catch (\RuntimeException $e) {
             // Log an alert for the site admin
             Log::add(
                 sprintf('Failed to delete cookie token for user %s with the following error: %s', $user['username'], $e->getMessage()),
diff --git a/plugins/system/schedulerunner/schedulerunner.xml b/plugins/system/schedulerunner/schedulerunner.xml
index b4fe68f63a119..ccaffcc83162b 100644
--- a/plugins/system/schedulerunner/schedulerunner.xml
+++ b/plugins/system/schedulerunner/schedulerunner.xml
@@ -9,12 +9,14 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>4.1</version>
 	<description>PLG_SYSTEM_SCHEDULERUNNER_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\System\ScheduleRunner</namespace>
 	<media destination="plg_system_schedulerunner" folder="media">
 		<folder>js</folder>
 		<filename>joomla.asset.json</filename>
 	</media>
 	<files>
-		<filename plugin="schedulerunner">schedulerunner.php</filename>
+		<folder plugin="schedulerunner">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_system_schedulerunner.ini</language>
diff --git a/plugins/system/schedulerunner/services/provider.php b/plugins/system/schedulerunner/services/provider.php
new file mode 100644
index 0000000000000..1c6d4cd76fc6d
--- /dev/null
+++ b/plugins/system/schedulerunner/services/provider.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.schedulerunner
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\System\ScheduleRunner\Extension\ScheduleRunner;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new ScheduleRunner(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('system', 'schedulerunner')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/system/schedulerunner/schedulerunner.php b/plugins/system/schedulerunner/src/Extension/ScheduleRunner.php
similarity index 82%
rename from plugins/system/schedulerunner/schedulerunner.php
rename to plugins/system/schedulerunner/src/Extension/ScheduleRunner.php
index 30ce85e53e907..5ad6b42a896e2 100644
--- a/plugins/system/schedulerunner/schedulerunner.php
+++ b/plugins/system/schedulerunner/src/Extension/ScheduleRunner.php
@@ -2,19 +2,17 @@
 
 /**
  * @package     Joomla.Plugin
- * @subpackage  System.ScheduleRunner
+ * @subpackage  System.schedulerunner
  *
  * @copyright   (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
-use Joomla\CMS\Application\CMSApplication;
+namespace Joomla\Plugin\System\ScheduleRunner\Extension;
+
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Event\Model;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Form\Form;
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Router\Route;
@@ -35,15 +33,15 @@
 /**
  * This plugin implements listeners to support a visitor-triggered lazy-scheduling pattern.
  * If `com_scheduler` is installed/enabled and its configuration allows unprotected lazy scheduling, this plugin
- * injects into each response with an HTML context a JS file {@see PlgSystemSchedulerunner::injectScheduleRunner()} that
- * sets up an AJAX callback to trigger the scheduler {@see PlgSystemSchedulerunner::runScheduler()}. This is achieved
+ * injects into each response with an HTML context a JS file {@see PlgSystemScheduleRunner::injectScheduleRunner()} that
+ * sets up an AJAX callback to trigger the scheduler {@see PlgSystemScheduleRunner::runScheduler()}. This is achieved
  * through a call to the `com_ajax` component.
  * Also supports the scheduler component configuration form through auto-generation of the webcron key and injection
  * of JS of usability enhancement.
  *
  * @since 4.1.0
  */
-class PlgSystemSchedulerunner extends CMSPlugin implements SubscriberInterface
+final class ScheduleRunner extends CMSPlugin implements SubscriberInterface
 {
     /**
      * Length of auto-generated webcron key.
@@ -53,12 +51,6 @@ class PlgSystemSchedulerunner extends CMSPlugin implements SubscriberInterface
      */
     private const WEBCRON_KEY_LENGTH = 20;
 
-    /**
-     * @var  CMSApplication
-     * @since  4.1.0
-     */
-    protected $app;
-
     /**
      * @inheritDoc
      *
@@ -66,7 +58,7 @@ class PlgSystemSchedulerunner extends CMSPlugin implements SubscriberInterface
      *
      * @since 4.1.0
      *
-     * @throws Exception
+     * @throws \Exception
      */
     public static function getSubscribedEvents(): array
     {
@@ -107,7 +99,7 @@ public static function getSubscribedEvents(): array
     public function injectLazyJS(EventInterface $event): void
     {
         // Only inject in HTML documents
-        if ($this->app->getDocument()->getType() !== 'html') {
+        if ($this->getApplication()->getDocument()->getType() !== 'html') {
             return;
         }
 
@@ -118,7 +110,7 @@ public function injectLazyJS(EventInterface $event): void
         }
 
         // Check if any task is due to decrease the load
-        $model = $this->app->bootComponent('com_scheduler')
+        $model = $this->getApplication()->bootComponent('com_scheduler')
             ->getMVCFactory()->createModel('Tasks', 'Administrator', ['ignore_request' => true]);
 
         $model->setState('filter.state', 1);
@@ -138,10 +130,10 @@ public function injectLazyJS(EventInterface $event): void
 
         // Add configuration options
         $triggerInterval = $config->get('lazy_scheduler.interval', 300);
-        $this->app->getDocument()->addScriptOptions('plg_system_schedulerunner', ['interval' => $triggerInterval]);
+        $this->getApplication()->getDocument()->addScriptOptions('plg_system_schedulerunner', ['interval' => $triggerInterval]);
 
         // Load and injection directive
-        $wa = $this->app->getDocument()->getWebAssetManager();
+        $wa = $this->getApplication()->getDocument()->getWebAssetManager();
         $wa->getRegistry()->addExtensionRegistryFile('plg_system_schedulerunner');
         $wa->useScript('plg_system_schedulerunner.run-schedule');
     }
@@ -158,7 +150,7 @@ public function injectLazyJS(EventInterface $event): void
      *
      * @since 4.1.0
      *
-     * @throws Exception
+     * @throws \Exception
      */
     public function runLazyCron(EventInterface $e)
     {
@@ -168,7 +160,7 @@ public function runLazyCron(EventInterface $e)
             return;
         }
 
-        // Since `navigator.sendBeacon()` may time out, allow execution after disconnect if possible.
+        // Since the the request from the frontend may time out, try allowing execution after disconnect.
         if (function_exists('ignore_user_abort')) {
             ignore_user_abort(true);
         }
@@ -179,7 +171,7 @@ public function runLazyCron(EventInterface $e)
         // Suppress all errors to avoid any output
         try {
             $this->runScheduler();
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
         }
 
         ob_end_clean();
@@ -202,7 +194,7 @@ public function runLazyCron(EventInterface $e)
      *
      * @since 4.1.0
      *
-     * @throws Exception
+     * @throws \Exception
      */
     public function runWebCron(Event $event)
     {
@@ -210,15 +202,15 @@ public function runWebCron(Event $event)
         $hash   = $config->get('webcron.key', '');
 
         if (!$config->get('webcron.enabled', false)) {
-            Log::add(Text::_('PLG_SYSTEM_SCHEDULE_RUNNER_WEBCRON_DISABLED'));
-            throw new Exception(Text::_('JERROR_ALERTNOAUTHOR'), 403);
+            Log::add($this->getApplication()->getLanguage()->_('PLG_SYSTEM_SCHEDULE_RUNNER_WEBCRON_DISABLED'));
+            throw new \Exception($this->getApplication()->getLanguage()->_('JERROR_ALERTNOAUTHOR'), 403);
         }
 
-        if (!strlen($hash) || $hash !== $this->app->getInput()->get('hash')) {
-            throw new Exception(Text::_('JERROR_ALERTNOAUTHOR'), 403);
+        if (!strlen($hash) || $hash !== $this->getApplication()->getInput()->get('hash')) {
+            throw new \Exception($this->getApplication()->getLanguage()->_('JERROR_ALERTNOAUTHOR'), 403);
         }
 
-        $id = (int) $this->app->getInput()->getInt('id', 0);
+        $id = (int) $this->getApplication()->getInput()->getInt('id', 0);
 
         $task = $this->runScheduler($id);
 
@@ -238,7 +230,7 @@ public function runWebCron(Event $event)
      *
      * @since 4.1.0
      *
-     * @throws Exception
+     * @throws \Exception
      */
     public function runTestCron(Event $event)
     {
@@ -246,13 +238,13 @@ public function runTestCron(Event $event)
             return;
         }
 
-        $id              = (int) $this->app->getInput()->getInt('id');
-        $allowConcurrent = $this->app->getInput()->getBool('allowConcurrent', false);
+        $id              = (int) $this->getApplication()->getInput()->getInt('id');
+        $allowConcurrent = $this->getApplication()->getInput()->getBool('allowConcurrent', false);
 
-        $user = Factory::getApplication()->getIdentity();
+        $user = $this->getApplication()->getIdentity();
 
         if (empty($id) || !$user->authorise('core.testrun', 'com_scheduler.task.' . $id)) {
-            throw new \Exception(Text::_('JERROR_ALERTNOAUTHOR'), 403);
+            throw new \Exception($this->getApplication()->getLanguage()->_('JERROR_ALERTNOAUTHOR'), 403);
         }
 
         /**
@@ -296,7 +288,7 @@ public function runTestCron(Event $event)
      * @since 4.1.0
      * @throws RuntimeException
      */
-    protected function runScheduler(int $id = 0): ?Task
+    private function runScheduler(int $id = 0): ?Task
     {
         return (new Scheduler())->runTask(['id' => $id]);
     }
@@ -304,24 +296,23 @@ protected function runScheduler(int $id = 0): ?Task
     /**
      * Enhance the scheduler config form by dynamically populating or removing display fields.
      *
-     * @param   EventInterface  $event  The onContentPrepareForm event.
+     * @param   Model\PrepareFormEvent  $event  The onContentPrepareForm event.
      *
      * @return void
      *
      * @since 4.1.0
-     * @throws UnexpectedValueException|RuntimeException
+     * @throws \UnexpectedValueException|\RuntimeException
      *
      * @todo  Move to another plugin?
      */
-    public function enhanceSchedulerConfig(EventInterface $event): void
+    public function enhanceSchedulerConfig(Model\PrepareFormEvent $event): void
     {
-        /** @var Form $form */
-        $form = $event->getArgument('0');
-        $data = $event->getArgument('1');
+        $form = $event->getForm();
+        $data = $event->getData();
 
         if (
             $form->getName() !== 'com_config.component'
-            || $this->app->getInput()->get('component') !== 'com_scheduler'
+            || $this->getApplication()->getInput()->get('component') !== 'com_scheduler'
         ) {
             return;
         }
@@ -352,7 +343,7 @@ public function enhanceSchedulerConfig(EventInterface $event): void
     public function generateWebcronKey(EventInterface $event): void
     {
         /** @var Extension $table */
-        [$context, $table] = $event->getArguments();
+        [$context, $table] = array_values($event->getArguments());
 
         if ($context !== 'com_config.component' || $table->name !== 'com_scheduler') {
             return;
diff --git a/plugins/system/schemaorg/forms/schemaorg.xml b/plugins/system/schemaorg/forms/schemaorg.xml
new file mode 100755
index 0000000000000..e012a47479f39
--- /dev/null
+++ b/plugins/system/schemaorg/forms/schemaorg.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form>
+	<fields name="schema">
+		<fieldset
+			name="schema"
+			label="PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_LABEL"
+		>
+			<field
+				name="schemainfo"
+				type="note"
+				class="alert alert-info d-block w-100"
+				description="PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_DESCRIPTION"
+			/>
+			<field
+				name="schemaType"
+				type="list"
+				label="PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_TYPE_LABEL"
+				default="None"
+				validate="options"
+				>
+				<option value="None">JNONE</option>
+			</field>
+
+		</fieldset>
+	</fields>
+</form>
diff --git a/plugins/system/schemaorg/schemaorg.xml b/plugins/system/schemaorg/schemaorg.xml
new file mode 100755
index 0000000000000..24c9d6bcfbf64
--- /dev/null
+++ b/plugins/system/schemaorg/schemaorg.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extension type="plugin" group="system" method="upgrade">
+	<name>plg_system_schemaorg</name>
+	<author>Joomla! Project</author>
+	<creationDate>2023-07</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_SYSTEM_SCHEMAORG_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\System\Schemaorg</namespace>
+	<files>
+		<folder plugin="schemaorg">services</folder>
+		<folder>src</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">language/en-GB/plg_system_schemaorg.ini</language>
+		<language tag="en-GB">language/en-GB/plg_system_schemaorg.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="baseType"
+					type="list"
+					label="PLG_SYSTEM_SCHEMAORG_BASETYPE_LABEL"
+					description="PLG_SYSTEM_SCHEMAORG_BASETYPE_DESCRIPTION"
+					validate="options"
+					required="true"
+					>
+					<option value="organization">PLG_SYSTEM_SCHEMAORG_BASETYPE_OPTION_ORGANIZATION</option>
+					<option value="person">PLG_SYSTEM_SCHEMAORG_BASETYPE_OPTION_PERSON</option>
+				</field>
+
+				<field
+					name="user"
+					type="user"
+					label="PLG_SYSTEM_SCHEMAORG_USER_LABEL"
+					showon="baseType:person"
+					default="0"
+				/>
+
+				<field
+					name="name"
+					type="text"
+					label="PLG_SYSTEM_SCHEMAORG_NAME_LABEL"
+					showon="baseType:organization[OR]user:0"
+				/>
+
+				<field
+					name="image"
+					type="media"
+					label="PLG_SYSTEM_SCHEMAORG_IMAGE_LABEL"
+				/>
+				<field
+					name="socialmedia"
+					type="subform"
+					label="PLG_SYSTEM_SCHEMAORG_SOCIALMEDIA_LABEL"
+					multiple="true"
+				>
+					<form>
+						<field
+							name="url"
+							type="url"
+							label="PLG_SYSTEM_SCHEMAORG_SOCIALMEDIA_URL_LABEL"
+							required="true"
+							hint="https://"
+							validate="url"
+						/>
+					</form>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
\ No newline at end of file
diff --git a/plugins/system/schemaorg/services/provider.php b/plugins/system/schemaorg/services/provider.php
new file mode 100644
index 0000000000000..1185fe3b9a190
--- /dev/null
+++ b/plugins/system/schemaorg/services/provider.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.schemaorg
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\User\UserFactoryInterface;
+use Joomla\Database\DatabaseInterface;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\System\Schemaorg\Extension\Schemaorg;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function register(Container $container)
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $dispatcher = $container->get(DispatcherInterface::class);
+
+                $plugin = new Schemaorg(
+                    $dispatcher,
+                    (array) PluginHelper::getPlugin('system', 'schemaorg')
+                );
+
+                $plugin->setApplication(Factory::getApplication());
+                $plugin->setDatabase(Factory::getContainer()->get(DatabaseInterface::class));
+                $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
new file mode 100644
index 0000000000000..591fb3136f1dd
--- /dev/null
+++ b/plugins/system/schemaorg/src/Extension/Schemaorg.php
@@ -0,0 +1,538 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.schemaorg
+ *
+ * @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\System\Schemaorg\Extension;
+
+use Joomla\CMS\Event\Model;
+use Joomla\CMS\Event\Plugin\System\Schemaorg\BeforeCompileHeadEvent;
+use Joomla\CMS\Event\Plugin\System\Schemaorg\PrepareDataEvent;
+use Joomla\CMS\Event\Plugin\System\Schemaorg\PrepareFormEvent;
+use Joomla\CMS\Event\Plugin\System\Schemaorg\PrepareSaveEvent;
+use Joomla\CMS\Helper\ModuleHelper;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Schemaorg\SchemaorgPrepareDateTrait;
+use Joomla\CMS\Schemaorg\SchemaorgPrepareImageTrait;
+use Joomla\CMS\Schemaorg\SchemaorgServiceInterface;
+use Joomla\CMS\Uri\Uri;
+use Joomla\CMS\User\UserFactoryAwareTrait;
+use Joomla\Database\DatabaseAwareTrait;
+use Joomla\Database\ParameterType;
+use Joomla\Event\SubscriberInterface;
+use Joomla\Registry\Registry;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Schemaorg System Plugin
+ *
+ * @since  5.0.0
+ */
+final class Schemaorg extends CMSPlugin implements SubscriberInterface
+{
+    use DatabaseAwareTrait;
+    use SchemaorgPrepareImageTrait;
+    use SchemaorgPrepareDateTrait;
+    use UserFactoryAwareTrait;
+
+    /**
+     * Load the language file on instantiation.
+     *
+     * @var    boolean
+     * @since  5.0.0
+     */
+    protected $autoloadLanguage = true;
+
+    /**
+     * Returns an array of events this subscriber will listen to.
+     *
+     * @return  array
+     *
+     * @since   5.0.0
+     */
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            'onBeforeCompileHead'  => 'onBeforeCompileHead',
+            'onContentPrepareData' => 'onContentPrepareData',
+            'onContentPrepareForm' => 'onContentPrepareForm',
+            'onContentAfterSave'   => 'onContentAfterSave',
+        ];
+    }
+
+    /**
+     * Runs on content preparation
+     *
+     * @param   Model\PrepareDataEvent  $event  The event
+     *
+     * @since   5.0.0
+     *
+     */
+    public function onContentPrepareData(Model\PrepareDataEvent $event)
+    {
+        $context = $event->getContext();
+        $data    = $event->getData();
+
+        $app = $this->getApplication();
+
+        if ($app->isClient('site') || !$this->isSupported($context)) {
+            return;
+        }
+
+        $data = (object) $data;
+
+        $itemId = $data->id ?? 0;
+
+        // Check if the form already has some data
+        if ($itemId > 0) {
+            $db = $this->getDatabase();
+
+            $query = $db->getQuery(true)
+                ->select('*')
+                ->from($db->quoteName('#__schemaorg'))
+                ->where($db->quoteName('itemId') . '= :itemId')
+                ->bind(':itemId', $itemId, ParameterType::INTEGER)
+                ->where($db->quoteName('context') . '= :context')
+                ->bind(':context', $context, ParameterType::STRING);
+
+            $results = $db->setQuery($query)->loadAssoc();
+
+            if (empty($results)) {
+                return;
+            }
+
+            $schemaType                 = $results['schemaType'];
+            $data->schema['schemaType'] = $schemaType;
+
+            $schema = new Registry($results['schema']);
+
+            $data->schema[$schemaType] = $schema->toArray();
+        }
+
+        $dispatcher = $this->getDispatcher();
+        $event      = new PrepareDataEvent('onSchemaPrepareData', [
+            'subject' => $data,
+            'context' => $context,
+        ]);
+
+        PluginHelper::importPlugin('schemaorg', null, true, $dispatcher);
+        $dispatcher->dispatch('onSchemaPrepareData', $event);
+    }
+
+    /**
+     * The form event.
+     *
+     * @param   Model\PrepareFormEvent  $event  The event
+     *
+     * @since   5.0.0
+     */
+    public function onContentPrepareForm(Model\PrepareFormEvent $event)
+    {
+        $form    = $event->getForm();
+        $context = $form->getName();
+        $app     = $this->getApplication();
+
+        if (!$app->isClient('administrator') || !$this->isSupported($context)) {
+            return;
+        }
+
+        // Load the form fields
+        $form->loadFile(JPATH_PLUGINS . '/' . $this->_type . '/' . $this->_name . '/forms/schemaorg.xml');
+
+
+        // The user should configure the plugin first
+        if (!$this->params->get('baseType')) {
+            $form->removeField('schemaType', 'schema');
+
+            $plugin = PluginHelper::getPlugin('system', 'schemaorg');
+
+            $user = $this->getApplication()->getIdentity();
+
+            $infoText = Text::_('PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_DESCRIPTION_NOT_CONFIGURATED');
+
+            // If edit permission are available, offer a link
+            if ($user->authorise('core.edit', 'com_plugins')) {
+                $infoText = Text::sprintf('PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_DESCRIPTION_NOT_CONFIGURATED_ADMIN', (int) $plugin->id);
+            }
+
+            $form->setFieldAttribute('schemainfo', 'description', $infoText, 'schema');
+
+            return;
+        }
+
+        $dispatcher = $this->getDispatcher();
+        $event      = new PrepareFormEvent('onSchemaPrepareForm', [
+            'subject' => $form,
+        ]);
+
+        PluginHelper::importPlugin('schemaorg', null, true, $dispatcher);
+        $dispatcher->dispatch('onSchemaPrepareForm', $event);
+    }
+
+    /**
+     * Saves form field data in the database
+     *
+     * @param   Model\AfterSaveEvent $event
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function onContentAfterSave(Model\AfterSaveEvent $event)
+    {
+        $context = $event->getContext();
+        $table   = $event->getItem();
+        $isNew   = $event->getIsNew();
+        $data    = $event->getData();
+        $app     = $this->getApplication();
+        $db      = $this->getDatabase();
+
+        if (!$app->isClient('administrator') || !$this->isSupported($context)) {
+            return;
+        }
+
+        $itemId = (int) $table->id;
+
+        if (empty($data['schema']) || empty($data['schema']['schemaType']) || $data['schema']['schemaType'] === 'None') {
+            $query = $db->getQuery(true);
+
+            $query->delete($db->quoteName('#__schemaorg'))
+                ->where($db->quoteName('itemId') . '= :itemId')
+                ->bind(':itemId', $itemId, ParameterType::INTEGER)
+                ->where($db->quoteName('context') . '= :context')
+                ->bind(':context', $context, ParameterType::STRING);
+
+            $db->setQuery($query)->execute();
+
+            return;
+        }
+
+        $query = $db->getQuery(true);
+
+        $query->select('*')
+            ->from($db->quoteName('#__schemaorg'))
+            ->where($db->quoteName('itemId') . '= :itemId')
+            ->bind(':itemId', $itemId, ParameterType::INTEGER)
+            ->where($db->quoteName('context') . '= :context')
+            ->bind(':context', $context, ParameterType::STRING);
+
+        $entry = $db->setQuery($query)->loadObject();
+
+        if (empty($entry->id)) {
+            $entry = new \stdClass();
+        }
+
+        $entry->itemId     = (int) $table->getId();
+        $entry->context    = $context;
+
+        if (isset($data['schema']['schemaType'])) {
+            $entry->schemaType = $data['schema']['schemaType'];
+
+            if (isset($data['schema'][$entry->schemaType])) {
+                $entry->schema = (new Registry($data['schema'][$entry->schemaType]))->toString();
+            }
+        }
+
+        $dispatcher = $this->getDispatcher();
+        $event      = new PrepareSaveEvent('onSchemaPrepareSave', [
+            'subject' => $entry,
+            'context' => $context,
+            'item'    => $table,
+            'isNew'   => $isNew,
+            'schema'  => $data['schema'],
+        ]);
+
+        PluginHelper::importPlugin('schemaorg', null, true, $dispatcher);
+        $dispatcher->dispatch('onSchemaPrepareSave', $event);
+
+        if (!isset($entry->schemaType)) {
+            return;
+        }
+
+        if (!empty($entry->id)) {
+            $db->updateObject('#__schemaorg', $entry, 'id');
+        } else {
+            $db->insertObject('#__schemaorg', $entry, 'id');
+        }
+    }
+
+    /**
+     * This event is triggered before the framework creates the Head section of the Document
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function onBeforeCompileHead(): void
+    {
+        $app      = $this->getApplication();
+        $baseType = $this->params->get('baseType');
+
+        $itemId  = (int) $app->getInput()->getInt('id');
+        $option  = $app->getInput()->get('option');
+        $view    = $app->getInput()->get('view');
+        $context = $option . '.' . $view;
+
+        // We need the plugin configured at least once to add structured data
+        if (!$app->isClient('site') || !in_array($baseType, ['organization', 'person']) || !$this->isSupported($context)) {
+            return;
+        }
+
+        $domain = Uri::root();
+
+        $isPerson = $baseType === 'person';
+
+        $schema = new Registry();
+
+        $baseSchema = [];
+
+        $baseSchema['@context'] = 'https://schema.org';
+        $baseSchema['@graph']   = [];
+
+        // Add base tag Person/Organization
+        $baseId = $domain . '#/schema/' . ucfirst($baseType) . '/base';
+
+        $siteSchema = [];
+
+        $siteSchema['@type'] = ucfirst($this->params->get('baseType'));
+        $siteSchema['@id']   = $baseId;
+
+        $name = $this->params->get('name');
+
+        if ($isPerson && $this->params->get('user') > 0) {
+            $user = $this->getUserFactory()->loadUserById($this->params->get('user'));
+
+            $name = $user ? $user->name : '';
+        }
+
+        if ($name) {
+            $siteSchema['name'] = $name;
+        }
+
+        $siteSchema['url'] = $domain;
+
+        // Image
+        $image = $this->params->get('image') ? HTMLHelper::_('cleanimageUrl', $this->params->get('image')) : false;
+
+        if ($image !== false) {
+            $siteSchema['logo'] = [
+                '@type'      => 'ImageObject',
+                '@id'        => $domain . '#/schema/ImageObject/logo',
+                'url'        => $image->url,
+                'contentUrl' => $image->url,
+                'width'      => $image->attributes['width'] ?? 0,
+                'height'     => $image->attributes['height'] ?? 0,
+            ];
+
+            $siteSchema['image'] = ['@id' => $siteSchema['logo']['@id']];
+        }
+
+        // Social media accounts
+        $socialMedia = (array) $this->params->get('socialmedia', []);
+
+        if (!empty($socialMedia)) {
+            $siteSchema['sameAs'] = [];
+        }
+
+        foreach ($socialMedia as $social) {
+            $siteSchema['sameAs'][] = $social->url;
+        }
+
+        $baseSchema['@graph'][] = $siteSchema;
+
+        // Add WebSite
+        $webSiteId = $domain . '#/schema/WebSite/base';
+
+        $webSiteSchema = [];
+
+        $webSiteSchema['@type']      = 'WebSite';
+        $webSiteSchema['@id']        = $webSiteId;
+        $webSiteSchema['url']        = $domain;
+        $webSiteSchema['name']       = $app->get('sitename');
+        $webSiteSchema['publisher']  = ['@id' => $baseId];
+
+        // We support Finder actions
+        $finder = ModuleHelper::getModule('mod_finder');
+
+        if (!empty($finder->id)) {
+            $webSiteSchema['potentialAction'] = [
+                '@type'       => 'SearchAction',
+                'target'      => Route::_('index.php?option=com_finder&view=search&q={search_term_string}', true, Route::TLS_IGNORE, true),
+                'query-input' => 'required name=search_term_string',
+            ];
+        }
+
+        $baseSchema['@graph'][] = $webSiteSchema;
+
+        // Add WebPage
+        $webPageId = $domain . '#/schema/WebPage/base';
+
+        $webPageSchema = [];
+
+        $webPageSchema['@type']       = 'WebPage';
+        $webPageSchema['@id']         = $webPageId;
+        $webPageSchema['url']         = htmlspecialchars(Uri::getInstance()->toString());
+        $webPageSchema['name']        = $app->getDocument()->getTitle();
+        $webPageSchema['description'] = $app->getDocument()->getDescription();
+        $webPageSchema['isPartOf']    = ['@id' => $webSiteId];
+        $webPageSchema['about']       = ['@id' => $baseId];
+        $webPageSchema['inLanguage']  = $app->getLanguage()->getTag();
+
+        // We support Breadcrumb linking
+        $breadcrumbs = ModuleHelper::getModule('mod_breadcrumbs');
+
+        if (!empty($breadcrumbs->id)) {
+            $webPageSchema['breadcrumb'] = ['@id' => $domain . '#/schema/BreadcrumbList/' . (int) $breadcrumbs->id];
+        }
+
+        $baseSchema['@graph'][] = $webPageSchema;
+
+        if ($itemId > 0) {
+            // Load the table data from the database
+            $db    = $this->getDatabase();
+            $query = $db->getQuery(true)
+                ->select('*')
+                ->from($db->quoteName('#__schemaorg'))
+                ->where($db->quoteName('itemId') . ' = :itemId')
+                ->bind(':itemId', $itemId, ParameterType::INTEGER)
+                ->where($db->quoteName('context') . ' = :context')
+                ->bind(':context', $context, ParameterType::STRING);
+
+            $result = $db->setQuery($query)->loadObject();
+
+            if ($result) {
+                $localSchema = new Registry($result->schema);
+
+                $localSchema->set('@id', $domain . '#/schema/' . str_replace('.', '/', $context) . '/' . (int) $result->itemId);
+                $localSchema->set('isPartOf', ['@id' => $webPageId]);
+
+                $itemSchema = $localSchema->toArray();
+
+                $baseSchema['@graph'][] = $itemSchema;
+            }
+        }
+
+        $schema->loadArray($baseSchema);
+
+        $dispatcher = $this->getDispatcher();
+        $event      = new BeforeCompileHeadEvent('onSchemaBeforeCompileHead', [
+            'subject' => $schema,
+            'context' => $context . '.' . $itemId,
+        ]);
+
+        PluginHelper::importPlugin('schemaorg', null, true, $dispatcher);
+        $dispatcher->dispatch('onSchemaBeforeCompileHead', $event);
+
+        $data = $schema->get('@graph');
+
+        foreach ($data as $key => $entry) {
+            $data[$key] = $this->cleanupSchema($entry);
+        }
+
+        $schema->set('@graph', $data);
+
+        $prettyPrint  = JDEBUG ? JSON_PRETTY_PRINT : 0;
+        $schemaString = $schema->toString('JSON', ['bitmask' => JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | $prettyPrint]);
+
+        if ($schemaString !== '{}') {
+            $wa = $this->getApplication()->getDocument()->getWebAssetManager();
+            $wa->addInlineScript($schemaString, ['name' => 'inline.schemaorg'], ['type' => 'application/ld+json']);
+        }
+    }
+
+    /**
+     * Clean the schema and remove empty fields
+     *
+     * @param   array  $schema
+     *
+     * @return  array
+     *
+     * @since  5.0.0
+     */
+    private function cleanupSchema($schema)
+    {
+        $result = [];
+
+        foreach ($schema as $key => $value) {
+            if (is_array($value)) {
+                // Subtypes need special handling
+                if (!empty($value['@type'])) {
+                    if ($value['@type'] === 'ImageObject') {
+                        if (!empty($value['url'])) {
+                            $value['url'] = $this->prepareImage($value['url']);
+                        }
+
+                        if (empty($value['url'])) {
+                            $value = [];
+                        }
+                    } elseif ($value['@type'] === 'Date') {
+                        if (!empty($value['value'])) {
+                            $value['value'] = $this->prepareDate($value['value']);
+                        }
+
+                        if (empty($value['value'])) {
+                            $value = [];
+                        }
+                    }
+
+                    // Go into the array
+                    $value = $this->cleanupSchema($value);
+
+                    // We don't save when the array contains only the @type
+                    if (empty($value) || count($value) <= 1) {
+                        $value = null;
+                    }
+                } elseif ($key == 'genericField') {
+                    foreach ($value as $field) {
+                        $result[$field['genericTitle']] = $field['genericValue'];
+                    }
+
+                    continue;
+                }
+            }
+
+            // No data, no play
+            if (empty($value)) {
+                continue;
+            }
+
+            $result[$key] = $value;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Check if the current plugin should execute schemaorg related activities
+     *
+     * @param   string  $context
+     *
+     * @return   boolean
+     *
+     * @since   5.0.0
+     */
+    protected function isSupported($context)
+    {
+        // We need at least the extension + view for loading the table fields
+        if (!str_contains($context, '.')) {
+            return false;
+        }
+
+        $parts     = explode('.', $context, 2);
+        $component = $this->getApplication()->bootComponent($parts[0]);
+
+        return $component instanceof SchemaorgServiceInterface;
+    }
+}
diff --git a/plugins/system/sef/sef.xml b/plugins/system/sef/sef.xml
index ca14129839d7e..bace5bea3b14c 100644
--- a/plugins/system/sef/sef.xml
+++ b/plugins/system/sef/sef.xml
@@ -9,8 +9,10 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>3.0.0</version>
 	<description>PLG_SEF_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\System\Sef</namespace>
 	<files>
-		<filename plugin="sef">sef.php</filename>
+		<folder plugin="sef">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_system_sef.ini</language>
diff --git a/plugins/system/sef/services/provider.php b/plugins/system/sef/services/provider.php
new file mode 100644
index 0000000000000..cf8309eddec61
--- /dev/null
+++ b/plugins/system/sef/services/provider.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.sef
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\System\Sef\Extension\Sef;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new Sef(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('system', 'sef')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/system/sef/sef.php b/plugins/system/sef/src/Extension/Sef.php
similarity index 92%
rename from plugins/system/sef/sef.php
rename to plugins/system/sef/src/Extension/Sef.php
index 3f254971b13f7..52a57213d1e7e 100644
--- a/plugins/system/sef/sef.php
+++ b/plugins/system/sef/src/Extension/Sef.php
@@ -6,10 +6,10 @@
  *
  * @copyright   (C) 2007 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
+namespace Joomla\Plugin\System\Sef\Extension;
+
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Uri\Uri;
@@ -23,15 +23,8 @@
  *
  * @since  1.5
  */
-class PlgSystemSef extends CMSPlugin
+final class Sef extends CMSPlugin
 {
-    /**
-     * @var    \Joomla\CMS\Application\CMSApplication
-     *
-     * @since  3.5
-     */
-    protected $app;
-
     /**
      * Add the canonical uri to the head.
      *
@@ -41,9 +34,9 @@ class PlgSystemSef extends CMSPlugin
      */
     public function onAfterDispatch()
     {
-        $doc = $this->app->getDocument();
+        $doc = $this->getApplication()->getDocument();
 
-        if (!$this->app->isClient('site') || $doc->getType() !== 'html') {
+        if (!$this->getApplication()->isClient('site') || $doc->getType() !== 'html') {
             return;
         }
 
@@ -87,16 +80,16 @@ public function onAfterDispatch()
      */
     public function onAfterRender()
     {
-        if (!$this->app->isClient('site')) {
+        if (!$this->getApplication()->isClient('site')) {
             return;
         }
 
         // Replace src links.
         $base   = Uri::base(true) . '/';
-        $buffer = $this->app->getBody();
+        $buffer = $this->getApplication()->getBody();
 
         // For feeds we need to search for the URL with domain.
-        $prefix = $this->app->getDocument()->getType() === 'feed' ? Uri::root() : '';
+        $prefix = $this->getApplication()->getDocument()->getType() === 'feed' ? Uri::root() : '';
 
         // Replace index.php URI by SEF URI.
         if (strpos($buffer, 'href="' . $prefix . 'index.php?') !== false) {
@@ -192,7 +185,7 @@ function ($match) use ($base, $protocols) {
         }
 
         // Use the replaced HTML body.
-        $this->app->setBody($buffer);
+        $this->getApplication()->setBody($buffer);
     }
 
     /**
@@ -219,7 +212,7 @@ private function checkBuffer($buffer)
                     $message = 'Unknown PCRE error calling PCRE function';
             }
 
-            throw new RuntimeException($message);
+            throw new \RuntimeException($message);
         }
     }
 }
diff --git a/plugins/system/sessiongc/services/provider.php b/plugins/system/sessiongc/services/provider.php
new file mode 100644
index 0000000000000..ba33eb65a943a
--- /dev/null
+++ b/plugins/system/sessiongc/services/provider.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.sessiongc
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\Session\MetadataManager;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\System\SessionGC\Extension\SessionGC;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin = new SessionGC(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('system', 'sessiongc'),
+                    $container->get(MetadataManager::class)
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/system/sessiongc/sessiongc.xml b/plugins/system/sessiongc/sessiongc.xml
index f31f5d92e5ea9..4ddec915e8675 100644
--- a/plugins/system/sessiongc/sessiongc.xml
+++ b/plugins/system/sessiongc/sessiongc.xml
@@ -9,8 +9,10 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>3.8.6</version>
 	<description>PLG_SYSTEM_SESSIONGC_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\System\SessionGC</namespace>
 	<files>
-		<filename plugin="sessiongc">sessiongc.php</filename>
+		<folder plugin="sessiongc">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_system_sessiongc.ini</language>
diff --git a/plugins/system/sessiongc/sessiongc.php b/plugins/system/sessiongc/src/Extension/SessionGC.php
similarity index 55%
rename from plugins/system/sessiongc/sessiongc.php
rename to plugins/system/sessiongc/src/Extension/SessionGC.php
index d51730314102e..c5da6d36e326f 100644
--- a/plugins/system/sessiongc/sessiongc.php
+++ b/plugins/system/sessiongc/src/Extension/SessionGC.php
@@ -6,14 +6,13 @@
  *
  * @copyright   (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
-use Joomla\CMS\Application\CMSApplication;
-use Joomla\CMS\Factory;
+namespace Joomla\Plugin\System\SessionGC\Extension;
+
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Session\MetadataManager;
+use Joomla\Event\DispatcherInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -24,23 +23,32 @@
  *
  * @since  3.8.6
  */
-class PlgSystemSessionGc extends CMSPlugin
+final class SessionGC extends CMSPlugin
 {
     /**
-     * Application object
+     * The meta data manager
      *
-     * @var    CMSApplication
-     * @since  3.8.6
+     * @var   MetadataManager
+     *
+     * @since 4.4.0
      */
-    protected $app;
+    private $metadataManager;
 
     /**
-     * Database driver
+     * Constructor.
+     *
+     * @param   DispatcherInterface  $dispatcher       The dispatcher
+     * @param   array                $config           An optional associative array of configuration settings
+     * @param   MetadataManager      $metadataManager  The user factory
      *
-     * @var    \Joomla\Database\DatabaseDriver
-     * @since  3.8.6
+     * @since   4.4.0
      */
-    protected $db;
+    public function __construct(DispatcherInterface $dispatcher, array $config, MetadataManager $metadataManager)
+    {
+        parent::__construct($dispatcher, $config);
+
+        $this->metadataManager = $metadataManager;
+    }
 
     /**
      * Runs after the HTTP response has been sent to the client and performs garbage collection tasks
@@ -58,20 +66,18 @@ public function onAfterRespond()
             $random = $divisor * lcg_value();
 
             if ($probability > 0 && $random < $probability) {
-                $this->app->getSession()->gc();
+                $this->getApplication()->getSession()->gc();
             }
         }
 
-        if ($this->app->get('session_handler', 'none') !== 'database' && $this->params->get('enable_session_metadata_gc', 1)) {
+        if ($this->getApplication()->get('session_handler', 'none') !== 'database' && $this->params->get('enable_session_metadata_gc', 1)) {
             $probability = $this->params->get('gc_probability', 1);
             $divisor     = $this->params->get('gc_divisor', 100);
 
             $random = $divisor * lcg_value();
 
             if ($probability > 0 && $random < $probability) {
-                /** @var MetadataManager $metadataManager */
-                $metadataManager = Factory::getContainer()->get(MetadataManager::class);
-                $metadataManager->deletePriorTo(time() - $this->app->getSession()->getExpire());
+                $this->metadataManager->deletePriorTo(time() - $this->getApplication()->getSession()->getExpire());
             }
         }
     }
diff --git a/plugins/system/shortcut/services/provider.php b/plugins/system/shortcut/services/provider.php
index d8f18649f68e9..3b14700c509cb 100644
--- a/plugins/system/shortcut/services/provider.php
+++ b/plugins/system/shortcut/services/provider.php
@@ -33,9 +33,8 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Shortcut(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('system', 'shortcut')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/system/shortcut/src/Extension/Shortcut.php b/plugins/system/shortcut/src/Extension/Shortcut.php
index 07aaa18436b37..81b841bd7e77f 100644
--- a/plugins/system/shortcut/src/Extension/Shortcut.php
+++ b/plugins/system/shortcut/src/Extension/Shortcut.php
@@ -124,15 +124,15 @@ public function addShortcuts(Event $event)
         $shortcuts = array_merge(
             $shortcuts,
             [
-                'applyKey'   => (object) ['selector' => 'joomla-toolbar-button .button-apply', 'shortcut' => 'A', 'title' => Text::_('JAPPLY')],
-                'saveKey'    => (object) ['selector' => 'joomla-toolbar-button .button-save', 'shortcut' => 'S', 'title' => Text::_('JTOOLBAR_SAVE')],
-                'cancelKey'  => (object) ['selector' => 'joomla-toolbar-button .button-cancel', 'shortcut' => 'Q', 'title' => Text::_('JCANCEL')],
-                'newKey'     => (object) ['selector' => 'joomla-toolbar-button .button-new', 'shortcut' => 'N', 'title' => Text::_('JTOOLBAR_NEW')],
-                'searchKey'  => (object) ['selector' => 'input[placeholder=' . Text::_('JSEARCH_FILTER') . ']', 'shortcut' => 'F', 'title' => Text::_('JSEARCH_FILTER')],
-                'optionKey'  => (object) ['selector' => 'joomla-toolbar-button .button-options', 'shortcut' => 'O', 'title' => Text::_('JOPTIONS')],
-                'helpKey'    => (object) ['selector' => 'joomla-toolbar-button .button-help', 'shortcut' => 'H', 'title' => Text::_('JHELP')],
-                'toggleMenu' => (object) ['selector' => '#menu-collapse', 'shortcut' => 'M', 'title' => Text::_('JTOGGLE_SIDEBAR_MENU')],
-                'dashboard'  => (object) ['selector' => (string) new Uri(Route::_('index.php?')), 'shortcut' => 'D', 'title' => Text::_('JHOMEDASHBOARD')],
+                'applyKey'   => (object) ['selector' => 'joomla-toolbar-button .button-apply', 'shortcut' => 'A', 'title' => $this->getApplication()->getLanguage()->_('JAPPLY')],
+                'saveKey'    => (object) ['selector' => 'joomla-toolbar-button .button-save', 'shortcut' => 'S', 'title' => $this->getApplication()->getLanguage()->_('JTOOLBAR_SAVE')],
+                'cancelKey'  => (object) ['selector' => 'joomla-toolbar-button .button-cancel', 'shortcut' => 'Q', 'title' => $this->getApplication()->getLanguage()->_('JCANCEL')],
+                'newKey'     => (object) ['selector' => 'joomla-toolbar-button .button-new', 'shortcut' => 'N', 'title' => $this->getApplication()->getLanguage()->_('JTOOLBAR_NEW')],
+                'searchKey'  => (object) ['selector' => 'input[placeholder=' . $this->getApplication()->getLanguage()->_('JSEARCH_FILTER') . ']', 'shortcut' => 'F', 'title' => $this->getApplication()->getLanguage()->_('JSEARCH_FILTER')],
+                'optionKey'  => (object) ['selector' => 'joomla-toolbar-button .button-options', 'shortcut' => 'O', 'title' => $this->getApplication()->getLanguage()->_('JOPTIONS')],
+                'helpKey'    => (object) ['selector' => 'joomla-toolbar-button .button-help', 'shortcut' => 'H', 'title' => $this->getApplication()->getLanguage()->_('JHELP')],
+                'toggleMenu' => (object) ['selector' => '#menu-collapse', 'shortcut' => 'M', 'title' => $this->getApplication()->getLanguage()->_('JTOGGLE_SIDEBAR_MENU')],
+                'dashboard'  => (object) ['selector' => (string) new Uri(Route::_('index.php?')), 'shortcut' => 'D', 'title' => $this->getApplication()->getLanguage()->_('JHOMEDASHBOARD')],
             ]
         );
 
diff --git a/plugins/system/skipto/services/provider.php b/plugins/system/skipto/services/provider.php
new file mode 100644
index 0000000000000..9f740ae7cd88f
--- /dev/null
+++ b/plugins/system/skipto/services/provider.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.skipto
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\System\Skipto\Extension\Skipto;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new Skipto(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('system', 'skipto')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/system/skipto/skipto.php b/plugins/system/skipto/skipto.php
deleted file mode 100644
index 89bbc1e711790..0000000000000
--- a/plugins/system/skipto/skipto.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Plugin
- * @subpackage  System.skipto
- *
- * @copyright   (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
- */
-
-use Joomla\CMS\Application\CMSApplicationInterface;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Plugin\CMSPlugin;
-
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-
-/**
- * Skipto plugin to add accessible keyboard navigation to the site and administrator templates.
- *
- * @since  4.0.0
- */
-class PlgSystemSkipto extends CMSPlugin
-{
-    /**
-     * Application object.
-     *
-     * @var    CMSApplicationInterface
-     * @since  4.0.0
-     */
-    protected $app;
-
-    /**
-     * Add the skipto navigation menu.
-     *
-     * @return  void
-     *
-     * @since   4.0.0
-     */
-    public function onAfterDispatch()
-    {
-        $section = $this->params->get('section', 'administrator');
-
-        if ($section !== 'both' && $this->app->isClient($section) !== true) {
-            return;
-        }
-
-        // Get the document object.
-        $document = $this->app->getDocument();
-
-        if ($document->getType() !== 'html') {
-            return;
-        }
-
-        // Are we in a modal?
-        if ($this->app->getInput()->get('tmpl', '', 'cmd') === 'component') {
-            return;
-        }
-
-        // Load language file.
-        $this->loadLanguage();
-
-        // Add plugin settings and strings for translations in JavaScript.
-        $document->addScriptOptions(
-            'skipto-settings',
-            [
-                'settings' => [
-                    'skipTo' => [
-                        // Feature switches
-                        'enableActions'               => false,
-                        'enableHeadingLevelShortcuts' => false,
-
-                        // Customization of button and menu
-                        'accesskey'     => '9',
-                        'displayOption' => 'popup',
-
-                        // Button labels and messages
-                        'buttonLabel'            => Text::_('PLG_SYSTEM_SKIPTO_TITLE'),
-                        'buttonTooltipAccesskey' => Text::_('PLG_SYSTEM_SKIPTO_ACCESS_KEY'),
-
-                        // Menu labels and messages
-                        'landmarkGroupLabel'  => Text::_('PLG_SYSTEM_SKIPTO_LANDMARK'),
-                        'headingGroupLabel'   => Text::_('PLG_SYSTEM_SKIPTO_HEADING'),
-                        'mofnGroupLabel'      => Text::_('PLG_SYSTEM_SKIPTO_HEADING_MOFN'),
-                        'headingLevelLabel'   => Text::_('PLG_SYSTEM_SKIPTO_HEADING_LEVEL'),
-                        'mainLabel'           => Text::_('PLG_SYSTEM_SKIPTO_LANDMARK_MAIN'),
-                        'searchLabel'         => Text::_('PLG_SYSTEM_SKIPTO_LANDMARK_SEARCH'),
-                        'navLabel'            => Text::_('PLG_SYSTEM_SKIPTO_LANDMARK_NAV'),
-                        'regionLabel'         => Text::_('PLG_SYSTEM_SKIPTO_LANDMARK_REGION'),
-                        'asideLabel'          => Text::_('PLG_SYSTEM_SKIPTO_LANDMARK_ASIDE'),
-                        'footerLabel'         => Text::_('PLG_SYSTEM_SKIPTO_LANDMARK_FOOTER'),
-                        'headerLabel'         => Text::_('PLG_SYSTEM_SKIPTO_LANDMARK_HEADER'),
-                        'formLabel'           => Text::_('PLG_SYSTEM_SKIPTO_LANDMARK_FORM'),
-                        'msgNoLandmarksFound' => Text::_('PLG_SYSTEM_SKIPTO_LANDMARK_NONE'),
-                        'msgNoHeadingsFound'  => Text::_('PLG_SYSTEM_SKIPTO_HEADING_NONE'),
-
-                        // Selectors for landmark and headings sections
-                        'headings'  => 'h1, h2, h3',
-                        'landmarks' => 'main, nav, search, aside, header, footer, form',
-                    ],
-                ],
-            ]
-        );
-
-        /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
-        $wa = $document->getWebAssetManager();
-        $wa->useScript('skipto');
-    }
-}
diff --git a/plugins/system/skipto/skipto.xml b/plugins/system/skipto/skipto.xml
index faeeeb545a777..c64dec148626b 100644
--- a/plugins/system/skipto/skipto.xml
+++ b/plugins/system/skipto/skipto.xml
@@ -9,8 +9,10 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>4.0.0</version>
 	<description>PLG_SYSTEM_SKIPTO_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\System\Skipto</namespace>
 	<files>
-		<filename plugin="skipto">skipto.php</filename>
+		<folder plugin="skipto">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_system_skipto.ini</language>
diff --git a/plugins/system/skipto/src/Extension/Skipto.php b/plugins/system/skipto/src/Extension/Skipto.php
new file mode 100644
index 0000000000000..a36f038f08458
--- /dev/null
+++ b/plugins/system/skipto/src/Extension/Skipto.php
@@ -0,0 +1,102 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.skipto
+ *
+ * @copyright   (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Plugin\System\Skipto\Extension;
+
+use Joomla\CMS\Plugin\CMSPlugin;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Skipto plugin to add accessible keyboard navigation to the site and administrator templates.
+ *
+ * @since  4.0.0
+ */
+final class Skipto extends CMSPlugin
+{
+    /**
+     * Add the skipto navigation menu.
+     *
+     * @return  void
+     *
+     * @since   4.0.0
+     */
+    public function onAfterDispatch()
+    {
+        $section = $this->params->get('section', 'administrator');
+
+        if ($section !== 'both' && $this->getApplication()->isClient($section) !== true) {
+            return;
+        }
+
+        // Get the document object.
+        $document = $this->getApplication()->getDocument();
+
+        if ($document->getType() !== 'html') {
+            return;
+        }
+
+        // Are we in a modal?
+        if ($this->getApplication()->getInput()->get('tmpl', '', 'cmd') === 'component') {
+            return;
+        }
+
+        // Load language file.
+        $this->loadLanguage();
+
+        // Add plugin settings and strings for translations in JavaScript.
+        $document->addScriptOptions(
+            'skipto-settings',
+            [
+                'settings' => [
+                    'skipTo' => [
+                        // Feature switches
+                        'enableActions'               => false,
+                        'enableHeadingLevelShortcuts' => false,
+
+                        // Customization of button and menu
+                        'accesskey'     => '9',
+                        'displayOption' => 'popup',
+
+                        // Button labels and messages
+                        'buttonLabel'            => $this->getApplication()->getLanguage()->_('PLG_SYSTEM_SKIPTO_TITLE'),
+                        'buttonTooltipAccesskey' => $this->getApplication()->getLanguage()->_('PLG_SYSTEM_SKIPTO_ACCESS_KEY'),
+
+                        // Menu labels and messages
+                        'landmarkGroupLabel'  => $this->getApplication()->getLanguage()->_('PLG_SYSTEM_SKIPTO_LANDMARK'),
+                        'headingGroupLabel'   => $this->getApplication()->getLanguage()->_('PLG_SYSTEM_SKIPTO_HEADING'),
+                        'mofnGroupLabel'      => $this->getApplication()->getLanguage()->_('PLG_SYSTEM_SKIPTO_HEADING_MOFN'),
+                        'headingLevelLabel'   => $this->getApplication()->getLanguage()->_('PLG_SYSTEM_SKIPTO_HEADING_LEVEL'),
+                        'mainLabel'           => $this->getApplication()->getLanguage()->_('PLG_SYSTEM_SKIPTO_LANDMARK_MAIN'),
+                        'searchLabel'         => $this->getApplication()->getLanguage()->_('PLG_SYSTEM_SKIPTO_LANDMARK_SEARCH'),
+                        'navLabel'            => $this->getApplication()->getLanguage()->_('PLG_SYSTEM_SKIPTO_LANDMARK_NAV'),
+                        'regionLabel'         => $this->getApplication()->getLanguage()->_('PLG_SYSTEM_SKIPTO_LANDMARK_REGION'),
+                        'asideLabel'          => $this->getApplication()->getLanguage()->_('PLG_SYSTEM_SKIPTO_LANDMARK_ASIDE'),
+                        'footerLabel'         => $this->getApplication()->getLanguage()->_('PLG_SYSTEM_SKIPTO_LANDMARK_FOOTER'),
+                        'headerLabel'         => $this->getApplication()->getLanguage()->_('PLG_SYSTEM_SKIPTO_LANDMARK_HEADER'),
+                        'formLabel'           => $this->getApplication()->getLanguage()->_('PLG_SYSTEM_SKIPTO_LANDMARK_FORM'),
+                        'msgNoLandmarksFound' => $this->getApplication()->getLanguage()->_('PLG_SYSTEM_SKIPTO_LANDMARK_NONE'),
+                        'msgNoHeadingsFound'  => $this->getApplication()->getLanguage()->_('PLG_SYSTEM_SKIPTO_HEADING_NONE'),
+
+                        // Selectors for landmark and headings sections
+                        'headings'  => 'h1, h2, h3',
+                        'landmarks' => 'main, nav, search, aside, header, footer, form',
+                    ],
+                ],
+            ]
+        );
+
+        /** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
+        $wa = $document->getWebAssetManager();
+        $wa->useScript('skipto');
+    }
+}
diff --git a/plugins/system/stats/services/provider.php b/plugins/system/stats/services/provider.php
new file mode 100644
index 0000000000000..fdcc949901ca0
--- /dev/null
+++ b/plugins/system/stats/services/provider.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.stats
+ *
+ * @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\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\Event\DispatcherInterface;
+use Joomla\Plugin\System\Stats\Extension\Stats;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new Stats(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('system', 'stats')
+                );
+                $plugin->setApplication(Factory::getApplication());
+                $plugin->setDatabase($container->get(DatabaseInterface::class));
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/system/stats/stats.php b/plugins/system/stats/src/Extension/Stats.php
similarity index 80%
rename from plugins/system/stats/stats.php
rename to plugins/system/stats/src/Extension/Stats.php
index 22297c9dd1224..c9528b0697f7f 100644
--- a/plugins/system/stats/stats.php
+++ b/plugins/system/stats/src/Extension/Stats.php
@@ -6,19 +6,17 @@
  *
  * @copyright   (C) 2015 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
+namespace Joomla\Plugin\System\Stats\Extension;
+
 use Joomla\CMS\Cache\Cache;
-use Joomla\CMS\Factory;
 use Joomla\CMS\Http\HttpFactory;
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\FileLayout;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Plugin\CMSPlugin;
-use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\User\UserHelper;
+use Joomla\Database\DatabaseAwareTrait;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -33,8 +31,10 @@
  *
  * @since  3.5
  */
-class PlgSystemStats extends CMSPlugin
+final class Stats extends CMSPlugin
 {
+    use DatabaseAwareTrait;
+
     /**
      * Indicates sending statistics is always allowed.
      *
@@ -53,20 +53,6 @@ class PlgSystemStats extends CMSPlugin
      */
     public const MODE_ALLOW_NEVER = 3;
 
-    /**
-     * @var    \Joomla\CMS\Application\CMSApplication
-     *
-     * @since  3.5
-     */
-    protected $app;
-
-    /**
-     * @var    \Joomla\Database\DatabaseDriver
-     *
-     * @since  3.5
-     */
-    protected $db;
-
     /**
      * URL to send the statistics.
      *
@@ -94,7 +80,7 @@ class PlgSystemStats extends CMSPlugin
      */
     public function onAfterInitialise()
     {
-        if (!$this->app->isClient('administrator') || !$this->isAllowedUser()) {
+        if (!$this->getApplication()->isClient('administrator') || !$this->isAllowedUser()) {
             return;
         }
 
@@ -106,7 +92,7 @@ public function onAfterInitialise()
             return;
         }
 
-        if (Uri::getInstance()->getVar('tmpl') === 'component') {
+        if ($this->getApplication()->getInput()->getVar('tmpl') === 'component') {
             return;
         }
 
@@ -123,7 +109,7 @@ public function onAfterInitialise()
      */
     public function onAfterDispatch()
     {
-        if (!$this->app->isClient('administrator') || !$this->isAllowedUser()) {
+        if (!$this->getApplication()->isClient('administrator') || !$this->isAllowedUser()) {
             return;
         }
 
@@ -135,15 +121,15 @@ public function onAfterDispatch()
             return;
         }
 
-        if (Uri::getInstance()->getVar('tmpl') === 'component') {
+        if ($this->getApplication()->getInput()->getVar('tmpl') === 'component') {
             return;
         }
 
-        if ($this->app->getDocument()->getType() !== 'html') {
+        if ($this->getApplication()->getDocument()->getType() !== 'html') {
             return;
         }
 
-        $this->app->getDocument()->getWebAssetManager()
+        $this->getApplication()->getDocument()->getWebAssetManager()
             ->registerAndUseScript('plg_system_stats.message', 'plg_system_stats/stats-message.js', [], ['defer' => true], ['core']);
     }
 
@@ -154,19 +140,19 @@ public function onAfterDispatch()
      *
      * @since   3.5
      *
-     * @throws  Exception         If user is not allowed.
-     * @throws  RuntimeException  If there is an error saving the params or sending the data.
+     * @throws  \Exception         If user is not allowed.
+     * @throws  \RuntimeException  If there is an error saving the params or sending the data.
      */
     public function onAjaxSendAlways()
     {
         if (!$this->isAllowedUser() || !$this->isAjaxRequest()) {
-            throw new Exception(Text::_('JGLOBAL_AUTH_ACCESS_DENIED'), 403);
+            throw new \Exception($this->getApplication()->getLanguage()->_('JGLOBAL_AUTH_ACCESS_DENIED'), 403);
         }
 
         $this->params->set('mode', static::MODE_ALLOW_ALWAYS);
 
         if (!$this->saveParams()) {
-            throw new RuntimeException('Unable to save plugin settings', 500);
+            throw new \RuntimeException('Unable to save plugin settings', 500);
         }
 
         echo json_encode(['sent' => (int) $this->sendStats()]);
@@ -179,23 +165,23 @@ public function onAjaxSendAlways()
      *
      * @since   3.5
      *
-     * @throws  Exception         If user is not allowed.
-     * @throws  RuntimeException  If there is an error saving the params.
+     * @throws  \Exception         If user is not allowed.
+     * @throws  \RuntimeException  If there is an error saving the params.
      */
     public function onAjaxSendNever()
     {
         if (!$this->isAllowedUser() || !$this->isAjaxRequest()) {
-            throw new Exception(Text::_('JGLOBAL_AUTH_ACCESS_DENIED'), 403);
+            throw new \Exception($this->getApplication()->getLanguage()->_('JGLOBAL_AUTH_ACCESS_DENIED'), 403);
         }
 
         $this->params->set('mode', static::MODE_ALLOW_NEVER);
 
         if (!$this->saveParams()) {
-            throw new RuntimeException('Unable to save plugin settings', 500);
+            throw new \RuntimeException('Unable to save plugin settings', 500);
         }
 
         if (!$this->disablePlugin()) {
-            throw new RuntimeException('Unable to disable the statistics plugin', 500);
+            throw new \RuntimeException('Unable to disable the statistics plugin', 500);
         }
 
         echo json_encode(['sent' => 0]);
@@ -209,13 +195,13 @@ public function onAjaxSendNever()
      *
      * @since   3.5
      *
-     * @throws  Exception         If user is not allowed.
-     * @throws  RuntimeException  If there is an error saving the params, disabling the plugin or sending the data.
+     * @throws  \Exception         If user is not allowed.
+     * @throws  \RuntimeException  If there is an error saving the params, disabling the plugin or sending the data.
      */
     public function onAjaxSendStats()
     {
         if (!$this->isAllowedUser() || !$this->isAjaxRequest()) {
-            throw new Exception(Text::_('JGLOBAL_AUTH_ACCESS_DENIED'), 403);
+            throw new \Exception($this->getApplication()->getLanguage()->_('JGLOBAL_AUTH_ACCESS_DENIED'), 403);
         }
 
         // User has not selected the mode. Show message.
@@ -231,7 +217,7 @@ public function onAjaxSendStats()
         }
 
         if (!$this->saveParams()) {
-            throw new RuntimeException('Unable to save plugin settings', 500);
+            throw new \RuntimeException('Unable to save plugin settings', 500);
         }
 
         echo json_encode(['sent' => (int) $this->sendStats()]);
@@ -275,7 +261,7 @@ public function debug($layoutId, $data = [])
      *
      * @since   3.5
      */
-    protected function getLayoutData()
+    private function getLayoutData()
     {
         return [
             'plugin'       => $this,
@@ -291,13 +277,13 @@ protected function getLayoutData()
      *
      * @since   3.5
      */
-    protected function getLayoutPaths()
+    private function getLayoutPaths()
     {
-        $template = Factory::getApplication()->getTemplate();
+        $template = $this->getApplication()->getTemplate();
 
         return [
             JPATH_ADMINISTRATOR . '/templates/' . $template . '/html/layouts/plugins/' . $this->_type . '/' . $this->_name,
-            __DIR__ . '/layouts',
+            JPATH_PLUGINS . '/' . $this->_type . '/' . $this->_name . '/layouts',
         ];
     }
 
@@ -310,7 +296,7 @@ protected function getLayoutPaths()
      *
      * @since   3.5
      */
-    protected function getRenderer($layoutId = 'default')
+    private function getRenderer($layoutId = 'default')
     {
         $renderer = new FileLayout($layoutId);
 
@@ -331,8 +317,8 @@ private function getStatsData()
         $data = [
             'unique_id'   => $this->getUniqueId(),
             'php_version' => PHP_VERSION,
-            'db_type'     => $this->db->name,
-            'db_version'  => $this->db->getVersion(),
+            'db_type'     => $this->getDatabase()->name,
+            'db_version'  => $this->getDatabase()->getVersion(),
             'cms_version' => JVERSION,
             'server_os'   => php_uname('s') . ' ' . php_uname('r'),
         ];
@@ -370,7 +356,7 @@ private function getUniqueId()
      */
     private function isAllowedUser()
     {
-        return Factory::getUser()->authorise('core.admin');
+        return $this->getApplication()->getIdentity() && $this->getApplication()->getIdentity()->authorise('core.admin');
     }
 
     /**
@@ -419,7 +405,7 @@ private function isUpdateRequired()
      */
     private function isAjaxRequest()
     {
-        return strtolower($this->app->getInput()->server->get('HTTP_X_REQUESTED_WITH', '')) === 'xmlhttprequest';
+        return strtolower($this->getApplication()->getInput()->server->get('HTTP_X_REQUESTED_WITH', '')) === 'xmlhttprequest';
     }
 
     /**
@@ -455,7 +441,7 @@ private function saveParams()
         $this->params->set('interval', $interval ?: 12);
 
         $paramsJson = $this->params->toString('JSON');
-        $db         = $this->db;
+        $db         = $this->getDatabase();
 
         $query = $db->getQuery(true)
             ->update($db->quoteName('#__extensions'))
@@ -468,7 +454,7 @@ private function saveParams()
         try {
             // Lock the tables to prevent multiple plugin executions causing a race condition
             $db->lockTable('#__extensions');
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             // If we can't lock the tables it's too risky to continue execution
             return false;
         }
@@ -478,7 +464,7 @@ private function saveParams()
             $result = $db->setQuery($query)->execute();
 
             $this->clearCacheGroups(['com_plugins']);
-        } catch (Exception $exc) {
+        } catch (\Exception $exc) {
             // If we failed to execute
             $db->unlockTables();
             $result = false;
@@ -487,7 +473,7 @@ private function saveParams()
         try {
             // Unlock the tables after writing
             $db->unlockTables();
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             // If we can't lock the tables assume we have somehow failed
             $result = false;
         }
@@ -502,7 +488,7 @@ private function saveParams()
      *
      * @since   3.5
      *
-     * @throws  RuntimeException  If there is an error sending the data and debug mode enabled.
+     * @throws  \RuntimeException  If there is an error sending the data and debug mode enabled.
      */
     private function sendStats()
     {
@@ -519,13 +505,13 @@ private function sendStats()
 
                 $error = 'Could not send site statistics to remote server: ' . $data->message;
             }
-        } catch (UnexpectedValueException $e) {
+        } catch (\UnexpectedValueException $e) {
             // There was an error sending stats. Should we do anything?
             $error = 'Could not send site statistics to remote server: ' . $e->getMessage();
-        } catch (RuntimeException $e) {
+        } catch (\RuntimeException $e) {
             // There was an error connecting to the server or in the post request
             $error = 'Could not connect to statistics server: ' . $e->getMessage();
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             // An unexpected error in processing; don't let this failure kill the site
             $error = 'Unexpected error connecting to statistics server: ' . $e->getMessage();
         }
@@ -535,8 +521,8 @@ private function sendStats()
             Log::add($error, Log::WARNING, 'jerror');
 
             // If Stats debug mode enabled, or Global Debug mode enabled, show error to the user.
-            if ($this->isDebugEnabled() || $this->app->get('debug')) {
-                throw new RuntimeException($error, 500);
+            if ($this->isDebugEnabled() || $this->getApplication()->get('debug')) {
+                throw new \RuntimeException($error, 500);
             }
 
             return false;
@@ -560,12 +546,12 @@ private function clearCacheGroups(array $clearGroups)
             try {
                 $options = [
                     'defaultgroup' => $group,
-                    'cachebase'    => $this->app->get('cache_path', JPATH_CACHE),
+                    'cachebase'    => $this->getApplication()->get('cache_path', JPATH_CACHE),
                 ];
 
                 $cache = Cache::getInstance('callback', $options);
                 $cache->clean();
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 // Ignore it
             }
         }
@@ -581,7 +567,7 @@ private function clearCacheGroups(array $clearGroups)
      */
     private function disablePlugin()
     {
-        $db = $this->db;
+        $db = $this->getDatabase();
 
         $query = $db->getQuery(true)
             ->update($db->quoteName('#__extensions'))
@@ -593,7 +579,7 @@ private function disablePlugin()
         try {
             // Lock the tables to prevent multiple plugin executions causing a race condition
             $db->lockTable('#__extensions');
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             // If we can't lock the tables it's too risky to continue execution
             return false;
         }
@@ -603,7 +589,7 @@ private function disablePlugin()
             $result = $db->setQuery($query)->execute();
 
             $this->clearCacheGroups(['com_plugins']);
-        } catch (Exception $exc) {
+        } catch (\Exception $exc) {
             // If we failed to execute
             $db->unlockTables();
             $result = false;
@@ -612,7 +598,7 @@ private function disablePlugin()
         try {
             // Unlock the tables after writing
             $db->unlockTables();
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             // If we can't lock the tables assume we have somehow failed
             $result = false;
         }
@@ -628,7 +614,7 @@ private function disablePlugin()
      */
     private function isCaptiveMFA(): bool
     {
-        return method_exists($this->app, 'isMultiFactorAuthenticationPage')
-            && $this->app->isMultiFactorAuthenticationPage(true);
+        return method_exists($this->getApplication(), 'isMultiFactorAuthenticationPage')
+            && $this->getApplication()->isMultiFactorAuthenticationPage(true);
     }
 }
diff --git a/plugins/system/stats/stats.xml b/plugins/system/stats/stats.xml
index e519bdca9d047..1c80ead0dd034 100644
--- a/plugins/system/stats/stats.xml
+++ b/plugins/system/stats/stats.xml
@@ -11,9 +11,9 @@
 	<description>PLG_SYSTEM_STATS_XML_DESCRIPTION</description>
 	<namespace path="src">Joomla\Plugin\System\Stats</namespace>
 	<files>
-		<folder>field</folder>
 		<folder>layouts</folder>
-		<filename plugin="stats">stats.php</filename>
+		<folder plugin="stats">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_system_stats.ini</language>
diff --git a/plugins/system/tasknotification/services/provider.php b/plugins/system/tasknotification/services/provider.php
new file mode 100644
index 0000000000000..2c87edd79830c
--- /dev/null
+++ b/plugins/system/tasknotification/services/provider.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.tasknotification
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\User\UserFactoryInterface;
+use Joomla\Database\DatabaseInterface;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\System\TaskNotification\Extension\TaskNotification;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new TaskNotification(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('system', 'tasknotification')
+                );
+                $plugin->setApplication(Factory::getApplication());
+                $plugin->setDatabase($container->get(DatabaseInterface::class));
+                $plugin->setUserFactory($container->get(UserFactoryInterface::class));
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/system/tasknotification/tasknotification.php b/plugins/system/tasknotification/src/Extension/TaskNotification.php
similarity index 83%
rename from plugins/system/tasknotification/tasknotification.php
rename to plugins/system/tasknotification/src/Extension/TaskNotification.php
index 3de75000b93f8..149b203c9d9e2 100644
--- a/plugins/system/tasknotification/tasknotification.php
+++ b/plugins/system/tasknotification/src/Extension/TaskNotification.php
@@ -2,29 +2,26 @@
 
 /**
  * @package     Joomla.Plugins
- * @subpackage  System.Tasknotification
+ * @subpackage  System.tasknotification
  *
  * @copyright   (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
-use Joomla\CMS\Application\CMSApplication;
+namespace Joomla\Plugin\System\TaskNotification\Extension;
+
+use Joomla\CMS\Event\Model;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
-use Joomla\CMS\Form\Form;
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Mail\MailTemplate;
 use Joomla\CMS\Plugin\CMSPlugin;
-use Joomla\CMS\User\UserFactoryInterface;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\Component\Scheduler\Administrator\Task\Status;
 use Joomla\Component\Scheduler\Administrator\Task\Task;
-use Joomla\Database\DatabaseInterface;
+use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Event\Event;
-use Joomla\Event\EventInterface;
 use Joomla\Event\SubscriberInterface;
+use Joomla\Filesystem\Path;
 use PHPMailer\PHPMailer\Exception as MailerException;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -42,8 +39,11 @@
  *
  * @since 4.1.0
  */
-class PlgSystemTasknotification extends CMSPlugin implements SubscriberInterface
+final class TaskNotification extends CMSPlugin implements SubscriberInterface
 {
+    use DatabaseAwareTrait;
+    use UserFactoryAwareTrait;
+
     /**
      * The task notification form. This form is merged into the task item form by {@see
      * injectTaskNotificationFieldset()}.
@@ -53,25 +53,12 @@ class PlgSystemTasknotification extends CMSPlugin implements SubscriberInterface
      */
     private const TASK_NOTIFICATION_FORM = 'task_notification';
 
-    /**
-     * @var  CMSApplication
-     * @since  4.1.0
-     */
-    protected $app;
-
-    /**
-     * @var  DatabaseInterface
-     * @since  4.1.0
-     */
-    protected $db;
-
     /**
      * @var boolean
      * @since 4.1.0
      */
     protected $autoloadLanguage = true;
 
-
     /**
      * @inheritDoc
      *
@@ -93,26 +80,25 @@ public static function getSubscribedEvents(): array
     /**
      * Inject fields to support configuration of post-execution notifications into the task item form.
      *
-     * @param   EventInterface  $event  The onContentPrepareForm event.
+     * @param   Model\PrepareFormEvent  $event  The onContentPrepareForm event.
      *
      * @return boolean True if successful.
      *
      * @since 4.1.0
      */
-    public function injectTaskNotificationFieldset(EventInterface $event): bool
+    public function injectTaskNotificationFieldset(Model\PrepareFormEvent $event): bool
     {
-        /** @var Form $form */
-        $form = $event->getArgument('0');
+        $form = $event->getForm();
 
         if ($form->getName() !== 'com_scheduler.task') {
             return true;
         }
 
-        $formFile = __DIR__ . "/forms/" . self::TASK_NOTIFICATION_FORM . '.xml';
+        $formFile = JPATH_PLUGINS . '/' . $this->_type . '/' . $this->_name . '/forms/' . self::TASK_NOTIFICATION_FORM . '.xml';
 
         try {
             $formFile = Path::check($formFile);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             // Log?
             return false;
         }
@@ -134,7 +120,7 @@ public function injectTaskNotificationFieldset(EventInterface $event): bool
      * @return void
      *
      * @since 4.1.0
-     * @throws Exception
+     * @throws \Exception
      */
     public function notifyFailure(Event $event): void
     {
@@ -161,7 +147,7 @@ public function notifyFailure(Event $event): void
      * @return void
      *
      * @since 4.1.0
-     * @throws Exception
+     * @throws \Exception
      */
     public function notifyOrphan(Event $event): void
     {
@@ -184,7 +170,7 @@ public function notifyOrphan(Event $event): void
      * @return void
      *
      * @since 4.1.0
-     * @throws Exception
+     * @throws \Exception
      */
     public function notifySuccess(Event $event): void
     {
@@ -214,7 +200,7 @@ public function notifySuccess(Event $event): void
      * @return void
      *
      * @since 4.1.0
-     * @throws Exception
+     * @throws \Exception
      */
     public function notifyFatalRecovery(Event $event): void
     {
@@ -238,7 +224,7 @@ public function notifyFatalRecovery(Event $event): void
      */
     private function getDataFromTask(Task $task): array
     {
-        $lockOrExecTime = Factory::getDate($task->get('locked') ?? $task->get('last_execution'))->format(Text::_('DATE_FORMAT_LC2'));
+        $lockOrExecTime = Factory::getDate($task->get('locked') ?? $task->get('last_execution'))->format($this->getApplication()->getLanguage()->_('DATE_FORMAT_LC2'));
 
         return [
             'TASK_ID'        => $task->get('id'),
@@ -257,15 +243,12 @@ private function getDataFromTask(Task $task): array
      * @return void
      *
      * @since 4.1.0
-     * @throws Exception
+     * @throws \Exception
      */
     private function sendMail(string $template, array $data, string $attachment = ''): void
     {
-        $app = $this->app;
-        $db  = $this->db;
-
-        /** @var UserFactoryInterface $userFactory */
-        $userFactory = Factory::getContainer()->get('user.factory');
+        $app = $this->getApplication();
+        $db  = $this->getDatabase();
 
         // Get all users who are not blocked and have opted in for system mails.
         $query = $db->getQuery(true);
@@ -279,12 +262,12 @@ private function sendMail(string $template, array $data, string $attachment = ''
 
         try {
             $users = $db->loadObjectList();
-        } catch (RuntimeException $e) {
+        } catch (\RuntimeException $e) {
             return;
         }
 
         if ($users === null) {
-            Log::add(Text::_('PLG_SYSTEM_TASK_NOTIFICATION_USER_FETCH_FAIL'), Log::ERROR);
+            Log::add($this->getApplication()->getLanguage()->_('PLG_SYSTEM_TASK_NOTIFICATION_USER_FETCH_FAIL'), Log::ERROR);
 
             return;
         }
@@ -293,7 +276,7 @@ private function sendMail(string $template, array $data, string $attachment = ''
 
         // Mail all matching users who also have the `core.manage` privilege for com_scheduler.
         foreach ($users as $user) {
-            $user = $userFactory->loadUserById($user->id);
+            $user = $this->getUserFactory()->loadUserById($user->id);
 
             if ($user->authorise('core.manage', 'com_scheduler')) {
                 try {
@@ -313,13 +296,13 @@ private function sendMail(string $template, array $data, string $attachment = ''
                     $mailer->send();
                     $mailSent = true;
                 } catch (MailerException $exception) {
-                    Log::add(Text::_('PLG_SYSTEM_TASK_NOTIFICATION_NOTIFY_SEND_EMAIL_FAIL'), Log::ERROR);
+                    Log::add($this->getApplication()->getLanguage()->_('PLG_SYSTEM_TASK_NOTIFICATION_NOTIFY_SEND_EMAIL_FAIL'), Log::ERROR);
                 }
             }
         }
 
         if (!$mailSent) {
-            Log::add(Text::_('PLG_SYSTEM_TASK_NOTIFICATION_NO_MAIL_SENT'), Log::WARNING);
+            Log::add($this->getApplication()->getLanguage()->_('PLG_SYSTEM_TASK_NOTIFICATION_NO_MAIL_SENT'), Log::WARNING);
         }
     }
 }
diff --git a/plugins/system/tasknotification/tasknotification.xml b/plugins/system/tasknotification/tasknotification.xml
index 0e2d1940635b9..5549e5d9e95d4 100644
--- a/plugins/system/tasknotification/tasknotification.xml
+++ b/plugins/system/tasknotification/tasknotification.xml
@@ -9,9 +9,11 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>4.1</version>
 	<description>PLG_SYSTEM_TASK_NOTIFICATION_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\System\TaskNotification</namespace>
 	<files>
-		<filename plugin="tasknotification">tasknotification.php</filename>
-		<folder>language</folder>
+		<folder>forms</folder>
+		<folder plugin="tasknotification">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_system_tasknotification.ini</language>
diff --git a/plugins/system/updatenotification/postinstall/updatecachetime.php b/plugins/system/updatenotification/postinstall/updatecachetime.php
deleted file mode 100644
index b020125158fdd..0000000000000
--- a/plugins/system/updatenotification/postinstall/updatecachetime.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Plugin
- * @subpackage  System.updatenotification
- *
- * @copyright   (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-use Joomla\CMS\Component\ComponentHelper;
-use Joomla\CMS\Factory;
-use Joomla\CMS\Plugin\PluginHelper;
-use Joomla\CMS\Table\Table;
-
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-
-/**
- * Checks if the com_installer config for the cache Hours are eq 0 and the updatenotification Plugin is enabled
- *
- * @return  boolean
- *
- * @since   3.6.3
- */
-function updatecachetime_postinstall_condition()
-{
-    $cacheTimeout = (int) ComponentHelper::getComponent('com_installer')->params->get('cachetimeout', 6);
-
-    // Check if cachetimeout is eq zero
-    if ($cacheTimeout === 0 && PluginHelper::isEnabled('system', 'updatenotification')) {
-        return true;
-    }
-
-    return false;
-}
-
-/**
- * Sets the cachetimeout back to the default (6 hours)
- *
- * @return  void
- *
- * @since   3.6.3
- */
-function updatecachetime_postinstall_action()
-{
-    $installer = ComponentHelper::getComponent('com_installer');
-
-    // Sets the cachetimeout back to the default (6 hours)
-    $installer->params->set('cachetimeout', 6);
-
-    // Save the new parameters back to com_installer
-    $table = Table::getInstance('extension');
-    $table->load($installer->id);
-    $table->bind(['params' => $installer->params->toString()]);
-
-    // Store the changes
-    if (!$table->store()) {
-        // If there is an error show it to the admin
-        Factory::getApplication()->enqueueMessage($table->getError(), 'error');
-    }
-}
diff --git a/plugins/system/updatenotification/updatenotification.xml b/plugins/system/updatenotification/updatenotification.xml
deleted file mode 100644
index 8178c51461b14..0000000000000
--- a/plugins/system/updatenotification/updatenotification.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<extension type="plugin" group="system" method="upgrade">
-	<name>plg_system_updatenotification</name>
-	<author>Joomla! Project</author>
-	<creationDate>2015-05</creationDate>
-	<copyright>(C) 2015 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>3.5.0</version>
-	<description>PLG_SYSTEM_UPDATENOTIFICATION_XML_DESCRIPTION</description>
-	<files>
-		<filename plugin="updatenotification">updatenotification.php</filename>
-	</files>
-	<languages folder="language">
-		<language tag="en-GB">language/en-GB/plg_system_updatenotification.ini</language>
-		<language tag="en-GB">language/en-GB/plg_system_updatenotification.sys.ini</language>
-	</languages>
-	<config>
-		<fields name="params">
-			<fieldset name="basic">
-				<field
-					name="email"
-					type="text"
-					label="PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_LBL"
-					description="PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_DESC"
-					default=""
-				/>
-
-				<field
-					name="language_override"
-					type="language"
-					label="PLG_SYSTEM_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_LBL"
-					description="PLG_SYSTEM_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_DESC"
-					default=""
-					client="administrator"
-					>
-					<option value="">PLG_SYSTEM_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_NONE</option>
-				</field>
-
-				<field
-					name="lastrun"
-					type="hidden"
-					default="0"
-				/>
-			</fieldset>
-		</fields>
-	</config>
-</extension>
diff --git a/plugins/system/webauthn/services/provider.php b/plugins/system/webauthn/services/provider.php
index bef57545a373d..005dfaa464978 100644
--- a/plugins/system/webauthn/services/provider.php
+++ b/plugins/system/webauthn/services/provider.php
@@ -15,6 +15,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\Event\DispatcherInterface;
@@ -22,6 +23,7 @@
 use Joomla\Plugin\System\Webauthn\CredentialRepository;
 use Joomla\Plugin\System\Webauthn\Extension\Webauthn;
 use Joomla\Plugin\System\Webauthn\MetadataRepository;
+use Joomla\Registry\Registry;
 use Webauthn\MetadataService\MetadataStatementRepository;
 use Webauthn\PublicKeyCredentialSourceRepository;
 
@@ -40,19 +42,16 @@ public function register(Container $container)
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $config  = (array) PluginHelper::getPlugin('system', 'webauthn');
-                $subject = $container->get(DispatcherInterface::class);
-
                 $app     = Factory::getApplication();
                 $session = $container->has('session') ? $container->get('session') : $this->getSession($app);
 
-                $db                    = $container->get('DatabaseDriver');
+                $db                    = $container->get(DatabaseInterface::class);
                 $credentialsRepository = $container->has(PublicKeyCredentialSourceRepository::class)
                     ? $container->get(PublicKeyCredentialSourceRepository::class)
                     : new CredentialRepository($db);
 
                 $metadataRepository = null;
-                $params             = new Joomla\Registry\Registry($config['params'] ?? '{}');
+                $params             = new Registry($config['params'] ?? '{}');
 
                 if ($params->get('attestationSupport', 0) == 1) {
                     $metadataRepository    = $container->has(MetadataStatementRepository::class)
@@ -64,7 +63,11 @@ function (Container $container) {
                     ? $container->get(Authentication::class)
                     : new Authentication($app, $session, $credentialsRepository, $metadataRepository);
 
-                $plugin = new Webauthn($subject, $config, $authenticationHelper);
+                $plugin = new Webauthn(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('system', 'webauthn'),
+                    $authenticationHelper
+                );
                 $plugin->setApplication($app);
 
                 return $plugin;
diff --git a/plugins/system/webauthn/src/Authentication.php b/plugins/system/webauthn/src/Authentication.php
index cce4ef5dab608..9d15b856d5947 100644
--- a/plugins/system/webauthn/src/Authentication.php
+++ b/plugins/system/webauthn/src/Authentication.php
@@ -1,11 +1,11 @@
 <?php
 
 /**
- * @package         Joomla.Plugin
- * @subpackage      System.Webauthn
+ * @package     Joomla.Plugin
+ * @subpackage  System.Webauthn
  *
  * @copyright   (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
- * @license         GNU General Public License version 2 or later; see LICENSE.txt
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\Plugin\System\Webauthn;
@@ -21,7 +21,6 @@
 use Joomla\CMS\WebAuthn\Server;
 use Joomla\Session\SessionInterface;
 use Laminas\Diactoros\ServerRequestFactory;
-use RuntimeException;
 use Webauthn\AuthenticationExtensions\AuthenticationExtensionsClientInputs;
 use Webauthn\AuthenticatorSelectionCriteria;
 use Webauthn\MetadataService\MetadataStatementRepository;
@@ -168,7 +167,7 @@ public function getMetadataRepository(): ?MetadataStatementRepository
      *
      * @return  PublicKeyCredentialCreationOptions
      *
-     * @throws  Exception
+     * @throws  \Exception
      * @since   4.2.0
      */
     public function getPubKeyCreationOptions(User $user): PublicKeyCredentialCreationOptions
@@ -216,7 +215,7 @@ public function getPubKeyCreationOptions(User $user): PublicKeyCredentialCreatio
      *
      * @return  PublicKeyCredentialRequestOptions
      *
-     * @throws  Exception
+     * @throws  \Exception
      * @since   4.2.0
      */
     public function getPubkeyRequestOptions(User $user): ?PublicKeyCredentialRequestOptions
@@ -244,7 +243,7 @@ public function getPubkeyRequestOptions(User $user): ?PublicKeyCredentialRequest
      *
      * @return  PublicKeyCredentialSource
      *
-     * @throws Exception
+     * @throws \Exception
      * @since   4.2.0
      */
     public function validateAssertionResponse(string $data, User $user): PublicKeyCredentialSource
@@ -260,7 +259,7 @@ public function validateAssertionResponse(string $data, User $user): PublicKeyCr
             || !($publicKeyCredentialRequestOptions instanceof PublicKeyCredentialRequestOptions)
         ) {
             Log::add('Cannot retrieve valid plg_system_webauthn.publicKeyCredentialRequestOptions from the session', Log::NOTICE, 'webauthn.system');
-            throw new RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_CREATE_INVALID_LOGIN_REQUEST'));
+            throw new \RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_CREATE_INVALID_LOGIN_REQUEST'));
         }
 
         $data = base64_decode($data);
@@ -268,7 +267,7 @@ public function validateAssertionResponse(string $data, User $user): PublicKeyCr
         if (empty($data)) {
             Log::add('No or invalid assertion data received from the browser', Log::NOTICE, 'webauthn.system');
 
-            throw new RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_CREATE_INVALID_LOGIN_REQUEST'));
+            throw new \RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_CREATE_INVALID_LOGIN_REQUEST'));
         }
 
         return $this->getWebauthnServer()->loadAndCheckAssertionResponse(
@@ -293,7 +292,7 @@ public function validateAssertionResponse(string $data, User $user): PublicKeyCr
      *
      * @return  PublicKeyCredentialSource|null
      *
-     * @throws  Exception
+     * @throws  \Exception
      * @since   4.2.0
      */
     public function validateAttestationResponse(string $data): PublicKeyCredentialSource
@@ -304,19 +303,19 @@ public function validateAttestationResponse(string $data): PublicKeyCredentialSo
         if (empty($encodedOptions)) {
             Log::add('Cannot retrieve plg_system_webauthn.publicKeyCredentialCreationOptions from the session', Log::NOTICE, 'webauthn.system');
 
-            throw new RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_CREATE_NO_PK'));
+            throw new \RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_CREATE_NO_PK'));
         }
 
         /** @var PublicKeyCredentialCreationOptions|null $publicKeyCredentialCreationOptions */
         try {
             $publicKeyCredentialCreationOptions = unserialize(base64_decode($encodedOptions));
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             Log::add('The plg_system_webauthn.publicKeyCredentialCreationOptions in the session is invalid', Log::NOTICE, 'webauthn.system');
             $publicKeyCredentialCreationOptions = null;
         }
 
         if (!is_object($publicKeyCredentialCreationOptions) || !($publicKeyCredentialCreationOptions instanceof PublicKeyCredentialCreationOptions)) {
-            throw new RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_CREATE_NO_PK'));
+            throw new \RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_CREATE_NO_PK'));
         }
 
         // Retrieve the stored user ID and make sure it's the same one in the request.
@@ -328,7 +327,7 @@ public function validateAttestationResponse(string $data): PublicKeyCredentialSo
             $message = sprintf('Invalid user! We asked the authenticator to attest user ID %d, the current user ID is %d', $storedUserId, $myUserId);
             Log::add($message, Log::NOTICE, 'webauthn.system');
 
-            throw new RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_CREATE_INVALID_USER'));
+            throw new \RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_CREATE_INVALID_USER'));
         }
 
         // We init the PSR-7 request object using Diactoros
@@ -394,7 +393,7 @@ private function getSiteIcon(): ?string
                 '/templates/',
                 '/templates/' . $this->app->getTemplate(),
             ];
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             return null;
         }
 
@@ -489,7 +488,7 @@ private function getPubKeyDescriptorsForUser(User $user): array
      *
      * @return  PublicKeyCredentialRequestOptions
      *
-     * @throws  Exception
+     * @throws  \Exception
      * @since   4.2.0
      */
     private function getPKCredentialRequestOptions(): PublicKeyCredentialRequestOptions
@@ -499,19 +498,19 @@ private function getPKCredentialRequestOptions(): PublicKeyCredentialRequestOpti
         if (empty($encodedOptions)) {
             Log::add('Cannot retrieve plg_system_webauthn.publicKeyCredentialRequestOptions from the session', Log::NOTICE, 'webauthn.system');
 
-            throw new RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_CREATE_INVALID_LOGIN_REQUEST'));
+            throw new \RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_CREATE_INVALID_LOGIN_REQUEST'));
         }
 
         try {
             $publicKeyCredentialRequestOptions = unserialize(base64_decode($encodedOptions));
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             Log::add('Invalid plg_system_webauthn.publicKeyCredentialRequestOptions in the session', Log::NOTICE, 'webauthn.system');
 
-            throw new RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_CREATE_INVALID_LOGIN_REQUEST'));
+            throw new \RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_CREATE_INVALID_LOGIN_REQUEST'));
         }
 
         if (!is_object($publicKeyCredentialRequestOptions) || !($publicKeyCredentialRequestOptions instanceof PublicKeyCredentialRequestOptions)) {
-            throw new RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_CREATE_INVALID_LOGIN_REQUEST'));
+            throw new \RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_CREATE_INVALID_LOGIN_REQUEST'));
         }
 
         return $publicKeyCredentialRequestOptions;
@@ -521,7 +520,7 @@ private function getPKCredentialRequestOptions(): PublicKeyCredentialRequestOpti
      * Get the WebAuthn library's Server object which facilitates WebAuthn operations
      *
      * @return  Server
-     * @throws  Exception
+     * @throws  \Exception
      * @since    4.2.0
      */
     private function getWebauthnServer(): Server
diff --git a/plugins/system/webauthn/src/CredentialRepository.php b/plugins/system/webauthn/src/CredentialRepository.php
index 535858f202e50..42275e25ebcbf 100644
--- a/plugins/system/webauthn/src/CredentialRepository.php
+++ b/plugins/system/webauthn/src/CredentialRepository.php
@@ -10,8 +10,6 @@
 
 namespace Joomla\Plugin\System\Webauthn;
 
-use Exception;
-use InvalidArgumentException;
 use Joomla\CMS\Date\Date;
 use Joomla\CMS\Encrypt\Aes;
 use Joomla\CMS\Factory;
@@ -19,13 +17,9 @@
 use Joomla\CMS\User\UserFactoryInterface;
 use Joomla\Database\DatabaseAwareInterface;
 use Joomla\Database\DatabaseAwareTrait;
-use Joomla\Database\DatabaseDriver;
 use Joomla\Database\DatabaseInterface;
 use Joomla\Plugin\System\Webauthn\Extension\Webauthn;
 use Joomla\Registry\Registry;
-use JsonException;
-use RuntimeException;
-use Throwable;
 use Webauthn\PublicKeyCredentialSource;
 use Webauthn\PublicKeyCredentialSourceRepository;
 use Webauthn\PublicKeyCredentialUserEntity;
@@ -66,7 +60,7 @@ public function __construct(DatabaseInterface $db = null)
      */
     public function findOneByCredentialId(string $publicKeyCredentialId): ?PublicKeyCredentialSource
     {
-        /** @var DatabaseDriver $db */
+        /** @var DatabaseInterface $db */
         $db           = $this->getDatabase();
         $credentialId = base64_encode($publicKeyCredentialId);
         $query        = $db->getQuery(true)
@@ -85,7 +79,7 @@ public function findOneByCredentialId(string $publicKeyCredentialId): ?PublicKey
 
         try {
             return PublicKeyCredentialSource::createFromArray(json_decode($json, true));
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
             return null;
         }
     }
@@ -102,7 +96,7 @@ public function findOneByCredentialId(string $publicKeyCredentialId): ?PublicKey
      */
     public function findAllForUserEntity(PublicKeyCredentialUserEntity $publicKeyCredentialUserEntity): array
     {
-        /** @var DatabaseDriver $db */
+        /** @var DatabaseInterface $db */
         $db         = $this->getDatabase();
         $userHandle = $publicKeyCredentialUserEntity->getId();
         $query      = $db->getQuery(true)
@@ -113,7 +107,7 @@ public function findAllForUserEntity(PublicKeyCredentialUserEntity $publicKeyCre
 
         try {
             $records = $db->setQuery($query)->loadAssocList();
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             return [];
         }
 
@@ -132,7 +126,7 @@ public function findAllForUserEntity(PublicKeyCredentialUserEntity $publicKeyCre
             try {
                 $json = $this->decryptCredential($record['credential']);
                 $data = json_decode($json, true);
-            } catch (JsonException $e) {
+            } catch (\JsonException $e) {
                 return null;
             }
 
@@ -142,7 +136,7 @@ public function findAllForUserEntity(PublicKeyCredentialUserEntity $publicKeyCre
 
             try {
                 return PublicKeyCredentialSource::createFromArray($data);
-            } catch (InvalidArgumentException $e) {
+            } catch (\InvalidArgumentException $e) {
                 return null;
             }
         };
@@ -176,7 +170,7 @@ public function findAllForUserEntity(PublicKeyCredentialUserEntity $publicKeyCre
      *
      * @return  void
      *
-     * @throws Exception
+     * @throws \Exception
      * @since   4.0.0
      */
     public function saveCredentialSource(PublicKeyCredentialSource $publicKeyCredentialSource): void
@@ -201,8 +195,8 @@ public function saveCredentialSource(PublicKeyCredentialSource $publicKeyCredent
         ];
         $update              = false;
 
-        /** @var DatabaseDriver $db */
-        $db     = $this->getDatabase();
+        /** @var DatabaseInterface $db */
+        $db = $this->getDatabase();
 
         // Try to find an existing record
         try {
@@ -214,7 +208,7 @@ public function saveCredentialSource(PublicKeyCredentialSource $publicKeyCredent
             $oldRecord = $db->setQuery($query)->loadObject();
 
             if (\is_null($oldRecord)) {
-                throw new Exception('This is a new record');
+                throw new \Exception('This is a new record');
             }
 
             /**
@@ -222,13 +216,13 @@ public function saveCredentialSource(PublicKeyCredentialSource $publicKeyCredent
              * save. Otherwise something fishy is going on.
              */
             if ($oldRecord->user_id != $publicKeyCredentialSource->getUserHandle()) {
-                throw new RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_CREDENTIAL_ID_ALREADY_IN_USE'));
+                throw new \RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_CREDENTIAL_ID_ALREADY_IN_USE'));
             }
 
             $o->user_id = $oldRecord->user_id;
             $o->label   = $oldRecord->label;
             $update     = true;
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
         }
 
         $o->credential = $this->encryptCredential($o->credential);
@@ -246,7 +240,7 @@ public function saveCredentialSource(PublicKeyCredentialSource $publicKeyCredent
          * the check below.
          */
         if ((\is_null($user) || $user->guest)) {
-            throw new RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_CANT_STORE_FOR_GUEST'));
+            throw new \RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_CANT_STORE_FOR_GUEST'));
         }
 
         $db->insertObject('#__webauthn_credentials', $o);
@@ -263,7 +257,7 @@ public function saveCredentialSource(PublicKeyCredentialSource $publicKeyCredent
      */
     public function getAll(int $userId): array
     {
-        /** @var DatabaseDriver $db */
+        /** @var DatabaseInterface $db */
         $db         = $this->getDatabase();
         $userHandle = $this->getHandleFromUserId($userId);
         $query      = $db->getQuery(true)
@@ -274,7 +268,7 @@ public function getAll(int $userId): array
 
         try {
             $results = $db->setQuery($query)->loadAssocList();
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             return [];
         }
 
@@ -294,7 +288,7 @@ public function getAll(int $userId): array
             try {
                 $json = $this->decryptCredential($record['credential']);
                 $data = json_decode($json, true);
-            } catch (JsonException $e) {
+            } catch (\JsonException $e) {
                 $record['credential'] = null;
 
                 return $record;
@@ -310,7 +304,7 @@ public function getAll(int $userId): array
                 $record['credential'] = PublicKeyCredentialSource::createFromArray($data);
 
                 return $record;
-            } catch (InvalidArgumentException $e) {
+            } catch (\InvalidArgumentException $e) {
                 $record['credential'] = null;
 
                 return $record;
@@ -331,7 +325,7 @@ public function getAll(int $userId): array
      */
     public function has(string $credentialId): bool
     {
-        /** @var DatabaseDriver $db */
+        /** @var DatabaseInterface $db */
         $db           = $this->getDatabase();
         $credentialId = base64_encode($credentialId);
         $query        = $db->getQuery(true)
@@ -344,7 +338,7 @@ public function has(string $credentialId): bool
             $count = $db->setQuery($query)->loadResult();
 
             return $count > 0;
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             return false;
         }
     }
@@ -361,7 +355,7 @@ public function has(string $credentialId): bool
      */
     public function setLabel(string $credentialId, string $label): void
     {
-        /** @var DatabaseDriver $db */
+        /** @var DatabaseInterface $db */
         $db           = $this->getDatabase();
         $credentialId = base64_encode($credentialId);
         $o            = (object) [
@@ -387,7 +381,7 @@ public function remove(string $credentialId): void
             return;
         }
 
-        /** @var DatabaseDriver $db */
+        /** @var DatabaseInterface $db */
         $db           = $this->getDatabase();
         $credentialId = base64_encode($credentialId);
         $query        = $db->getQuery(true)
@@ -468,7 +462,7 @@ public function getUserIdFromHandle(?string $userHandle): ?int
             return null;
         }
 
-        /** @var DatabaseDriver $db */
+        /** @var DatabaseInterface $db */
         $db = $this->getDatabase();
 
         // Check that the userHandle does exist in the database
@@ -479,7 +473,7 @@ public function getUserIdFromHandle(?string $userHandle): ?int
 
         try {
             $numRecords = $db->setQuery($query)->loadResult();
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             return null;
         }
 
@@ -507,7 +501,7 @@ public function getUserIdFromHandle(?string $userHandle): ?int
         while (true) {
             try {
                 $ids = $db->setQuery($query, $start, $limit)->loadColumn();
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 return null;
             }
 
@@ -591,7 +585,7 @@ private function getEncryptionKey(): string
             /** @var Registry $config */
             $config = $app->getConfig();
             $secret = $config->get('secret', '');
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $secret = '';
         }
 
diff --git a/plugins/system/webauthn/src/Extension/Webauthn.php b/plugins/system/webauthn/src/Extension/Webauthn.php
index bfab77c766098..1b19c5f0d08cd 100644
--- a/plugins/system/webauthn/src/Extension/Webauthn.php
+++ b/plugins/system/webauthn/src/Extension/Webauthn.php
@@ -1,11 +1,11 @@
 <?php
 
 /**
- * @package         Joomla.Plugin
- * @subpackage      System.Webauthn
+ * @package     Joomla.Plugin
+ * @subpackage  System.Webauthn
  *
  * @copyright   (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
- * @license         GNU General Public License version 2 or later; see LICENSE.txt
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\Plugin\System\Webauthn\Extension;
@@ -104,18 +104,18 @@ final class Webauthn extends CMSPlugin implements SubscriberInterface
     /**
      * Constructor. Loads the language files as well.
      *
-     * @param   DispatcherInterface  $subject    The object to observe
-     * @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).
-     * @param   Authentication|null  $authHelper The WebAuthn helper object
+     * @param   DispatcherInterface  $dispatcher    The object to observe
+     * @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).
+     * @param   Authentication|null  $authHelper    The WebAuthn helper object
      *
      * @since  4.0.0
      */
-    public function __construct(&$subject, array $config = [], Authentication $authHelper = null)
+    public function __construct(DispatcherInterface $dispatcher, array $config = [], Authentication $authHelper = null)
     {
-        parent::__construct($subject, $config);
+        parent::__construct($dispatcher, $config);
 
         /**
          * Note: Do NOT try to load the language in the constructor. This is called before Joomla initializes the
diff --git a/plugins/system/webauthn/src/Field/WebauthnField.php b/plugins/system/webauthn/src/Field/WebauthnField.php
index 1139d45e7bdbc..46f89a1dc03e5 100644
--- a/plugins/system/webauthn/src/Field/WebauthnField.php
+++ b/plugins/system/webauthn/src/Field/WebauthnField.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Plugin\System\Webauthn\Field;
 
-use Exception;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\FormField;
 use Joomla\CMS\Language\Text;
@@ -42,7 +41,7 @@ class WebauthnField extends FormField
      * Returns the input field's HTML
      *
      * @return  string
-     * @throws  Exception
+     * @throws  \Exception
      *
      * @since   4.0.0
      */
diff --git a/plugins/system/webauthn/src/MetadataRepository.php b/plugins/system/webauthn/src/MetadataRepository.php
index 7e6cda397df78..6010a68925eaa 100644
--- a/plugins/system/webauthn/src/MetadataRepository.php
+++ b/plugins/system/webauthn/src/MetadataRepository.php
@@ -1,16 +1,15 @@
 <?php
 
 /**
- * @package         Joomla.Plugin
- * @subpackage      System.Webauthn
+ * @package     Joomla.Plugin
+ * @subpackage  System.Webauthn
  *
  * @copyright   (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
- * @license         GNU General Public License version 2 or later; see LICENSE.txt
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\Plugin\System\Webauthn;
 
-use Exception;
 use Lcobucci\JWT\Configuration;
 use Lcobucci\JWT\Token\Plain;
 use Webauthn\MetadataService\MetadataStatementRepository;
@@ -26,7 +25,7 @@
  * This repository contains the metadata of all FIDO authenticators as published by the FIDO
  * Alliance in their MDS version 3.0.
  *
- * @see   https://fidoalliance.org/metadata/
+ * @link  https://fidoalliance.org/metadata/
  * @since 4.2.0
  */
 final class MetadataRepository implements MetadataStatementRepository
@@ -129,7 +128,7 @@ private function load(): void
         try {
             $jwtConfig = Configuration::forUnsecuredSigner();
             $token     = $jwtConfig->parser()->parse($rawJwt);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             return;
         }
 
@@ -154,7 +153,7 @@ private function load(): void
                 }
 
                 return MetadataStatement::createFromArray($array);
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 return null;
             }
         };
diff --git a/plugins/system/webauthn/src/PluginTraits/AdditionalLoginButtons.php b/plugins/system/webauthn/src/PluginTraits/AdditionalLoginButtons.php
index 2b60a4a121baa..4e5fb83a2f5a0 100644
--- a/plugins/system/webauthn/src/PluginTraits/AdditionalLoginButtons.php
+++ b/plugins/system/webauthn/src/PluginTraits/AdditionalLoginButtons.php
@@ -1,16 +1,15 @@
 <?php
 
 /**
- * @package         Joomla.Plugin
- * @subpackage      System.Webauthn
+ * @package     Joomla.Plugin
+ * @subpackage  System.Webauthn
  *
  * @copyright   (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
- * @license         GNU General Public License version 2 or later; see LICENSE.txt
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\Plugin\System\Webauthn\PluginTraits;
 
-use Exception;
 use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Document\HtmlDocument;
 use Joomla\CMS\Helper\AuthenticationHelper;
@@ -62,7 +61,7 @@ trait AdditionalLoginButtons
     public function onUserLoginButtons(Event $event): void
     {
         /** @var string $form The HTML ID of the form we are enclosed in */
-        [$form] = $event->getArguments();
+        [$form] = array_values($event->getArguments());
 
         // If we determined we should not inject a button return early
         if (!$this->mustDisplayButton()) {
@@ -77,7 +76,7 @@ public function onUserLoginButtons(Event $event): void
             UserHelper::genRandomPassword(12) . '-' . UserHelper::genRandomPassword(8);
 
         // Get local path to image
-        $image = HTMLHelper::_('image', 'plg_system_webauthn/webauthn.svg', '', '', true, true);
+        $image = HTMLHelper::_('image', 'plg_system_webauthn/fido-passkey-black.svg', '', '', true, true);
 
         // If you can't find the image then skip it
         $image = $image ? JPATH_ROOT . substr($image, \strlen(Uri::root(true))) : '';
@@ -136,7 +135,7 @@ private function mustDisplayButton(): bool
              */
             try {
                 $document = $this->getApplication()->getDocument();
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 $document = null;
             }
 
diff --git a/plugins/system/webauthn/src/PluginTraits/AjaxHandler.php b/plugins/system/webauthn/src/PluginTraits/AjaxHandler.php
index a4095bf7de6f3..6f595b12e9165 100644
--- a/plugins/system/webauthn/src/PluginTraits/AjaxHandler.php
+++ b/plugins/system/webauthn/src/PluginTraits/AjaxHandler.php
@@ -1,16 +1,15 @@
 <?php
 
 /**
- * @package         Joomla.Plugin
- * @subpackage      System.Webauthn
+ * @package     Joomla.Plugin
+ * @subpackage  System.Webauthn
  *
  * @copyright   (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
- * @license         GNU General Public License version 2 or later; see LICENSE.txt
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\Plugin\System\Webauthn\PluginTraits;
 
-use Exception;
 use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Event\AbstractEvent;
 use Joomla\CMS\Event\GenericEvent;
@@ -27,7 +26,6 @@
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Uri\Uri;
 use Joomla\Event\Event;
-use RuntimeException;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -52,7 +50,7 @@ trait AjaxHandler
      *
      * @return  void
      *
-     * @throws  Exception
+     * @throws  \Exception
      * @since   4.0.0
      */
     public function onAjaxWebauthn(Ajax $event): void
@@ -75,12 +73,12 @@ public function onAjaxWebauthn(Ajax $event): void
             $akaction = $input->getCmd('akaction');
 
             if (!$this->getApplication()->checkToken('request')) {
-                throw new RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'));
+                throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'));
             }
 
             // Empty action? No bueno.
             if (empty($akaction)) {
-                throw new RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_AJAX_INVALIDACTION'));
+                throw new \RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_AJAX_INVALIDACTION'));
             }
 
             // Call the plugin event onAjaxWebauthnSomething where Something is the akaction param.
@@ -131,7 +129,7 @@ function ($carry, $result) {
                 },
                 null
             );
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             Log::add("Callback failure, redirecting to $returnURL.", Log::DEBUG, 'webauthn.system');
             $this->getApplication()->getSession()->set('plg_system_webauthn.returnUrl', null);
             $this->getApplication()->enqueueMessage($e->getMessage(), 'error');
diff --git a/plugins/system/webauthn/src/PluginTraits/AjaxHandlerChallenge.php b/plugins/system/webauthn/src/PluginTraits/AjaxHandlerChallenge.php
index 050927898b05e..c74e12129bb31 100644
--- a/plugins/system/webauthn/src/PluginTraits/AjaxHandlerChallenge.php
+++ b/plugins/system/webauthn/src/PluginTraits/AjaxHandlerChallenge.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Plugin\System\Webauthn\PluginTraits;
 
-use Exception;
 use Joomla\CMS\Event\Plugin\System\Webauthn\AjaxChallenge;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Uri\Uri;
@@ -40,7 +39,7 @@ trait AjaxHandlerChallenge
      *
      * @return  void
      *
-     * @throws  Exception
+     * @throws  \Exception
      * @since   4.0.0
      */
     public function onAjaxWebauthnChallenge(AjaxChallenge $event): void
@@ -75,7 +74,7 @@ public function onAjaxWebauthnChallenge(AjaxChallenge $event): void
         // Is the username valid?
         try {
             $userId = UserHelper::getUserId($username);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $userId = 0;
         }
 
@@ -87,7 +86,7 @@ public function onAjaxWebauthnChallenge(AjaxChallenge $event): void
 
         try {
             $myUser = Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById($userId);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $myUser = new User();
         }
 
diff --git a/plugins/system/webauthn/src/PluginTraits/AjaxHandlerCreate.php b/plugins/system/webauthn/src/PluginTraits/AjaxHandlerCreate.php
index fbe409d2c2149..5bcb4cb750f91 100644
--- a/plugins/system/webauthn/src/PluginTraits/AjaxHandlerCreate.php
+++ b/plugins/system/webauthn/src/PluginTraits/AjaxHandlerCreate.php
@@ -10,13 +10,11 @@
 
 namespace Joomla\Plugin\System\Webauthn\PluginTraits;
 
-use Exception;
 use Joomla\CMS\Event\Plugin\System\Webauthn\AjaxCreate;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\FileLayout;
 use Joomla\CMS\User\UserFactoryInterface;
-use RuntimeException;
 use Webauthn\PublicKeyCredentialSource;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -39,7 +37,7 @@ trait AjaxHandlerCreate
      *
      * @return  void
      *
-     * @throws  Exception
+     * @throws  \Exception
      * @since   4.0.0
      */
     public function onAjaxWebauthnCreate(AjaxCreate $event): void
@@ -66,7 +64,7 @@ public function onAjaxWebauthnCreate(AjaxCreate $event): void
             $session->set('plg_system_webauthn.publicKeyCredentialCreationOptions', null);
 
             // Politely tell the presumed hacker trying to abuse this callback to go away.
-            throw new RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_CREATE_INVALID_USER'));
+            throw new \RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_CREATE_INVALID_USER'));
         }
 
         // Get the credentials repository object. It's outside the try-catch because I also need it to display the GUI.
@@ -82,11 +80,11 @@ public function onAjaxWebauthnCreate(AjaxCreate $event): void
             $publicKeyCredentialSource = $this->authenticationHelper->validateAttestationResponse($data);
 
             if (!\is_object($publicKeyCredentialSource) || !($publicKeyCredentialSource instanceof PublicKeyCredentialSource)) {
-                throw new RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_CREATE_NO_ATTESTED_DATA'));
+                throw new \RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_CREATE_NO_ATTESTED_DATA'));
             }
 
             $credentialRepository->saveCredentialSource($publicKeyCredentialSource);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $error                     = $e->getMessage();
             $publicKeyCredentialSource = null;
         }
diff --git a/plugins/system/webauthn/src/PluginTraits/AjaxHandlerDelete.php b/plugins/system/webauthn/src/PluginTraits/AjaxHandlerDelete.php
index 0971d75081331..b74a4b73eed2f 100644
--- a/plugins/system/webauthn/src/PluginTraits/AjaxHandlerDelete.php
+++ b/plugins/system/webauthn/src/PluginTraits/AjaxHandlerDelete.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Plugin\System\Webauthn\PluginTraits;
 
-use Exception;
 use Joomla\CMS\Event\Plugin\System\Webauthn\AjaxDelete;
 use Joomla\CMS\User\User;
 
@@ -64,7 +63,7 @@ public function onAjaxWebauthnDelete(AjaxDelete $event): void
             $user             = $this->getApplication()->getIdentity() ?? new User();
             $credentialHandle = $repository->getUserHandleFor($credentialId);
             $myHandle         = $repository->getHandleFromUserId($user->id);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $event->addResult(false);
 
             return;
@@ -79,7 +78,7 @@ public function onAjaxWebauthnDelete(AjaxDelete $event): void
         // Delete the record
         try {
             $repository->remove($credentialId);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $event->addResult(false);
 
             return;
diff --git a/plugins/system/webauthn/src/PluginTraits/AjaxHandlerLogin.php b/plugins/system/webauthn/src/PluginTraits/AjaxHandlerLogin.php
index 9f184a8a6c437..7c0c197290009 100644
--- a/plugins/system/webauthn/src/PluginTraits/AjaxHandlerLogin.php
+++ b/plugins/system/webauthn/src/PluginTraits/AjaxHandlerLogin.php
@@ -21,8 +21,6 @@
 use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\User\User;
 use Joomla\CMS\User\UserFactoryInterface;
-use RuntimeException;
-use Throwable;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -60,7 +58,7 @@ public function onAjaxWebauthnLogin(AjaxLogin $event): void
             if (empty($userId)) {
                 Log::add('Cannot determine the user ID', Log::NOTICE, 'webauthn.system');
 
-                throw new RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_CREATE_INVALID_LOGIN_REQUEST'));
+                throw new \RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_CREATE_INVALID_LOGIN_REQUEST'));
             }
 
             // Do I have a valid user?
@@ -70,7 +68,7 @@ public function onAjaxWebauthnLogin(AjaxLogin $event): void
                 $message = sprintf('User #%d does not exist', $userId);
                 Log::add($message, Log::NOTICE, 'webauthn.system');
 
-                throw new RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_CREATE_INVALID_LOGIN_REQUEST'));
+                throw new \RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_CREATE_INVALID_LOGIN_REQUEST'));
             }
 
             // Validate the authenticator response and get the user handle
@@ -79,7 +77,7 @@ public function onAjaxWebauthnLogin(AjaxLogin $event): void
             if (is_null($userHandle)) {
                 Log::add('Cannot retrieve the user handle from the request; the browser did not assert our request.', Log::NOTICE, 'webauthn.system');
 
-                throw new RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_CREATE_INVALID_LOGIN_REQUEST'));
+                throw new \RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_CREATE_INVALID_LOGIN_REQUEST'));
             }
 
             // Does the user handle match the user ID? This should never trigger by definition of the login check.
@@ -89,7 +87,7 @@ public function onAjaxWebauthnLogin(AjaxLogin $event): void
                 $message = sprintf('Invalid user handle; expected %s, got %s', $validUserHandle, $userHandle);
                 Log::add($message, Log::NOTICE, 'webauthn.system');
 
-                throw new RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_CREATE_INVALID_LOGIN_REQUEST'));
+                throw new \RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_CREATE_INVALID_LOGIN_REQUEST'));
             }
 
             // Make sure the user exists
@@ -99,13 +97,13 @@ public function onAjaxWebauthnLogin(AjaxLogin $event): void
                 $message = sprintf('Invalid user ID; expected %d, got %d', $userId, $user->id);
                 Log::add($message, Log::NOTICE, 'webauthn.system');
 
-                throw new RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_CREATE_INVALID_LOGIN_REQUEST'));
+                throw new \RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_CREATE_INVALID_LOGIN_REQUEST'));
             }
 
             // Login the user
             Log::add("Logging in the user", Log::INFO, 'webauthn.system');
             $this->loginUser((int) $userId);
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
             $session->set('plg_system_webauthn.publicKeyCredentialRequestOptions', null);
 
             $response                = $this->getAuthenticationResponseObject();
@@ -138,7 +136,7 @@ public function onAjaxWebauthnLogin(AjaxLogin $event): void
      * @param   int   $userId   The user ID to log in
      *
      * @return  void
-     * @throws  Exception
+     * @throws  \Exception
      * @since   4.2.0
      */
     private function loginUser(int $userId): void
@@ -152,12 +150,12 @@ class_exists('Joomla\\CMS\\Authentication\\Authentication', true);
 
         // Does the user account have a pending activation?
         if (!empty($user->activation)) {
-            throw new RuntimeException(Text::_('JGLOBAL_AUTH_ACCESS_DENIED'));
+            throw new \RuntimeException(Text::_('JGLOBAL_AUTH_ACCESS_DENIED'));
         }
 
         // Is the user account blocked?
         if ($user->block) {
-            throw new RuntimeException(Text::_('JGLOBAL_AUTH_ACCESS_DENIED'));
+            throw new \RuntimeException(Text::_('JGLOBAL_AUTH_ACCESS_DENIED'));
         }
 
         $statusSuccess = Authentication::STATUS_SUCCESS;
@@ -229,7 +227,7 @@ class_exists('Joomla\\CMS\\Authentication\\Authentication', true);
         Log::add($response->error_message, Log::WARNING, 'jerror');
 
         // Throw an exception to let the caller know that the login failed
-        throw new RuntimeException($response->error_message);
+        throw new \RuntimeException($response->error_message);
     }
 
     /**
@@ -292,7 +290,7 @@ private function processLoginFailure(AuthenticationResponse $response): bool
      *
      * @return  string|null  The user handle or null
      *
-     * @throws  Exception
+     * @throws  \Exception
      * @since   4.2.0
      */
     private function getUserHandleFromResponse(User $user): ?string
diff --git a/plugins/system/webauthn/src/PluginTraits/AjaxHandlerSaveLabel.php b/plugins/system/webauthn/src/PluginTraits/AjaxHandlerSaveLabel.php
index 5147cbab4e78c..7a32d0c4154ca 100644
--- a/plugins/system/webauthn/src/PluginTraits/AjaxHandlerSaveLabel.php
+++ b/plugins/system/webauthn/src/PluginTraits/AjaxHandlerSaveLabel.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Plugin\System\Webauthn\PluginTraits;
 
-use Exception;
 use Joomla\CMS\Event\Plugin\System\Webauthn\AjaxSaveLabel;
 use Joomla\CMS\User\User;
 
@@ -66,7 +65,7 @@ public function onAjaxWebauthnSavelabel(AjaxSaveLabel $event): void
             $credentialHandle = $repository->getUserHandleFor($credentialId);
             $user             = $this->getApplication()->getIdentity() ?? new User();
             $myHandle         = $repository->getHandleFromUserId($user->id);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $event->addResult(false);
 
             return;
@@ -88,7 +87,7 @@ public function onAjaxWebauthnSavelabel(AjaxSaveLabel $event): void
         // Save the new label
         try {
             $repository->setLabel($credentialId, $newLabel);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $event->addResult(false);
 
             return;
diff --git a/plugins/system/webauthn/src/PluginTraits/EventReturnAware.php b/plugins/system/webauthn/src/PluginTraits/EventReturnAware.php
index b2cb33781c8f7..6b6417c03e5fe 100644
--- a/plugins/system/webauthn/src/PluginTraits/EventReturnAware.php
+++ b/plugins/system/webauthn/src/PluginTraits/EventReturnAware.php
@@ -1,15 +1,16 @@
 <?php
 
 /**
- * @package         Joomla.Plugin
- * @subpackage      System.Webauthn
+ * @package     Joomla.Plugin
+ * @subpackage  System.Webauthn
  *
  * @copyright   (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
- * @license         GNU General Public License version 2 or later; see LICENSE.txt
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\Plugin\System\Webauthn\PluginTraits;
 
+use Joomla\CMS\Event\Result\ResultAwareInterface;
 use Joomla\Event\Event;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -34,6 +35,11 @@ trait EventReturnAware
      */
     private function returnFromEvent(Event $event, $value = null): void
     {
+        if ($event instanceof ResultAwareInterface) {
+            $event->addResult($value);
+            return;
+        }
+
         $result = $event->getArgument('result') ?: [];
 
         if (!is_array($result)) {
diff --git a/plugins/system/webauthn/src/PluginTraits/UserDeletion.php b/plugins/system/webauthn/src/PluginTraits/UserDeletion.php
index a03087f22ccea..5dd83d6016c69 100644
--- a/plugins/system/webauthn/src/PluginTraits/UserDeletion.php
+++ b/plugins/system/webauthn/src/PluginTraits/UserDeletion.php
@@ -10,10 +10,9 @@
 
 namespace Joomla\Plugin\System\Webauthn\PluginTraits;
 
-use Exception;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Log\Log;
-use Joomla\Database\DatabaseDriver;
+use Joomla\Database\DatabaseInterface;
 use Joomla\Event\Event;
 use Joomla\Utilities\ArrayHelper;
 
@@ -46,7 +45,7 @@ public function onUserAfterDelete(Event $event): void
          * @var   bool        $success True if user was successfully stored in the database
          * @var   string|null $msg     Message
          */
-        [$user, $success, $msg] = $event->getArguments();
+        [$user, $success, $msg] = array_values($event->getArguments());
 
         if (!$success) {
             $this->returnFromEvent($event, true);
@@ -57,8 +56,8 @@ public function onUserAfterDelete(Event $event): void
         if ($userId) {
             Log::add("Removing WebAuthn Passwordless Login information for deleted user #{$userId}", Log::DEBUG, 'webauthn.system');
 
-            /** @var DatabaseDriver $db */
-            $db = Factory::getContainer()->get('DatabaseDriver');
+            /** @var DatabaseInterface $db */
+            $db = Factory::getContainer()->get(DatabaseInterface::class);
 
             $query = $db->getQuery(true)
                 ->delete($db->quoteName('#__webauthn_credentials'))
@@ -67,7 +66,7 @@ public function onUserAfterDelete(Event $event): void
 
             try {
                 $db->setQuery($query)->execute();
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 // Don't worry if this fails
             }
 
diff --git a/plugins/system/webauthn/src/PluginTraits/UserProfileFields.php b/plugins/system/webauthn/src/PluginTraits/UserProfileFields.php
index cbcf3445516f6..df816fdee3839 100644
--- a/plugins/system/webauthn/src/PluginTraits/UserProfileFields.php
+++ b/plugins/system/webauthn/src/PluginTraits/UserProfileFields.php
@@ -1,16 +1,15 @@
 <?php
 
 /**
- * @package         Joomla.Plugin
- * @subpackage      System.Webauthn
+ * @package     Joomla.Plugin
+ * @subpackage  System.Webauthn
  *
  * @copyright   (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
- * @license         GNU General Public License version 2 or later; see LICENSE.txt
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\Plugin\System\Webauthn\PluginTraits;
 
-use Exception;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\HTML\HTMLHelper;
@@ -91,7 +90,7 @@ function (array $credential) {
      *
      * @return  void
      *
-     * @throws  Exception
+     * @throws  \Exception
      * @since   4.0.0
      */
     public function onContentPrepareForm(Event $event)
@@ -100,7 +99,7 @@ public function onContentPrepareForm(Event $event)
          * @var   Form  $form The form to be altered.
          * @var   mixed $data The associated data for the form.
          */
-        [$form, $data] = $event->getArguments();
+        [$form, $data] = array_values($event->getArguments());
 
         $name = $form->getName();
 
@@ -152,7 +151,7 @@ public function onContentPrepareForm(Event $event)
      *
      * @return  void
      *
-     * @throws  Exception
+     * @throws  \Exception
      * @since   4.0.0
      */
     public function onContentPrepareData(Event $event): void
@@ -161,7 +160,7 @@ public function onContentPrepareData(Event $event): void
          * @var   string|null        $context  The context for the data
          * @var   array|object|null  $data     An object or array containing the data for the form.
          */
-        [$context, $data] = $event->getArguments();
+        [$context, $data] = array_values($event->getArguments());
 
         if (!\in_array($context, ['com_users.profile', 'com_users.user'])) {
             return;
@@ -181,7 +180,7 @@ public function onContentPrepareData(Event $event): void
      *
      * @return  User|null  A user object or null if no match is found
      *
-     * @throws  Exception
+     * @throws  \Exception
      * @since   4.0.0
      */
     private function getUserFromData($data): ?User
diff --git a/plugins/task/checkfiles/src/Extension/Checkfiles.php b/plugins/task/checkfiles/src/Extension/Checkfiles.php
index aa4afc64c091c..51649a0d01500 100644
--- a/plugins/task/checkfiles/src/Extension/Checkfiles.php
+++ b/plugins/task/checkfiles/src/Extension/Checkfiles.php
@@ -19,7 +19,6 @@
 use Joomla\Event\SubscriberInterface;
 use Joomla\Filesystem\Folder;
 use Joomla\Filesystem\Path;
-use LogicException;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -101,7 +100,7 @@ public function __construct(DispatcherInterface $dispatcher, array $config, stri
      *
      * @since 4.1.0
      * @throws \RuntimeException
-     * @throws LogicException
+     * @throws \LogicException
      */
     protected function checkImages(ExecuteTaskEvent $event): int
     {
@@ -144,7 +143,7 @@ protected function checkImages(ExecuteTaskEvent $event): int
 
             try {
                 $image->resize($newWidth, $newHeight, false);
-            } catch (LogicException $e) {
+            } catch (\LogicException $e) {
                 $this->logTask($this->getApplication()->getLanguage()->_('PLG_TASK_CHECK_FILES_LOG_RESIZE_FAIL'), 'error');
 
                 return TaskStatus::KNOCKOUT;
diff --git a/plugins/task/deleteactionlogs/deleteactionlogs.xml b/plugins/task/deleteactionlogs/deleteactionlogs.xml
new file mode 100644
index 0000000000000..97ea8df143f13
--- /dev/null
+++ b/plugins/task/deleteactionlogs/deleteactionlogs.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extension type="plugin" group="task" method="upgrade">
+	<name>plg_task_deleteactionlogs</name>
+	<author>Joomla! Project</author>
+	<creationDate>2023-07</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_TASK_DELETEACTIONLOGS_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\Task\DeleteActionLogs</namespace>
+	<files>
+		<folder>forms</folder>
+		<folder plugin="deleteactionlogs">services</folder>
+		<folder>src</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">language/en-GB/plg_task_deleteactionlogs.ini</language>
+		<language tag="en-GB">language/en-GB/plg_task_deleteactionlogs.sys.ini</language>
+	</languages>
+</extension>
diff --git a/plugins/task/deleteactionlogs/forms/deleteForm.xml b/plugins/task/deleteactionlogs/forms/deleteForm.xml
new file mode 100644
index 0000000000000..df2935362b77c
--- /dev/null
+++ b/plugins/task/deleteactionlogs/forms/deleteForm.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form>
+	<fields name="params">
+		<fieldset name="task_params">
+			<field
+				name="logDeletePeriod"
+				type="number"
+				label="PLG_TASK_DELETEACTIONLOGS_LOG_DELETE_PERIOD"
+				default="7"
+				min="1"
+				filter="int"
+				validate="number"
+			/>
+		</fieldset>
+	</fields>
+</form>
\ No newline at end of file
diff --git a/plugins/captcha/recaptcha_invisible/services/provider.php b/plugins/task/deleteactionlogs/services/provider.php
similarity index 68%
rename from plugins/captcha/recaptcha_invisible/services/provider.php
rename to plugins/task/deleteactionlogs/services/provider.php
index ffd2f8ff88ba3..be8a108e29ace 100644
--- a/plugins/captcha/recaptcha_invisible/services/provider.php
+++ b/plugins/task/deleteactionlogs/services/provider.php
@@ -2,22 +2,22 @@
 
 /**
  * @package     Joomla.Plugin
- * @subpackage  Captcha.invisible_recaptcha
+ * @subpackage  Task.deletelogs
  *
- * @copyright   (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
+ * @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\Captcha\Google\HttpBridgePostRequestMethod;
 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\Event\DispatcherInterface;
-use Joomla\Plugin\Captcha\InvisibleReCaptcha\Extension\InvisibleReCaptcha;
+use Joomla\Plugin\Task\DeleteActionLogs\Extension\DeleteActionLogs;
 
 return new class () implements ServiceProviderInterface {
     /**
@@ -27,19 +27,19 @@
      *
      * @return  void
      *
-     * @since   4.3.0
+     * @since   __DEPLOY_VERSION__
      */
     public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $plugin = new InvisibleReCaptcha(
+                $plugin = new DeleteActionLogs(
                     $container->get(DispatcherInterface::class),
-                    (array) PluginHelper::getPlugin('captcha', 'recaptcha_invisible'),
-                    new HttpBridgePostRequestMethod()
+                    (array) PluginHelper::getPlugin('task', 'deleteactionlogs')
                 );
                 $plugin->setApplication(Factory::getApplication());
+                $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
new file mode 100644
index 0000000000000..e9535dbcf0384
--- /dev/null
+++ b/plugins/task/deleteactionlogs/src/Extension/DeleteActionLogs.php
@@ -0,0 +1,108 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Task.deleteactionlogs
+ *
+ * @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\Task\DeleteActionLogs\Extension;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\Component\Scheduler\Administrator\Event\ExecuteTaskEvent;
+use Joomla\Component\Scheduler\Administrator\Task\Status;
+use Joomla\Component\Scheduler\Administrator\Task\Task;
+use Joomla\Component\Scheduler\Administrator\Traits\TaskPluginTrait;
+use Joomla\Database\DatabaseAwareTrait;
+use Joomla\Event\SubscriberInterface;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * A task plugin. For Delete Action Logs after x days
+ * {@see ExecuteTaskEvent}.
+ *
+ * @since __DEPLOY_VERSION__
+ */
+final class DeleteActionLogs extends CMSPlugin implements SubscriberInterface
+{
+    use DatabaseAwareTrait;
+    use TaskPluginTrait;
+
+    /**
+     * @var string[]
+     * @since __DEPLOY_VERSION__
+     */
+    private const TASKS_MAP = [
+        'delete.actionlogs' => [
+            'langConstPrefix' => 'PLG_TASK_DELETEACTIONLOGS_DELETE',
+            'method'          => 'deleteLogs',
+            'form'            => 'deleteForm',
+        ],
+    ];
+
+    /**
+     * @var boolean
+     * @since __DEPLOY_VERSION__
+     */
+    protected $autoloadLanguage = true;
+
+    /**
+     * @inheritDoc
+     *
+     * @return string[]
+     *
+     * @since __DEPLOY_VERSION__
+     */
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            'onTaskOptionsList'    => 'advertiseRoutines',
+            'onExecuteTask'        => 'standardRoutineHandler',
+            'onContentPrepareForm' => 'enhanceTaskItemForm',
+        ];
+    }
+
+    /**
+     * @param   ExecuteTaskEvent  $event  The `onExecuteTask` event.
+     *
+     * @return integer  The routine exit code.
+     *
+     * @since  __DEPLOY_VERSION__
+     * @throws \Exception
+     */
+    private function deleteLogs(ExecuteTaskEvent $event): int
+    {
+        $daysToDeleteAfter = (int) $event->getArgument('params')->logDeletePeriod ?? 0;
+        $this->logTask(sprintf('Delete Logs after %d days', $daysToDeleteAfter));
+        $now               = Factory::getDate()->toSql();
+        $db                = $this->getDatabase();
+        $query             = $db->getQuery(true);
+
+        if ($daysToDeleteAfter > 0) {
+            $days = -1 * $daysToDeleteAfter;
+
+            $query->clear()
+                ->delete($db->quoteName('#__action_logs'))
+                ->where($db->quoteName('log_date') . ' < ' . $query->dateAdd($db->quote($now), $days, 'DAY'));
+
+            $db->setQuery($query);
+
+            try {
+                $db->execute();
+            } catch (\RuntimeException $e) {
+                // Ignore it
+                return Status::KNOCKOUT;
+            }
+        }
+
+        $this->logTask('Delete Logs end');
+
+        return Status::OK;
+    }
+}
diff --git a/plugins/task/demotasks/demotasks.xml b/plugins/task/demotasks/demotasks.xml
deleted file mode 100644
index 2ea1425e3bc9e..0000000000000
--- a/plugins/task/demotasks/demotasks.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<extension type="plugin" group="task" method="upgrade">
-	<name>plg_task_demo_tasks</name>
-	<author>Joomla! Project</author>
-	<creationDate>2021-07</creationDate>
-	<copyright>(C) 2021 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>4.1</version>
-	<description>PLG_TASK_DEMO_TASKS_XML_DESCRIPTION</description>
-	<namespace path="src">Joomla\Plugin\Task\DemoTasks</namespace>
-	<files>
-		<folder plugin="demotasks">services</folder>
-		<folder>src</folder>
-		<folder>forms</folder>
-	</files>
-	<languages>
-		<language tag="en-GB">language/en-GB/plg_task_demotasks.ini</language>
-		<language tag="en-GB">language/en-GB/plg_task_demotasks.sys.ini</language>
-	</languages>
-</extension>
diff --git a/plugins/task/demotasks/src/Extension/DemoTasks.php b/plugins/task/demotasks/src/Extension/DemoTasks.php
deleted file mode 100644
index 8a1f6d557b432..0000000000000
--- a/plugins/task/demotasks/src/Extension/DemoTasks.php
+++ /dev/null
@@ -1,223 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Plugins
- * @subpackage  Task.DemoTasks
- *
- * @copyright   (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-namespace Joomla\Plugin\Task\DemoTasks\Extension;
-
-use Joomla\CMS\Plugin\CMSPlugin;
-use Joomla\Component\Scheduler\Administrator\Event\ExecuteTaskEvent;
-use Joomla\Component\Scheduler\Administrator\Task\Status;
-use Joomla\Component\Scheduler\Administrator\Task\Task;
-use Joomla\Component\Scheduler\Administrator\Traits\TaskPluginTrait;
-use Joomla\Event\SubscriberInterface;
-
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-
-/**
- * A demo task plugin. Offers 3 task routines and demonstrates the use of {@see TaskPluginTrait},
- * {@see ExecuteTaskEvent}.
- *
- * @since 4.1.0
- */
-final class DemoTasks extends CMSPlugin implements SubscriberInterface
-{
-    use TaskPluginTrait;
-
-    /**
-     * @var string[]
-     * @since 4.1.0
-     */
-    private const TASKS_MAP = [
-        'demoTask_r1.sleep' => [
-            'langConstPrefix' => 'PLG_TASK_DEMO_TASKS_TASK_SLEEP',
-            'method'          => 'sleep',
-            'form'            => 'testTaskForm',
-        ],
-        'demoTask_r2.memoryStressTest' => [
-            'langConstPrefix' => 'PLG_TASK_DEMO_TASKS_STRESS_MEMORY',
-            'method'          => 'stressMemory',
-        ],
-        'demoTask_r3.memoryStressTestOverride' => [
-            'langConstPrefix' => 'PLG_TASK_DEMO_TASKS_STRESS_MEMORY_OVERRIDE',
-            'method'          => 'stressMemoryRemoveLimit',
-        ],
-        'demoTask_r4.resumable' => [
-            'langConstPrefix' => 'PLG_TASK_DEMO_TASKS_RESUMABLE',
-            'method'          => 'resumable',
-            'form'            => 'testTaskForm',
-        ],
-    ];
-
-    /**
-     * @var boolean
-     * @since 4.1.0
-     */
-    protected $autoloadLanguage = true;
-
-    /**
-     * @inheritDoc
-     *
-     * @return string[]
-     *
-     * @since 4.1.0
-     */
-    public static function getSubscribedEvents(): array
-    {
-        return [
-            'onTaskOptionsList'    => 'advertiseRoutines',
-            'onExecuteTask'        => 'standardRoutineHandler',
-            'onContentPrepareForm' => 'enhanceTaskItemForm',
-        ];
-    }
-
-    /**
-     * Sample resumable task.
-     *
-     * Whether the task will resume is random. There's a 40% chance of finishing every time it runs.
-     *
-     * You can use this as a template to create long running tasks which can detect an impending
-     * timeout condition, return Status::WILL_RESUME and resume execution next time they are called.
-     *
-     * @param   ExecuteTaskEvent  $event  The event we are handling
-     *
-     * @return  integer
-     *
-     * @since   4.1.0
-     * @throws  \Exception
-     */
-    private function resumable(ExecuteTaskEvent $event): int
-    {
-        /** @var Task $task */
-        $task    = $event->getArgument('subject');
-        $timeout = (int) $event->getArgument('params')->timeout ?? 1;
-
-        $lastStatus = $task->get('last_exit_code', Status::OK);
-
-        // This is how you detect if you are resuming a task or starting it afresh
-        if ($lastStatus === Status::WILL_RESUME) {
-            $this->logTask(sprintf('Resuming task %d', $task->get('id')));
-        } else {
-            $this->logTask(sprintf('Starting new task %d', $task->get('id')));
-        }
-
-        // Sample task body; we are simply sleeping for some time.
-        $this->logTask(sprintf('Starting %ds timeout', $timeout));
-        sleep($timeout);
-        $this->logTask(sprintf('%ds timeout over!', $timeout));
-
-        // Should I resume the task in the next step (randomly decided)?
-        $willResume = random_int(0, 5) < 4;
-
-        // Log our intention to resume or not and return the appropriate exit code.
-        if ($willResume) {
-            $this->logTask(sprintf('Task %d will resume', $task->get('id')));
-        } else {
-            $this->logTask(sprintf('Task %d is now complete', $task->get('id')));
-        }
-
-        return $willResume ? Status::WILL_RESUME : Status::OK;
-    }
-
-    /**
-     * @param   ExecuteTaskEvent  $event  The `onExecuteTask` event.
-     *
-     * @return integer  The routine exit code.
-     *
-     * @since  4.1.0
-     * @throws \Exception
-     */
-    private function sleep(ExecuteTaskEvent $event): int
-    {
-        $timeout = (int) $event->getArgument('params')->timeout ?? 1;
-
-        $this->logTask(sprintf('Starting %d timeout', $timeout));
-        sleep($timeout);
-        $this->logTask(sprintf('%d timeout over!', $timeout));
-
-        return Status::OK;
-    }
-
-    /**
-     * Standard routine method for the memory test routine.
-     *
-     * @param   ExecuteTaskEvent  $event  The `onExecuteTask` event.
-     *
-     * @return integer  The routine exit code.
-     *
-     * @since  4.1.0
-     * @throws \Exception
-     */
-    private function stressMemory(ExecuteTaskEvent $event): int
-    {
-        $mLimit = $this->getMemoryLimit();
-        $this->logTask(sprintf('Memory Limit: %d KB', $mLimit));
-
-        $iMem = $cMem = memory_get_usage();
-        $i    = 0;
-
-        while ($cMem + ($cMem - $iMem) / ++$i <= $mLimit) {
-            $this->logTask(sprintf('Current memory usage: %d KB', $cMem));
-            ${"array" . $i} = array_fill(0, 100000, 1);
-        }
-
-        return Status::OK;
-    }
-
-    /**
-     * Standard routine method for the memory test routine, also attempts to override the memory limit set by the PHP
-     * INI.
-     *
-     * @param   ExecuteTaskEvent  $event  The `onExecuteTask` event.
-     *
-     * @return integer  The routine exit code.
-     *
-     * @since  4.1.0
-     * @throws \Exception
-     */
-    private function stressMemoryRemoveLimit(ExecuteTaskEvent $event): int
-    {
-        $success = false;
-
-        if (function_exists('ini_set')) {
-            $success = ini_set('memory_limit', -1) !== false;
-        }
-
-        $this->logTask('Memory limit override ' . $success ? 'successful' : 'failed');
-
-        return $this->stressMemory($event);
-    }
-
-    /**
-     * Processes the PHP ini memory_limit setting, returning the memory limit in KB
-     *
-     * @return float
-     *
-     * @since 4.1.0
-     */
-    private function getMemoryLimit(): float
-    {
-        $memoryLimit = ini_get('memory_limit');
-
-        if (preg_match('/^(\d+)(.)$/', $memoryLimit, $matches)) {
-            if ($matches[2] == 'M') {
-                // * nnnM -> nnn MB
-                $memoryLimit = $matches[1] * 1024 * 1024;
-            } else {
-                if ($matches[2] == 'K') {
-                    // * nnnK -> nnn KB
-                    $memoryLimit = $matches[1] * 1024;
-                }
-            }
-        }
-
-        return (float) $memoryLimit;
-    }
-}
diff --git a/plugins/task/globalcheckin/forms/globalcheckin_params.xml b/plugins/task/globalcheckin/forms/globalcheckin_params.xml
new file mode 100644
index 0000000000000..bb590d17e8dbb
--- /dev/null
+++ b/plugins/task/globalcheckin/forms/globalcheckin_params.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<form>
+	<fields name="params">
+		<fieldset name="task_params">
+			<field
+				name="delay"
+				type="number"
+				label="PLG_TASK_GLOBALCHECKIN_DELAY_LABEL"
+				default="1"
+				required="true"
+				min="0"
+				step="1"
+				validate="number"
+				filter="int"
+			/>
+		</fieldset>
+	</fields>
+</form>
diff --git a/plugins/task/globalcheckin/globalcheckin.xml b/plugins/task/globalcheckin/globalcheckin.xml
new file mode 100644
index 0000000000000..813a35010ec65
--- /dev/null
+++ b/plugins/task/globalcheckin/globalcheckin.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<extension type="plugin" group="task" method="upgrade">
+	<name>plg_task_globalcheckin</name>
+	<author>Joomla! Project</author>
+	<creationDate>2023-06-22</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_TASK_GLOBALCHECKIN_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\Task\Globalcheckin</namespace>
+	<files>
+		<folder plugin="globalcheckin">services</folder>
+		<folder>src</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">language/en-GB/plg_task_globalcheckin.ini</language>
+		<language tag="en-GB">language/en-GB/plg_task_globalcheckin.sys.ini</language>
+	</languages>
+</extension>
diff --git a/plugins/task/globalcheckin/services/provider.php b/plugins/task/globalcheckin/services/provider.php
new file mode 100644
index 0000000000000..987565bc9dad4
--- /dev/null
+++ b/plugins/task/globalcheckin/services/provider.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Task.Globalcheckin
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\Database\DatabaseInterface;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\Task\Globalcheckin\Extension\Globalcheckin;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     * @since   __DEPLOY_VERSION__
+     */
+    public function register(Container $container)
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = PluginHelper::getPlugin('task', 'globalcheckin');
+                $dispatcher = $container->get(DispatcherInterface::class);
+
+                $checkin = new Globalcheckin(
+                    $dispatcher,
+                    (array) $plugin
+                );
+                $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
new file mode 100644
index 0000000000000..72f8956469650
--- /dev/null
+++ b/plugins/task/globalcheckin/src/Extension/Globalcheckin.php
@@ -0,0 +1,125 @@
+<?php
+
+/**
+ * @package     Joomla.Plugins
+ * @subpackage  Task.Globalcheckin
+ *
+ * @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\Task\Globalcheckin\Extension;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\Component\Scheduler\Administrator\Event\ExecuteTaskEvent;
+use Joomla\Component\Scheduler\Administrator\Task\Status as TaskStatus;
+use Joomla\Component\Scheduler\Administrator\Traits\TaskPluginTrait;
+use Joomla\Database\DatabaseAwareTrait;
+use Joomla\Database\Exception\ExecutionFailureException;
+use Joomla\Event\SubscriberInterface;
+
+/**
+ * Task plugin with routines to check in a checked out item.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class Globalcheckin extends CMSPlugin implements SubscriberInterface
+{
+    use DatabaseAwareTrait;
+    use TaskPluginTrait;
+
+    /**
+     * @var string[]
+     * @since __DEPLOY_VERSION__
+     */
+    protected const TASKS_MAP = [
+        'plg_task_globalcheckin_task_get' => [
+            'langConstPrefix' => 'PLG_TASK_GLOBALCHECKIN',
+            'form'            => 'globalcheckin_params',
+            'method'          => 'makeCheckin',
+        ],
+    ];
+
+    /**
+     * @var boolean
+     * @since __DEPLOY_VERSION__
+     */
+    protected $autoloadLanguage = true;
+
+    /**
+     * @inheritDoc
+     *
+     * @return string[]
+     *
+     * @since __DEPLOY_VERSION__
+     */
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            'onTaskOptionsList'    => 'advertiseRoutines',
+            'onExecuteTask'        => 'standardRoutineHandler',
+            'onContentPrepareForm' => 'enhanceTaskItemForm',
+        ];
+    }
+
+    /**
+     * Standard method for the checkin routine.
+     *
+     * @param   ExecuteTaskEvent  $event  The onExecuteTask event
+     *
+     * @return  integer  The exit code
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    protected function makeCheckin(ExecuteTaskEvent $event): int
+    {
+        $db     = $this->getDatabase();
+        $tables = $db->getTableList();
+        $prefix = $db->getPrefix();
+        $delay  = (int) $event->getArgument('params')->delay ?? 1;
+        $failed = false;
+
+        foreach ($tables as $tn) {
+            // Make sure we get the right tables based on prefix.
+            if (stripos($tn, $prefix) !== 0) {
+                continue;
+            }
+
+            $fields = $db->getTableColumns($tn, false);
+
+            if (!(isset($fields['checked_out']) && isset($fields['checked_out_time']))) {
+                continue;
+            }
+
+            $query = $db->getQuery(true)
+                ->update($db->quoteName($tn))
+                ->set($db->quoteName('checked_out') . ' = NULL')
+                ->set($db->quoteName('checked_out_time') . ' = NULL');
+
+            if ($fields['checked_out']->Null === 'YES') {
+                $query->where($db->quoteName('checked_out') . ' IS NOT NULL');
+            } else {
+                $query->where($db->quoteName('checked_out') . ' > 0');
+            }
+
+            if ($delay > 0) {
+                $delayTime = Factory::getDate('now', 'UTC')->sub(new \DateInterval('PT' . $delay . 'H'))->toSql();
+                $query->where(
+                    $db->quoteName('checked_out_time') . ' < ' . $db->quote($delayTime)
+                );
+            }
+
+            $db->setQuery($query);
+
+            try {
+                $db->execute();
+            } catch (ExecutionFailureException $e) {
+                // This failure isn't critical, don't care too much
+                $failed = true;
+            }
+        }
+
+        return $failed ? TaskStatus::INVALID_EXIT : TaskStatus::OK;
+    }
+}
diff --git a/plugins/task/privacyconsent/forms/privacyconsentForm.xml b/plugins/task/privacyconsent/forms/privacyconsentForm.xml
new file mode 100644
index 0000000000000..dd6f12b71ff64
--- /dev/null
+++ b/plugins/task/privacyconsent/forms/privacyconsentForm.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form>
+	<fields name="params">
+		<fieldset name="task_params">
+			<field
+					name="consentexpiration"
+					type="integer"
+					label="PLG_TASK_PRIVACYCONSENT_CONSENTEXPIRATIONDAYS_LABEL"
+					description="PLG_TASK_PRIVACYCONSENT_CONSENTEXPIRATIONDAYS_DESC"
+					first="0"
+					last="720"
+					step="30"
+					default="360"
+					filter="int"
+					validate="number"
+				/>
+				<field
+					name="remind"
+					type="integer"
+					label="PLG_TASK_PRIVACYCONSENT_REMINDBEFORE_LABEL"
+					description="PLG_TASK_PRIVACYCONSENT_REMINDBEFORE_DESC"
+					first="0"
+					last="120"
+					step="1"
+					default="30"
+					filter="int"
+					validate="number"
+				/>
+		</fieldset>
+	</fields>
+</form>
diff --git a/plugins/task/privacyconsent/privacyconsent.xml b/plugins/task/privacyconsent/privacyconsent.xml
new file mode 100644
index 0000000000000..c47fd75c4747d
--- /dev/null
+++ b/plugins/task/privacyconsent/privacyconsent.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extension type="plugin" group="task" method="upgrade">
+	<name>plg_task_privacyconsent</name>
+	<author>Joomla! Project</author>
+	<creationDate>2023-07</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_TASK_PRIVACYCONSENT_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\Task\PrivacyConsent</namespace>
+	<files>
+		<folder>forms</folder>
+		<folder plugin="privacyconsent">services</folder>
+		<folder>src</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">language/en-GB/plg_task_privacyconsent.ini</language>
+		<language tag="en-GB">language/en-GB/plg_task_privacyconsent.sys.ini</language>
+	</languages>
+</extension>
diff --git a/plugins/task/privacyconsent/services/provider.php b/plugins/task/privacyconsent/services/provider.php
new file mode 100644
index 0000000000000..4bd20fa1c74c3
--- /dev/null
+++ b/plugins/task/privacyconsent/services/provider.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Task.PrivacyConsent
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\User\UserFactoryInterface;
+use Joomla\Database\DatabaseInterface;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\Task\PrivacyConsent\Extension\PrivacyConsent;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function register(Container $container)
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin = new PrivacyConsent(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('task', 'privacyconsent')
+                );
+                $plugin->setApplication(Factory::getApplication());
+                $plugin->setDatabase($container->get(DatabaseInterface::class));
+                $plugin->setUserFactory($container->get(UserFactoryInterface::class));
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/task/privacyconsent/src/Extension/PrivacyConsent.php b/plugins/task/privacyconsent/src/Extension/PrivacyConsent.php
new file mode 100644
index 0000000000000..d79a595e4ee8b
--- /dev/null
+++ b/plugins/task/privacyconsent/src/Extension/PrivacyConsent.php
@@ -0,0 +1,261 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Task.PrivacyConsent
+ *
+ * @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\Task\PrivacyConsent\Extension;
+
+use Joomla\CMS\Application\ApplicationHelper;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Mail\Exception\MailDisabledException;
+use Joomla\CMS\Mail\MailTemplate;
+use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Uri\Uri;
+use Joomla\CMS\User\UserFactoryAwareTrait;
+use Joomla\CMS\User\UserHelper;
+use Joomla\Component\Scheduler\Administrator\Event\ExecuteTaskEvent;
+use Joomla\Component\Scheduler\Administrator\Task\Status;
+use Joomla\Component\Scheduler\Administrator\Task\Task;
+use Joomla\Component\Scheduler\Administrator\Traits\TaskPluginTrait;
+use Joomla\Database\DatabaseAwareTrait;
+use Joomla\Database\ParameterType;
+use Joomla\Event\SubscriberInterface;
+use PHPMailer\PHPMailer\Exception as phpmailerException;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * A task plugin. Offers 2 task routines Invalidate Expired Consents and Remind Expired Consents
+ * {@see ExecuteTaskEvent}.
+ *
+ * @since __DEPLOY_VERSION__
+ */
+final class PrivacyConsent extends CMSPlugin implements SubscriberInterface
+{
+    use DatabaseAwareTrait;
+    use TaskPluginTrait;
+    use UserFactoryAwareTrait;
+
+    /**
+     * @var string[]
+     * @since __DEPLOY_VERSION__
+     */
+    private const TASKS_MAP = [
+        'privacy.consent' => [
+            'langConstPrefix' => 'PLG_TASK_PRIVACYCONSENT_INVALIDATE',
+            'method'          => 'privacyConsents',
+            'form'            => 'privacyconsentForm',
+        ],
+    ];
+
+    /**
+     * @var boolean
+     *
+     * @since __DEPLOY_VERSION__
+     */
+    protected $autoloadLanguage = true;
+
+    /**
+     * @inheritDoc
+     *
+     * @return string[]
+     *
+     * @since __DEPLOY_VERSION__
+     */
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            'onTaskOptionsList'    => 'advertiseRoutines',
+            'onExecuteTask'        => 'standardRoutineHandler',
+            'onContentPrepareForm' => 'enhanceTaskItemForm',
+        ];
+    }
+
+    /**
+     * Method to send the remind for privacy consents renew.
+     *
+     * @param   ExecuteTaskEvent  $event  The `onExecuteTask` event.
+     *
+     * @return integer  The routine exit code.
+     *
+     * @since  __DEPLOY_VERSION__
+     * @throws \Exception
+     */
+    private function privacyConsents(ExecuteTaskEvent $event): int
+    {
+        // Load the parameters.
+        $expire = (int) $event->getArgument('params')->consentexpiration ?? 365;
+        $remind = (int) $event->getArgument('params')->remind ?? 30;
+
+        if (
+            $this->invalidateExpiredConsents($expire) === Status::OK
+            && $this->remindExpiringConsents($expire, $remind) === Status::OK
+        ) {
+            return Status::OK;
+        }
+
+        return Status::KNOCKOUT;
+    }
+
+    /**
+     * Method to send the remind for privacy consents renew.
+     *
+     * @param   integer    $expire
+     * @param   integer    $remind
+     *
+     * @return integer  The routine exit code.
+     *
+     * @since  __DEPLOY_VERSION__
+     * @throws \Exception
+     */
+    private function remindExpiringConsents($expire, $remind): int
+    {
+        $now      = Factory::getDate()->toSql();
+        $period   = '-' . ($expire - $remind);
+        $db       = $this->getDatabase();
+        $query    = $db->getQuery(true);
+
+        $query->select($db->quoteName(['r.id', 'r.user_id', 'u.email']))
+            ->from($db->quoteName('#__privacy_consents', 'r'))
+            ->join('LEFT', $db->quoteName('#__users', 'u'), $db->quoteName('u.id') . ' = ' . $db->quoteName('r.user_id'))
+            ->where($db->quoteName('subject') . ' = ' . $db->quote('PLG_TASK_PRIVACYCONSENT_SUBJECT'))
+            ->where($db->quoteName('remind') . ' = 0')
+            ->where($query->dateAdd($db->quote($now), $period, 'DAY') . ' > ' . $db->quoteName('created'));
+
+        try {
+            $users = $db->setQuery($query)->loadObjectList();
+        } catch (\RuntimeException $exception) {
+            return Status::KNOCKOUT;
+        }
+
+        // Do not process further if no expired consents found
+        if (empty($users)) {
+            return Status::OK;
+        }
+
+        $app      = $this->getApplication();
+        $linkMode = $app->get('force_ssl', 0) == 2 ? Route::TLS_FORCE : Route::TLS_IGNORE;
+
+        foreach ($users as $user) {
+            $token       = ApplicationHelper::getHash(UserHelper::genRandomPassword());
+            $hashedToken = UserHelper::hashPassword($token);
+
+            // The mail
+            try {
+                $templateData = [
+                    'sitename' => $app->get('sitename'),
+                    'url'      => Uri::root(),
+                    'tokenurl' => Route::link('site', 'index.php?option=com_privacy&view=remind&remind_token=' . $token, false, $linkMode, true),
+                    'formurl'  => Route::link('site', 'index.php?option=com_privacy&view=remind', false, $linkMode, true),
+                    'token'    => $token,
+                ];
+
+                $mailer = new MailTemplate('plg_task_privacyconsent.request.reminder', $app->getLanguage()->getTag());
+                $mailer->addTemplateData($templateData);
+                $mailer->addRecipient($user->email);
+
+                $mailResult = $mailer->send();
+
+                if ($mailResult === false) {
+                    return Status::KNOCKOUT;
+                }
+
+                $userId = (int) $user->id;
+
+                // Update the privacy_consents item to not send the reminder again
+                $query->clear()
+                    ->update($db->quoteName('#__privacy_consents'))
+                    ->set($db->quoteName('remind') . ' = 1')
+                    ->set($db->quoteName('token') . ' = :token')
+                    ->where($db->quoteName('id') . ' = :userid')
+                    ->bind(':token', $hashedToken)
+                    ->bind(':userid', $userId, ParameterType::INTEGER);
+                $db->setQuery($query);
+
+                try {
+                    $db->execute();
+                } catch (\RuntimeException $e) {
+                    return Status::KNOCKOUT;
+                }
+            } catch (MailDisabledException | phpmailerException $exception) {
+                return Status::KNOCKOUT;
+            }
+        }
+        $this->logTask('Remind end');
+
+        return Status::OK;
+    }
+
+    /**
+     * Method to delete the expired privacy consents.
+     *
+     * @param   integer    $expire
+     *
+     * @return integer  The routine exit code.
+     *
+     * @since  __DEPLOY_VERSION__
+     * @throws \Exception
+     */
+    private function invalidateExpiredConsents($expire): int
+    {
+        $now    = Factory::getDate()->toSql();
+        $period = '-' . $expire;
+        $db     = $this->getDatabase();
+        $query  = $db->getQuery(true);
+
+        $query->select($db->quoteName(['id', 'user_id']))
+            ->from($db->quoteName('#__privacy_consents'))
+            ->where($query->dateAdd($db->quote($now), $period, 'DAY') . ' > ' . $db->quoteName('created'))
+            ->where($db->quoteName('subject') . ' = ' . $db->quote('PLG_TASK_PRIVACYCONSENT_SUBJECT'))
+            ->where($db->quoteName('state') . ' = 1');
+
+        $db->setQuery($query);
+
+        try {
+            $users = $db->loadObjectList();
+        } catch (\RuntimeException $e) {
+            return Status::KNOCKOUT;
+        }
+
+        // Do not process further if no expired consents found
+        if (empty($users)) {
+            return Status::OK;
+        }
+
+        // Push a notification to the site's super users
+        /** @var MessageModel $messageModel */
+        $messageModel = $this->getApplication()->bootComponent('com_messages')->getMVCFactory()->createModel('Message', 'Administrator');
+
+        foreach ($users as $user) {
+            $userId = (int) $user->id;
+            $query  = $db->getQuery(true)
+                ->update($db->quoteName('#__privacy_consents'))
+                ->set($db->quoteName('state') . ' = 0')
+                ->where($db->quoteName('id') . ' = :userid')
+                ->bind(':userid', $userId, ParameterType::INTEGER);
+            $db->setQuery($query);
+
+            try {
+                $db->execute();
+            } catch (\RuntimeException $e) {
+                return Status::KNOCKOUT;
+            }
+
+            $messageModel->notifySuperUsers(
+                Text::_('PLG_TASK_PRIVACYCONSENT_NOTIFICATION_USER_PRIVACY_EXPIRED_SUBJECT'),
+                Text::sprintf('PLG_TASK_PRIVACYCONSENT_NOTIFICATION_USER_PRIVACY_EXPIRED_MESSAGE', $this->getUserFactory()->loadUserById($user->user_id)->username)
+            );
+        }
+
+        return Status::OK;
+    }
+}
diff --git a/plugins/task/requests/src/Extension/Requests.php b/plugins/task/requests/src/Extension/Requests.php
index 220c4cad5b369..a70fba520954c 100644
--- a/plugins/task/requests/src/Extension/Requests.php
+++ b/plugins/task/requests/src/Extension/Requests.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Plugin\Task\Requests\Extension;
 
-use Exception;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\Component\Scheduler\Administrator\Event\ExecuteTaskEvent;
 use Joomla\Component\Scheduler\Administrator\Task\Status as TaskStatus;
@@ -111,7 +110,7 @@ public function __construct(DispatcherInterface $dispatcher, array $config, Http
      * @return integer  The exit code
      *
      * @since 4.1.0
-     * @throws Exception
+     * @throws \Exception
      */
     protected function makeGetRequest(ExecuteTaskEvent $event): int
     {
@@ -126,12 +125,12 @@ protected function makeGetRequest(ExecuteTaskEvent $event): int
         $headers  = [];
 
         if ($auth && $authType && $authKey) {
-            $headers = [$authType => $authKey];
+            $headers = ['Authorization' => $authType . ' ' . $authKey];
         }
 
         try {
             $response = $this->httpFactory->getHttp([])->get($url, $headers, $timeout);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $this->logTask($this->getApplication()->getLanguage()->_('PLG_TASK_REQUESTS_TASK_GET_REQUEST_LOG_TIMEOUT'));
 
             return TaskStatus::TIMEOUT;
@@ -147,7 +146,7 @@ protected function makeGetRequest(ExecuteTaskEvent $event): int
             File::write($responseFilename, $responseBody);
             $this->snapshot['output_file'] = $responseFilename;
             $responseStatus                = 'SAVED';
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $this->logTask($this->getApplication()->getLanguage()->_('PLG_TASK_REQUESTS_TASK_GET_REQUEST_LOG_UNWRITEABLE_OUTPUT'), 'error');
             $responseStatus = 'NOT_SAVED';
         }
diff --git a/plugins/task/demotasks/forms/testTaskForm.xml b/plugins/task/rotatelogs/forms/rotateForm.xml
similarity index 64%
rename from plugins/task/demotasks/forms/testTaskForm.xml
rename to plugins/task/rotatelogs/forms/rotateForm.xml
index bddef6c79395f..80b95abbe9460 100644
--- a/plugins/task/demotasks/forms/testTaskForm.xml
+++ b/plugins/task/rotatelogs/forms/rotateForm.xml
@@ -3,15 +3,15 @@
 	<fields name="params">
 		<fieldset name="task_params">
 			<field
-				name="timeout"
-				type="number"
-				label="PLG_TASK_DEMO_TASKS_SLEEP_TIMEOUT_LABEL"
-				default="1"
-				required="true"
-				min="1"
+				name="logstokeep"
+				type="integer"
+				label="PLG_TASK_ROTATELOGS_LOGSTOKEEP_LABEL"
+				first="1"
+				last="10"
 				step="1"
-				validate="number"
+				default="1"
 				filter="int"
+				validate="number"
 			/>
 		</fieldset>
 	</fields>
diff --git a/plugins/task/rotatelogs/rotatelogs.xml b/plugins/task/rotatelogs/rotatelogs.xml
new file mode 100644
index 0000000000000..45311f120f583
--- /dev/null
+++ b/plugins/task/rotatelogs/rotatelogs.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extension type="plugin" group="task" method="upgrade">
+	<name>plg_task_rotatelogs</name>
+	<author>Joomla! Project</author>
+	<creationDate>2023-07</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_TASK_ROTATELOGS_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\Task\RotateLogs</namespace>
+	<files>
+		<folder>forms</folder>
+		<folder plugin="rotatelogs">services</folder>
+		<folder>src</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">language/en-GB/plg_task_rotatelogs.ini</language>
+		<language tag="en-GB">language/en-GB/plg_task_rotatelogs.sys.ini</language>
+	</languages>
+</extension>
diff --git a/plugins/task/rotatelogs/services/provider.php b/plugins/task/rotatelogs/services/provider.php
new file mode 100644
index 0000000000000..b2f8c50576064
--- /dev/null
+++ b/plugins/task/rotatelogs/services/provider.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Task.rotatelogs
+ *
+ * @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\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\Event\DispatcherInterface;
+use Joomla\Plugin\Task\RotateLogs\Extension\RotateLogs;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function register(Container $container)
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin = new RotateLogs(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('task', 'rotatelogs')
+                );
+                $plugin->setApplication(Factory::getApplication());
+                $plugin->setDatabase($container->get(DatabaseInterface::class));
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/task/rotatelogs/src/Extension/RotateLogs.php b/plugins/task/rotatelogs/src/Extension/RotateLogs.php
new file mode 100644
index 0000000000000..930b5b4bc933d
--- /dev/null
+++ b/plugins/task/rotatelogs/src/Extension/RotateLogs.php
@@ -0,0 +1,183 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Task.rotatelogs
+ *
+ * @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\Task\RotateLogs\Extension;
+
+use Joomla\CMS\Filesystem\File;
+use Joomla\CMS\Filesystem\Folder;
+use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\Component\Scheduler\Administrator\Event\ExecuteTaskEvent;
+use Joomla\Component\Scheduler\Administrator\Task\Status;
+use Joomla\Component\Scheduler\Administrator\Task\Task;
+use Joomla\Component\Scheduler\Administrator\Traits\TaskPluginTrait;
+use Joomla\Database\DatabaseAwareTrait;
+use Joomla\Event\SubscriberInterface;
+use Joomla\Filesystem\Path;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * A task plugin. Offers 1 task routines Rotate Logs
+ * {@see ExecuteTaskEvent}.
+ *
+ * @since __DEPLOY_VERSION__
+ */
+final class RotateLogs extends CMSPlugin implements SubscriberInterface
+{
+    use DatabaseAwareTrait;
+    use TaskPluginTrait;
+
+    /**
+     * @var string[]
+     * @since __DEPLOY_VERSION__
+     */
+    private const TASKS_MAP = [
+        'rotation.logs' => [
+            'langConstPrefix' => 'PLG_TASK_ROTATELOGS_ROTATION',
+            'method'          => 'rotateLogs',
+            'form'            => 'rotateForm',
+        ],
+    ];
+
+    /**
+     * @var boolean
+     * @since __DEPLOY_VERSION__
+     */
+    protected $autoloadLanguage = true;
+
+    /**
+     * @inheritDoc
+     *
+     * @return string[]
+     *
+     * @since __DEPLOY_VERSION__
+     */
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            'onTaskOptionsList'    => 'advertiseRoutines',
+            'onExecuteTask'        => 'standardRoutineHandler',
+            'onContentPrepareForm' => 'enhanceTaskItemForm',
+        ];
+    }
+
+    /**
+     * Method for the logs rotation task.
+     *
+     * @param   ExecuteTaskEvent  $event  The `onExecuteTask` event.
+     *
+     * @return integer  The routine exit code.
+     *
+     * @since  __DEPLOY_VERSION__
+     * @throws \Exception
+     */
+    private function rotateLogs(ExecuteTaskEvent $event): int
+    {
+        $logsToKeep = (int) $event->getArgument('params')->logstokeep ?? 1;
+
+        // Get the log path
+        $logPath = Path::clean($this->getApplication()->get('log_path'));
+
+        // Invalid path, stop processing further
+        if (!is_dir($logPath)) {
+            return Status::KNOCKOUT;
+        }
+
+        $logFiles = $this->getLogFiles($logPath);
+
+        // Sort log files by version number in reverse order
+        krsort($logFiles, SORT_NUMERIC);
+
+        foreach ($logFiles as $version => $files) {
+            if ($version >= $logsToKeep) {
+                // Delete files which have version greater than or equals $logsToKeep
+                foreach ($files as $file) {
+                    File::delete($logPath . '/' . $file);
+                }
+            } else {
+                // For files which have version smaller than $logsToKeep, rotate (increase version number)
+                foreach ($files as $file) {
+                    $this->rotate($logPath, $file, $version);
+                }
+            }
+        }
+
+        return Status::OK;
+    }
+
+    /**
+     * Method to rotate (increase version) of a log file
+     *
+     * @param   string  $path            Path to file to rotate
+     * @param   string  $filename        Name of file to rotate
+     * @param   int     $currentVersion  The current version number
+     *
+     * @return  void
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    private function rotate($path, $filename, $currentVersion)
+    {
+        if ($currentVersion === 0) {
+            $rotatedFile = $path . '/1.' . $filename;
+        } else {
+            /*
+             * Rotated log file has this filename format [VERSION].[FILENAME].php. To rotate it, we just need to explode
+             * the filename into an array, increase value of first element (keep version) and implode it back to get the
+             * rotated file name
+             */
+            $parts    = explode('.', $filename);
+            $parts[0] = $currentVersion + 1;
+
+            $rotatedFile = $path . '/' . implode('.', $parts);
+        }
+
+        File::move($path . '/' . $filename, $rotatedFile);
+    }
+
+    /**
+     * Get log files from log folder
+     *
+     * @param   string  $path  The folder to get log files
+     *
+     * @return  array   The log files in the given path grouped by version number (not rotated files have number 0)
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    private function getLogFiles($path)
+    {
+        $logFiles = [];
+        $files    = Folder::files($path, '\.php$');
+
+        foreach ($files as $file) {
+            $parts = explode('.', $file);
+
+            /*
+             * Rotated log file has this filename format [VERSION].[FILENAME].php. So if $parts has at least 3 elements
+             * and the first element is a number, we know that it's a rotated file and can get it's current version
+             */
+            if (count($parts) >= 3 && is_numeric($parts[0])) {
+                $version = (int) $parts[0];
+            } else {
+                $version = 0;
+            }
+
+            if (!isset($logFiles[$version])) {
+                $logFiles[$version] = [];
+            }
+
+            $logFiles[$version][] = $file;
+        }
+
+        return $logFiles;
+    }
+}
diff --git a/plugins/task/sitestatus/src/Extension/SiteStatus.php b/plugins/task/sitestatus/src/Extension/SiteStatus.php
index 23e98340bc657..be5ed0f41ac88 100644
--- a/plugins/task/sitestatus/src/Extension/SiteStatus.php
+++ b/plugins/task/sitestatus/src/Extension/SiteStatus.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Plugin\Task\SiteStatus\Extension;
 
-use Exception;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\Component\Scheduler\Administrator\Event\ExecuteTaskEvent;
 use Joomla\Component\Scheduler\Administrator\Task\Status;
@@ -120,7 +119,7 @@ public function __construct(DispatcherInterface $dispatcher, array $config, arra
      * @return void
      *
      * @since 4.1.0
-     * @throws Exception
+     * @throws \Exception
      */
     public function alterSiteStatus(ExecuteTaskEvent $event): void
     {
@@ -156,7 +155,7 @@ public function alterSiteStatus(ExecuteTaskEvent $event): void
      * @return  integer  The task exit code
      *
      * @since  4.1.0
-     * @throws Exception
+     * @throws \Exception
      */
     private function writeConfigFile(Registry $config): int
     {
@@ -172,7 +171,7 @@ private function writeConfigFile(Registry $config): int
             // Attempt to write the configuration file as a PHP class named JConfig.
             $configuration = $config->toString('PHP', ['class' => 'JConfig', 'closingtag' => false]);
             File::write($file, $configuration);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $this->logTask($this->getApplication()->getLanguage()->_('PLG_TASK_SITE_STATUS_ERROR_WRITE_FAILED'), 'error');
 
             return Status::KNOCKOUT;
diff --git a/plugins/task/updatenotification/forms/sendForm.xml b/plugins/task/updatenotification/forms/sendForm.xml
new file mode 100644
index 0000000000000..47fe0c72d808c
--- /dev/null
+++ b/plugins/task/updatenotification/forms/sendForm.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form>
+	<fields name="params">
+		<fieldset name="task_params">
+			<field
+				name="email"
+				type="text"
+				label="PLG_TASK_UPDATENOTIFICATION_EMAIL_LBL"
+				description="PLG_TASK_UPDATENOTIFICATION_EMAIL_DESC"
+				default=""
+			/>
+			<field
+				name="language_override"
+				type="language"
+				label="PLG_TASK_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_LBL"
+				description="PLG_TASK_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_DESC"
+				default=""
+				client="administrator"
+				>
+				<option value="">PLG_TASK_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_NONE</option>
+			</field>
+		</fieldset>
+	</fields>
+</form>
diff --git a/plugins/task/updatenotification/services/provider.php b/plugins/task/updatenotification/services/provider.php
new file mode 100644
index 0000000000000..ee30840167ba3
--- /dev/null
+++ b/plugins/task/updatenotification/services/provider.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Task.updatenotification
+ *
+ * @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\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\Event\DispatcherInterface;
+use Joomla\Plugin\Task\UpdateNotification\Extension\UpdateNotification;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin = new UpdateNotification(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('task', 'updatenotification')
+                );
+                $plugin->setApplication(Factory::getApplication());
+                $plugin->setDatabase($container->get(DatabaseInterface::class));
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/system/updatenotification/updatenotification.php b/plugins/task/updatenotification/src/Extension/UpdateNotification.php
similarity index 56%
rename from plugins/system/updatenotification/updatenotification.php
rename to plugins/task/updatenotification/src/Extension/UpdateNotification.php
index b4831185fffb3..3817abead9b8b 100644
--- a/plugins/system/updatenotification/updatenotification.php
+++ b/plugins/task/updatenotification/src/Extension/UpdateNotification.php
@@ -2,20 +2,16 @@
 
 /**
  * @package     Joomla.Plugin
- * @subpackage  System.updatenotification
+ * @subpackage  Task.updatenotification
  *
- * @copyright   (C) 2015 Open Source Matters, Inc. <https://www.joomla.org>
+ * @copyright   (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
+namespace Joomla\Plugin\Task\UpdateNotification\Extension;
+
 use Joomla\CMS\Access\Access;
-use Joomla\CMS\Cache\Cache;
-use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Extension\ExtensionHelper;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Log\Log;
 use Joomla\CMS\Mail\Exception\MailDisabledException;
 use Joomla\CMS\Mail\MailTemplate;
 use Joomla\CMS\Plugin\CMSPlugin;
@@ -23,148 +19,101 @@
 use Joomla\CMS\Updater\Updater;
 use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\Version;
+use Joomla\Component\Scheduler\Administrator\Event\ExecuteTaskEvent;
+use Joomla\Component\Scheduler\Administrator\Task\Status;
+use Joomla\Component\Scheduler\Administrator\Traits\TaskPluginTrait;
+use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Database\ParameterType;
+use Joomla\Event\SubscriberInterface;
 use PHPMailer\PHPMailer\Exception as phpMailerException;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
-// Uncomment the following line to enable debug mode (update notification email sent every single time)
-// define('PLG_SYSTEM_UPDATENOTIFICATION_DEBUG', 1);
-
 /**
- * Joomla! Update Notification plugin
- *
- * Sends out an email to all Super Users or a predefined list of email addresses of Super Users when a new
- * Joomla! version is available.
+ * A task plugin. Offers 2 task routines Invalidate Expired Consents and Remind Expired Consents
+ * {@see ExecuteTaskEvent}.
  *
- * This plugin is a direct adaptation of the corresponding plugin in Akeeba Ltd's Admin Tools. The author has
- * consented to relicensing their plugin's code under GPLv2 or later (the original version was licensed under
- * GPLv3 or later) to allow its inclusion in the Joomla! CMS.
- *
- * @since  3.5
+ * @since __DEPLOY_VERSION__
  */
-class PlgSystemUpdatenotification extends CMSPlugin
+final class UpdateNotification extends CMSPlugin implements SubscriberInterface
 {
+    use DatabaseAwareTrait;
+    use TaskPluginTrait;
+
     /**
-     * Application object
-     *
-     * @var    \Joomla\CMS\Application\CMSApplication
-     * @since  4.0.0
+     * @var string[]
+     * @since __DEPLOY_VERSION__
      */
-    protected $app;
+    private const TASKS_MAP = [
+        'update.notification' => [
+            'langConstPrefix' => 'PLG_TASK_UPDATENOTIFICATION_SEND',
+            'method'          => 'sendNotification',
+            'form'            => 'sendForm',
+        ],
+    ];
 
     /**
-     * Database driver
-     *
-     * @var    \Joomla\Database\DatabaseInterface
-     * @since  4.0.0
+     * @var boolean
+     * @since __DEPLOY_VERSION__
      */
-    protected $db;
+    protected $autoloadLanguage = true;
 
     /**
-     * Load plugin language files automatically
+     * @inheritDoc
+     *
+     * @return string[]
      *
-     * @var    boolean
-     * @since  3.6.3
+     * @since __DEPLOY_VERSION__
      */
-    protected $autoloadLanguage = true;
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            'onTaskOptionsList'    => 'advertiseRoutines',
+            'onExecuteTask'        => 'standardRoutineHandler',
+            'onContentPrepareForm' => 'enhanceTaskItemForm',
+        ];
+    }
 
     /**
-     * The update check and notification email code is triggered after the page has fully rendered.
+     * Method to send the update notification.
      *
-     * @return  void
+     * @param   ExecuteTaskEvent  $event  The `onExecuteTask` event.
      *
-     * @since   3.5
+     * @return integer  The routine exit code.
+     *
+     * @since  __DEPLOY_VERSION__
+     * @throws \Exception
      */
-    public function onAfterRender()
+    private function sendNotification(ExecuteTaskEvent $event): int
     {
-        // Get the timeout for Joomla! updates, as configured in com_installer's component parameters
-        $component = ComponentHelper::getComponent('com_installer');
-
-        /** @var \Joomla\Registry\Registry $params */
-        $params        = $component->getParams();
-        $cache_timeout = (int) $params->get('cachetimeout', 6);
-        $cache_timeout = 3600 * $cache_timeout;
-
-        // Do we need to run? Compare the last run timestamp stored in the plugin's options with the current
-        // timestamp. If the difference is greater than the cache timeout we shall not execute again.
-        $now  = time();
-        $last = (int) $this->params->get('lastrun', 0);
-
-        if (!defined('PLG_SYSTEM_UPDATENOTIFICATION_DEBUG') && (abs($now - $last) < $cache_timeout)) {
-            return;
-        }
-
-        // Update last run status
-        // If I have the time of the last run, I can update, otherwise insert
-        $this->params->set('lastrun', $now);
-
-        $db         = $this->db;
-        $paramsJson = $this->params->toString('JSON');
-
-        $query = $db->getQuery(true)
-            ->update($db->quoteName('#__extensions'))
-            ->set($db->quoteName('params') . ' = :params')
-            ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
-            ->where($db->quoteName('folder') . ' = ' . $db->quote('system'))
-            ->where($db->quoteName('element') . ' = ' . $db->quote('updatenotification'))
-            ->bind(':params', $paramsJson);
-
-        try {
-            // Lock the tables to prevent multiple plugin executions causing a race condition
-            $db->lockTable('#__extensions');
-        } catch (Exception $e) {
-            // If we can't lock the tables it's too risky to continue execution
-            return;
-        }
-
-        try {
-            // Update the plugin parameters
-            $result = $db->setQuery($query)->execute();
-
-            $this->clearCacheGroups(['com_plugins']);
-        } catch (Exception $exc) {
-            // If we failed to execute
-            $db->unlockTables();
-            $result = false;
-        }
-
-        try {
-            // Unlock the tables after writing
-            $db->unlockTables();
-        } catch (Exception $e) {
-            // If we can't lock the tables assume we have somehow failed
-            $result = false;
-        }
-
-        // Abort on failure
-        if (!$result) {
-            return;
-        }
+        // Load the parameters.
+        $specificEmail  = $event->getArgument('params')->email ?? '';
+        $forcedLanguage = $event->getArgument('params')->language_override ?? '';
 
         // This is the extension ID for Joomla! itself
         $eid = ExtensionHelper::getExtensionRecord('joomla', 'file')->extension_id;
 
         // Get any available updates
         $updater = Updater::getInstance();
-        $results = $updater->findUpdates([$eid], $cache_timeout);
+        $results = $updater->findUpdates([$eid], 0);
 
         // If there are no updates our job is done. We need BOTH this check AND the one below.
         if (!$results) {
-            return;
+            return Status::OK;
         }
 
         // Get the update model and retrieve the Joomla! core updates
-        $model = $this->app->bootComponent('com_installer')
+        $model = $this->getApplication()->bootComponent('com_installer')
             ->getMVCFactory()->createModel('Update', 'Administrator', ['ignore_request' => true]);
+
         $model->setState('filter.extension_id', $eid);
         $updates = $model->getItems();
 
         // If there are no updates we don't have to notify anyone about anything. This is NOT a duplicate check.
         if (empty($updates)) {
-            return;
+            return Status::OK;
         }
 
         // Get the available update
@@ -172,7 +121,7 @@ public function onAfterRender()
 
         // Check the available version. If it's the same or less than the installed version we have no updates to notify about.
         if (version_compare($update->version, JVERSION, 'le')) {
-            return;
+            return Status::OK;
         }
 
         // If we're here, we have updates. First, get a link to the Joomla! Update component.
@@ -194,11 +143,10 @@ public function onAfterRender()
          *
          * The plugins should modify the $uri object directly and return null.
          */
-        $this->app->triggerEvent('onBuildAdministratorLoginURL', [&$uri]);
+        $this->getApplication()->triggerEvent('onBuildAdministratorLoginURL', [&$uri]);
 
         // Let's find out the email addresses to notify
-        $superUsers    = [];
-        $specificEmail = $this->params->get('email', '');
+        $superUsers = [];
 
         if (!empty($specificEmail)) {
             $superUsers = $this->getSuperUsers($specificEmail);
@@ -209,7 +157,7 @@ public function onAfterRender()
         }
 
         if (empty($superUsers)) {
-            return;
+            return Status::KNOCKOUT;
         }
 
         /*
@@ -219,15 +167,13 @@ public function onAfterRender()
          * following code does DO NOT TOUCH IT. It makes the difference between a hobbyist CMS and a professional
          * solution!
          */
-        $jLanguage = $this->app->getLanguage();
-        $jLanguage->load('plg_system_updatenotification', JPATH_ADMINISTRATOR, 'en-GB', true, true);
-        $jLanguage->load('plg_system_updatenotification', JPATH_ADMINISTRATOR, null, true, false);
+        $jLanguage = $this->getApplication()->getLanguage();
+        $jLanguage->load('plg_task_updatenotification', JPATH_ADMINISTRATOR, 'en-GB', true, true);
+        $jLanguage->load('plg_task_updatenotification', JPATH_ADMINISTRATOR, null, true, false);
 
         // Then try loading the preferred (forced) language
-        $forcedLanguage = $this->params->get('language_override', '');
-
         if (!empty($forcedLanguage)) {
-            $jLanguage->load('plg_system_updatenotification', JPATH_ADMINISTRATOR, $forcedLanguage, true, false);
+            $jLanguage->load('plg_task_updatenotification', JPATH_ADMINISTRATOR, $forcedLanguage, true, false);
         }
 
         // Replace merge codes with their values
@@ -236,7 +182,7 @@ public function onAfterRender()
         $jVersion       = new Version();
         $currentVersion = $jVersion->getShortVersion();
 
-        $sitename = $this->app->get('sitename');
+        $sitename = $this->getApplication()->get('sitename');
 
         $substitutions = [
             'newversion'  => $newVersion,
@@ -250,18 +196,22 @@ public function onAfterRender()
         // Send the emails to the Super Users
         foreach ($superUsers as $superUser) {
             try {
-                $mailer = new MailTemplate('plg_system_updatenotification.mail', $jLanguage->getTag());
+                $mailer = new MailTemplate('plg_task_updatenotification.mail', $jLanguage->getTag());
                 $mailer->addRecipient($superUser->email);
                 $mailer->addTemplateData($substitutions);
                 $mailer->send();
             } catch (MailDisabledException | phpMailerException $exception) {
                 try {
-                    Log::add(Text::_($exception->getMessage()), Log::WARNING, 'jerror');
+                    $this->logTask($jLanguage->_($exception->getMessage()));
                 } catch (\RuntimeException $exception) {
-                    $this->app->enqueueMessage(Text::_($exception->errorMessage()), 'warning');
+                    return Status::KNOCKOUT;
                 }
             }
         }
+
+        $this->logTask('UpdateNotification end');
+
+        return Status::OK;
     }
 
     /**
@@ -277,7 +227,7 @@ public function onAfterRender()
      */
     private function getSuperUsers($email = null)
     {
-        $db     = $this->db;
+        $db     = $this->getDatabase();
         $emails = [];
 
         // Convert the email list to an array
@@ -313,7 +263,7 @@ private function getSuperUsers($email = null)
             if (empty($groups)) {
                 return $ret;
             }
-        } catch (Exception $exc) {
+        } catch (\Exception $exc) {
             return $ret;
         }
 
@@ -330,7 +280,7 @@ private function getSuperUsers($email = null)
             if (empty($userIDs)) {
                 return $ret;
             }
-        } catch (Exception $exc) {
+        } catch (\Exception $exc) {
             return $ret;
         }
 
@@ -350,36 +300,10 @@ private function getSuperUsers($email = null)
 
             $db->setQuery($query);
             $ret = $db->loadObjectList();
-        } catch (Exception $exc) {
+        } catch (\Exception $exc) {
             return $ret;
         }
 
         return $ret;
     }
-
-    /**
-     * Clears cache groups. We use it to clear the plugins cache after we update the last run timestamp.
-     *
-     * @param   array  $clearGroups  The cache groups to clean
-     *
-     * @return  void
-     *
-     * @since   3.5
-     */
-    private function clearCacheGroups(array $clearGroups)
-    {
-        foreach ($clearGroups as $group) {
-            try {
-                $options = [
-                    'defaultgroup' => $group,
-                    'cachebase'    => $this->app->get('cache_path', JPATH_CACHE),
-                ];
-
-                $cache = Cache::getInstance('callback', $options);
-                $cache->clean();
-            } catch (Exception $e) {
-                // Ignore it
-            }
-        }
-    }
 }
diff --git a/plugins/task/updatenotification/updatenotification.xml b/plugins/task/updatenotification/updatenotification.xml
new file mode 100644
index 0000000000000..125144ab7a8e9
--- /dev/null
+++ b/plugins/task/updatenotification/updatenotification.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extension type="plugin" group="task" method="upgrade">
+	<name>plg_task_updatenotification</name>
+	<author>Joomla! Project</author>
+	<creationDate>2023-07</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_TASK_UPDATENOTIFICATION_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\Task\UpdateNotification</namespace>
+	<files>
+		<folder>forms</folder>
+		<folder plugin="updatenotification">services</folder>
+		<folder>src</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">language/en-GB/plg_task_updatenotification.ini</language>
+		<language tag="en-GB">language/en-GB/plg_task_updatenotification.sys.ini</language>
+	</languages>
+</extension>
diff --git a/plugins/user/contactcreator/services/provider.php b/plugins/user/contactcreator/services/provider.php
index eec1db9e1650d..30c41aea18850 100644
--- a/plugins/user/contactcreator/services/provider.php
+++ b/plugins/user/contactcreator/services/provider.php
@@ -26,16 +26,15 @@
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.4.0
      */
     public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new ContactCreator(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('user', 'contactcreator')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/user/joomla/services/provider.php b/plugins/user/joomla/services/provider.php
index af1c86e7d3bd2..d887469f2eff5 100644
--- a/plugins/user/joomla/services/provider.php
+++ b/plugins/user/joomla/services/provider.php
@@ -13,6 +13,7 @@
 use Joomla\CMS\Extension\PluginInterface;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\User\UserFactoryInterface;
 use Joomla\Database\DatabaseInterface;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
@@ -27,20 +28,20 @@
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.4.0
      */
     public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Joomla(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('user', 'joomla')
                 );
                 $plugin->setApplication(Factory::getApplication());
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
+                $plugin->setUserFactory($container->get(UserFactoryInterface::class));
 
                 return $plugin;
             }
diff --git a/plugins/user/joomla/src/Extension/Joomla.php b/plugins/user/joomla/src/Extension/Joomla.php
index 03ded29183dda..3e5d4b57c02b6 100644
--- a/plugins/user/joomla/src/Extension/Joomla.php
+++ b/plugins/user/joomla/src/Extension/Joomla.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Plugin\User\Joomla\Extension;
 
-use Exception;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\LanguageFactoryInterface;
@@ -19,12 +18,12 @@
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\User\User;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\CMS\User\UserHelper;
 use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Database\Exception\ExecutionFailureException;
 use Joomla\Database\ParameterType;
 use Joomla\Registry\Registry;
-use RuntimeException;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -38,6 +37,7 @@
 final class Joomla extends CMSPlugin
 {
     use DatabaseAwareTrait;
+    use UserFactoryAwareTrait;
 
     /**
      * Set as required the passwords fields when mail to user is set to No
@@ -125,7 +125,7 @@ public function onUserAfterDelete($user, $success, $msg): void
 
         try {
             $db->setQuery($query)->execute();
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             // Do nothing
         }
 
@@ -137,7 +137,7 @@ public function onUserAfterDelete($user, $success, $msg): void
 
         try {
             $db->setQuery($query)->execute();
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             // Do nothing
         }
     }
@@ -260,7 +260,7 @@ public function onUserLogin($user, $options = [])
         $instance = $this->getUser($user, $options);
 
         // If getUser returned an error, then pass it back.
-        if ($instance instanceof Exception) {
+        if ($instance instanceof \Exception) {
             return false;
         }
 
@@ -317,7 +317,7 @@ public function onUserLogin($user, $options = [])
 
         try {
             $db->setQuery($query)->execute();
-        } catch (RuntimeException $e) {
+        } catch (\RuntimeException $e) {
             // The old session is already invalidated, don't let this block logging in
         }
 
@@ -352,7 +352,7 @@ public function onUserLogin($user, $options = [])
      */
     public function onUserLogout($user, $options = [])
     {
-        $my      = Factory::getUser();
+        $my      = $this->getApplication()->getIdentity();
         $session = Factory::getSession();
 
         $userid = (int) $user['id'];
@@ -467,15 +467,14 @@ private function disableMfaOnSilentLogin(array $options): void
      */
     private function getUser($user, $options = [])
     {
-        $instance = User::getInstance();
-        $id       = (int) UserHelper::getUserId($user['username']);
-
-        if ($id) {
-            $instance->load($id);
+        $instance = $this->getUserFactory()->loadUserByUsername($user['username']);
 
+        if ($instance && $instance->id) {
             return $instance;
         }
 
+        $instance = $this->getUserFactory()->loadUserById(0);
+
         // @todo : move this out of the plugin
         $params = ComponentHelper::getParams('com_users');
 
diff --git a/plugins/user/profile/services/provider.php b/plugins/user/profile/services/provider.php
index d276dbda3d9d6..e16963afa8fe5 100644
--- a/plugins/user/profile/services/provider.php
+++ b/plugins/user/profile/services/provider.php
@@ -27,16 +27,15 @@
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.4.0
      */
     public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Profile(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('user', 'profile')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/user/profile/src/Extension/Profile.php b/plugins/user/profile/src/Extension/Profile.php
index 13df097d09fd6..4bc410e5a0642 100644
--- a/plugins/user/profile/src/Extension/Profile.php
+++ b/plugins/user/profile/src/Extension/Profile.php
@@ -11,7 +11,6 @@
 namespace Joomla\Plugin\User\Profile\Extension;
 
 use Exception;
-use InvalidArgumentException;
 use Joomla\CMS\Date\Date;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Form\FormHelper;
@@ -300,7 +299,7 @@ public function onContentPrepareForm(Form $form, $data)
      * @return  boolean
      *
      * @since   3.1
-     * @throws  InvalidArgumentException on invalid date.
+     * @throws  \InvalidArgumentException on invalid date.
      */
     public function onUserBeforeSave($user, $isnew, $data)
     {
@@ -309,14 +308,14 @@ public function onUserBeforeSave($user, $isnew, $data)
             try {
                 $date       = new Date($data['profile']['dob']);
                 $this->date = $date->format('Y-m-d H:i:s');
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 // Throw an exception if date is not valid.
-                throw new InvalidArgumentException($this->getApplication()->getLanguage()->_('PLG_USER_PROFILE_ERROR_INVALID_DOB'));
+                throw new \InvalidArgumentException($this->getApplication()->getLanguage()->_('PLG_USER_PROFILE_ERROR_INVALID_DOB'));
             }
 
             if (Date::getInstance('now') < $date) {
                 // Throw an exception if dob is greater than now.
-                throw new InvalidArgumentException($this->getApplication()->getLanguage()->_('PLG_USER_PROFILE_ERROR_INVALID_DOB_FUTURE_DATE'));
+                throw new \InvalidArgumentException($this->getApplication()->getLanguage()->_('PLG_USER_PROFILE_ERROR_INVALID_DOB_FUTURE_DATE'));
             }
         }
 
@@ -327,7 +326,7 @@ public function onUserBeforeSave($user, $isnew, $data)
 
         // Check that the tos is checked.
         if ($task === 'register' && $tosEnabled && $option === 'com_users' && !$data['profile']['tos']) {
-            throw new InvalidArgumentException($this->getApplication()->getLanguage()->_('PLG_USER_PROFILE_FIELD_TOS_DESC_SITE'));
+            throw new \InvalidArgumentException($this->getApplication()->getLanguage()->_('PLG_USER_PROFILE_FIELD_TOS_DESC_SITE'));
         }
 
         return true;
diff --git a/plugins/user/terms/services/provider.php b/plugins/user/terms/services/provider.php
index 1fef732a9d650..d19592facdd86 100644
--- a/plugins/user/terms/services/provider.php
+++ b/plugins/user/terms/services/provider.php
@@ -26,16 +26,15 @@
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.4.0
      */
     public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Terms(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('user', 'terms')
                 );
                 $plugin->setApplication(Factory::getApplication());
diff --git a/plugins/user/terms/src/Extension/Terms.php b/plugins/user/terms/src/Extension/Terms.php
index 85f85a8d68f46..b4bba582cdb68 100644
--- a/plugins/user/terms/src/Extension/Terms.php
+++ b/plugins/user/terms/src/Extension/Terms.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Plugin\User\Terms\Extension;
 
-use InvalidArgumentException;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Form\FormHelper;
 use Joomla\CMS\Plugin\CMSPlugin;
@@ -79,7 +78,7 @@ public function onContentPrepareForm(Form $form, $data)
      * @return  boolean
      *
      * @since   3.9.0
-     * @throws  InvalidArgumentException on missing required data.
+     * @throws  \InvalidArgumentException on missing required data.
      */
     public function onUserBeforeSave($user, $isNew, $data)
     {
@@ -102,7 +101,7 @@ public function onUserBeforeSave($user, $isNew, $data)
         $form   = $input->post->get('jform', [], 'array');
 
         if ($option == 'com_users' && in_array($task, ['registration.register']) && empty($form['terms']['terms'])) {
-            throw new InvalidArgumentException($this->getApplication()->getLanguage()->_('PLG_USER_TERMS_FIELD_ERROR'));
+            throw new \InvalidArgumentException($this->getApplication()->getLanguage()->_('PLG_USER_TERMS_FIELD_ERROR'));
         }
 
         return true;
diff --git a/plugins/user/token/services/provider.php b/plugins/user/token/services/provider.php
index 956f852794bc1..d255df74460a3 100644
--- a/plugins/user/token/services/provider.php
+++ b/plugins/user/token/services/provider.php
@@ -13,6 +13,7 @@
 use Joomla\CMS\Extension\PluginInterface;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\User\UserFactoryInterface;
 use Joomla\Database\DatabaseInterface;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
@@ -27,20 +28,20 @@
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   4.4.0
      */
     public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
             function (Container $container) {
-                $dispatcher = $container->get(DispatcherInterface::class);
                 $plugin     = new Token(
-                    $dispatcher,
+                    $container->get(DispatcherInterface::class),
                     (array) PluginHelper::getPlugin('user', 'token')
                 );
                 $plugin->setApplication(Factory::getApplication());
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
+                $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 3faf48a33ed8c..035a5fbbadd26 100644
--- a/plugins/user/token/src/Extension/Token.php
+++ b/plugins/user/token/src/Extension/Token.php
@@ -10,12 +10,11 @@
 
 namespace Joomla\Plugin\User\Token\Extension;
 
-use Exception;
 use Joomla\CMS\Crypt\Crypt;
-use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Database\ParameterType;
 use Joomla\Utilities\ArrayHelper;
@@ -32,6 +31,7 @@
 final class Token extends CMSPlugin
 {
     use DatabaseAwareTrait;
+    use UserFactoryAwareTrait;
 
     /**
      * Load the language file on instantiation.
@@ -139,7 +139,7 @@ public function onContentPrepareData(string $context, &$data): bool
 
                 $data->{$this->profileKeyPrefix}[$k] = $v[1];
             }
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             // We suppress any database error. It means we get no token saved by default.
         }
 
@@ -179,7 +179,7 @@ public function onContentPrepareData(string $context, &$data): bool
      *
      * @return  boolean
      *
-     * @throws  Exception  When $form is not a valid form object
+     * @throws  \Exception  When $form is not a valid form object
      * @since   4.0.0
      */
     public function onContentPrepareForm(Form $form, $data): bool
@@ -218,7 +218,7 @@ public function onContentPrepareForm(Form $form, $data): bool
 
         // No token: no reset
         $userTokenSeed = $this->getTokenSeedForUser($userId);
-        $currentUser   = Factory::getUser();
+        $currentUser   = $this->getApplication()->getIdentity();
 
         if (empty($userTokenSeed)) {
             $form->removeField('notokenforotherpeople', 'joomlatoken');
@@ -379,7 +379,7 @@ public function onUserAfterSave($data, bool $isNew, bool $result, ?string $error
      *
      * @return  void
      *
-     * @throws  Exception
+     * @throws  \Exception
      * @since   4.0.0
      */
     public function onUserAfterDelete(array $user, bool $success, string $msg): void
@@ -406,7 +406,7 @@ public function onUserAfterDelete(array $user, bool $success, string $msg): void
             $query->bind(':profileKey', $profileKey, ParameterType::STRING);
 
             $db->setQuery($query)->execute();
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             // Do nothing.
         }
     }
@@ -451,7 +451,7 @@ private function getTokenSeedForUser(int $userId): ?string
             $query->bind(':userId', $userId, ParameterType::INTEGER);
 
             return $db->setQuery($query)->loadResult();
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             return null;
         }
     }
@@ -489,7 +489,7 @@ private function isInAllowedUserGroup($userId)
     {
         $allowedUserGroups = $this->getAllowedUserGroups();
 
-        $user = Factory::getUser($userId);
+        $user = $this->getUserFactory()->loadUserById($userId);
 
         if ($user->id != $userId) {
             return false;
@@ -598,7 +598,7 @@ private function hasTokenProfileFields(?int $userId): bool
 
         try {
             $numRows = $db->setQuery($q)->loadResult() ?? 0;
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             return false;
         }
 
diff --git a/plugins/user/token/src/Field/JoomlatokenField.php b/plugins/user/token/src/Field/JoomlatokenField.php
index f0be2d5b823d1..7de4cbc7751ae 100644
--- a/plugins/user/token/src/Field/JoomlatokenField.php
+++ b/plugins/user/token/src/Field/JoomlatokenField.php
@@ -62,7 +62,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
          */
         $userId = $this->form->getData()->get('id');
 
-        if ($userId != Factory::getUser()->id) {
+        if ($userId != $this->getCurrentUser()->id) {
             $this->hidden = true;
         }
 
@@ -118,7 +118,7 @@ private function getTokenForDisplay(string $tokenSeed): string
         $userId    = $this->form->getData()->get('id');
         $message   = base64_encode("$algorithm:$userId:$tokenHash");
 
-        if ($userId != Factory::getUser()->id) {
+        if ($userId != $this->getCurrentUser()->id) {
             $message = '';
         }
 
diff --git a/plugins/webservices/banners/banners.xml b/plugins/webservices/banners/banners.xml
index a859f8fbad1bc..af0210278322b 100644
--- a/plugins/webservices/banners/banners.xml
+++ b/plugins/webservices/banners/banners.xml
@@ -9,8 +9,10 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>4.0.0</version>
 	<description>PLG_WEBSERVICES_BANNERS_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\WebServices\Banners</namespace>
 	<files>
-		<filename plugin="banners">banners.php</filename>
+		<folder plugin="banners">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_webservices_banners.ini</language>
diff --git a/plugins/webservices/banners/services/provider.php b/plugins/webservices/banners/services/provider.php
new file mode 100644
index 0000000000000..3c07d5c4a7abb
--- /dev/null
+++ b/plugins/webservices/banners/services/provider.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Webservices.banners
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\WebServices\Banners\Extension\Banners;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new Banners(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('webservices', 'banners')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/webservices/banners/banners.php b/plugins/webservices/banners/src/Extension/Banners.php
similarity index 94%
rename from plugins/webservices/banners/banners.php
rename to plugins/webservices/banners/src/Extension/Banners.php
index 7953c2f503393..ac00be0bab2d0 100644
--- a/plugins/webservices/banners/banners.php
+++ b/plugins/webservices/banners/src/Extension/Banners.php
@@ -2,14 +2,14 @@
 
 /**
  * @package     Joomla.Plugin
- * @subpackage  Webservices.Banners
+ * @subpackage  Webservices.banners
  *
  * @copyright   (C) 2019 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
+namespace Joomla\Plugin\WebServices\Banners\Extension;
+
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Router\ApiRouter;
 use Joomla\Router\Route;
@@ -23,7 +23,7 @@
  *
  * @since  4.0.0
  */
-class PlgWebservicesBanners extends CMSPlugin
+final class Banners extends CMSPlugin
 {
     /**
      * Load the language file on instantiation.
diff --git a/plugins/webservices/config/config.xml b/plugins/webservices/config/config.xml
index 33fa52e6bf5fb..695e4278b5200 100644
--- a/plugins/webservices/config/config.xml
+++ b/plugins/webservices/config/config.xml
@@ -9,8 +9,10 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>4.0.0</version>
 	<description>PLG_WEBSERVICES_CONFIG_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\WebServices\Config</namespace>
 	<files>
-		<filename plugin="config">config.php</filename>
+		<folder plugin="config">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_webservices_config.ini</language>
diff --git a/plugins/webservices/config/services/provider.php b/plugins/webservices/config/services/provider.php
new file mode 100644
index 0000000000000..0ba121418245d
--- /dev/null
+++ b/plugins/webservices/config/services/provider.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Webservices.config
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\WebServices\Config\Extension\Config;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new Config(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('webservices', 'config')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/webservices/config/config.php b/plugins/webservices/config/src/Extension/Config.php
similarity index 91%
rename from plugins/webservices/config/config.php
rename to plugins/webservices/config/src/Extension/Config.php
index 0672e3d2efd0f..74c1612e36385 100644
--- a/plugins/webservices/config/config.php
+++ b/plugins/webservices/config/src/Extension/Config.php
@@ -2,14 +2,14 @@
 
 /**
  * @package     Joomla.Plugin
- * @subpackage  Webservices.Config
+ * @subpackage  Webservices.config
  *
  * @copyright   (C) 2019 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
+namespace Joomla\Plugin\WebServices\Config\Extension;
+
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Router\ApiRouter;
 use Joomla\Router\Route;
@@ -23,7 +23,7 @@
  *
  * @since  4.0.0
  */
-class PlgWebservicesConfig extends CMSPlugin
+final class Config extends CMSPlugin
 {
     /**
      * Load the language file on instantiation.
diff --git a/plugins/webservices/contact/contact.xml b/plugins/webservices/contact/contact.xml
index 1fec26a2ffa39..2450a5d123e12 100644
--- a/plugins/webservices/contact/contact.xml
+++ b/plugins/webservices/contact/contact.xml
@@ -9,8 +9,10 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>4.0.0</version>
 	<description>PLG_WEBSERVICES_CONTACT_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\WebServices\Contact</namespace>
 	<files>
-		<filename plugin="contact">contact.php</filename>
+		<folder plugin="contact">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_webservices_contact.ini</language>
diff --git a/plugins/webservices/contact/services/provider.php b/plugins/webservices/contact/services/provider.php
new file mode 100644
index 0000000000000..4d018a71320dd
--- /dev/null
+++ b/plugins/webservices/contact/services/provider.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Webservices.contact
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\WebServices\Contact\Extension\Contact;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new Contact(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('webservices', 'contact')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/webservices/contact/contact.php b/plugins/webservices/contact/src/Extension/Contact.php
similarity index 96%
rename from plugins/webservices/contact/contact.php
rename to plugins/webservices/contact/src/Extension/Contact.php
index f5c999819174f..0c1f9e57c2cb8 100644
--- a/plugins/webservices/contact/contact.php
+++ b/plugins/webservices/contact/src/Extension/Contact.php
@@ -2,14 +2,14 @@
 
 /**
  * @package     Joomla.Plugin
- * @subpackage  Webservices.Contact
+ * @subpackage  Webservices.contact
  *
  * @copyright   (C) 2019 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
+namespace Joomla\Plugin\WebServices\Contact\Extension;
+
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Router\ApiRouter;
 use Joomla\Router\Route;
@@ -23,7 +23,7 @@
  *
  * @since  4.0.0
  */
-class PlgWebservicesContact extends CMSPlugin
+final class Contact extends CMSPlugin
 {
     /**
      * Load the language file on instantiation.
diff --git a/plugins/webservices/content/content.xml b/plugins/webservices/content/content.xml
index 99feef2b92e3a..24b0882cccafa 100644
--- a/plugins/webservices/content/content.xml
+++ b/plugins/webservices/content/content.xml
@@ -9,8 +9,10 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>4.0.0</version>
 	<description>PLG_WEBSERVICES_CONTENT_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\WebServices\Content</namespace>
 	<files>
-		<filename plugin="content">content.php</filename>
+		<folder plugin="content">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_webservices_content.ini</language>
diff --git a/plugins/webservices/content/services/provider.php b/plugins/webservices/content/services/provider.php
new file mode 100644
index 0000000000000..875a1f81bcf48
--- /dev/null
+++ b/plugins/webservices/content/services/provider.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Webservices.content
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\WebServices\Content\Extension\Content;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new Content(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('webservices', 'content')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/webservices/content/content.php b/plugins/webservices/content/src/Extension/Content.php
similarity index 95%
rename from plugins/webservices/content/content.php
rename to plugins/webservices/content/src/Extension/Content.php
index b9c87ab3ed7dc..981316aa7aecf 100644
--- a/plugins/webservices/content/content.php
+++ b/plugins/webservices/content/src/Extension/Content.php
@@ -2,14 +2,14 @@
 
 /**
  * @package     Joomla.Plugin
- * @subpackage  Webservices.Content
+ * @subpackage  Webservices.content
  *
  * @copyright   (C) 2019 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
+namespace Joomla\Plugin\WebServices\Content\Extension;
+
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Router\ApiRouter;
 use Joomla\Router\Route;
@@ -23,7 +23,7 @@
  *
  * @since  4.0.0
  */
-class PlgWebservicesContent extends CMSPlugin
+final class Content extends CMSPlugin
 {
     /**
      * Load the language file on instantiation.
diff --git a/plugins/webservices/installer/installer.xml b/plugins/webservices/installer/installer.xml
index e757e9849deb4..d9a09aef3e824 100644
--- a/plugins/webservices/installer/installer.xml
+++ b/plugins/webservices/installer/installer.xml
@@ -9,8 +9,10 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>4.0.0</version>
 	<description>PLG_WEBSERVICES_INSTALLER_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\WebServices\Installer</namespace>
 	<files>
-		<filename plugin="installer">installer.php</filename>
+		<folder plugin="installer">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_webservices_installer.ini</language>
diff --git a/plugins/webservices/installer/services/provider.php b/plugins/webservices/installer/services/provider.php
new file mode 100644
index 0000000000000..f987f23c72d80
--- /dev/null
+++ b/plugins/webservices/installer/services/provider.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Webservices.installer
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\WebServices\Installer\Extension\Installer;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new Installer(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('webservices', 'installer')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/webservices/installer/installer.php b/plugins/webservices/installer/src/Extension/Installer.php
similarity index 88%
rename from plugins/webservices/installer/installer.php
rename to plugins/webservices/installer/src/Extension/Installer.php
index e857629d6249e..133f0648ff811 100644
--- a/plugins/webservices/installer/installer.php
+++ b/plugins/webservices/installer/src/Extension/Installer.php
@@ -2,14 +2,14 @@
 
 /**
  * @package     Joomla.Plugin
- * @subpackage  Webservices.Installer
+ * @subpackage  Webservices.installer
  *
  * @copyright   (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
+namespace Joomla\Plugin\WebServices\Installer\Extension;
+
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Router\ApiRouter;
 use Joomla\Router\Route;
@@ -23,7 +23,7 @@
  *
  * @since  4.0.0
  */
-class PlgWebservicesInstaller extends CMSPlugin
+final class Installer extends CMSPlugin
 {
     /**
      * Load the language file on instantiation.
diff --git a/plugins/webservices/languages/languages.xml b/plugins/webservices/languages/languages.xml
index 38eb843b93372..f9e09e30397d3 100644
--- a/plugins/webservices/languages/languages.xml
+++ b/plugins/webservices/languages/languages.xml
@@ -9,8 +9,10 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>4.0.0</version>
 	<description>PLG_WEBSERVICES_LANGUAGES_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\WebServices\Languages</namespace>
 	<files>
-		<filename plugin="languages">languages.php</filename>
+		<folder plugin="languages">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_webservices_languages.ini</language>
diff --git a/plugins/webservices/languages/services/provider.php b/plugins/webservices/languages/services/provider.php
new file mode 100644
index 0000000000000..9362ff782b9d3
--- /dev/null
+++ b/plugins/webservices/languages/services/provider.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Webservices.languages
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\WebServices\Languages\Extension\Languages;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new Languages(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('webservices', 'languages')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/webservices/languages/languages.php b/plugins/webservices/languages/src/Extension/Languages.php
similarity index 96%
rename from plugins/webservices/languages/languages.php
rename to plugins/webservices/languages/src/Extension/Languages.php
index 3908f17b62eba..ba518f3c60e12 100644
--- a/plugins/webservices/languages/languages.php
+++ b/plugins/webservices/languages/src/Extension/Languages.php
@@ -2,14 +2,14 @@
 
 /**
  * @package     Joomla.Plugin
- * @subpackage  Webservices.Languages
+ * @subpackage  Webservices.languages
  *
  * @copyright   (C) 2019 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
+namespace Joomla\Plugin\WebServices\Languages\Extension;
+
 use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Router\ApiRouter;
@@ -24,7 +24,7 @@
  *
  * @since  4.0.0
  */
-class PlgWebservicesLanguages extends CMSPlugin
+final class Languages extends CMSPlugin
 {
     /**
      * Load the language file on instantiation.
diff --git a/plugins/webservices/media/media.xml b/plugins/webservices/media/media.xml
index fa4f9d6ac4d17..25da02c3254a9 100644
--- a/plugins/webservices/media/media.xml
+++ b/plugins/webservices/media/media.xml
@@ -9,8 +9,10 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>4.1.0</version>
 	<description>PLG_WEBSERVICES_MEDIA_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\WebServices\Media</namespace>
 	<files>
-		<filename plugin="media">media.php</filename>
+		<folder plugin="media">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_webservices_media.ini</language>
diff --git a/plugins/webservices/media/services/provider.php b/plugins/webservices/media/services/provider.php
new file mode 100644
index 0000000000000..53149f5df4f34
--- /dev/null
+++ b/plugins/webservices/media/services/provider.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Webservices.media
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\WebServices\Media\Extension\Media;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new Media(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('webservices', 'media')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/webservices/media/media.php b/plugins/webservices/media/src/Extension/Media.php
similarity index 96%
rename from plugins/webservices/media/media.php
rename to plugins/webservices/media/src/Extension/Media.php
index 0c23c54343a04..75008b6ea114a 100644
--- a/plugins/webservices/media/media.php
+++ b/plugins/webservices/media/src/Extension/Media.php
@@ -2,14 +2,14 @@
 
 /**
  * @package     Joomla.Plugin
- * @subpackage  Webservices.Media
+ * @subpackage  Webservices.media
  *
  * @copyright   (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
+namespace Joomla\Plugin\WebServices\Media\Extension;
+
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Router\ApiRouter;
 use Joomla\Router\Route;
@@ -23,7 +23,7 @@
  *
  * @since  4.1.0
  */
-class PlgWebservicesMedia extends CMSPlugin
+final class Media extends CMSPlugin
 {
     /**
      * Load the language file on instantiation.
diff --git a/plugins/webservices/menus/menus.xml b/plugins/webservices/menus/menus.xml
index 3c2334774dca4..f73ca722c3779 100644
--- a/plugins/webservices/menus/menus.xml
+++ b/plugins/webservices/menus/menus.xml
@@ -9,8 +9,10 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>4.0.0</version>
 	<description>PLG_WEBSERVICES_MENUS_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\WebServices\Menus</namespace>
 	<files>
-		<filename plugin="menus">menus.php</filename>
+		<folder plugin="menus">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_webservices_menus.ini</language>
diff --git a/plugins/webservices/menus/services/provider.php b/plugins/webservices/menus/services/provider.php
new file mode 100644
index 0000000000000..429e4b560d52e
--- /dev/null
+++ b/plugins/webservices/menus/services/provider.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Webservices.menus
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\WebServices\Menus\Extension\Menus;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new Menus(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('webservices', 'menus')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/webservices/menus/menus.php b/plugins/webservices/menus/src/Extension/Menus.php
similarity index 93%
rename from plugins/webservices/menus/menus.php
rename to plugins/webservices/menus/src/Extension/Menus.php
index 8e2ffda275a1f..1b9be947fd13b 100644
--- a/plugins/webservices/menus/menus.php
+++ b/plugins/webservices/menus/src/Extension/Menus.php
@@ -2,14 +2,14 @@
 
 /**
  * @package     Joomla.Menus
- * @subpackage  Webservices.Menus
+ * @subpackage  Webservices.menus
  *
  * @copyright   (C) 2019 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
+namespace Joomla\Plugin\WebServices\Menus\Extension;
+
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Router\ApiRouter;
 use Joomla\Router\Route;
@@ -23,7 +23,7 @@
  *
  * @since  4.0.0
  */
-class PlgWebservicesMenus extends CMSPlugin
+final class Menus extends CMSPlugin
 {
     /**
      * Load the language file on instantiation.
diff --git a/plugins/webservices/messages/messages.xml b/plugins/webservices/messages/messages.xml
index e4b1233b1bc66..1723b9feac43c 100644
--- a/plugins/webservices/messages/messages.xml
+++ b/plugins/webservices/messages/messages.xml
@@ -9,8 +9,10 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>4.0.0</version>
 	<description>PLG_WEBSERVICES_MESSAGES_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\WebServices\Messages</namespace>
 	<files>
-		<filename plugin="messages">messages.php</filename>
+		<folder plugin="messages">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_webservices_messages.ini</language>
diff --git a/plugins/webservices/messages/services/provider.php b/plugins/webservices/messages/services/provider.php
new file mode 100644
index 0000000000000..cc5a30c8b3e50
--- /dev/null
+++ b/plugins/webservices/messages/services/provider.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Webservices.messages
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\WebServices\Messages\Extension\Messages;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new Messages(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('webservices', 'messages')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/webservices/messages/messages.php b/plugins/webservices/messages/src/Extension/Messages.php
similarity index 87%
rename from plugins/webservices/messages/messages.php
rename to plugins/webservices/messages/src/Extension/Messages.php
index 96a7bafdfdfdb..6b09ea2fa5bc1 100644
--- a/plugins/webservices/messages/messages.php
+++ b/plugins/webservices/messages/src/Extension/Messages.php
@@ -2,14 +2,14 @@
 
 /**
  * @package     Joomla.Plugin
- * @subpackage  Webservices.Messages
+ * @subpackage  Webservices.messages
  *
  * @copyright   (C) 2019 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
+namespace Joomla\Plugin\WebServices\Messages\Extension;
+
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Router\ApiRouter;
 
@@ -22,7 +22,7 @@
  *
  * @since  4.0.0
  */
-class PlgWebservicesMessages extends CMSPlugin
+final class Messages extends CMSPlugin
 {
     /**
      * Load the language file on instantiation.
diff --git a/plugins/webservices/modules/modules.xml b/plugins/webservices/modules/modules.xml
index e5219f150f95a..dbbc2ef8a1eb0 100644
--- a/plugins/webservices/modules/modules.xml
+++ b/plugins/webservices/modules/modules.xml
@@ -9,8 +9,10 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>4.0.0</version>
 	<description>PLG_WEBSERVICES_MODULES_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\WebServices\Modules</namespace>
 	<files>
-		<filename plugin="modules">modules.php</filename>
+		<folder plugin="modules">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_webservices_modules.ini</language>
diff --git a/plugins/webservices/modules/services/provider.php b/plugins/webservices/modules/services/provider.php
new file mode 100644
index 0000000000000..d46ee93f8981b
--- /dev/null
+++ b/plugins/webservices/modules/services/provider.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Webservices.modules
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\WebServices\Modules\Extension\Modules;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new Modules(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('webservices', 'modules')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/webservices/modules/modules.php b/plugins/webservices/modules/src/Extension/Modules.php
similarity index 92%
rename from plugins/webservices/modules/modules.php
rename to plugins/webservices/modules/src/Extension/Modules.php
index ecc1ee9c0892c..7351de6e7f3a9 100644
--- a/plugins/webservices/modules/modules.php
+++ b/plugins/webservices/modules/src/Extension/Modules.php
@@ -2,14 +2,14 @@
 
 /**
  * @package     Joomla.Modules
- * @subpackage  Webservices.Modules
+ * @subpackage  Webservices.modules
  *
  * @copyright   (C) 2019 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
+namespace Joomla\Plugin\WebServices\Modules\Extension;
+
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Router\ApiRouter;
 use Joomla\Router\Route;
@@ -23,7 +23,7 @@
  *
  * @since  4.0.0
  */
-class PlgWebservicesModules extends CMSPlugin
+final class Modules extends CMSPlugin
 {
     /**
      * Load the language file on instantiation.
diff --git a/plugins/webservices/newsfeeds/newsfeeds.xml b/plugins/webservices/newsfeeds/newsfeeds.xml
index b9e805d371a68..5910b01bfd1c1 100644
--- a/plugins/webservices/newsfeeds/newsfeeds.xml
+++ b/plugins/webservices/newsfeeds/newsfeeds.xml
@@ -9,8 +9,10 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>4.0.0</version>
 	<description>PLG_WEBSERVICES_NEWSFEEDS_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\WebServices\Newsfeeds</namespace>
 	<files>
-		<filename plugin="newsfeeds">newsfeeds.php</filename>
+		<folder plugin="newsfeeds">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_webservices_newsfeeds.ini</language>
diff --git a/plugins/webservices/newsfeeds/services/provider.php b/plugins/webservices/newsfeeds/services/provider.php
new file mode 100644
index 0000000000000..f9882fc32fe95
--- /dev/null
+++ b/plugins/webservices/newsfeeds/services/provider.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Webservices.newsfeeds
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\WebServices\Newsfeeds\Extension\Newsfeeds;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new Newsfeeds(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('webservices', 'newsfeeds')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/webservices/newsfeeds/newsfeeds.php b/plugins/webservices/newsfeeds/src/Extension/Newsfeeds.php
similarity index 88%
rename from plugins/webservices/newsfeeds/newsfeeds.php
rename to plugins/webservices/newsfeeds/src/Extension/Newsfeeds.php
index 2ab99631dc915..c397384d8a6cc 100644
--- a/plugins/webservices/newsfeeds/newsfeeds.php
+++ b/plugins/webservices/newsfeeds/src/Extension/Newsfeeds.php
@@ -2,14 +2,14 @@
 
 /**
  * @package     Joomla.Plugin
- * @subpackage  Webservices.Newsfeeds
+ * @subpackage  Webservices.newsfeeds
  *
  * @copyright   (C) 2019 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
+namespace Joomla\Plugin\WebServices\Newsfeeds\Extension;
+
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Router\ApiRouter;
 
@@ -22,7 +22,7 @@
  *
  * @since  4.0.0
  */
-class PlgWebservicesNewsfeeds extends CMSPlugin
+final class Newsfeeds extends CMSPlugin
 {
     /**
      * Load the language file on instantiation.
diff --git a/plugins/webservices/plugins/plugins.xml b/plugins/webservices/plugins/plugins.xml
index 30d5e258ce463..a475d8c7fc4c6 100644
--- a/plugins/webservices/plugins/plugins.xml
+++ b/plugins/webservices/plugins/plugins.xml
@@ -9,8 +9,10 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>4.0.0</version>
 	<description>PLG_WEBSERVICES_PLUGINS_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\WebServices\Plugins</namespace>
 	<files>
-		<filename plugin="plugins">plugins.php</filename>
+		<folder plugin="plugins">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_webservices_plugins.ini</language>
diff --git a/plugins/webservices/plugins/services/provider.php b/plugins/webservices/plugins/services/provider.php
new file mode 100644
index 0000000000000..ab32c66ad4590
--- /dev/null
+++ b/plugins/webservices/plugins/services/provider.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Webservices.plugins
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\WebServices\Plugins\Extension\Plugins;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new Plugins(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('webservices', 'plugins')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/webservices/plugins/plugins.php b/plugins/webservices/plugins/src/Extension/Plugins.php
similarity index 90%
rename from plugins/webservices/plugins/plugins.php
rename to plugins/webservices/plugins/src/Extension/Plugins.php
index 67ea401b6b8e1..8d65b95201c32 100644
--- a/plugins/webservices/plugins/plugins.php
+++ b/plugins/webservices/plugins/src/Extension/Plugins.php
@@ -2,14 +2,14 @@
 
 /**
  * @package     Joomla.Plugin
- * @subpackage  Webservices.Plugins
+ * @subpackage  Webservices.plugins
  *
  * @copyright   (C) 2019 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
+namespace Joomla\Plugin\WebServices\Plugins\Extension;
+
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Router\ApiRouter;
 use Joomla\Router\Route;
@@ -23,7 +23,7 @@
  *
  * @since  4.0.0
  */
-class PlgWebservicesPlugins extends CMSPlugin
+final class Plugins extends CMSPlugin
 {
     /**
      * Load the language file on instantiation.
diff --git a/plugins/webservices/privacy/privacy.xml b/plugins/webservices/privacy/privacy.xml
index 28b6cc2000cf9..5743ec4b33a48 100644
--- a/plugins/webservices/privacy/privacy.xml
+++ b/plugins/webservices/privacy/privacy.xml
@@ -9,8 +9,10 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>4.0.0</version>
 	<description>PLG_WEBSERVICES_PRIVACY_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\WebServices\Privacy</namespace>
 	<files>
-		<filename plugin="privacy">privacy.php</filename>
+		<folder plugin="privacy">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_webservices_privacy.ini</language>
diff --git a/plugins/webservices/privacy/services/provider.php b/plugins/webservices/privacy/services/provider.php
new file mode 100644
index 0000000000000..cedac8b092839
--- /dev/null
+++ b/plugins/webservices/privacy/services/provider.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Webservices.privacy
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\WebServices\Privacy\Extension\Privacy;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new Privacy(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('webservices', 'privacy')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/webservices/privacy/privacy.php b/plugins/webservices/privacy/src/Extension/Privacy.php
similarity index 92%
rename from plugins/webservices/privacy/privacy.php
rename to plugins/webservices/privacy/src/Extension/Privacy.php
index cf0e971b571ee..304a21d7ec858 100644
--- a/plugins/webservices/privacy/privacy.php
+++ b/plugins/webservices/privacy/src/Extension/Privacy.php
@@ -2,14 +2,14 @@
 
 /**
  * @package     Joomla.Privacy
- * @subpackage  Webservices.Privacy
+ * @subpackage  Webservices.privacy
  *
  * @copyright   (C) 2019 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
+namespace Joomla\Plugin\WebServices\Privacy\Extension;
+
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Router\ApiRouter;
 use Joomla\Router\Route;
@@ -23,7 +23,7 @@
  *
  * @since  4.0.0
  */
-class PlgWebservicesPrivacy extends CMSPlugin
+final class Privacy extends CMSPlugin
 {
     /**
      * Load the language file on instantiation.
diff --git a/plugins/webservices/redirect/redirect.xml b/plugins/webservices/redirect/redirect.xml
index e588a33a6e529..298d0734958f9 100644
--- a/plugins/webservices/redirect/redirect.xml
+++ b/plugins/webservices/redirect/redirect.xml
@@ -9,8 +9,10 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>4.0.0</version>
 	<description>PLG_WEBSERVICES_REDIRECT_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\WebServices\Redirect</namespace>
 	<files>
-		<filename plugin="redirect">redirect.php</filename>
+		<folder plugin="redirect">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_webservices_redirect.ini</language>
diff --git a/plugins/webservices/redirect/services/provider.php b/plugins/webservices/redirect/services/provider.php
new file mode 100644
index 0000000000000..780c83d0b7d7b
--- /dev/null
+++ b/plugins/webservices/redirect/services/provider.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Webservices.redirect
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\WebServices\Redirect\Extension\Redirect;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new Redirect(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('webservices', 'redirect')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/webservices/redirect/redirect.php b/plugins/webservices/redirect/src/Extension/Redirect.php
similarity index 87%
rename from plugins/webservices/redirect/redirect.php
rename to plugins/webservices/redirect/src/Extension/Redirect.php
index 243249be5d17a..6ac8a9ca9fe59 100644
--- a/plugins/webservices/redirect/redirect.php
+++ b/plugins/webservices/redirect/src/Extension/Redirect.php
@@ -2,14 +2,14 @@
 
 /**
  * @package     Joomla.Redirect
- * @subpackage  Webservices.Redirect
+ * @subpackage  Webservices.redirect
  *
  * @copyright   (C) 2019 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
+namespace Joomla\Plugin\WebServices\Redirect\Extension;
+
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Router\ApiRouter;
 
@@ -22,7 +22,7 @@
  *
  * @since  4.0.0
  */
-class PlgWebservicesRedirect extends CMSPlugin
+final class Redirect extends CMSPlugin
 {
     /**
      * Load the language file on instantiation.
diff --git a/plugins/webservices/tags/services/provider.php b/plugins/webservices/tags/services/provider.php
new file mode 100644
index 0000000000000..d5de8fa376c47
--- /dev/null
+++ b/plugins/webservices/tags/services/provider.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Webservices.tags
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\WebServices\Tags\Extension\Tags;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new Tags(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('webservices', 'tags')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/webservices/tags/tags.php b/plugins/webservices/tags/src/Extension/Tags.php
similarity index 87%
rename from plugins/webservices/tags/tags.php
rename to plugins/webservices/tags/src/Extension/Tags.php
index ba8c875227641..ad07205609d0d 100644
--- a/plugins/webservices/tags/tags.php
+++ b/plugins/webservices/tags/src/Extension/Tags.php
@@ -2,14 +2,14 @@
 
 /**
  * @package     Joomla.Tags
- * @subpackage  Webservices.Tags
+ * @subpackage  Webservices.tags
  *
  * @copyright   (C) 2019 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
+namespace Joomla\Plugin\WebServices\Tags\Extension;
+
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Router\ApiRouter;
 
@@ -22,7 +22,7 @@
  *
  * @since  4.0.0
  */
-class PlgWebservicesTags extends CMSPlugin
+final class Tags extends CMSPlugin
 {
     /**
      * Load the language file on instantiation.
diff --git a/plugins/webservices/tags/tags.xml b/plugins/webservices/tags/tags.xml
index 4b1f024351f60..afc14e8b70c66 100644
--- a/plugins/webservices/tags/tags.xml
+++ b/plugins/webservices/tags/tags.xml
@@ -9,8 +9,10 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>4.0.0</version>
 	<description>PLG_WEBSERVICES_TAGS_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\WebServices\Tags</namespace>
 	<files>
-		<filename plugin="tags">tags.php</filename>
+		<folder plugin="tags">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_webservices_tags.ini</language>
diff --git a/plugins/webservices/templates/services/provider.php b/plugins/webservices/templates/services/provider.php
new file mode 100644
index 0000000000000..d863558a01a0a
--- /dev/null
+++ b/plugins/webservices/templates/services/provider.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Webservices.templates
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\WebServices\Templates\Extension\Templates;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new Templates(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('webservices', 'templates')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/webservices/templates/templates.php b/plugins/webservices/templates/src/Extension/Templates.php
similarity index 89%
rename from plugins/webservices/templates/templates.php
rename to plugins/webservices/templates/src/Extension/Templates.php
index 9dd9b27173ade..b9e0ed373ba86 100644
--- a/plugins/webservices/templates/templates.php
+++ b/plugins/webservices/templates/src/Extension/Templates.php
@@ -2,14 +2,14 @@
 
 /**
  * @package     Joomla.Templates
- * @subpackage  Webservices.Templates
+ * @subpackage  Webservices.templates
  *
  * @copyright   (C) 2019 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
+namespace Joomla\Plugin\WebServices\Templates\Extension;
+
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Router\ApiRouter;
 
@@ -22,7 +22,7 @@
  *
  * @since  4.0.0
  */
-class PlgWebservicesTemplates extends CMSPlugin
+final class Templates extends CMSPlugin
 {
     /**
      * Load the language file on instantiation.
diff --git a/plugins/webservices/templates/templates.xml b/plugins/webservices/templates/templates.xml
index d41cbd35c1edb..071439a027833 100644
--- a/plugins/webservices/templates/templates.xml
+++ b/plugins/webservices/templates/templates.xml
@@ -9,8 +9,10 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>4.0.0</version>
 	<description>PLG_WEBSERVICES_TEMPLATES_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\WebServices\Templates</namespace>
 	<files>
-		<filename plugin="templates">templates.php</filename>
+		<folder plugin="templates">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_webservices_templates.ini</language>
diff --git a/plugins/webservices/users/services/provider.php b/plugins/webservices/users/services/provider.php
new file mode 100644
index 0000000000000..0b4f96112b720
--- /dev/null
+++ b/plugins/webservices/users/services/provider.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Webservices.users
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\WebServices\Users\Extension\Users;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new Users(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('webservices', 'users')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/webservices/users/users.php b/plugins/webservices/users/src/Extension/Users.php
similarity index 93%
rename from plugins/webservices/users/users.php
rename to plugins/webservices/users/src/Extension/Users.php
index cbd088cfbeddd..1f7fee69b8221 100644
--- a/plugins/webservices/users/users.php
+++ b/plugins/webservices/users/src/Extension/Users.php
@@ -2,14 +2,14 @@
 
 /**
  * @package     Joomla.Users
- * @subpackage  Webservices.Users
+ * @subpackage  Webservices.users
  *
  * @copyright   (C) 2019 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
+namespace Joomla\Plugin\WebServices\Users\Extension;
+
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Router\ApiRouter;
 
@@ -22,7 +22,7 @@
  *
  * @since  4.0.0
  */
-class PlgWebservicesUsers extends CMSPlugin
+final class Users extends CMSPlugin
 {
     /**
      * Load the language file on instantiation.
diff --git a/plugins/webservices/users/users.xml b/plugins/webservices/users/users.xml
index b2526a4a628fa..5e6e3fe2a1e9f 100644
--- a/plugins/webservices/users/users.xml
+++ b/plugins/webservices/users/users.xml
@@ -9,8 +9,10 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>4.0.0</version>
 	<description>PLG_WEBSERVICES_USERS_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\WebServices\Users</namespace>
 	<files>
-		<filename plugin="users">users.php</filename>
+		<folder plugin="users">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_webservices_users.ini</language>
diff --git a/plugins/workflow/featuring/featuring.xml b/plugins/workflow/featuring/featuring.xml
index 913bc91b6432c..b4d7e9c5498b9 100644
--- a/plugins/workflow/featuring/featuring.xml
+++ b/plugins/workflow/featuring/featuring.xml
@@ -9,9 +9,11 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>4.0.0</version>
 	<description>PLG_WORKFLOW_FEATURING_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\Workflow\Featuring</namespace>
 	<files>
-		<filename plugin="featuring">featuring.php</filename>
 		<folder>forms</folder>
+		<folder plugin="featuring">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_workflow_featuring.ini</language>
diff --git a/plugins/workflow/featuring/services/provider.php b/plugins/workflow/featuring/services/provider.php
new file mode 100644
index 0000000000000..418712f22b966
--- /dev/null
+++ b/plugins/workflow/featuring/services/provider.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Workflow.featuring
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\Workflow\Featuring\Extension\Featuring;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new Featuring(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('workflow', 'featuring')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/workflow/featuring/featuring.php b/plugins/workflow/featuring/src/Extension/Featuring.php
similarity index 86%
rename from plugins/workflow/featuring/featuring.php
rename to plugins/workflow/featuring/src/Extension/Featuring.php
index 0371b3bb747e8..6e58f496454bb 100644
--- a/plugins/workflow/featuring/featuring.php
+++ b/plugins/workflow/featuring/src/Extension/Featuring.php
@@ -2,16 +2,16 @@
 
 /**
  * @package     Joomla.Plugin
- * @subpackage  Workflow.Featuring
+ * @subpackage  Workflow.featuring
  *
  * @copyright   (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
-use Joomla\CMS\Application\CMSWebApplicationInterface;
+namespace Joomla\Plugin\Workflow\Featuring\Extension;
+
 use Joomla\CMS\Event\AbstractEvent;
+use Joomla\CMS\Event\Model;
 use Joomla\CMS\Event\Table\BeforeStoreEvent;
 use Joomla\CMS\Event\View\DisplayEvent;
 use Joomla\CMS\Event\Workflow\WorkflowFunctionalityUsedEvent;
@@ -39,7 +39,7 @@
  *
  * @since  4.0.0
  */
-class PlgWorkflowFeaturing extends CMSPlugin implements SubscriberInterface
+final class Featuring extends CMSPlugin implements SubscriberInterface
 {
     use WorkflowPluginTrait;
 
@@ -51,14 +51,6 @@ class PlgWorkflowFeaturing extends CMSPlugin implements SubscriberInterface
      */
     protected $autoloadLanguage = true;
 
-    /**
-     * Loads the CMS Application for direct access
-     *
-     * @var   CMSWebApplicationInterface
-     * @since 4.0.0
-     */
-    protected $app;
-
     /**
      * The name of the supported functionality to check against
      *
@@ -92,14 +84,14 @@ public static function getSubscribedEvents(): array
     /**
      * The form event.
      *
-     * @param   EventInterface  $event  The event
+     * @param   Model\PrepareFormEvent  $event  The event
      *
      * @since   4.0.0
      */
-    public function onContentPrepareForm(EventInterface $event)
+    public function onContentPrepareForm(Model\PrepareFormEvent $event)
     {
-        $form = $event->getArgument('0');
-        $data = $event->getArgument('1');
+        $form = $event->getForm();
+        $data = $event->getData();
 
         $context = $form->getName();
 
@@ -118,7 +110,7 @@ public function onContentPrepareForm(EventInterface $event)
      * Check also for the workflow implementation and if the field exists
      *
      * @param   Form      $form  The form
-     * @param   stdClass  $data  The data
+     * @param   object    $data  The data
      *
      * @return  boolean
      *
@@ -134,11 +126,11 @@ protected function enhanceItemForm(Form $form, $data)
 
         $parts = explode('.', $context);
 
-        $component = $this->app->bootComponent($parts[0]);
+        $component = $this->getApplication()->bootComponent($parts[0]);
 
         $modelName = $component->getModelName($context);
 
-        $table = $component->getMVCFactory()->createModel($modelName, $this->app->getName(), ['ignore_request' => true])
+        $table = $component->getMVCFactory()->createModel($modelName, $this->getApplication()->getName(), ['ignore_request' => true])
             ->getTable();
 
         $fieldname = $table->getColumnAlias('featured');
@@ -192,7 +184,7 @@ protected function enhanceItemForm(Form $form, $data)
      */
     public function onAfterDisplay(DisplayEvent $event)
     {
-        if (!$this->app->isClient('administrator')) {
+        if (!$this->getApplication()->isClient('administrator')) {
             return;
         }
 
@@ -234,7 +226,7 @@ public function onAfterDisplay(DisplayEvent $event)
 			});
 		";
 
-        $this->app->getDocument()->addScriptDeclaration($js);
+        $this->getApplication()->getDocument()->addScriptDeclaration($js);
 
         return true;
     }
@@ -269,10 +261,10 @@ public function onWorkflowBeforeTransition(WorkflowTransitionEvent $event)
          * Execute the normal "onContentBeforeChangeFeatured" plugins. But they could cancel the execution,
          * So we have to precheck and cancel the whole transition stuff if not allowed.
          */
-        $this->app->set('plgWorkflowFeaturing.' . $context, $pks);
+        $this->getApplication()->set('plgWorkflowFeaturing.' . $context, $pks);
 
         // Trigger the change state event.
-        $eventResult = $this->app->getDispatcher()->dispatch(
+        $eventResult = $this->getApplication()->getDispatcher()->dispatch(
             'onContentBeforeChangeFeatured',
             AbstractEvent::create(
                 'onContentBeforeChangeFeatured',
@@ -289,7 +281,7 @@ public function onWorkflowBeforeTransition(WorkflowTransitionEvent $event)
         );
 
         // Release allowed pks, the job is done
-        $this->app->set('plgWorkflowFeaturing.' . $context, []);
+        $this->getApplication()->set('plgWorkflowFeaturing.' . $context, []);
 
         if ($eventResult->getArgument('abort')) {
             $event->setStopTransition();
@@ -320,7 +312,7 @@ public function onWorkflowAfterTransition(WorkflowTransitionEvent $event): void
             return;
         }
 
-        $component = $this->app->bootComponent($extensionName);
+        $component = $this->getApplication()->bootComponent($extensionName);
 
         $value = $transition->options->get('featuring');
 
@@ -336,7 +328,7 @@ public function onWorkflowAfterTransition(WorkflowTransitionEvent $event): void
 
         $modelName = $component->getModelName($context);
 
-        $model = $component->getMVCFactory()->createModel($modelName, $this->app->getName(), $options);
+        $model = $component->getMVCFactory()->createModel($modelName, $this->getApplication()->getName(), $options);
 
         $model->featured($pks, $value);
     }
@@ -362,7 +354,7 @@ public function onContentBeforeChangeFeatured(FeatureEvent $event)
 
         // We have allowed the pks, so we're the one who triggered
         // With onWorkflowBeforeTransition => free pass
-        if ($this->app->get('plgWorkflowFeaturing.' . $extension) === $pks) {
+        if ($this->getApplication()->get('plgWorkflowFeaturing.' . $extension) === $pks) {
             return true;
         }
 
@@ -372,25 +364,23 @@ public function onContentBeforeChangeFeatured(FeatureEvent $event)
     /**
      * The save event.
      *
-     * @param   EventInterface  $event
+     * @param   Model\BeforeSaveEvent  $event
      *
      * @return  boolean
      *
      * @since   4.0.0
      */
-    public function onContentBeforeSave(EventInterface $event)
+    public function onContentBeforeSave(Model\BeforeSaveEvent $event)
     {
-        $context = $event->getArgument('0');
-
-        /** @var TableInterface $table */
-        $table = $event->getArgument('1');
-        $isNew = $event->getArgument('2');
-        $data  = $event->getArgument('3');
+        $context = $event->getContext();
 
         if (!$this->isSupported($context)) {
             return true;
         }
 
+        /** @var TableInterface $table */
+        $table   = $event->getItem();
+        $data    = $event->getData();
         $keyName = $table->getColumnAlias('featured');
 
         // Check for the old value
@@ -403,7 +393,10 @@ public function onContentBeforeSave(EventInterface $event)
          * As we're setting the field to disabled, no value should be there at all
          */
         if (isset($data[$keyName])) {
-            $this->app->enqueueMessage(Text::_('PLG_WORKFLOW_FEATURING_CHANGE_STATE_NOT_ALLOWED'), 'error');
+            $this->getApplication()->enqueueMessage(
+                $this->getApplication()->getLanguage()->_('PLG_WORKFLOW_FEATURING_CHANGE_STATE_NOT_ALLOWED'),
+                'error'
+            );
 
             return false;
         }
@@ -431,11 +424,11 @@ public function onContentVersioningPrepareTable(EventInterface $event)
 
         $parts = explode('.', $context);
 
-        $component = $this->app->bootComponent($parts[0]);
+        $component = $this->getApplication()->bootComponent($parts[0]);
 
         $modelName = $component->getModelName($context);
 
-        $model = $component->getMVCFactory()->createModel($modelName, $this->app->getName(), ['ignore_request' => true]);
+        $model = $component->getMVCFactory()->createModel($modelName, $this->getApplication()->getName(), ['ignore_request' => true]);
 
         $table = $model->getTable();
 
@@ -467,11 +460,11 @@ public function onTableBeforeStore(BeforeStoreEvent $event)
             return;
         }
 
-        $component = $this->app->bootComponent($parts[0]);
+        $component = $this->getApplication()->bootComponent($parts[0]);
 
         $modelName = $component->getModelName($typeAlias);
 
-        $model = $component->getMVCFactory()->createModel($modelName, $this->app->getName(), ['ignore_request' => true]);
+        $model = $component->getMVCFactory()->createModel($modelName, $this->getApplication()->getName(), ['ignore_request' => true]);
 
         $table = $model->getTable();
 
@@ -506,7 +499,7 @@ protected function isSupported($context)
             return false;
         }
 
-        $component = $this->app->bootComponent($parts[0]);
+        $component = $this->getApplication()->bootComponent($parts[0]);
 
         if (
             !$component instanceof WorkflowServiceInterface
@@ -518,7 +511,7 @@ protected function isSupported($context)
 
         $modelName = $component->getModelName($context);
 
-        $model = $component->getMVCFactory()->createModel($modelName, $this->app->getName(), ['ignore_request' => true]);
+        $model = $component->getMVCFactory()->createModel($modelName, $this->getApplication()->getName(), ['ignore_request' => true]);
 
         if (!$model instanceof DatabaseModelInterface || !method_exists($model, 'featured')) {
             return false;
diff --git a/plugins/workflow/notification/notification.xml b/plugins/workflow/notification/notification.xml
index b7d89f31eaaa8..2531119572176 100644
--- a/plugins/workflow/notification/notification.xml
+++ b/plugins/workflow/notification/notification.xml
@@ -9,9 +9,11 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>4.0.0</version>
 	<description>PLG_WORKFLOW_NOTIFICATION_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\Workflow\Notification</namespace>
 	<files>
-		<filename plugin="notification">notification.php</filename>
 		<folder>forms</folder>
+		<folder plugin="notification">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_workflow_notification.ini</language>
diff --git a/plugins/workflow/notification/services/provider.php b/plugins/workflow/notification/services/provider.php
new file mode 100644
index 0000000000000..7aa7335324c97
--- /dev/null
+++ b/plugins/workflow/notification/services/provider.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Workflow.notification
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\LanguageFactoryInterface;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\User\UserFactoryInterface;
+use Joomla\Database\DatabaseInterface;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\Workflow\Notification\Extension\Notification;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new Notification(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('workflow', 'notification'),
+                    $container->get(LanguageFactoryInterface::class)
+                );
+                $plugin->setApplication(Factory::getApplication());
+                $plugin->setDatabase($container->get(DatabaseInterface::class));
+                $plugin->setUserFactory($container->get(UserFactoryInterface::class));
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/workflow/notification/notification.php b/plugins/workflow/notification/src/Extension/Notification.php
similarity index 72%
rename from plugins/workflow/notification/notification.php
rename to plugins/workflow/notification/src/Extension/Notification.php
index b2d752f1c3e24..1c10d1adea177 100644
--- a/plugins/workflow/notification/notification.php
+++ b/plugins/workflow/notification/src/Extension/Notification.php
@@ -2,26 +2,25 @@
 
 /**
  * @package     Joomla.Plugin
- * @subpackage  Workflow.Notification
+ * @subpackage  Workflow.notification
  *
  * @copyright   (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
-use Joomla\CMS\Application\CMSApplicationInterface;
+namespace Joomla\Plugin\Workflow\Notification\Extension;
+
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Event\Model;
 use Joomla\CMS\Event\Workflow\WorkflowTransitionEvent;
-use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\LanguageFactoryInterface;
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\Plugin\CMSPlugin;
-use Joomla\CMS\User\UserFactoryInterface;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\CMS\Workflow\WorkflowPluginTrait;
 use Joomla\CMS\Workflow\WorkflowServiceInterface;
-use Joomla\Event\EventInterface;
+use Joomla\Database\DatabaseAwareTrait;
+use Joomla\Event\DispatcherInterface;
 use Joomla\Event\SubscriberInterface;
 use Joomla\Utilities\ArrayHelper;
 
@@ -34,9 +33,11 @@
  *
  * @since  4.0.0
  */
-class PlgWorkflowNotification extends CMSPlugin implements SubscriberInterface
+final class Notification extends CMSPlugin implements SubscriberInterface
 {
     use WorkflowPluginTrait;
+    use DatabaseAwareTrait;
+    use UserFactoryAwareTrait;
 
     /**
      * Load the language file on instantiation.
@@ -47,19 +48,12 @@ class PlgWorkflowNotification extends CMSPlugin implements SubscriberInterface
     protected $autoloadLanguage = true;
 
     /**
-     * Loads the CMS Application for direct access
+     * The language factory.
      *
-     * @var   CMSApplicationInterface
-     * @since 4.0.0
+     * @var    LanguageFactoryInterface
+     * @since  4.4.0
      */
-    protected $app;
-
-    /**
-     * @var    \Joomla\Database\DatabaseDriver
-     *
-     * @since  3.9.0
-     */
-    protected $db;
+    private $languageFactory;
 
     /**
      * Returns an array of events this subscriber will listen to.
@@ -76,21 +70,36 @@ public static function getSubscribedEvents(): array
         ];
     }
 
+
+    /**
+     * Constructor.
+     *
+     * @param   DispatcherInterface       $dispatcher       The dispatcher
+     * @param   array                     $config           An optional associative array of configuration settings
+     * @param   LanguageFactoryInterface  $languageFactory  The language factory
+     *
+     * @since   4.2.0
+     */
+    public function __construct(DispatcherInterface $dispatcher, array $config, LanguageFactoryInterface $languageFactory)
+    {
+        parent::__construct($dispatcher, $config);
+
+        $this->languageFactory = $languageFactory;
+    }
+
     /**
      * The form event.
      *
-     * @param   Form      $form  The form
-     * @param   stdClass  $data  The data
+     * @param   Model\PrepareFormEvent   $event  The event
      *
      * @return   boolean
      *
      * @since   4.0.0
      */
-    public function onContentPrepareForm(EventInterface $event)
+    public function onContentPrepareForm(Model\PrepareFormEvent $event)
     {
-        $form = $event->getArgument('0');
-        $data = $event->getArgument('1');
-
+        $form    = $event->getForm();
+        $data    = $event->getData();
         $context = $form->getName();
 
         // Extend the transition form
@@ -121,7 +130,7 @@ public function onWorkflowAfterTransition(WorkflowTransitionEvent $event)
             return;
         }
 
-        $component = $this->app->bootComponent($extensionName);
+        $component = $this->getApplication()->bootComponent($extensionName);
 
         // Check if send-mail is active
         if (empty($transition->options['notification_send_mail'])) {
@@ -139,14 +148,14 @@ public function onWorkflowAfterTransition(WorkflowTransitionEvent $event)
         $userIds = $this->getUsersFromGroup($transition);
 
         // The active user
-        $user = $this->app->getIdentity();
+        $user = $this->getApplication()->getIdentity();
 
         // Prepare Language for messages
         $defaultLanguage = ComponentHelper::getParams('com_languages')->get('administrator');
-        $debug           = $this->app->get('debug_lang');
+        $debug           = $this->getApplication()->get('debug_lang');
 
         $modelName = $component->getModelName($context);
-        $model     = $component->getMVCFactory()->createModel($modelName, $this->app->getName(), ['ignore_request' => true]);
+        $model     = $component->getMVCFactory()->createModel($modelName, $this->getApplication()->getName(), ['ignore_request' => true]);
 
         // Don't send the notification to the active user
         $key = array_search($user->id, $userIds);
@@ -162,33 +171,32 @@ public function onWorkflowAfterTransition(WorkflowTransitionEvent $event)
 
         // If there are no receivers, stop here
         if (empty($userIds)) {
-            $this->app->enqueueMessage(Text::_('PLG_WORKFLOW_NOTIFICATION_NO_RECEIVER'), 'error');
+            $this->getApplication()->enqueueMessage($this->getApplication()->getLanguage()->_('PLG_WORKFLOW_NOTIFICATION_NO_RECEIVER'), 'error');
 
             return;
         }
 
         // Get the model for private messages
-        $model_message = $this->app->bootComponent('com_messages')
+        $model_message = $this->getApplication()->bootComponent('com_messages')
             ->getMVCFactory()->createModel('Message', 'Administrator');
 
         // Get the title of the stage
-        $model_stage = $this->app->bootComponent('com_workflow')
+        $model_stage = $this->getApplication()->bootComponent('com_workflow')
             ->getMVCFactory()->createModel('Stage', 'Administrator');
 
         $toStage = $model_stage->getItem($transition->to_stage_id)->title;
 
         // Get the name of the transition
-        $model_transition = $this->app->bootComponent('com_workflow')
+        $model_transition = $this->getApplication()->bootComponent('com_workflow')
             ->getMVCFactory()->createModel('Transition', 'Administrator');
 
         $transitionName = $model_transition->getItem($transition->id)->title;
 
         $hasGetItem = method_exists($model, 'getItem');
-        $container  = Factory::getContainer();
 
         foreach ($pks as $pk) {
             // Get the title of the item which has changed, unknown as fallback
-            $title = Text::_('PLG_WORKFLOW_NOTIFICATION_NO_TITLE');
+            $title = $this->getApplication()->getLanguage()->_('PLG_WORKFLOW_NOTIFICATION_NO_TITLE');
 
             if ($hasGetItem) {
                 $item  = $model->getItem($pk);
@@ -197,12 +205,11 @@ public function onWorkflowAfterTransition(WorkflowTransitionEvent $event)
 
             // Send Email to receivers
             foreach ($userIds as $user_id) {
-                $receiver = $container->get(UserFactoryInterface::class)->loadUserById($user_id);
+                $receiver = $this->getUserFactory()->loadUserById($user_id);
 
-                if ($receiver->authorise('core.manage', 'com_message')) {
+                if ($receiver->authorise('core.manage', 'com_messages')) {
                     // Load language for messaging
-                    $lang = $container->get(LanguageFactoryInterface::class)
-                        ->createLanguage($user->getParam('admin_language', $defaultLanguage), $debug);
+                    $lang = $this->languageFactory->createLanguage($user->getParam('admin_language', $defaultLanguage), $debug);
                     $lang->load('plg_workflow_notification');
                     $messageText = sprintf(
                         $lang->_('PLG_WORKFLOW_NOTIFICATION_ON_TRANSITION_MSG'),
@@ -228,7 +235,7 @@ public function onWorkflowAfterTransition(WorkflowTransitionEvent $event)
             }
         }
 
-        $this->app->enqueueMessage(Text::_('PLG_WORKFLOW_NOTIFICATION_SENT'), 'message');
+        $this->getApplication()->enqueueMessage($this->getApplication()->getLanguage()->_('PLG_WORKFLOW_NOTIFICATION_SENT'), 'message');
     }
 
     /**
@@ -260,7 +267,7 @@ private function getUsersFromGroup($data): array
 
         if (!empty($groups)) {
             // UserIds from usergroups
-            $model = Factory::getApplication()->bootComponent('com_users')
+            $model = $this->getApplication()->bootComponent('com_users')
                 ->getMVCFactory()->createModel('Users', 'Administrator', ['ignore_request' => true]);
 
             $model->setState('list.select', 'id');
@@ -299,12 +306,9 @@ protected function isSupported($context)
             return false;
         }
 
-        $component = $this->app->bootComponent($parts[0]);
+        $component = $this->getApplication()->bootComponent($parts[0]);
 
-        if (
-            !$component instanceof WorkflowServiceInterface
-            || !$component->isWorkflowActive($context)
-        ) {
+        if (!$component instanceof WorkflowServiceInterface || !$component->isWorkflowActive($context)) {
             return false;
         }
 
@@ -326,16 +330,18 @@ private function removeLocked(array $userIds): array
             return [];
         }
 
+        $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 = $this->db->getQuery(true);
+        $query = $db->getQuery(true);
 
-        $query->select($this->db->quoteName('user_id'))
-            ->from($this->db->quoteName('#__messages_cfg'))
-            ->whereIn($this->db->quoteName('user_id'), $userIds)
-            ->where($this->db->quoteName('cfg_name') . ' = ' . $this->db->quote('locked'))
-            ->where($this->db->quoteName('cfg_value') . ' = 1');
+        $query->select($db->quoteName('user_id'))
+            ->from($db->quoteName('#__messages_cfg'))
+            ->whereIn($db->quoteName('user_id'), $userIds)
+            ->where($db->quoteName('cfg_name') . ' = ' . $db->quote('locked'))
+            ->where($db->quoteName('cfg_value') . ' = 1');
 
-        $locked = $this->db->setQuery($query)->loadColumn();
+        $locked = $db->setQuery($query)->loadColumn();
 
         return array_diff($userIds, $locked);
     }
diff --git a/plugins/workflow/publishing/publishing.xml b/plugins/workflow/publishing/publishing.xml
index 2edcb0fce5450..37dbcd7971019 100644
--- a/plugins/workflow/publishing/publishing.xml
+++ b/plugins/workflow/publishing/publishing.xml
@@ -9,9 +9,11 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>4.0.0</version>
 	<description>PLG_WORKFLOW_PUBLISHING_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\Workflow\Publishing</namespace>
 	<files>
-		<filename plugin="publishing">publishing.php</filename>
 		<folder>forms</folder>
+		<folder plugin="publishing">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_workflow_publishing.ini</language>
diff --git a/plugins/workflow/publishing/services/provider.php b/plugins/workflow/publishing/services/provider.php
new file mode 100644
index 0000000000000..e210d89f79d6d
--- /dev/null
+++ b/plugins/workflow/publishing/services/provider.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Workflow.publishing
+ *
+ * @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\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\Workflow\Publishing\Extension\Publishing;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin     = new Publishing(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('workflow', 'publishing')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
diff --git a/plugins/workflow/publishing/publishing.php b/plugins/workflow/publishing/src/Extension/Publishing.php
similarity index 85%
rename from plugins/workflow/publishing/publishing.php
rename to plugins/workflow/publishing/src/Extension/Publishing.php
index f1bf0d62a72d9..61dbc7ab04e48 100644
--- a/plugins/workflow/publishing/publishing.php
+++ b/plugins/workflow/publishing/src/Extension/Publishing.php
@@ -2,15 +2,15 @@
 
 /**
  * @package     Joomla.Plugin
- * @subpackage  Workflow.Publishing
+ * @subpackage  Workflow.publishing
  *
  * @copyright   (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
-use Joomla\CMS\Application\CMSWebApplicationInterface;
+namespace Joomla\Plugin\Workflow\Publishing\Extension;
+
+use Joomla\CMS\Event\Model;
 use Joomla\CMS\Event\Table\BeforeStoreEvent;
 use Joomla\CMS\Event\View\DisplayEvent;
 use Joomla\CMS\Event\Workflow\WorkflowFunctionalityUsedEvent;
@@ -37,7 +37,7 @@
  *
  * @since  4.0.0
  */
-class PlgWorkflowPublishing extends CMSPlugin implements SubscriberInterface
+final class Publishing extends CMSPlugin implements SubscriberInterface
 {
     use WorkflowPluginTrait;
 
@@ -49,14 +49,6 @@ class PlgWorkflowPublishing extends CMSPlugin implements SubscriberInterface
      */
     protected $autoloadLanguage = true;
 
-    /**
-     * Loads the CMS Application for direct access
-     *
-     * @var   CMSWebApplicationInterface
-     * @since 4.0.0
-     */
-    protected $app;
-
     /**
      * The name of the supported name to check against
      *
@@ -90,15 +82,14 @@ public static function getSubscribedEvents(): array
     /**
      * The form event.
      *
-     * @param   EventInterface  $event  The event
+     * @param   Model\PrepareFormEvent  $event  The event
      *
      * @since   4.0.0
      */
-    public function onContentPrepareForm(EventInterface $event)
+    public function onContentPrepareForm(Model\PrepareFormEvent $event)
     {
-        $form = $event->getArgument('0');
-        $data = $event->getArgument('1');
-
+        $form    = $event->getForm();
+        $data    = $event->getData();
         $context = $form->getName();
 
         // Extend the transition form
@@ -155,11 +146,11 @@ protected function enhanceItemForm(Form $form, $data)
 
         $parts = explode('.', $context);
 
-        $component = $this->app->bootComponent($parts[0]);
+        $component = $this->getApplication()->bootComponent($parts[0]);
 
         $modelName = $component->getModelName($context);
 
-        $table = $component->getMVCFactory()->createModel($modelName, $this->app->getName(), ['ignore_request' => true])
+        $table = $component->getMVCFactory()->createModel($modelName, $this->getApplication()->getName(), ['ignore_request' => true])
             ->getTable();
 
         $fieldname = $table->getColumnAlias('published');
@@ -209,7 +200,7 @@ protected function enhanceItemForm(Form $form, $data)
      */
     public function onAfterDisplay(DisplayEvent $event)
     {
-        if (!$this->app->isClient('administrator')) {
+        if (!$this->getApplication()->isClient('administrator')) {
             return;
         }
 
@@ -254,7 +245,7 @@ public function onAfterDisplay(DisplayEvent $event)
 			});
 		";
 
-        $this->app->getDocument()->addScriptDeclaration($js);
+        $this->getApplication()->getDocument()->addScriptDeclaration($js);
 
         return true;
     }
@@ -289,16 +280,16 @@ public function onWorkflowBeforeTransition(WorkflowTransitionEvent $event)
          * Execute the normal "onContentBeforeChangeState" plugins. But they could cancel the execution,
          * So we have to precheck and cancel the whole transition stuff if not allowed.
          */
-        $this->app->set('plgWorkflowPublishing.' . $context, $pks);
+        $this->getApplication()->set('plgWorkflowPublishing.' . $context, $pks);
 
-        $result = $this->app->triggerEvent('onContentBeforeChangeState', [
+        $result = $this->getApplication()->triggerEvent('onContentBeforeChangeState', [
             $context,
             $pks,
             $value,
             ]);
 
         // Release allowed pks, the job is done
-        $this->app->set('plgWorkflowPublishing.' . $context, []);
+        $this->getApplication()->set('plgWorkflowPublishing.' . $context, []);
 
         if (in_array(false, $result, true)) {
             $event->setStopTransition();
@@ -329,7 +320,7 @@ public function onWorkflowAfterTransition(WorkflowTransitionEvent $event)
             return true;
         }
 
-        $component = $this->app->bootComponent($extensionName);
+        $component = $this->getApplication()->bootComponent($extensionName);
 
         $value = $transition->options->get('publishing');
 
@@ -345,7 +336,7 @@ public function onWorkflowAfterTransition(WorkflowTransitionEvent $event)
 
         $modelName = $component->getModelName($context);
 
-        $model = $component->getMVCFactory()->createModel($modelName, $this->app->getName(), $options);
+        $model = $component->getMVCFactory()->createModel($modelName, $this->getApplication()->getName(), $options);
 
         $model->publish($pks, $value);
     }
@@ -353,17 +344,17 @@ public function onWorkflowAfterTransition(WorkflowTransitionEvent $event)
     /**
      * Change State of an item. Used to disable state change
      *
-     * @param   EventInterface  $event
+     * @param   Model\BeforeChangeStateEvent  $event
      *
      * @return boolean
      *
-     * @throws Exception
+     * @throws \Exception
      * @since   4.0.0
      */
-    public function onContentBeforeChangeState(EventInterface $event)
+    public function onContentBeforeChangeState(Model\BeforeChangeStateEvent $event)
     {
-        $context = $event->getArgument('0');
-        $pks     = $event->getArgument('1');
+        $context = $event->getContext();
+        $pks     = $event->getPks();
 
         if (!$this->isSupported($context)) {
             return true;
@@ -371,35 +362,33 @@ public function onContentBeforeChangeState(EventInterface $event)
 
         // We have allowed the pks, so we're the one who triggered
         // With onWorkflowBeforeTransition => free pass
-        if ($this->app->get('plgWorkflowPublishing.' . $context) === $pks) {
+        if ($this->getApplication()->get('plgWorkflowPublishing.' . $context) === $pks) {
             return true;
         }
 
-        throw new Exception(Text::_('PLG_WORKFLOW_PUBLISHING_CHANGE_STATE_NOT_ALLOWED'));
+        throw new \Exception($this->getApplication()->getLanguage()->_('PLG_WORKFLOW_PUBLISHING_CHANGE_STATE_NOT_ALLOWED'));
     }
 
     /**
      * The save event.
      *
-     * @param   EventInterface  $event
+     * @param   Model\BeforeSaveEvent  $event
      *
      * @return  boolean
      *
      * @since   4.0.0
      */
-    public function onContentBeforeSave(EventInterface $event)
+    public function onContentBeforeSave(Model\BeforeSaveEvent $event)
     {
-        $context = $event->getArgument('0');
-
-        /** @var TableInterface $table */
-        $table = $event->getArgument('1');
-        $isNew = $event->getArgument('2');
-        $data  = $event->getArgument('3');
+        $context = $event->getContext();
 
         if (!$this->isSupported($context)) {
             return true;
         }
 
+        /** @var TableInterface $table */
+        $table   = $event->getItem();
+        $data    = $event->getData();
         $keyName = $table->getColumnAlias('published');
 
         // Check for the old value
@@ -412,7 +401,7 @@ public function onContentBeforeSave(EventInterface $event)
          * As we're setting the field to disabled, no value should be there at all
          */
         if (isset($data[$keyName])) {
-            $this->app->enqueueMessage(Text::_('PLG_WORKFLOW_PUBLISHING_CHANGE_STATE_NOT_ALLOWED'), 'error');
+            $this->getApplication()->enqueueMessage($this->getApplication()->getLanguage()->_('PLG_WORKFLOW_PUBLISHING_CHANGE_STATE_NOT_ALLOWED'), 'error');
 
             return false;
         }
@@ -440,11 +429,11 @@ public function onContentVersioningPrepareTable(EventInterface $event)
 
         $parts = explode('.', $context);
 
-        $component = $this->app->bootComponent($parts[0]);
+        $component = $this->getApplication()->bootComponent($parts[0]);
 
         $modelName = $component->getModelName($context);
 
-        $model = $component->getMVCFactory()->createModel($modelName, $this->app->getName(), ['ignore_request' => true]);
+        $model = $component->getMVCFactory()->createModel($modelName, $this->getApplication()->getName(), ['ignore_request' => true]);
 
         $table = $model->getTable();
 
@@ -476,11 +465,11 @@ public function onTableBeforeStore(BeforeStoreEvent $event)
             return;
         }
 
-        $component = $this->app->bootComponent($parts[0]);
+        $component = $this->getApplication()->bootComponent($parts[0]);
 
         $modelName = $component->getModelName($typeAlias);
 
-        $model = $component->getMVCFactory()->createModel($modelName, $this->app->getName(), ['ignore_request' => true]);
+        $model = $component->getMVCFactory()->createModel($modelName, $this->getApplication()->getName(), ['ignore_request' => true]);
 
         $table = $model->getTable();
 
@@ -515,7 +504,7 @@ protected function isSupported($context)
             return false;
         }
 
-        $component = $this->app->bootComponent($parts[0]);
+        $component = $this->getApplication()->bootComponent($parts[0]);
 
         if (
             !$component instanceof WorkflowServiceInterface
@@ -527,7 +516,7 @@ protected function isSupported($context)
 
         $modelName = $component->getModelName($context);
 
-        $model = $component->getMVCFactory()->createModel($modelName, $this->app->getName(), ['ignore_request' => true]);
+        $model = $component->getMVCFactory()->createModel($modelName, $this->getApplication()->getName(), ['ignore_request' => true]);
 
         if (!$model instanceof DatabaseModelInterface || !method_exists($model, 'publish')) {
             return false;
diff --git a/ruleset.xml b/ruleset.xml
index 4ab99f7bf8c72..dbe75cebc35d8 100644
--- a/ruleset.xml
+++ b/ruleset.xml
@@ -120,8 +120,6 @@
         <exclude-pattern type="relative">libraries/src/Tree/ImmutableNodeTrait\.php</exclude-pattern>
         <exclude-pattern type="relative">libraries/src/Updater/UpdateAdapter\.php</exclude-pattern>
         <exclude-pattern type="relative">libraries/src/User/User\.php</exclude-pattern>
-        <exclude-pattern type="relative">plugins/editors/tinymce/tinymce\.php</exclude-pattern>
-        <exclude-pattern type="relative">plugins/system/cache/cache\.php</exclude-pattern>
     </rule>
 
     <rule ref="PSR1.Methods.CamelCapsMethodName.NotCamelCaps">
@@ -236,12 +234,6 @@
         <exclude-pattern type="relative">libraries/src/Updater/Update\.php</exclude-pattern>
         <exclude-pattern type="relative">libraries/src/Updater/UpdateAdapter\.php</exclude-pattern>
         <exclude-pattern type="relative">modules/mod_articles_category/src/Helper/ArticlesCategoryHelper\.php</exclude-pattern>
-        <exclude-pattern type="relative">plugins/content/emailcloak/emailcloak\.php</exclude-pattern>
-        <exclude-pattern type="relative">plugins/content/joomla/joomla\.php</exclude-pattern>
-        <exclude-pattern type="relative">plugins/content/loadmodule/loadmodule\.php</exclude-pattern>
-        <exclude-pattern type="relative">plugins/content/pagebreak/pagebreak\.php</exclude-pattern>
-        <exclude-pattern type="relative">plugins/editors/none/none\.php</exclude-pattern>
-        <exclude-pattern type="relative">plugins/user/joomla/joomla\.php</exclude-pattern>
         <exclude-pattern type="relative">tests/</exclude-pattern>
     </rule>
 
diff --git a/templates/cassiopeia/component.php b/templates/cassiopeia/component.php
index 3412342b69928..dc3df9c17169b 100644
--- a/templates/cassiopeia/component.php
+++ b/templates/cassiopeia/component.php
@@ -56,7 +56,7 @@
 		--template-bg-light: #f0f4fb;
 		--template-text-dark: #495057;
 		--template-text-light: #ffffff;
-		--template-link-color: #2a69b8;
+		--link-color: var(--link-color);
 		--template-special-color: #001B4C;
 		$fontStyles
 	}");
diff --git a/templates/cassiopeia/error.php b/templates/cassiopeia/error.php
index 40be5dd717852..7e3c881a5807e 100644
--- a/templates/cassiopeia/error.php
+++ b/templates/cassiopeia/error.php
@@ -72,7 +72,7 @@
 		--template-bg-light: #f0f4fb;
 		--template-text-dark: #495057;
 		--template-text-light: #ffffff;
-		--template-link-color: #2a69b8;
+		--link-color: var(--link-color);
 		--template-special-color: #001B4C;
 		$fontStyles
 	}");
@@ -101,6 +101,9 @@
 
 // Defer font awesome
 $wa->getAsset('style', 'fontawesome')->setAttribute('rel', 'lazy-stylesheet');
+
+// Get the error code
+$errorCode = $this->error->getCode();
 ?>
 <!DOCTYPE html>
 <html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
@@ -148,6 +151,11 @@
 
     <div class="site-grid">
         <div class="grid-child container-component">
+            <?php if ($this->countModules('error-' . $errorCode)) : ?>
+                <div class="container">
+                    <jdoc:include type="modules" name="error-<?php echo $errorCode; ?>" style="none" />
+                </div>
+            <?php else : ?>
             <h1 class="page-header"><?php echo Text::_('JERROR_LAYOUT_PAGE_NOT_FOUND'); ?></h1>
             <div class="card">
                 <div class="card-body">
@@ -167,28 +175,29 @@
                     <blockquote>
                         <span class="badge bg-secondary"><?php echo $this->error->getCode(); ?></span> <?php echo htmlspecialchars($this->error->getMessage(), ENT_QUOTES, 'UTF-8'); ?>
                     </blockquote>
-                    <?php if ($this->debug) : ?>
-                        <div>
+                </div>
+            </div>
+            <?php endif; ?>
+            <?php if ($this->debug) : ?>
+                <div>
+                    <?php echo $this->renderBacktrace(); ?>
+                    <?php // Check if there are more Exceptions and render their data as well ?>
+                    <?php if ($this->error->getPrevious()) : ?>
+                        <?php $loop = true; ?>
+                        <?php // Reference $this->_error here and in the loop as setError() assigns errors to this property and we need this for the backtrace to work correctly ?>
+                        <?php // Make the first assignment to setError() outside the loop so the loop does not skip Exceptions ?>
+                        <?php $this->setError($this->_error->getPrevious()); ?>
+                        <?php while ($loop === true) : ?>
+                            <p><strong><?php echo Text::_('JERROR_LAYOUT_PREVIOUS_ERROR'); ?></strong></p>
+                            <p><?php echo htmlspecialchars($this->_error->getMessage(), ENT_QUOTES, 'UTF-8'); ?></p>
                             <?php echo $this->renderBacktrace(); ?>
-                            <?php // Check if there are more Exceptions and render their data as well ?>
-                            <?php if ($this->error->getPrevious()) : ?>
-                                <?php $loop = true; ?>
-                                <?php // Reference $this->_error here and in the loop as setError() assigns errors to this property and we need this for the backtrace to work correctly ?>
-                                <?php // Make the first assignment to setError() outside the loop so the loop does not skip Exceptions ?>
-                                <?php $this->setError($this->_error->getPrevious()); ?>
-                                <?php while ($loop === true) : ?>
-                                    <p><strong><?php echo Text::_('JERROR_LAYOUT_PREVIOUS_ERROR'); ?></strong></p>
-                                    <p><?php echo htmlspecialchars($this->_error->getMessage(), ENT_QUOTES, 'UTF-8'); ?></p>
-                                    <?php echo $this->renderBacktrace(); ?>
-                                    <?php $loop = $this->setError($this->_error->getPrevious()); ?>
-                                <?php endwhile; ?>
-                                <?php // Reset the main error object to the base error ?>
-                                <?php $this->setError($this->error); ?>
-                            <?php endif; ?>
-                        </div>
+                            <?php $loop = $this->setError($this->_error->getPrevious()); ?>
+                        <?php endwhile; ?>
+                        <?php // Reset the main error object to the base error ?>
+                        <?php $this->setError($this->error); ?>
                     <?php endif; ?>
                 </div>
-            </div>
+            <?php endif; ?>
         </div>
     </div>
     <?php if ($this->countModules('footer')) : ?>
diff --git a/templates/cassiopeia/html/mod_menu/collapse-metismenu.php b/templates/cassiopeia/html/mod_menu/collapse-metismenu.php
index 4cf569dadb302..0a826b8c99a2e 100644
--- a/templates/cassiopeia/html/mod_menu/collapse-metismenu.php
+++ b/templates/cassiopeia/html/mod_menu/collapse-metismenu.php
@@ -16,7 +16,7 @@
 HTMLHelper::_('bootstrap.collapse');
 ?>
 
-<nav class="navbar navbar-expand-md" aria-label="<?php echo htmlspecialchars($module->title, ENT_QUOTES, 'UTF-8'); ?>">
+<nav class="navbar navbar-expand-lg" aria-label="<?php echo htmlspecialchars($module->title, ENT_QUOTES, 'UTF-8'); ?>">
     <button class="navbar-toggler navbar-toggler-right" type="button" data-bs-toggle="collapse" data-bs-target="#navbar<?php echo $module->id; ?>" aria-controls="navbar<?php echo $module->id; ?>" aria-expanded="false" aria-label="<?php echo Text::_('MOD_MENU_TOGGLE'); ?>">
         <span class="icon-menu" aria-hidden="true"></span>
     </button>
diff --git a/templates/cassiopeia/html/mod_menu/dropdown-metismenu_component.php b/templates/cassiopeia/html/mod_menu/dropdown-metismenu_component.php
index fcf16639ccf70..183da3896078a 100644
--- a/templates/cassiopeia/html/mod_menu/dropdown-metismenu_component.php
+++ b/templates/cassiopeia/html/mod_menu/dropdown-metismenu_component.php
@@ -10,8 +10,8 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Filter\OutputFilter;
 use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\Filter\OutputFilter;
 
 $attributes = [];
 
diff --git a/templates/cassiopeia/html/mod_menu/dropdown-metismenu_url.php b/templates/cassiopeia/html/mod_menu/dropdown-metismenu_url.php
index cf137081c2e2f..9ec79b19365ed 100644
--- a/templates/cassiopeia/html/mod_menu/dropdown-metismenu_url.php
+++ b/templates/cassiopeia/html/mod_menu/dropdown-metismenu_url.php
@@ -10,8 +10,8 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Filter\OutputFilter;
 use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\Filter\OutputFilter;
 
 $attributes = [];
 
diff --git a/templates/cassiopeia/index.php b/templates/cassiopeia/index.php
index 0ead32b485aeb..87ce10cb08402 100644
--- a/templates/cassiopeia/index.php
+++ b/templates/cassiopeia/index.php
@@ -58,6 +58,18 @@
 			--cassiopeia-font-weight-normal: 400;
 			--cassiopeia-font-weight-headings: 700;';
         }
+    } elseif ($paramsFontScheme === 'system') {
+        $fontStylesBody    = $this->params->get('systemFontBody', '');
+        $fontStylesHeading = $this->params->get('systemFontHeading', '');
+
+        if ($fontStylesBody) {
+            $fontStyles = '--cassiopeia-font-family-body: ' . $fontStylesBody . ';
+            --cassiopeia-font-weight-normal: 400;';
+        }
+        if ($fontStylesHeading) {
+            $fontStyles .= '--cassiopeia-font-family-headings: ' . $fontStylesHeading . ';
+    		--cassiopeia-font-weight-headings: 700;';
+        }
     } else {
         $wa->registerAndUseStyle('fontscheme.current', $paramsFontScheme, ['version' => 'auto'], ['media' => 'print', 'rel' => 'lazy-stylesheet', 'onload' => 'this.media=\'all\'']);
         $this->getPreloadManager()->preload($wa->getAsset('style', 'fontscheme.current')->getUri() . '?' . $this->getMediaVersion(), ['as' => 'style']);
@@ -74,7 +86,7 @@
 		--template-bg-light: #f0f4fb;
 		--template-text-dark: #495057;
 		--template-text-light: #ffffff;
-		--template-link-color: #2a69b8;
+		--template-link-color: var(--link-color);
 		--template-special-color: #001B4C;
 		$fontStyles
 	}");
@@ -113,6 +125,7 @@
 ?>
 <!DOCTYPE html>
 <html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
+
 <head>
     <jdoc:include type="metas" />
     <jdoc:include type="styles" />
@@ -133,7 +146,7 @@
 
         <?php if ($this->countModules('topbar')) : ?>
             <div class="container-topbar">
-            <jdoc:include type="modules" name="topbar" style="none" />
+                <jdoc:include type="modules" name="topbar" style="none" />
             </div>
         <?php endif; ?>
 
@@ -178,21 +191,21 @@
         <?php endif; ?>
 
         <?php if ($this->countModules('top-a', true)) : ?>
-        <div class="grid-child container-top-a">
-            <jdoc:include type="modules" name="top-a" style="card" />
-        </div>
+            <div class="grid-child container-top-a">
+                <jdoc:include type="modules" name="top-a" style="card" />
+            </div>
         <?php endif; ?>
 
         <?php if ($this->countModules('top-b', true)) : ?>
-        <div class="grid-child container-top-b">
-            <jdoc:include type="modules" name="top-b" style="card" />
-        </div>
+            <div class="grid-child container-top-b">
+                <jdoc:include type="modules" name="top-b" style="card" />
+            </div>
         <?php endif; ?>
 
         <?php if ($this->countModules('sidebar-left', true)) : ?>
-        <div class="grid-child container-sidebar-left">
-            <jdoc:include type="modules" name="sidebar-left" style="card" />
-        </div>
+            <div class="grid-child container-sidebar-left">
+                <jdoc:include type="modules" name="sidebar-left" style="card" />
+            </div>
         <?php endif; ?>
 
         <div class="grid-child container-component">
@@ -200,36 +213,36 @@
             <jdoc:include type="modules" name="main-top" style="card" />
             <jdoc:include type="message" />
             <main>
-            <jdoc:include type="component" />
+                <jdoc:include type="component" />
             </main>
             <jdoc:include type="modules" name="main-bottom" style="card" />
         </div>
 
         <?php if ($this->countModules('sidebar-right', true)) : ?>
-        <div class="grid-child container-sidebar-right">
-            <jdoc:include type="modules" name="sidebar-right" style="card" />
-        </div>
+            <div class="grid-child container-sidebar-right">
+                <jdoc:include type="modules" name="sidebar-right" style="card" />
+            </div>
         <?php endif; ?>
 
         <?php if ($this->countModules('bottom-a', true)) : ?>
-        <div class="grid-child container-bottom-a">
-            <jdoc:include type="modules" name="bottom-a" style="card" />
-        </div>
+            <div class="grid-child container-bottom-a">
+                <jdoc:include type="modules" name="bottom-a" style="card" />
+            </div>
         <?php endif; ?>
 
         <?php if ($this->countModules('bottom-b', true)) : ?>
-        <div class="grid-child container-bottom-b">
-            <jdoc:include type="modules" name="bottom-b" style="card" />
-        </div>
+            <div class="grid-child container-bottom-b">
+                <jdoc:include type="modules" name="bottom-b" style="card" />
+            </div>
         <?php endif; ?>
     </div>
 
     <?php if ($this->countModules('footer', true)) : ?>
-    <footer class="container-footer footer full-width">
-        <div class="grid-child">
-            <jdoc:include type="modules" name="footer" style="none" />
-        </div>
-    </footer>
+        <footer class="container-footer footer full-width">
+            <div class="grid-child">
+                <jdoc:include type="modules" name="footer" style="none" />
+            </div>
+        </footer>
     <?php endif; ?>
 
     <?php if ($this->params->get('backTop') == 1) : ?>
@@ -240,4 +253,5 @@
 
     <jdoc:include type="modules" name="debug" style="none" />
 </body>
+
 </html>
diff --git a/templates/cassiopeia/joomla.asset.json b/templates/cassiopeia/joomla.asset.json
index 72245f898376d..67b53cd7103da 100644
--- a/templates/cassiopeia/joomla.asset.json
+++ b/templates/cassiopeia/joomla.asset.json
@@ -56,7 +56,7 @@
       "type": "script",
       "uri": "template.js",
       "attributes" : {
-        "defer": true
+        "type": "module"
       },
       "dependencies": [
         "core"
diff --git a/templates/cassiopeia/offline.php b/templates/cassiopeia/offline.php
index 5b1292aa689c4..c07195596be43 100644
--- a/templates/cassiopeia/offline.php
+++ b/templates/cassiopeia/offline.php
@@ -67,7 +67,7 @@
 		--template-bg-light: #f0f4fb;
 		--template-text-dark: #495057;
 		--template-text-light: #ffffff;
-		--template-link-color: #2a69b8;
+		--link-color: var(--link-color);
 		--template-special-color: #001B4C;
 		$fontStyles
 	}");
diff --git a/templates/cassiopeia/templateDetails.xml b/templates/cassiopeia/templateDetails.xml
index d8628d3324a9f..b69ab1ba2035b 100644
--- a/templates/cassiopeia/templateDetails.xml
+++ b/templates/cassiopeia/templateDetails.xml
@@ -40,6 +40,9 @@
 		<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>
 	<languages folder="language">
 		<language tag="en-GB">en-GB/tpl_cassiopeia.ini</language>
@@ -94,6 +97,9 @@
 					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>
@@ -103,6 +109,56 @@
 					</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"
diff --git a/templates/system/build_incomplete.html b/templates/system/build_incomplete.html
index d3896d742cd3c..709dbdcababfa 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:-o-radial-gradient(center,ellipse,#f1f1f1 0,#ee2a00 100%);background:radial-gradient(ellipse at center,#f1f1f1 0,#ee2a00 100%);background-attachment:fixed;background-repeat:no-repeat}body{background-color:transparent;color:#555;font:14px/18px sans-serif}body,ol,ul{margin:0;padding:0}ol,ul{list-style:none}a{color:#0084b4;text-decoration:none}a:focus,a:hover{text-decoration:underline}p a{line-height:inherit}.container{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-box-pack:center;-ms-flex-pack:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;height:100vh;justify-content:center;margin:0 auto;overflow:hidden;position:relative;width:100%}.alert-main{background:#fff;border:1px solid rgba(0,0,0,.1);border-radius:5px;-webkit-box-shadow:0 0 10px rgba(0,0,0,.05);box-shadow:0 0 10px rgba(0,0,0,.05);display:block;margin:0 20px;padding:20px 60px;position:relative}svg{bottom:-120px;position:absolute;right:-70px;-webkit-transform:rotate(10deg);transform:rotate(10deg);width:400px;z-index:-1}h1,p{position:relative;text-align:center;text-rendering:optimizeLegibility;z-index:10}h1{font-size:40px;font-weight:200;line-height:1;margin:18px 0 0;text-shadow:0 1px 2px rgba(0,0,0,.2)}label,p{color:#777;font-size:18px;font-weight:300;line-height:25px;margin:10px 0 20px}p a{color:#1c3d5c;font-weight:700}.link-help{background-color:#f5f5f5;border:1px solid rgba(0,0,0,.1);border-radius:.25rem;font-size:1rem;font-weight:400;padding:.4rem .85rem;text-decoration:none}.link-help:hover{background-color:#eee;text-decoration:none}.footer{font-size:11px;margin:8px 20px;text-align:left}.footer ul{margin-bottom:5px}.footer li{display:inline;line-height:20px;margin:0 5px}.footer a,.footer li{color:#1c3d5c}.footer a:hover{color:#59b0ff}.links{display:block;font-size:1rem;margin-left:auto;margin-right:auto;margin-top:4rem;text-align:center}.links li{display:inline-block;margin-top:20px}@media screen and (max-width:480px){.container{height:auto;padding-bottom:20px;padding-top: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":"المزيد من التفاصيل"},"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","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","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","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","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","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 Details"},"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":"پارسی","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-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":"פרטים נוספים"},"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":"További részletek"},"it-IT":{"language":"Italiano IT","header":"Configurazione Ambientale 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":"Ulteriori 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":"Толығырақ"},"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 informacji"},"pt-BR":{"language":"Português 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 pretende fazer isso, 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 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":"Детальніше"},"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;background:radial-gradient(ellipse at center,#f1f1f1 0,#ee2a00 100%);background-attachment:fixed;background-repeat:no-repeat}body{background-color:transparent;color:#555;font:14px/18px sans-serif}body,ol,ul{margin:0;padding:0}ol,ul{list-style:none}a{color:#0084b4;text-decoration:none}a:focus,a:hover{text-decoration:underline}p a{line-height:inherit}.container{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-box-pack:center;-ms-flex-pack:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;height:100vh;justify-content:center;margin:0 auto;overflow:hidden;position:relative;width:100%}.alert-main{background:#fff;border:1px solid rgba(0,0,0,.1);border-radius:5px;-webkit-box-shadow:0 0 10px rgba(0,0,0,.05);box-shadow:0 0 10px rgba(0,0,0,.05);display:block;margin:0 20px;padding:20px 60px;position:relative}svg{bottom:-120px;position:absolute;right:-70px;-webkit-transform:rotate(10deg);transform:rotate(10deg);width:400px;z-index:-1}h1,p{position:relative;text-align:center;text-rendering:optimizeLegibility;z-index:10}h1{font-size:40px;font-weight:200;line-height:1;margin:18px 0 0;text-shadow:0 1px 2px rgba(0,0,0,.2)}label,p{color:#777;font-size:18px;font-weight:300;line-height:25px;margin:10px 0 20px}p a{color:#1c3d5c;font-weight:700}.link-help{background-color:#f5f5f5;border:1px solid rgba(0,0,0,.1);border-radius:.25rem;font-size:1rem;font-weight:400;padding:.4rem .85rem;text-decoration:none}.link-help:hover{background-color:#eee;text-decoration:none}.footer{font-size:11px;margin:8px 20px;text-align:left}.footer ul{margin-bottom:5px}.footer li{display:inline;line-height:20px;margin:0 5px}.footer a,.footer li{color:#1c3d5c}.footer a:hover{color:#59b0ff}.links{display:block;font-size:1rem;margin-left:auto;margin-right:auto;margin-top:4rem;text-align:center}.links li{display:inline-block;margin-top:20px}@media screen and (max-width:480px){.container{height:auto;padding-bottom:20px;padding-top: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":"المزيد من التفاصيل"},"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","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","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","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","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","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 Details"},"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":"پارسی","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-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","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":"További részletek"},"id-ID":{"language":"Bahasa Indonesia ID","header":"Lingkup Setelan Tidak Lengkap","text1":"Sepertinya Anda mencoba menjalankan Joomla! dari repositori git kami. Untuk melakukannya, Anda harus menyelesaikan beberapa langkah tambahan terlebih dahulu.","help-url-text":"Lebih Detailnya"},"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":"Ulteriori 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":"Толығырақ"},"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 informacji"},"pt-BR":{"language":"Português 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 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":"Детальніше"},"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/error.php b/templates/system/error.php
index e47be06ffe79b..03ebf7d72e783 100644
--- a/templates/system/error.php
+++ b/templates/system/error.php
@@ -30,6 +30,8 @@
 // Set page title
 $this->setTitle($this->error->getCode() . ' - ' . htmlspecialchars($this->error->getMessage(), ENT_QUOTES, 'UTF-8'));
 
+// Get the error code
+$errorCode = $this->error->getCode();
 ?>
 <!DOCTYPE html>
 <html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
@@ -42,22 +44,26 @@
     <div class="error">
         <div id="outline">
         <div id="errorboxoutline">
+            <?php if ($this->countModules('error-' . $errorCode)) : ?>
+                    <jdoc:include type="modules" name="error-<?php echo $errorCode; ?>" style="none" />
+            <?php else : ?>
             <div id="errorboxheader"><?php echo $this->error->getCode(); ?> - <?php echo htmlspecialchars($this->error->getMessage(), ENT_QUOTES, 'UTF-8'); ?></div>
             <div id="errorboxbody">
             <p><strong><?php echo Text::_('JERROR_LAYOUT_NOT_ABLE_TO_VISIT'); ?></strong></p>
-            <ol>
+            <ul>
                 <li><?php echo Text::_('JERROR_LAYOUT_AN_OUT_OF_DATE_BOOKMARK_FAVOURITE'); ?></li>
                 <li><?php echo Text::_('JERROR_LAYOUT_SEARCH_ENGINE_OUT_OF_DATE_LISTING'); ?></li>
                 <li><?php echo Text::_('JERROR_LAYOUT_MIS_TYPED_ADDRESS'); ?></li>
                 <li><?php echo Text::_('JERROR_LAYOUT_YOU_HAVE_NO_ACCESS_TO_THIS_PAGE'); ?></li>
                 <li><?php echo Text::_('JERROR_LAYOUT_REQUESTED_RESOURCE_WAS_NOT_FOUND'); ?></li>
                 <li><?php echo Text::_('JERROR_LAYOUT_ERROR_HAS_OCCURRED_WHILE_PROCESSING_YOUR_REQUEST'); ?></li>
-            </ol>
+            </ul>
             <p><strong><?php echo Text::_('JERROR_LAYOUT_PLEASE_TRY_ONE_OF_THE_FOLLOWING_PAGES'); ?></strong></p>
             <ul>
                 <li><a href="<?php echo Uri::root(true); ?>/index.php"><?php echo Text::_('JERROR_LAYOUT_HOME_PAGE'); ?></a></li>
             </ul>
             <p><?php echo Text::_('JERROR_LAYOUT_PLEASE_CONTACT_THE_SYSTEM_ADMINISTRATOR'); ?></p>
+            <?php endif; ?>
             <div id="techinfo">
             <p>
                 <?php echo htmlspecialchars($this->error->getMessage(), ENT_QUOTES, 'UTF-8'); ?>
@@ -93,7 +99,6 @@
         </div>
         </div>
     </div>
-
     <jdoc:include type="modules" name="debug" style="none" />
 </body>
 </html>
diff --git a/templates/system/fatal-error.html b/templates/system/fatal-error.html
index 0767b2c65b995..4cc3ce11d142d 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:-o-radial-gradient(center,ellipse,#f1f1f1 0,#ee2a00 100%);background:radial-gradient(ellipse at center,#f1f1f1 0,#ee2a00 100%);background-attachment:fixed;background-repeat:no-repeat}body{background-color:transparent;color:#555;font:14px/18px sans-serif}body,ol,ul{margin:0;padding:0}ol,ul{list-style:none}a{color:#0084b4;text-decoration:none}a:focus,a:hover{text-decoration:underline}p a{line-height:inherit}.container{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-box-pack:center;-ms-flex-pack:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;height:100vh;justify-content:center;margin:0 auto;overflow:hidden;position:relative;width:100%}.alert-main{background:#fff;border:1px solid rgba(0,0,0,.1);border-radius:5px;-webkit-box-shadow:0 0 10px rgba(0,0,0,.05);box-shadow:0 0 10px rgba(0,0,0,.05);display:block;margin:0 20px;padding:20px 60px;position:relative}svg{bottom:-120px;position:absolute;right:-70px;-webkit-transform:rotate(10deg);transform:rotate(10deg);width:400px;z-index:-1}h1,p{position:relative;text-align:center;text-rendering:optimizeLegibility;z-index:10}h1{font-size:40px;font-weight:200;line-height:1;margin:18px 0 0;text-shadow:0 1px 2px rgba(0,0,0,.2)}label,p{color:#777;font-size:18px;font-weight:300;line-height:25px;margin:10px 0 20px}p a{color:#1c3d5c;font-weight:700}.link-help{background-color:#f5f5f5;border:1px solid rgba(0,0,0,.1);border-radius:.25rem;font-size:1rem;font-weight:400;padding:.4rem .85rem;text-decoration:none}.link-help:hover{background-color:#eee;text-decoration:none}.footer{font-size:11px;margin:8px 20px;text-align:left}.footer ul{margin-bottom:5px}.footer li{display:inline;line-height:20px;margin:0 5px}.footer a,.footer li{color:#1c3d5c}.footer a:hover{color:#59b0ff}.links{display:block;font-size:1rem;margin-left:auto;margin-right:auto;margin-top:4rem;text-align:center}.links li{display:inline-block;margin-top:20px}@media screen and (max-width:480px){.container{height:auto;padding-bottom:20px;padding-top: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":"ساعدني في حل هذا"},"bg-BG":{"language":"Български","header":"За съжаление възникна проблем, който не можахме да поправим.","text1":"Сървърът върна \"{{statusCode_statusText}}\"","help-url-text":"Помогнете ми да разреша това"},"ca-ES":{"language":"Anglès GB","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","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","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","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","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","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-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":"עזור לי לפתור זאת"},"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 da che non siamo riusciti a 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":"Бұл мәселені шешуге көмектес"},"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":"Допоможіть мені це вирішити"},"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;background:radial-gradient(ellipse at center,#f1f1f1 0,#ee2a00 100%);background-attachment:fixed;background-repeat:no-repeat}body{background-color:transparent;color:#555;font:14px/18px sans-serif}body,ol,ul{margin:0;padding:0}ol,ul{list-style:none}a{color:#0084b4;text-decoration:none}a:focus,a:hover{text-decoration:underline}p a{line-height:inherit}.container{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-box-pack:center;-ms-flex-pack:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;height:100vh;justify-content:center;margin:0 auto;overflow:hidden;position:relative;width:100%}.alert-main{background:#fff;border:1px solid rgba(0,0,0,.1);border-radius:5px;-webkit-box-shadow:0 0 10px rgba(0,0,0,.05);box-shadow:0 0 10px rgba(0,0,0,.05);display:block;margin:0 20px;padding:20px 60px;position:relative}svg{bottom:-120px;position:absolute;right:-70px;-webkit-transform:rotate(10deg);transform:rotate(10deg);width:400px;z-index:-1}h1,p{position:relative;text-align:center;text-rendering:optimizeLegibility;z-index:10}h1{font-size:40px;font-weight:200;line-height:1;margin:18px 0 0;text-shadow:0 1px 2px rgba(0,0,0,.2)}label,p{color:#777;font-size:18px;font-weight:300;line-height:25px;margin:10px 0 20px}p a{color:#1c3d5c;font-weight:700}.link-help{background-color:#f5f5f5;border:1px solid rgba(0,0,0,.1);border-radius:.25rem;font-size:1rem;font-weight:400;padding:.4rem .85rem;text-decoration:none}.link-help:hover{background-color:#eee;text-decoration:none}.footer{font-size:11px;margin:8px 20px;text-align:left}.footer ul{margin-bottom:5px}.footer li{display:inline;line-height:20px;margin:0 5px}.footer a,.footer li{color:#1c3d5c}.footer a:hover{color:#59b0ff}.links{display:block;font-size:1rem;margin-left:auto;margin-right:auto;margin-top:4rem;text-align:center}.links li{display:inline-block;margin-top:20px}@media screen and (max-width:480px){.container{height:auto;padding-bottom:20px;padding-top: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":"ساعدني في حل هذا"},"bg-BG":{"language":"Български","header":"За съжаление възникна проблем, който не можахме да поправим.","text1":"Сървърът върна \"{{statusCode_statusText}}\"","help-url-text":"Помогнете ми да разреша това"},"ca-ES":{"language":"Anglès GB","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","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","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","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","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","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-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","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":"Бұл мәселені шешуге көмектес"},"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":"Допоможіть мені це вирішити"},"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 ae42c29b990e8..8d34dadbc3fc7 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:-o-radial-gradient(center,ellipse,#f1f1f1 0,#ee2a00 100%);background:radial-gradient(ellipse at center,#f1f1f1 0,#ee2a00 100%);background-attachment:fixed;background-repeat:no-repeat}body{background-color:transparent;color:#555;font:14px/18px sans-serif}body,ol,ul{margin:0;padding:0}ol,ul{list-style:none}a{color:#0084b4;text-decoration:none}a:focus,a:hover{text-decoration:underline}p a{line-height:inherit}.container{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-box-pack:center;-ms-flex-pack:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;height:100vh;justify-content:center;margin:0 auto;overflow:hidden;position:relative;width:100%}.alert-main{background:#fff;border:1px solid rgba(0,0,0,.1);border-radius:5px;-webkit-box-shadow:0 0 10px rgba(0,0,0,.05);box-shadow:0 0 10px rgba(0,0,0,.05);display:block;margin:0 20px;padding:20px 60px;position:relative}svg{bottom:-120px;position:absolute;right:-70px;-webkit-transform:rotate(10deg);transform:rotate(10deg);width:400px;z-index:-1}h1,p{position:relative;text-align:center;text-rendering:optimizeLegibility;z-index:10}h1{font-size:40px;font-weight:200;line-height:1;margin:18px 0 0;text-shadow:0 1px 2px rgba(0,0,0,.2)}label,p{color:#777;font-size:18px;font-weight:300;line-height:25px;margin:10px 0 20px}p a{color:#1c3d5c;font-weight:700}.link-help{background-color:#f5f5f5;border:1px solid rgba(0,0,0,.1);border-radius:.25rem;font-size:1rem;font-weight:400;padding:.4rem .85rem;text-decoration:none}.link-help:hover{background-color:#eee;text-decoration:none}.footer{font-size:11px;margin:8px 20px;text-align:left}.footer ul{margin-bottom:5px}.footer li{display:inline;line-height:20px;margin:0 5px}.footer a,.footer li{color:#1c3d5c}.footer a:hover{color:#59b0ff}.links{display:block;font-size:1rem;margin-left:auto;margin-right:auto;margin-top:4rem;text-align:center}.links li{display:inline-block;margin-top:20px}@media screen and (max-width:480px){.container{height:auto;padding-bottom:20px;padding-top: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":"ساعدني في حل هذا"},"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","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","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","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","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","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":"پارسی","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-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":"עזור לי לפתור זאת"},"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":"Бұл мәселені шешуге көмектес"},"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 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":"Допоможіть мені це вирішити"},"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;background:radial-gradient(ellipse at center,#f1f1f1 0,#ee2a00 100%);background-attachment:fixed;background-repeat:no-repeat}body{background-color:transparent;color:#555;font:14px/18px sans-serif}body,ol,ul{margin:0;padding:0}ol,ul{list-style:none}a{color:#0084b4;text-decoration:none}a:focus,a:hover{text-decoration:underline}p a{line-height:inherit}.container{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-box-pack:center;-ms-flex-pack:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;height:100vh;justify-content:center;margin:0 auto;overflow:hidden;position:relative;width:100%}.alert-main{background:#fff;border:1px solid rgba(0,0,0,.1);border-radius:5px;-webkit-box-shadow:0 0 10px rgba(0,0,0,.05);box-shadow:0 0 10px rgba(0,0,0,.05);display:block;margin:0 20px;padding:20px 60px;position:relative}svg{bottom:-120px;position:absolute;right:-70px;-webkit-transform:rotate(10deg);transform:rotate(10deg);width:400px;z-index:-1}h1,p{position:relative;text-align:center;text-rendering:optimizeLegibility;z-index:10}h1{font-size:40px;font-weight:200;line-height:1;margin:18px 0 0;text-shadow:0 1px 2px rgba(0,0,0,.2)}label,p{color:#777;font-size:18px;font-weight:300;line-height:25px;margin:10px 0 20px}p a{color:#1c3d5c;font-weight:700}.link-help{background-color:#f5f5f5;border:1px solid rgba(0,0,0,.1);border-radius:.25rem;font-size:1rem;font-weight:400;padding:.4rem .85rem;text-decoration:none}.link-help:hover{background-color:#eee;text-decoration:none}.footer{font-size:11px;margin:8px 20px;text-align:left}.footer ul{margin-bottom:5px}.footer li{display:inline;line-height:20px;margin:0 5px}.footer a,.footer li{color:#1c3d5c}.footer a:hover{color:#59b0ff}.links{display:block;font-size:1rem;margin-left:auto;margin-right:auto;margin-top:4rem;text-align:center}.links li{display:inline-block;margin-top:20px}@media screen and (max-width:480px){.container{height:auto;padding-bottom:20px;padding-top: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":"ساعدني في حل هذا"},"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","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","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","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","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","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":"پارسی","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-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","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":"Бұл мәселені шешуге көмектес"},"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 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":"Допоможіть мені це вирішити"},"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/README.md b/tests/System/README.md
index 4f60dea46f0ce..8d070961ebf72 100644
--- a/tests/System/README.md
+++ b/tests/System/README.md
@@ -12,8 +12,9 @@ A couple of steps are needed before the CMS system tests can be executed on the
 3. Copy the cypress.config.dist.js to cypress.config.js in the root of the joomla folder
 4. Adjust the baseUrl in the cypress.config.js file, it should point to the Joomla base url
 5. Adapt the env variables in the file cypress.config.js, they should point to the site, user data and database environment
-6. Ensure the system has all the required dependencies according to the Cypress [documentation](https://docs.cypress.io/guides/getting-started/installing-cypress)
-7. Run the command `npm run cypress:install`
+6. In order to run the api tests you will need to change the value in your configuration.php for $secret to `tEstValue`
+7. Ensure the system has all the required dependencies according to the Cypress [documentation](https://docs.cypress.io/guides/getting-started/installing-cypress)
+8. Run the command `npm run cypress:install`
 
 ## Run the existing tests
 Cypress has a nice gui which lists all the existing tests and is able to launch a browser where the tests are executed. To open the cypress gui, run the following command:
diff --git a/tests/System/data/com_newsfeeds/joomla.org.xml b/tests/System/data/com_newsfeeds/joomla.org.xml
new file mode 100644
index 0000000000000..49a3da6bb3cdd
--- /dev/null
+++ b/tests/System/data/com_newsfeeds/joomla.org.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- generator="Joomla! - Open Source Content Management" -->
+<?xml-stylesheet href="/plugins/system/jce/css/content.css?badb4208be409b1335b815dde676300e" type="text/css"?>
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+	<channel>
+		<title>Joomla! Official News</title>
+		<description><![CDATA[Joomla! - the dynamic portal engine and content management system]]></description>
+		<link>https://www.joomla.org/announcements.html</link>
+		<lastBuildDate>Wed, 12 Apr 2023 19:48:43 +0000</lastBuildDate>
+		<generator>Joomla! - Open Source Content Management</generator>
+		<atom:link rel="self" type="application/rss+xml" href="https://www.joomla.org/announcements.feed?type=rss"/>
+		<language>en-gb</language>
+		<managingEditor>noreply@joomla.org (Joomla!)</managingEditor>
+		<item>
+			<title>Joomla 4.3.0 Release Candidate 3 - test the final package</title>
+			<link>https://www.joomla.org/announcements/release-news/5883-joomla-4-3-0-release-candidate-3-test-the-final-package.html</link>
+			<guid isPermaLink="true">https://www.joomla.org/announcements/release-news/5883-joomla-4-3-0-release-candidate-3-test-the-final-package.html</guid>
+			<description><![CDATA[
+<p class="lead">The Joomla Project is pleased to announce the availability of Joomla 4.3.0 Release Candidate 3 for testing.</p>
+]]></description>
+			<author>feed@example.com (Joomla)</author>
+			<category>Project Release News</category>
+			<pubDate>Wed, 12 Apr 2023 06:56:30 +0000</pubDate>
+		</item>
+		<item>
+			<title>Joomla 4.3.0 Release Candidate 2 - test the final package</title>
+			<link>https://www.joomla.org/announcements/release-news/5881-joomla-4-3-0-release-candidate-2-test-the-final-package.html</link>
+			<guid isPermaLink="true">https://www.joomla.org/announcements/release-news/5881-joomla-4-3-0-release-candidate-2-test-the-final-package.html</guid>
+			<description><![CDATA[
+<p class="lead">The Joomla Project is pleased to announce the availability of Joomla 4.3.0 Release Candidate 2 for testing.</p>
+]]></description>
+			<author>feed@example.com (Joomla)</author>
+			<category>Project Release News</category>
+			<pubDate>Sun, 02 Apr 2023 06:56:30 +0000</pubDate>
+		</item>
+		<item>
+			<title>Joomla 4.3.0 Release Candidate 1 - test the final package</title>
+			<link>https://www.joomla.org/announcements/release-news/5880-joomla-4-3-0-release-candidate-1-test-the-final-package.html</link>
+			<guid isPermaLink="true">https://www.joomla.org/announcements/release-news/5880-joomla-4-3-0-release-candidate-1-test-the-final-package.html</guid>
+			<description><![CDATA[
+<p class="lead">The Joomla Project is pleased to announce the availability of Joomla 4.3.0 Release Candidate 1 for testing.</p>
+]]></description>
+			<author>feed@example.com (Joomla)</author>
+			<category>Project Release News</category>
+			<pubDate>Mon, 20 Mar 2023 06:56:30 +0000</pubDate>
+		</item>
+		<item>
+			<title>Joomla 4.2.9 Bug Fix Release</title>
+			<link>https://www.joomla.org/announcements/release-news/5879-joomla-4-2-9-bug-fix-release.html</link>
+			<guid isPermaLink="true">https://www.joomla.org/announcements/release-news/5879-joomla-4-2-9-bug-fix-release.html</guid>
+			<description><![CDATA[
+<p class="lead">Joomla! 4.2.9 is now available. This is a Bug Fix release for the 4.x series of Joomla!</p>
+]]></description>
+			<author>feed@example.com (Joomla)</author>
+			<category>Project Release News</category>
+			<pubDate>Tue, 14 Mar 2023 06:56:30 +0000</pubDate>
+		</item>
+		<item>
+			<title>Joomla 4.2.8 Security Release</title>
+			<link>https://www.joomla.org/announcements/release-news/5878-joomla-4-2-8-security-release.html</link>
+			<guid isPermaLink="true">https://www.joomla.org/announcements/release-news/5878-joomla-4-2-8-security-release.html</guid>
+			<description><![CDATA[
+<p class="lead">Joomla! 4.2.8 is now available. This is a security release for the 4.x series of Joomla! which addresses a critical security vulnerability in the web services API. We strongly recommend that you update your sites immediately.</p>
+]]></description>
+			<author>feed@example.com (Joomla)</author>
+			<category>Project Release News</category>
+			<pubDate>Thu, 16 Feb 2023 07:56:30 +0000</pubDate>
+		</item>
+		<item>
+			<title>Joomla! 4.2.8 - Important Security Announcement - Patch Available Soon</title>
+			<link>https://www.joomla.org/announcements/release-news/5877-joomla-4-2-8-important-security-announcement-patch-available-soon.html</link>
+			<guid isPermaLink="true">https://www.joomla.org/announcements/release-news/5877-joomla-4-2-8-important-security-announcement-patch-available-soon.html</guid>
+			<description><![CDATA[
+<p class="lead">A Joomla 4.2.8 release containing a security fix will be published on Thursday, 16th February at approximately 16:00 UTC</p>
+]]></description>
+			<author>feed@example.com (Joomla)</author>
+			<category>Project Release News</category>
+			<pubDate>Mon, 13 Feb 2023 17:00:00 +0000</pubDate>
+		</item>
+		<item>
+			<title>Joomla 4.2.7 Security and Bug Fix Release</title>
+			<link>https://www.joomla.org/announcements/release-news/5876-joomla-4-2-7-security-and-bug-fix-release.html</link>
+			<guid isPermaLink="true">https://www.joomla.org/announcements/release-news/5876-joomla-4-2-7-security-and-bug-fix-release.html</guid>
+			<description><![CDATA[
+<p class="lead">Joomla 4.2.7 is now available. This is a security and bug fix release for the 4.x series of Joomla.</p>
+]]></description>
+			<author>feed@example.com (Joomla)</author>
+			<category>Project Release News</category>
+			<pubDate>Tue, 31 Jan 2023 07:56:30 +0000</pubDate>
+		</item>
+		<item>
+			<title>Joomla 4.2.6 Bug Fix Release </title>
+			<link>https://www.joomla.org/announcements/release-news/5875-joomla-4-2-6-bug-fix-release.html</link>
+			<guid isPermaLink="true">https://www.joomla.org/announcements/release-news/5875-joomla-4-2-6-bug-fix-release.html</guid>
+			<description><![CDATA[
+<p class="lead">Joomla 4.2.6 is now available. This is a bug fix release for the 4.x series of Joomla.</p>
+]]></description>
+			<author>feed@example.com (Joomla)</author>
+			<category>Project Release News</category>
+			<pubDate>Tue, 13 Dec 2022 07:56:30 +0000</pubDate>
+		</item>
+		<item>
+			<title>Joomla 4.2.5 Security and Bug Fix release</title>
+			<link>https://www.joomla.org/announcements/release-news/5873-joomla-4-2-5-security-and-bug-fix-release.html</link>
+			<guid isPermaLink="true">https://www.joomla.org/announcements/release-news/5873-joomla-4-2-5-security-and-bug-fix-release.html</guid>
+			<description><![CDATA[
+<p class="lead">Joomla 4.2.5 is now available. This is a security and bug fix release for the 4.x series of Joomla which addresses 1 security vulnerability.</p>
+]]></description>
+			<author>feed@example.com (The Joomla! Project)</author>
+			<category>Project Release News</category>
+			<pubDate>Tue, 08 Nov 2022 06:00:00 +0000</pubDate>
+		</item>
+		<item>
+			<title>Sunset on GLIP as Joomla welcomes Mattermost</title>
+			<link>https://www.joomla.org/announcements/release-news/5874-sunset-on-glip-as-joomla-welcomes-mattermost.html</link>
+			<guid isPermaLink="true">https://www.joomla.org/announcements/release-news/5874-sunset-on-glip-as-joomla-welcomes-mattermost.html</guid>
+			<description><![CDATA[
+<p class="lead" style="margin: 10px 0;">We all have a new home for our daily communication.</p>
+]]></description>
+			<author>feed@example.com (Operations Department)</author>
+			<category>Project Release News</category>
+			<pubDate>Mon, 07 Nov 2022 06:59:32 +0000</pubDate>
+		</item>
+	</channel>
+</rss>
diff --git a/tests/System/integration/administrator/components/com_banners/Banner.cy.js b/tests/System/integration/administrator/components/com_banners/Banner.cy.js
new file mode 100644
index 0000000000000..656434df59dd7
--- /dev/null
+++ b/tests/System/integration/administrator/components/com_banners/Banner.cy.js
@@ -0,0 +1,35 @@
+describe('Test in backend that the banners form', () => {
+  beforeEach(() => {
+    cy.doAdministratorLogin();
+    // Clear the filter
+    cy.visit('/administrator/index.php?option=com_banners&filter=');
+  });
+  afterEach(() => cy.task('queryDB', "DELETE FROM #__banners WHERE name = 'Test banner'"));
+
+  it('can create a banner', () => {
+    cy.visit('/administrator/index.php?option=com_banners&task=banner.add');
+    cy.get('#jform_name').clear().type('Test banner');
+    cy.clickToolbarButton('Save & Close');
+
+    cy.get('#system-message-container').contains('Banner saved.').should('exist');
+    cy.contains('Test banner');
+  });
+
+  it('check redirection to list view', () => {
+    cy.visit('/administrator/index.php?option=com_banners&task=banner.add');
+    cy.intercept('index.php?option=com_banners&view=banners').as('listview');
+    cy.clickToolbarButton('Cancel');
+
+    cy.wait('@listview');
+  });
+
+  it('can edit a banner', () => {
+    cy.db_createBanner({ name: 'Test Banner' }).then((banner) => {
+      cy.visit(`/administrator/index.php?option=com_banners&task=banner.edit&id=${banner.id}`);
+      cy.get('#jform_name').clear().type('Test banner edited');
+      cy.clickToolbarButton('Save & Close');
+
+      cy.contains('Test banner edited');
+    });
+  });
+});
diff --git a/tests/System/integration/administrator/components/com_banners/Banners.cy.js b/tests/System/integration/administrator/components/com_banners/Banners.cy.js
new file mode 100644
index 0000000000000..d671f90a97a4c
--- /dev/null
+++ b/tests/System/integration/administrator/components/com_banners/Banners.cy.js
@@ -0,0 +1,76 @@
+describe('Test in backend that the banners list', () => {
+  beforeEach(() => {
+    cy.doAdministratorLogin();
+    cy.visit('/administrator/index.php?option=com_banners&view=banners&filter=');
+  });
+
+  it('has a title', () => {
+    cy.get('h1.page-title').should('contain.text', 'Banners');
+  });
+
+  it('can display a list of banners', () => {
+    cy.db_createBanner({ name: 'Test banner' }).then(() => {
+      cy.reload();
+
+      cy.contains('Test banner');
+    });
+  });
+
+  it('can open the banner form', () => {
+    cy.clickToolbarButton('New');
+
+    cy.contains('Banners: New');
+  });
+
+  it('can publish the test banner', () => {
+    cy.db_createBanner({ name: 'Test banner', state: 0 }).then(() => {
+      cy.reload();
+      cy.searchForItem('Test banner');
+      cy.checkAllResults();
+      cy.clickToolbarButton('Action');
+      cy.contains('Publish').click();
+      cy.on('window:confirm', () => true);
+
+      cy.get('#system-message-container').contains('Banner published.').should('exist');
+    });
+  });
+
+  it('can unpublish the test banner', () => {
+    cy.db_createBanner({ name: 'Test banner', state: 1 }).then(() => {
+      cy.reload();
+      cy.searchForItem('Test banner');
+      cy.checkAllResults();
+      cy.clickToolbarButton('Action');
+      cy.contains('Unpublish').click();
+      cy.on('window:confirm', () => true);
+
+      cy.get('#system-message-container').contains('Banner unpublished.').should('exist');
+    });
+  });
+
+  it('can trash the test banner', () => {
+    cy.db_createBanner({ name: 'Test banner' }).then(() => {
+      cy.reload();
+      cy.searchForItem('Test banner');
+      cy.checkAllResults();
+      cy.clickToolbarButton('Action');
+      cy.contains('Trash').click();
+      cy.on('window:confirm', () => true);
+
+      cy.get('#system-message-container').contains('Banner trashed.').should('exist');
+    });
+  });
+
+  it('can delete the test banner', () => {
+    cy.db_createBanner({ name: 'Test banner', state: -2 }).then(() => {
+      cy.reload();
+      cy.setFilter('published', 'Trashed');
+      cy.searchForItem('Test banner');
+      cy.checkAllResults();
+      cy.clickToolbarButton('empty trash');
+      cy.on('window:confirm', () => true);
+
+      cy.get('#system-message-container').contains('Banner deleted.').should('exist');
+    });
+  });
+});
diff --git a/tests/System/integration/administrator/components/com_banners/Client.cy.js b/tests/System/integration/administrator/components/com_banners/Client.cy.js
new file mode 100644
index 0000000000000..84eac4dfae8df
--- /dev/null
+++ b/tests/System/integration/administrator/components/com_banners/Client.cy.js
@@ -0,0 +1,37 @@
+describe('Test in backend that the banner clients form', () => {
+  beforeEach(() => {
+    cy.doAdministratorLogin();
+    // Clear the filter
+    cy.visit('/administrator/index.php?option=com_banners&view=clients&filter=');
+  });
+  afterEach(() => cy.task('queryDB', "DELETE FROM #__banner_clients WHERE name = 'test banner client'"));
+
+  it('can create a client', () => {
+    cy.visit('/administrator/index.php?option=com_banners&task=client.add');
+    cy.get('#jform_name').clear().type('test banner client');
+    cy.get('#jform_contact').clear().type('test banner client');
+    cy.clickToolbarButton('Save & Close');
+
+    cy.get('#system-message-container').contains('Client saved.').should('exist');
+    cy.contains('test banner client');
+  });
+
+  it('check redirection to list view', () => {
+    cy.visit('/administrator/index.php?option=com_banners&task=client.add');
+    cy.intercept('index.php?option=com_banners&view=clients').as('listview');
+    cy.clickToolbarButton('Cancel');
+
+    cy.wait('@listview');
+  });
+
+  it('can edit a client', () => {
+    cy.db_createBannerClient({ name: 'test client' }).then((bannerClient) => {
+      cy.visit(`/administrator/index.php?option=com_banners&task=client.edit&id=${bannerClient.id}`);
+      cy.get('#jform_name').clear().type('test banner client');
+      cy.get('#jform_contact').clear().type('test banner');
+      cy.clickToolbarButton('Save & Close');
+
+      cy.contains('test banner client');
+    });
+  });
+});
diff --git a/tests/System/integration/administrator/components/com_banners/Clients.cy.js b/tests/System/integration/administrator/components/com_banners/Clients.cy.js
new file mode 100644
index 0000000000000..008af9fb4061b
--- /dev/null
+++ b/tests/System/integration/administrator/components/com_banners/Clients.cy.js
@@ -0,0 +1,76 @@
+describe('Test in backend that the clients list', () => {
+  beforeEach(() => {
+    cy.doAdministratorLogin();
+    cy.visit('/administrator/index.php?option=com_banners&view=clients&filter=');
+  });
+
+  it('has a title', () => {
+    cy.get('h1.page-title').should('contain.text', 'Banners: Clients');
+  });
+
+  it('can display a list of clients', () => {
+    cy.db_createBannerClient({ name: 'test banner client' }).then(() => {
+      cy.reload();
+
+      cy.contains('test banner client');
+    });
+  });
+
+  it('can open the clients form', () => {
+    cy.clickToolbarButton('New');
+
+    cy.contains('Banners: New Client');
+  });
+
+  it('can publish the test client', () => {
+    cy.db_createBannerClient({ name: 'test banner client', state: 0 }).then(() => {
+      cy.reload();
+      cy.searchForItem('test banner client');
+      cy.checkAllResults();
+      cy.clickToolbarButton('Action');
+      cy.contains('Publish').click();
+      cy.on('window:confirm', () => true);
+
+      cy.get('#system-message-container').contains('Client published.').should('exist');
+    });
+  });
+
+  it('can unpublish the test client', () => {
+    cy.db_createBannerClient({ name: 'test banner client', state: 1 }).then(() => {
+      cy.reload();
+      cy.searchForItem('test banner client');
+      cy.checkAllResults();
+      cy.clickToolbarButton('Action');
+      cy.contains('Unpublish').click();
+      cy.on('window:confirm', () => true);
+
+      cy.get('#system-message-container').contains('Client unpublished.').should('exist');
+    });
+  });
+
+  it('can trash the test client', () => {
+    cy.db_createBannerClient({ name: 'test banner client' }).then(() => {
+      cy.reload();
+      cy.searchForItem('test banner client');
+      cy.checkAllResults();
+      cy.clickToolbarButton('Action');
+      cy.contains('Trash').click();
+      cy.on('window:confirm', () => true);
+
+      cy.get('#system-message-container').contains('Client trashed.').should('exist');
+    });
+  });
+
+  it('can delete the test client', () => {
+    cy.db_createBannerClient({ name: 'test banner client', state: -2 }).then(() => {
+      cy.reload();
+      cy.setFilter('state', 'Trashed');
+      cy.searchForItem('test banner client');
+      cy.checkAllResults();
+      cy.clickToolbarButton('empty trash');
+      cy.on('window:confirm', () => true);
+
+      cy.get('#system-message-container').contains('Client deleted.').should('exist');
+    });
+  });
+});
diff --git a/tests/System/integration/administrator/components/com_categories/Categories.cy.js b/tests/System/integration/administrator/components/com_categories/Categories.cy.js
index b1feacac6fc20..22c0b4c84fc0b 100644
--- a/tests/System/integration/administrator/components/com_categories/Categories.cy.js
+++ b/tests/System/integration/administrator/components/com_categories/Categories.cy.js
@@ -1,14 +1,14 @@
-describe('Test that the categories back end list', () => {
+describe('Test in backend that the categories list', () => {
   beforeEach(() => {
     cy.doAdministratorLogin();
-    cy.visit('administrator/index.php?option=com_categories&view=categories&extension=com_content&filter=');
+    cy.visit('/administrator/index.php?option=com_categories&view=categories&extension=com_content&filter=');
   });
 
   it('has a title', () => {
     cy.contains('h1', 'Categories').should('exist');
   });
 
-  it('can show a list of categories', () => {
+  it('can display a list of categories', () => {
     cy.db_createCategory({ title: 'Test category' }).then(() => {
       cy.reload();
 
@@ -21,4 +21,58 @@ describe('Test that the categories back end list', () => {
 
     cy.contains('New Category');
   });
+
+  it('can publish the test category', () => {
+    cy.db_createCategory({ title: 'Test category', published: 0 }).then(() => {
+      cy.reload();
+      cy.searchForItem('Test category');
+      cy.checkAllResults();
+      cy.clickToolbarButton('Action');
+      cy.contains('Publish').click();
+      cy.on('window:confirm', () => true);
+
+      cy.get('#system-message-container').contains('Category published.').should('exist');
+    });
+  });
+
+  it('can unpublish the test category', () => {
+    cy.db_createCategory({ title: 'Test category', published: 1 }).then(() => {
+      cy.reload();
+      cy.searchForItem('Test category');
+      cy.checkAllResults();
+      cy.clickToolbarButton('Action');
+      cy.contains('Unpublish').click();
+      cy.on('window:confirm', () => true);
+
+      cy.get('#system-message-container').contains('Category unpublished.').should('exist');
+    });
+  });
+
+  it('can trash the test category', () => {
+    cy.db_createCategory({ title: 'Test category' }).then(() => {
+      cy.reload();
+      cy.searchForItem('Test category');
+      cy.checkAllResults();
+      cy.clickToolbarButton('Action');
+      cy.contains('Trash').click();
+      cy.on('window:confirm', () => true);
+
+      cy.get('#system-message-container').contains('Category trashed.').should('exist');
+    });
+  });
+
+  it('can delete the test category', () => {
+    // The category needs to be created through the form so proper assets are created
+    cy.visit('/administrator/index.php?option=com_categories&task=category.add&extension=com_content');
+    cy.get('#jform_title').type('Test category');
+    cy.get('#jform_published').select('Trashed');
+    cy.clickToolbarButton('Save & Close');
+    cy.setFilter('published', 'Trashed');
+    cy.searchForItem('Test category');
+    cy.checkAllResults();
+    cy.clickToolbarButton('empty trash');
+    cy.on('window:confirm', () => true);
+
+    cy.get('#system-message-container').contains('Category deleted.').should('exist');
+  });
 });
diff --git a/tests/System/integration/administrator/components/com_categories/Category.cy.js b/tests/System/integration/administrator/components/com_categories/Category.cy.js
index 0caeb6e24282b..cc542daa671ff 100644
--- a/tests/System/integration/administrator/components/com_categories/Category.cy.js
+++ b/tests/System/integration/administrator/components/com_categories/Category.cy.js
@@ -1,13 +1,35 @@
-describe('Test that the category back end form', () => {
-  beforeEach(() => cy.doAdministratorLogin());
+describe('Test in backend that the category form', () => {
+  beforeEach(() => {
+    cy.doAdministratorLogin();
+    // Clear the filter
+    cy.visit('/administrator/index.php?option=com_categories&extension=com_content&filter=');
+  });
   afterEach(() => cy.task('queryDB', "DELETE FROM #__categories WHERE title = 'Test category'"));
 
   it('can create a category', () => {
-    cy.visit('administrator/index.php?option=com_categories&task=category.add&extension=com_content');
+    cy.visit('/administrator/index.php?option=com_categories&task=category.add&extension=com_content');
     cy.get('#jform_title').should('exist').type('Test category');
     cy.clickToolbarButton('Save & Close');
 
     cy.get('#system-message-container').contains('Category saved.').should('exist');
     cy.contains('Test category');
   });
+
+  it('can change access level of a test category', () => {
+    cy.db_createCategory({ title: 'Test category' }).then((id) => {
+      cy.visit(`/administrator/index.php?option=com_categories&task=category.edit&id=${id}&extension=com_content`);
+      cy.get('#jform_access').select('Special');
+      cy.clickToolbarButton('Save & Close');
+
+      cy.get('td').contains('Special').should('exist');
+    });
+  });
+
+  it('check redirection to list view', () => {
+    cy.visit('/administrator/index.php?option=com_categories&task=category.add&extension=com_content&filter[published]=');
+    cy.intercept('index.php?option=com_categories&view=categories&extension=com_content').as('listview');
+    cy.clickToolbarButton('Cancel');
+
+    cy.wait('@listview');
+  });
 });
diff --git a/tests/System/integration/administrator/components/com_config/Application.cy.js b/tests/System/integration/administrator/components/com_config/Application.cy.js
new file mode 100644
index 0000000000000..004420961815d
--- /dev/null
+++ b/tests/System/integration/administrator/components/com_config/Application.cy.js
@@ -0,0 +1,33 @@
+describe('Test in backend that the application configuration', () => {
+  beforeEach(() => {
+    cy.task('clearEmails');
+    cy.doAdministratorLogin();
+    cy.visit('/administrator/index.php?option=com_config');
+  });
+
+  it('has a title', () => {
+    cy.contains('h1', 'Global Configuration').should('exist');
+  });
+
+  it('can display the configuration', () => {
+    cy.contains('label', 'Site Name').should('exist');
+  });
+
+  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_smtpsecure').select('none');
+    cy.get('#sendtestmail').click();
+
+    cy.task('getMails').then((mails) => {
+      cy.get('#system-message-container').should('contain.text', 'The email was sent to');
+
+      cy.wrap(mails).should('have.lengthOf', 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'));
+    });
+  });
+});
diff --git a/tests/System/integration/administrator/components/com_contact/Contact.cy.js b/tests/System/integration/administrator/components/com_contact/Contact.cy.js
new file mode 100644
index 0000000000000..7b3332570550c
--- /dev/null
+++ b/tests/System/integration/administrator/components/com_contact/Contact.cy.js
@@ -0,0 +1,35 @@
+describe('Test in backend that the contact form', () => {
+  beforeEach(() => {
+    cy.doAdministratorLogin();
+    // Clear the filter
+    cy.visit('/administrator/index.php?option=com_contact&filter=');
+  });
+  afterEach(() => cy.task('queryDB', "DELETE FROM #__contact_details WHERE name = 'Test contact'"));
+
+  it('can create a contact', () => {
+    cy.visit('/administrator/index.php?option=com_contact&task=contact.add');
+    cy.get('#jform_name').clear().type('Test contact');
+    cy.clickToolbarButton('Save & Close');
+
+    cy.get('#system-message-container').contains('Contact saved.').should('exist');
+    cy.contains('Test contact');
+  });
+
+  it('can change access level of a test contact', () => {
+    cy.db_createContact({ name: 'Test contact' }).then((contact) => {
+      cy.visit(`/administrator/index.php?option=com_contact&task=contact.edit&id=${contact.id}`);
+      cy.get('#jform_access').select('Special');
+      cy.clickToolbarButton('Save & Close');
+
+      cy.get('td').contains('Special').should('exist');
+    });
+  });
+
+  it('check redirection to list view', () => {
+    cy.visit('/administrator/index.php?option=com_contact&task=contact.add');
+    cy.intercept('index.php?option=com_contact&view=contacts').as('listview');
+    cy.clickToolbarButton('Cancel');
+
+    cy.wait('@listview');
+  });
+});
diff --git a/tests/System/integration/administrator/components/com_contact/Contacts.cy.js b/tests/System/integration/administrator/components/com_contact/Contacts.cy.js
new file mode 100644
index 0000000000000..f9501ae3ce1a5
--- /dev/null
+++ b/tests/System/integration/administrator/components/com_contact/Contacts.cy.js
@@ -0,0 +1,102 @@
+describe('Test in backend that the contacts list', () => {
+  beforeEach(() => {
+    cy.doAdministratorLogin();
+    cy.visit('/administrator/index.php?option=com_contact&view=contacts&filter=');
+  });
+
+  it('has a title', () => {
+    cy.get('h1.page-title').should('contain.text', 'Contacts');
+  });
+
+  it('can display a list of contacts', () => {
+    cy.db_createContact({ name: 'Test contact' }).then(() => {
+      cy.reload();
+
+      cy.contains('Test contact');
+    });
+  });
+
+  it('can open the contact form', () => {
+    cy.clickToolbarButton('New');
+
+    cy.contains('Contacts: New');
+  });
+
+  it('can publish the test contact', () => {
+    cy.db_createContact({ name: 'Test contact', published: 0 }).then(() => {
+      cy.reload();
+      cy.searchForItem('Test contact');
+      cy.checkAllResults();
+      cy.clickToolbarButton('Action');
+      cy.contains('Publish').click();
+      cy.on('window:confirm', () => true);
+
+      cy.get('#system-message-container').contains('Contact published.').should('exist');
+    });
+  });
+
+  it('can unpublish the test contact', () => {
+    cy.db_createContact({ name: 'Test contact', published: 1 }).then(() => {
+      cy.reload();
+      cy.searchForItem('Test contact');
+      cy.checkAllResults();
+      cy.clickToolbarButton('Action');
+      cy.contains('Unpublish').click();
+      cy.on('window:confirm', () => true);
+
+      cy.get('#system-message-container').contains('Contact unpublished.').should('exist');
+    });
+  });
+
+  it('can feature the test contact', () => {
+    cy.db_createContact({ name: 'Test contact', featured: 0 }).then(() => {
+      cy.reload();
+      cy.searchForItem('Test contact');
+      cy.checkAllResults();
+      cy.clickToolbarButton('Action');
+      cy.contains('.button-featured', 'Feature').click();
+      cy.on('window:confirm', () => true);
+
+      cy.get('#system-message-container').contains('Contact featured.').should('exist');
+    });
+  });
+
+  it('can unfeature the test contact', () => {
+    cy.db_createContact({ name: 'Test contact', featured: 1 }).then(() => {
+      cy.reload();
+      cy.searchForItem('Test contact');
+      cy.checkAllResults();
+      cy.clickToolbarButton('Action');
+      cy.contains('Unfeature').click();
+      cy.on('window:confirm', () => true);
+
+      cy.get('#system-message-container').contains('Contact unfeatured.').should('exist');
+    });
+  });
+
+  it('can trash the test contact', () => {
+    cy.db_createContact({ name: 'Test contact' }).then(() => {
+      cy.reload();
+      cy.searchForItem('Test contact');
+      cy.checkAllResults();
+      cy.clickToolbarButton('Action');
+      cy.contains('Trash').click();
+      cy.on('window:confirm', () => true);
+
+      cy.get('#system-message-container').contains('Contact trashed.').should('exist');
+    });
+  });
+
+  it('can delete the test contact', () => {
+    cy.db_createContact({ name: 'Test contact', published: -2 }).then(() => {
+      cy.reload();
+      cy.setFilter('published', 'Trashed');
+      cy.searchForItem('Test contact');
+      cy.checkAllResults();
+      cy.clickToolbarButton('empty trash');
+      cy.on('window:confirm', () => true);
+
+      cy.get('#system-message-container').contains('Contact deleted.').should('exist');
+    });
+  });
+});
diff --git a/tests/System/integration/administrator/components/com_content/Article.cy.js b/tests/System/integration/administrator/components/com_content/Article.cy.js
index eae613b5db119..a5b2e69e73703 100644
--- a/tests/System/integration/administrator/components/com_content/Article.cy.js
+++ b/tests/System/integration/administrator/components/com_content/Article.cy.js
@@ -1,9 +1,13 @@
-describe('Test that the article back end form', () => {
-  beforeEach(() => cy.doAdministratorLogin());
+describe('Test in backend that the article form', () => {
+  beforeEach(() => {
+    cy.doAdministratorLogin();
+    // Clear the filter
+    cy.visit('/administrator/index.php?option=com_content&filter=');
+  });
   afterEach(() => cy.task('queryDB', "DELETE FROM #__content WHERE title = 'Test article'"));
 
-  it('can create a article', () => {
-    cy.visit('administrator/index.php?option=com_content&task=article.add');
+  it('can create an article', () => {
+    cy.visit('/administrator/index.php?option=com_content&task=article.add');
     cy.get('#jform_title').clear().type('Test article');
     cy.clickToolbarButton('Save & Close');
 
@@ -11,13 +15,21 @@ describe('Test that the article back end form', () => {
     cy.contains('Test article');
   });
 
-  it('can change access level of the test article', () => {
-    cy.db_createArticle({ title: 'Test article' }).then((id) => {
-      cy.visit(`administrator/index.php?option=com_content&task=article.edit&id=${id}`);
+  it('can change access level of a test article', () => {
+    cy.db_createArticle({ title: 'Test article' }).then((article) => {
+      cy.visit(`/administrator/index.php?option=com_content&task=article.edit&id=${article.id}`);
       cy.get('#jform_access').select('Special');
       cy.clickToolbarButton('Save & Close');
 
       cy.get('td').contains('Special').should('exist');
     });
   });
+
+  it('check redirection to list view', () => {
+    cy.visit('/administrator/index.php?option=com_content&task=article.add');
+    cy.intercept('index.php?option=com_content&view=articles').as('listview');
+    cy.clickToolbarButton('Cancel');
+
+    cy.wait('@listview');
+  });
 });
diff --git a/tests/System/integration/administrator/components/com_content/Articles.cy.js b/tests/System/integration/administrator/components/com_content/Articles.cy.js
index 93578c566a55c..0633244cc3f7f 100644
--- a/tests/System/integration/administrator/components/com_content/Articles.cy.js
+++ b/tests/System/integration/administrator/components/com_content/Articles.cy.js
@@ -1,14 +1,14 @@
-describe('Test that the articles back end list', () => {
+describe('Test in backend that the articles list', () => {
   beforeEach(() => {
     cy.doAdministratorLogin();
-    cy.visit('administrator/index.php?option=com_content&view=articles&filter=');
+    cy.visit('/administrator/index.php?option=com_content&view=articles&filter=');
   });
 
   it('has a title', () => {
     cy.get('h1.page-title').should('contain.text', 'Articles');
   });
 
-  it('can show a list of articles', () => {
+  it('can display a list of articles', () => {
     cy.db_createArticle({ title: 'Test article' }).then(() => {
       cy.reload();
 
diff --git a/tests/System/integration/administrator/components/com_cpanel/CPanel.cy.js b/tests/System/integration/administrator/components/com_cpanel/CPanel.cy.js
new file mode 100644
index 0000000000000..672a55aa811bd
--- /dev/null
+++ b/tests/System/integration/administrator/components/com_cpanel/CPanel.cy.js
@@ -0,0 +1,21 @@
+describe('Test in backend that the cpanel system dashboard', () => {
+  beforeEach(() => {
+    cy.doAdministratorLogin();
+    cy.visit('/administrator/index.php?option=com_cpanel&view=cpanel&dashboard=system');
+  });
+
+  it('has a title', () => {
+    cy.contains('h1', 'System Dashboard').should('exist');
+  });
+
+  it('can display the modules', () => {
+    cy.contains('h2', 'Setup').should('exist');
+    cy.contains('h2', 'Install').should('exist');
+    cy.contains('h2', 'Templates').should('exist');
+    cy.contains('h2', 'Maintenance').should('exist');
+    cy.contains('h2', 'Manage').should('exist');
+    cy.contains('h2', 'Information').should('exist');
+    cy.contains('h2', 'Update').should('exist');
+    cy.contains('h2', 'User Permissions ').should('exist');
+  });
+});
diff --git a/tests/System/integration/administrator/components/com_fields/Field.cy.js b/tests/System/integration/administrator/components/com_fields/Field.cy.js
index 7e797b6b7134c..3b7514e58e11d 100644
--- a/tests/System/integration/administrator/components/com_fields/Field.cy.js
+++ b/tests/System/integration/administrator/components/com_fields/Field.cy.js
@@ -1,9 +1,13 @@
-describe('Test that the field back end form', () => {
-  beforeEach(() => cy.doAdministratorLogin());
+describe('Test in backend that the field form', () => {
+  beforeEach(() => {
+    cy.doAdministratorLogin();
+    // Clear the filter
+    cy.visit('/administrator/index.php?option=com_fields&filter=');
+  });
   afterEach(() => cy.task('queryDB', "DELETE FROM #__fields WHERE title = 'Test field'"));
 
   it('can create a field', () => {
-    cy.visit('administrator/index.php?option=com_fields&task=field.add&context=com_content.article');
+    cy.visit('/administrator/index.php?option=com_fields&task=field.add&context=com_content.article');
     cy.get('#jform_title').clear().type('Test field');
     cy.clickToolbarButton('Save & Close');
 
@@ -11,9 +15,17 @@ describe('Test that the field back end form', () => {
     cy.contains('Test field');
   });
 
+  it('check redirection to list view', () => {
+    cy.visit('/administrator/index.php?option=com_fields&task=field.add&context=com_content.article');
+    cy.intercept('index.php?option=com_fields&view=fields&context=com_content.article').as('listview');
+    cy.clickToolbarButton('Cancel');
+
+    cy.wait('@listview');
+  });
+
   it('can edit a field', () => {
     cy.db_createField({ title: 'Test field' }).then((id) => {
-      cy.visit(`administrator/index.php?option=com_fields&task=field.edit&id=${id}&context=com_content.article`);
+      cy.visit(`/administrator/index.php?option=com_fields&task=field.edit&id=${id}&context=com_content.article`);
       cy.get('#jform_title').clear().type('Test field edited');
       cy.clickToolbarButton('Save & Close');
 
diff --git a/tests/System/integration/administrator/components/com_fields/Fields.cy.js b/tests/System/integration/administrator/components/com_fields/Fields.cy.js
index 65eaa3c45b572..8b6845b582edb 100644
--- a/tests/System/integration/administrator/components/com_fields/Fields.cy.js
+++ b/tests/System/integration/administrator/components/com_fields/Fields.cy.js
@@ -1,14 +1,14 @@
-describe('Test that the custom fields back end list', () => {
+describe('Test in backend that the custom fields list', () => {
   beforeEach(() => {
     cy.doAdministratorLogin();
-    cy.visit('administrator/index.php?option=com_fields&view=fields&context=com_content.article&filter=');
+    cy.visit('/administrator/index.php?option=com_fields&view=fields&context=com_content.article&filter=');
   });
 
   it('has a title', () => {
     cy.get('h1.page-title').should('contain.text', 'Fields');
   });
 
-  it('can show a list of fields', () => {
+  it('can display a list of fields', () => {
     cy.db_createField({ title: 'Test field' }).then(() => {
       cy.reload();
 
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 3d4c1aa2d3356..1aa5a4e6f7b87 100644
--- a/tests/System/integration/administrator/components/com_login/Login.cy.js
+++ b/tests/System/integration/administrator/components/com_login/Login.cy.js
@@ -1,5 +1,5 @@
-describe('Test that the login component', () => {
-  it('can log in and out in the back end', () => {
+describe('Test in backend that the login component', () => {
+  it('can log in and out', () => {
     cy.doAdministratorLogin(null, null, false);
     cy.doAdministratorLogout();
   });
diff --git a/tests/System/integration/administrator/components/com_media/Media.cy.js b/tests/System/integration/administrator/components/com_media/Media.cy.js
new file mode 100644
index 0000000000000..00c816bbb335a
--- /dev/null
+++ b/tests/System/integration/administrator/components/com_media/Media.cy.js
@@ -0,0 +1,90 @@
+describe('Test in backend that the media manager', () => {
+  beforeEach(() => {
+    cy.doAdministratorLogin(Cypress.env('username'), Cypress.env('password'));
+    cy.intercept('*format=json*task=api.files*').as('getMedia');
+  });
+
+  it('has a title', () => {
+    cy.visit('/administrator/index.php?option=com_media');
+    cy.wait('@getMedia');
+
+    cy.get('h1.page-title').should('contain.text', 'Media');
+  });
+
+  it('can display the local media data when no path is defined', () => {
+    cy.visit('/administrator/index.php?option=com_media');
+    cy.wait('@getMedia');
+
+    cy.get('.media-container').should('contain.text', 'Local');
+    cy.get('.media-browser .media-browser-item-directory').should('exist');
+    cy.get('.media-browser .media-browser-image').should('exist');
+  });
+
+  it('can display the local media data when an adapter is defined in the url', () => {
+    cy.visit('/administrator/index.php?option=com_media&path=local-images:/');
+    cy.wait('@getMedia');
+
+    cy.get('.media-browser .media-browser-image').should('contain.text', 'joomla_black.png');
+  });
+
+  it('can display the local media data when an adapter is defined in the session', () => {
+    window.sessionStorage.setItem('joomla.mediamanager', JSON.stringify({ selectedDirectory: 'local-images:/' }));
+    cy.visit('/administrator/index.php?option=com_media');
+    cy.wait('@getMedia');
+
+    cy.get('.media-browser .media-browser-image').should('contain.text', 'joomla_black.png');
+  });
+
+  it('can display the first adapter files when an invalid adapter is defined in the url', () => {
+    cy.visit('/administrator/index.php?option=com_media&path=local-invalid:/');
+    cy.wait('@getMedia');
+
+    cy.get('.media-browser .media-browser-image').should('contain.text', 'joomla_black.png');
+  });
+
+  it('can display the first adapter files when an invalid adapter is defined in the session', () => {
+    window.sessionStorage.setItem('joomla.mediamanager', JSON.stringify({ selectedDirectory: 'local-invalid:/' }));
+    cy.visit('/administrator/index.php?option=com_media');
+    cy.wait('@getMedia');
+
+    cy.get('.media-browser .media-browser-image').should('contain.text', 'joomla_black.png');
+  });
+
+  it('can display the local media data from the path in the url', () => {
+    cy.visit('/administrator/index.php?option=com_media&path=local-images:/sampledata/cassiopeia');
+    cy.wait('@getMedia');
+
+    cy.get('.media-browser .media-browser-image').should('contain.text', 'nasa1-1200.jpg');
+  });
+
+  it('can display the local media data from the path in the session', () => {
+    window.sessionStorage.setItem('joomla.mediamanager', JSON.stringify({ selectedDirectory: 'local-images:/sampledata/cassiopeia' }));
+    cy.visit('/administrator/index.php?option=com_media');
+    cy.wait('@getMedia');
+
+    cy.get('.media-browser .media-browser-image').should('contain.text', 'nasa1-1200.jpg');
+  });
+
+  it('can display the local media data from the path in the url when also defined in the session', () => {
+    window.sessionStorage.setItem('joomla.mediamanager', JSON.stringify({ selectedDirectory: 'local-images:/banners' }));
+    cy.visit('/administrator/index.php?option=com_media&path=local-images:/sampledata/cassiopeia');
+    cy.wait('@getMedia');
+
+    cy.get('.media-browser .media-browser-image').should('contain.text', 'nasa1-1200.jpg');
+  });
+
+  it('can display an error message when an invalid path is defined in the url', () => {
+    cy.visit('/administrator/index.php?option=com_media&path=local-images:/invalid');
+    cy.wait('@getMedia');
+
+    cy.get('#system-message-container').should('contain.text', 'File or Folder not found');
+  });
+
+  it('can display an error message when an invalid path is defined in the session', () => {
+    window.sessionStorage.setItem('joomla.mediamanager', JSON.stringify({ selectedDirectory: 'local-images:/invalid' }));
+    cy.visit('/administrator/index.php?option=com_media');
+    cy.wait('@getMedia');
+
+    cy.get('#system-message-container').should('contain.text', 'File or Folder not found');
+  });
+});
diff --git a/tests/System/integration/administrator/components/com_menu/Menu.cy.js b/tests/System/integration/administrator/components/com_menu/Menu.cy.js
index 044b995fde58d..a1d0055097f75 100644
--- a/tests/System/integration/administrator/components/com_menu/Menu.cy.js
+++ b/tests/System/integration/administrator/components/com_menu/Menu.cy.js
@@ -1,9 +1,9 @@
-describe('Test that the user back end form', () => {
+describe('Test in backend that the user form', () => {
   beforeEach(() => cy.doAdministratorLogin());
   afterEach(() => cy.task('queryDB', "DELETE FROM #__menu_types WHERE menutype = 'test'"));
 
   it('can create a new menu', () => {
-    cy.visit('administrator/index.php?option=com_menus&task=menu.add');
+    cy.visit('/administrator/index.php?option=com_menus&task=menu.add');
 
     cy.get('#jform_title').clear().type('test menu');
     cy.get('#jform_menutype').clear().type('test');
diff --git a/tests/System/integration/administrator/components/com_menu/MenuItem.cy.js b/tests/System/integration/administrator/components/com_menu/MenuItem.cy.js
index 1cdc0bd80ce83..d2a9c9ab9b9c4 100644
--- a/tests/System/integration/administrator/components/com_menu/MenuItem.cy.js
+++ b/tests/System/integration/administrator/components/com_menu/MenuItem.cy.js
@@ -1,12 +1,12 @@
-describe('Test that the menu back end list', () => {
+describe('Test in backend that the menu list', () => {
   beforeEach(() => {
     cy.doAdministratorLogin();
-    cy.visit('administrator/index.php?option=com_menus&view=items&menutype=mainmenu');
+    cy.visit('/administrator/index.php?option=com_menus&view=items&menutype=mainmenu');
   });
 
   it('has a title', () => cy.get('h1.page-title').should('contain.text', 'Menus: Items'));
 
-  it('can show a list of menu items', () => {
+  it('can display a list of menu items', () => {
     cy.db_createMenuItem({ title: 'Test menu item' }).then(() => {
       cy.reload();
 
diff --git a/tests/System/integration/administrator/components/com_menu/Menus.cy.js b/tests/System/integration/administrator/components/com_menu/Menus.cy.js
index bf85fe031a647..d606f4574ce2f 100644
--- a/tests/System/integration/administrator/components/com_menu/Menus.cy.js
+++ b/tests/System/integration/administrator/components/com_menu/Menus.cy.js
@@ -1,12 +1,12 @@
-describe('Test that the menu back end list', () => {
+describe('Test in backend that the menu list', () => {
   beforeEach(() => {
     cy.doAdministratorLogin();
-    cy.visit('administrator/index.php?option=com_menus&view=menus&filter=');
+    cy.visit('/administrator/index.php?option=com_menus&view=menus&filter=');
   });
 
   it('has a title', () => cy.get('h1.page-title').should('contain.text', 'Menus'));
 
-  it('can show a list of menus', () => cy.contains('Main Menu'));
+  it('can display a list of menus', () => cy.contains('Main Menu'));
 
   it('can open the menu form', () => {
     cy.clickToolbarButton('New');
diff --git a/tests/System/integration/administrator/components/com_modules/Module.cy.js b/tests/System/integration/administrator/components/com_modules/Module.cy.js
new file mode 100644
index 0000000000000..761d79fa9aea5
--- /dev/null
+++ b/tests/System/integration/administrator/components/com_modules/Module.cy.js
@@ -0,0 +1,27 @@
+describe('Test in backend that the module form', () => {
+  beforeEach(() => {
+    cy.doAdministratorLogin();
+    // Clear the filter
+    cy.visit('/administrator/index.php?option=com_modules&filter=');
+  });
+  afterEach(() => cy.task('queryDB', "DELETE FROM #__modules WHERE title = 'Test module'"));
+
+  it('can create a module', () => {
+    cy.visit('/administrator/index.php?option=com_modules&task=module.add&client_id=0&eid=44');
+    cy.get('#jform_title').clear().type('Test module');
+    cy.clickToolbarButton('Save & Close');
+
+    cy.get('#system-message-container').contains('Module saved').should('exist');
+    cy.contains('Test module');
+  });
+
+  it('can edit a module', () => {
+    cy.db_createModule({ title: 'Test module', module: 'mod_custom' }).then((id) => {
+      cy.visit(`/administrator/index.php?option=com_modules&task=module.edit&id=${id}`);
+      cy.get('#jform_title').clear().type('Test module edited');
+      cy.clickToolbarButton('Save & Close');
+
+      cy.contains('Test module edited');
+    });
+  });
+});
diff --git a/tests/System/integration/administrator/components/com_modules/Modules.cy.js b/tests/System/integration/administrator/components/com_modules/Modules.cy.js
new file mode 100644
index 0000000000000..d6c7bca3758c8
--- /dev/null
+++ b/tests/System/integration/administrator/components/com_modules/Modules.cy.js
@@ -0,0 +1,76 @@
+describe('Test in backend that the module list', () => {
+  beforeEach(() => {
+    cy.doAdministratorLogin();
+    cy.visit('/administrator/index.php?option=com_modules&view=modules&filter=');
+  });
+
+  it('has a title', () => {
+    cy.get('h1.page-title').should('contain.text', 'Modules');
+  });
+
+  it('can display a list of modules', () => {
+    cy.db_createModule({ title: 'Test module', module: 'mod_custom' }).then(() => {
+      cy.reload();
+
+      cy.contains('Test module');
+    });
+  });
+
+  it('can open the module list', () => {
+    cy.clickToolbarButton('New');
+
+    cy.contains('Select a Module Type');
+  });
+
+  it('can publish the test module', () => {
+    cy.db_createModule({ title: 'Test module', module: 'mod_custom', published: 0 }).then(() => {
+      cy.reload();
+      cy.searchForItem('Test module');
+      cy.checkAllResults();
+      cy.clickToolbarButton('Action');
+      cy.contains('Publish').click();
+      cy.on('window:confirm', () => true);
+
+      cy.get('#system-message-container').contains('Module published').should('exist');
+    });
+  });
+
+  it('can unpublish the test module', () => {
+    cy.db_createModule({ title: 'Test module', module: 'mod_custom', published: 1 }).then(() => {
+      cy.reload();
+      cy.searchForItem('Test module');
+      cy.checkAllResults();
+      cy.clickToolbarButton('Action');
+      cy.contains('Unpublish').click();
+      cy.on('window:confirm', () => true);
+
+      cy.get('#system-message-container').contains('Module unpublished').should('exist');
+    });
+  });
+
+  it('can trash the test module', () => {
+    cy.db_createModule({ title: 'Test module', module: 'mod_custom' }).then(() => {
+      cy.reload();
+      cy.searchForItem('Test module');
+      cy.checkAllResults();
+      cy.clickToolbarButton('Action');
+      cy.contains('Trash').click();
+      cy.on('window:confirm', () => true);
+
+      cy.get('#system-message-container').contains('Module trashed').should('exist');
+    });
+  });
+
+  it('can delete the test module', () => {
+    cy.db_createModule({ title: 'Test module', module: 'mod_custom', published: -2 }).then(() => {
+      cy.reload();
+      cy.setFilter('state', 'Trashed');
+      cy.searchForItem('Test module');
+      cy.checkAllResults();
+      cy.clickToolbarButton('empty trash');
+      cy.on('window:confirm', () => true);
+
+      cy.get('#system-message-container').contains('Module deleted').should('exist');
+    });
+  });
+});
diff --git a/tests/System/integration/administrator/components/com_newsfeeds/Newsfeed.cy.js b/tests/System/integration/administrator/components/com_newsfeeds/Newsfeed.cy.js
new file mode 100644
index 0000000000000..d3eac81b022ec
--- /dev/null
+++ b/tests/System/integration/administrator/components/com_newsfeeds/Newsfeed.cy.js
@@ -0,0 +1,32 @@
+describe('Test in backend that the newsfeed form', () => {
+  beforeEach(() => cy.doAdministratorLogin());
+  afterEach(() => cy.task('queryDB', "DELETE FROM #__newsfeeds WHERE name = 'Test newsfeed'"));
+
+  it('can create a newsfeed', () => {
+    cy.visit('/administrator/index.php?option=com_newsfeeds&task=newsfeed.add');
+    cy.get('#jform_name').clear().type('Test newsfeed');
+    cy.get('#jform_link').clear().type('https://newsfeedtesturl');
+    cy.clickToolbarButton('Save & Close');
+
+    cy.get('#system-message-container').contains('News feed saved.').should('exist');
+    cy.contains('Test newsfeed');
+  });
+
+  it('can change access level of a test newsfeed', () => {
+    cy.db_createNewsFeed({ name: 'Test newsfeed', link: 'https://newsfeedtesturl' }).then((feed) => {
+      cy.visit(`/administrator/index.php?option=com_newsfeeds&task=newsfeed.edit&id=${feed.id}`);
+      cy.get('#jform_access').select('Special');
+      cy.clickToolbarButton('Save & Close');
+
+      cy.get('td').contains('Special').should('exist');
+    });
+  });
+
+  it('check redirection to list view', () => {
+    cy.visit('administrator/index.php?option=com_newsfeeds&task=newsfeed.add');
+    cy.intercept('index.php?option=com_newsfeeds&view=newsfeeds').as('listview');
+    cy.clickToolbarButton('Cancel');
+
+    cy.wait('@listview');
+  });
+});
diff --git a/tests/System/integration/administrator/components/com_newsfeeds/Newsfeeds.cy.js b/tests/System/integration/administrator/components/com_newsfeeds/Newsfeeds.cy.js
new file mode 100644
index 0000000000000..e81123d18243d
--- /dev/null
+++ b/tests/System/integration/administrator/components/com_newsfeeds/Newsfeeds.cy.js
@@ -0,0 +1,76 @@
+describe('Test in backend that the newsfeeds list', () => {
+  beforeEach(() => {
+    cy.doAdministratorLogin();
+    cy.visit('/administrator/index.php?option=com_newsfeeds&view=newsfeeds&filter=');
+  });
+
+  it('has a title', () => {
+    cy.get('h1.page-title').should('contain.text', 'News Feeds');
+  });
+
+  it('can display a list of newsfeeds', () => {
+    cy.db_createNewsFeed({ name: 'Test newsfeed' }).then(() => {
+      cy.reload();
+
+      cy.contains('Test newsfeed');
+    });
+  });
+
+  it('can open the newsfeed form', () => {
+    cy.clickToolbarButton('New');
+
+    cy.contains('News Feeds: New');
+  });
+
+  it('can publish the test newsfeed', () => {
+    cy.db_createNewsFeed({ name: 'Test newsfeed', link: 'https://newsfeedtesturl', published: 0 }).then(() => {
+      cy.reload();
+      cy.searchForItem('Test newsfeed');
+      cy.checkAllResults();
+      cy.clickToolbarButton('Action');
+      cy.contains('Publish').click();
+      cy.on('window:confirm', () => true);
+
+      cy.get('#system-message-container').contains('News feed published.').should('exist');
+    });
+  });
+
+  it('can unpublish the test newsfeed', () => {
+    cy.db_createNewsFeed({ name: 'Test newsfeed', link: 'https://newsfeedtesturl', published: 1 }).then(() => {
+      cy.reload();
+      cy.searchForItem('Test newsfeed');
+      cy.checkAllResults();
+      cy.clickToolbarButton('Action');
+      cy.contains('Unpublish').click();
+      cy.on('window:confirm', () => true);
+
+      cy.get('#system-message-container').contains('News feed unpublished.').should('exist');
+    });
+  });
+
+  it('can trash the test newsfeed', () => {
+    cy.db_createNewsFeed({ name: 'Test newsfeed', link: 'https://newsfeedtesturl' }).then(() => {
+      cy.reload();
+      cy.searchForItem('Test newsfeed');
+      cy.checkAllResults();
+      cy.clickToolbarButton('Action');
+      cy.contains('Trash').click();
+      cy.on('window:confirm', () => true);
+
+      cy.get('#system-message-container').contains('News feed trashed.').should('exist');
+    });
+  });
+
+  it('can delete the test newsfeed', () => {
+    cy.db_createNewsFeed({ name: 'Test newsfeed', link: 'https://newsfeedtesturl', published: -2 }).then(() => {
+      cy.reload();
+      cy.setFilter('published', 'Trashed');
+      cy.searchForItem('Test newsfeed');
+      cy.checkAllResults();
+      cy.clickToolbarButton('empty trash');
+      cy.on('window:confirm', () => true);
+
+      cy.get('#system-message-container').contains('News feed deleted.').should('exist');
+    });
+  });
+});
diff --git a/tests/System/integration/administrator/components/com_tags/Tag.cy.js b/tests/System/integration/administrator/components/com_tags/Tag.cy.js
new file mode 100644
index 0000000000000..c9dc6fbf07121
--- /dev/null
+++ b/tests/System/integration/administrator/components/com_tags/Tag.cy.js
@@ -0,0 +1,35 @@
+describe('Test in backend that the tag form', () => {
+  beforeEach(() => {
+    cy.doAdministratorLogin();
+    // Clear the filter
+    cy.visit('/administrator/index.php?option=com_tags&filter=');
+  });
+  afterEach(() => cy.task('queryDB', "DELETE FROM #__tags WHERE title = 'Test tag'"));
+
+  it('can create a tag', () => {
+    cy.visit('/administrator/index.php?option=com_tags&task=tag.add');
+    cy.get('#jform_title').clear().type('Test tag');
+    cy.clickToolbarButton('Save & Close');
+
+    cy.get('#system-message-container').contains('Tag saved').should('exist');
+    cy.contains('Test tag');
+  });
+
+  it('can edit a tag', () => {
+    cy.db_createTag({ title: 'Test tag' }).then((id) => {
+      cy.visit(`/administrator/index.php?option=com_tags&task=tag.edit&id=${id}`);
+      cy.get('#jform_title').clear().type('Test tag edited');
+      cy.clickToolbarButton('Save & Close');
+
+      cy.contains('Test tag edited');
+    });
+  });
+
+  it('check redirection to list view', () => {
+    cy.visit('/administrator/index.php?option=com_tags&task=tag.add');
+    cy.intercept('index.php?option=com_tags&view=tags').as('listview');
+    cy.clickToolbarButton('Cancel');
+
+    cy.wait('@listview');
+  });
+});
diff --git a/tests/System/integration/administrator/components/com_tags/Tags.cy.js b/tests/System/integration/administrator/components/com_tags/Tags.cy.js
new file mode 100644
index 0000000000000..5590a9355d70a
--- /dev/null
+++ b/tests/System/integration/administrator/components/com_tags/Tags.cy.js
@@ -0,0 +1,76 @@
+describe('Test in backend that the custom tags list', () => {
+  beforeEach(() => {
+    cy.doAdministratorLogin();
+    cy.visit('/administrator/index.php?option=com_tags&view=tags&filter=');
+  });
+
+  it('has a title', () => {
+    cy.get('h1.page-title').should('contain.text', 'Tags');
+  });
+
+  it('can display a list of tags', () => {
+    cy.db_createTag({ title: 'Test tag' }).then(() => {
+      cy.reload();
+
+      cy.contains('Test tag');
+    });
+  });
+
+  it('can open the tag form', () => {
+    cy.clickToolbarButton('New');
+
+    cy.contains('Tags: New');
+  });
+
+  it('can publish the test tag', () => {
+    cy.db_createTag({ title: 'Test tag', published: 0 }).then(() => {
+      cy.reload();
+      cy.searchForItem('Test tag');
+      cy.checkAllResults();
+      cy.clickToolbarButton('Action');
+      cy.contains('Publish').click();
+      cy.on('window:confirm', () => true);
+
+      cy.get('#system-message-container').contains('Tag published').should('exist');
+    });
+  });
+
+  it('can unpublish the test tag', () => {
+    cy.db_createTag({ title: 'Test tag', published: 1 }).then(() => {
+      cy.reload();
+      cy.searchForItem('Test tag');
+      cy.checkAllResults();
+      cy.clickToolbarButton('Action');
+      cy.contains('Unpublish').click();
+      cy.on('window:confirm', () => true);
+
+      cy.get('#system-message-container').contains('Tag unpublished').should('exist');
+    });
+  });
+
+  it('can trash the test tag', () => {
+    cy.db_createTag({ title: 'Test tag' }).then(() => {
+      cy.reload();
+      cy.searchForItem('Test tag');
+      cy.checkAllResults();
+      cy.clickToolbarButton('Action');
+      cy.contains('Trash').click();
+      cy.on('window:confirm', () => true);
+
+      cy.get('#system-message-container').contains('Tag trashed').should('exist');
+    });
+  });
+
+  it('can delete the test tag', () => {
+    cy.db_createTag({ title: 'Test tag', published: -2 }).then(() => {
+      cy.reload();
+      cy.setFilter('published', 'Trashed');
+      cy.searchForItem('Test tag');
+      cy.checkAllResults();
+      cy.clickToolbarButton('empty trash');
+      cy.on('window:confirm', () => true);
+
+      cy.get('#system-message-container').contains('Tag deleted').should('exist');
+    });
+  });
+});
diff --git a/tests/System/integration/administrator/components/com_users/User.cy.js b/tests/System/integration/administrator/components/com_users/User.cy.js
index dd34c6b4e7ab5..9e72cccb43e61 100644
--- a/tests/System/integration/administrator/components/com_users/User.cy.js
+++ b/tests/System/integration/administrator/components/com_users/User.cy.js
@@ -1,9 +1,9 @@
-describe('Test that the user back end form', () => {
+describe('Test in backend that the user form', () => {
   beforeEach(() => cy.doAdministratorLogin());
   afterEach(() => cy.task('queryDB', "DELETE FROM #__users WHERE username = 'test'"));
 
   it('can create a new user', () => {
-    cy.visit('administrator/index.php?option=com_users&task=user.add');
+    cy.visit('/administrator/index.php?option=com_users&task=user.add');
 
     cy.get('#jform_name').clear().type('test user');
     cy.get('#jform_username').clear().type('test');
@@ -18,7 +18,7 @@ describe('Test that the user back end form', () => {
 
   it('can edit a user', () => {
     cy.db_createUser().then((id) => {
-      cy.visit(`administrator/index.php?option=com_users&task=user.edit&id=${id}`);
+      cy.visit(`/administrator/index.php?option=com_users&task=user.edit&id=${id}`);
 
       cy.get('#jform_name').clear().type('test edited');
       cy.get('#jform_username').clear().type('testedited');
diff --git a/tests/System/integration/administrator/components/com_users/Users.cy.js b/tests/System/integration/administrator/components/com_users/Users.cy.js
index dd652765da4ac..11e23e907730d 100644
--- a/tests/System/integration/administrator/components/com_users/Users.cy.js
+++ b/tests/System/integration/administrator/components/com_users/Users.cy.js
@@ -1,14 +1,14 @@
-describe('Test that the user back end list', () => {
+describe('Test in backend that the user list', () => {
   beforeEach(() => {
     cy.doAdministratorLogin();
-    cy.visit('administrator/index.php?option=com_users&view=users&filter=');
+    cy.visit('/administrator/index.php?option=com_users&view=users&filter=');
   });
 
   it('has a title', () => {
     cy.get('h1.page-title').should('contain.text', 'Users');
   });
 
-  it('can show a list of users', () => {
+  it('can display a list of users', () => {
     cy.db_createUser({ name: 'Test user' }).then(() => {
       cy.reload();
 
diff --git a/tests/System/integration/api/com_banners/Banners.cy.js b/tests/System/integration/api/com_banners/Banners.cy.js
index 3b4851f387b59..6619b1ed4ee6f 100644
--- a/tests/System/integration/api/com_banners/Banners.cy.js
+++ b/tests/System/integration/api/com_banners/Banners.cy.js
@@ -9,6 +9,14 @@ describe('Test that banners API endpoint', () => {
         .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}`))
+      .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+        .its('name')
+        .should('include', 'automated test banner'));
+  });
+
   it('can create a banner', () => {
     cy.db_createCategory({ extension: 'com_banners' })
       .then((categoryId) => cy.api_post('/banners', {
@@ -30,7 +38,7 @@ describe('Test that banners API endpoint', () => {
 
   it('can update a banner', () => {
     cy.db_createBanner({ name: 'automated test banner' })
-      .then((id) => cy.api_patch(`/banners/${id}`, { name: 'updated automated test banner' }))
+      .then((banner) => cy.api_patch(`/banners/${banner.id}`, { name: 'updated automated test banner' }))
       .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
         .its('name')
         .should('include', 'updated automated test banner'));
@@ -38,6 +46,6 @@ describe('Test that banners API endpoint', () => {
 
   it('can delete a banner', () => {
     cy.db_createBanner({ name: 'automated test banner', state: -2 })
-      .then((id) => cy.api_delete(`/banners/${id}`));
+      .then((banner) => cy.api_delete(`/banners/${banner.id}`));
   });
 });
diff --git a/tests/System/integration/api/com_banners/Categories.cy.js b/tests/System/integration/api/com_banners/Categories.cy.js
new file mode 100644
index 0000000000000..66f54b16f50a5
--- /dev/null
+++ b/tests/System/integration/api/com_banners/Categories.cy.js
@@ -0,0 +1,33 @@
+describe('Test that banners categories API endpoint', () => {
+  afterEach(() => cy.task('queryDB', "DELETE FROM #__categories WHERE title = 'automated test banner category'"));
+
+  it('can display a list of categories', () => {
+    cy.db_createCategory({ title: 'automated test banner category', extension: 'com_banners' })
+      .then((id) => cy.db_createBanner({ name: 'automated test banner', catid: id }))
+      .then(() => cy.api_get('/banners/categories'))
+      .then((response) => cy.api_responseContains(response, 'title', 'automated test banner category'));
+  });
+
+  it('can display a single category', () => {
+    cy.db_createCategory({ title: 'automated test banner category', extension: 'com_banners' })
+      .then((id) => cy.api_get(`/banners/categories/${id}`))
+      .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+        .its('title')
+        .should('include', 'automated test banner category'));
+  });
+
+  it('can create a category', () => {
+    cy.api_post('/banners/categories', { title: 'automated test banner category' })
+      .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+        .its('title')
+        .should('include', 'automated test banner category'));
+  });
+
+  it('can update a category', () => {
+    cy.db_createCategory({ title: 'automated test banner category', extension: 'com_banners' })
+      .then((id) => cy.api_patch(`/banners/categories/${id}`, { title: 'updated automated test banner category' }))
+      .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+        .its('title')
+        .should('include', 'updated automated test banner category'));
+  });
+});
diff --git a/tests/System/integration/api/com_banners/Clients.cy.js b/tests/System/integration/api/com_banners/Clients.cy.js
new file mode 100644
index 0000000000000..fb731827264e4
--- /dev/null
+++ b/tests/System/integration/api/com_banners/Clients.cy.js
@@ -0,0 +1,44 @@
+describe('Test that banners clients API endpoint', () => {
+  afterEach(() => cy.task('queryDB', 'DELETE FROM #__banner_clients'));
+
+  it('can deliver a list of clients', () => {
+    cy.db_createBannerClient({ name: 'automated test banner client' })
+      .then(() => cy.api_get('/banners/clients'))
+      .then((response) => cy.wrap(response).its('body').its('data.0').its('attributes')
+        .its('name')
+        .should('include', 'automated test banner client'));
+  });
+
+  it('can deliver a single client', () => {
+    cy.db_createBannerClient({ name: 'automated test banner client' })
+      .then((bannerclient) => cy.api_get(`/banners/clients/${bannerclient.id}`))
+      .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+        .its('name')
+        .should('include', 'automated test banner client'));
+  });
+
+  it('can create a client', () => {
+    cy.api_post('/banners/clients', {
+      name: 'automated test banner client',
+      contact: 'automated test banner client',
+      state: 1,
+      extrainfo: '',
+    })
+      .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+        .its('name')
+        .should('include', 'automated test banner client'));
+  });
+
+  it('can update a client', () => {
+    cy.db_createBannerClient({ name: 'automated test banner client' })
+      .then((bannerclient) => cy.api_patch(`/banners/clients/${bannerclient.id}`, { name: 'updated automated test banner client' }))
+      .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+        .its('name')
+        .should('include', 'updated automated test banner client'));
+  });
+
+  it('can delete a client', () => {
+    cy.db_createBannerClient({ name: 'automated test banner client', state: -2 })
+      .then((bannerclient) => cy.api_delete(`/banners/clients/${bannerclient.id}`));
+  });
+});
diff --git a/tests/System/integration/api/com_contact/Categories.cy.js b/tests/System/integration/api/com_contact/Categories.cy.js
new file mode 100644
index 0000000000000..78093a74b6635
--- /dev/null
+++ b/tests/System/integration/api/com_contact/Categories.cy.js
@@ -0,0 +1,33 @@
+describe('Test that contact categories API endpoint', () => {
+  afterEach(() => cy.task('queryDB', "DELETE FROM #__categories WHERE title = 'automated test contact category'"));
+
+  it('can display a list of categories', () => {
+    cy.db_createCategory({ title: 'automated test contact category', extension: 'com_contact' })
+      .then((id) => cy.db_createContact({ name: 'automated test contact', catid: id }))
+      .then(() => cy.api_get('/contacts/categories'))
+      .then((response) => cy.api_responseContains(response, 'title', 'automated test contact category'));
+  });
+
+  it('can display a single category', () => {
+    cy.db_createCategory({ title: 'automated test contact category', extension: 'com_contact' })
+      .then((id) => cy.api_get(`/contacts/categories/${id}`))
+      .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+        .its('title')
+        .should('include', 'automated test contact category'));
+  });
+
+  it('can create a category', () => {
+    cy.api_post('/contacts/categories', { title: 'automated test contact category' })
+      .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+        .its('title')
+        .should('include', 'automated test contact category'));
+  });
+
+  it('can update a category', () => {
+    cy.db_createCategory({ title: 'automated test contact category', extension: 'com_contact' })
+      .then((id) => cy.api_patch(`/contacts/categories/${id}`, { title: 'updated automated test contact category' }))
+      .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+        .its('title')
+        .should('include', 'updated automated test contact category'));
+  });
+});
diff --git a/tests/System/integration/api/com_contact/Contacts.cy.js b/tests/System/integration/api/com_contact/Contacts.cy.js
index 428e5355d4f8e..632e7bd0e6af1 100644
--- a/tests/System/integration/api/com_contact/Contacts.cy.js
+++ b/tests/System/integration/api/com_contact/Contacts.cy.js
@@ -1,4 +1,5 @@
 describe('Test that contacts API endpoint', () => {
+  beforeEach(() => cy.task('clearEmails'));
   afterEach(() => cy.task('queryDB', 'DELETE FROM #__contact_details'));
 
   it('can deliver a list of contacts', () => {
@@ -9,8 +10,16 @@ describe('Test that contacts API endpoint', () => {
         .should('include', 'automated test contact'));
   });
 
+  it('can deliver a single contact', () => {
+    cy.db_createContact({ name: 'automated test contact' })
+      .then((contact) => cy.api_get(`/contacts/${contact.id}`))
+      .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+        .its('name')
+        .should('include', 'automated test contact'));
+  });
+
   it('can create a contact', () => {
-    cy.db_createCategory({ extension: 'com_contacts' })
+    cy.db_createCategory({ extension: 'com_contact' })
       .then((categoryId) => cy.api_post('/contacts', {
         name: 'automated test contact',
         alias: 'test-contact',
@@ -25,7 +34,7 @@ describe('Test that contacts API endpoint', () => {
 
   it('can update a contact', () => {
     cy.db_createContact({ name: 'automated test contact', access: 1 })
-      .then((id) => cy.api_patch(`/contacts/${id}`, { name: 'updated automated test contact' }))
+      .then((contact) => cy.api_patch(`/contacts/${contact.id}`, { name: 'updated automated test contact' }))
       .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
         .its('name')
         .should('include', 'updated automated test contact'));
@@ -33,6 +42,28 @@ describe('Test that contacts API endpoint', () => {
 
   it('can delete a contact', () => {
     cy.db_createContact({ name: 'automated test contact', published: -2 })
-      .then((id) => cy.api_delete(`/contacts/${id}`));
+      .then((contact) => cy.api_delete(`/contacts/${contact.id}`));
+  });
+
+  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_subject: 'automated test subject',
+        contact_message: 'automated test message',
+      }))
+      .then((response) => cy.wrap(response).its('status')
+        .should('equal', 200));
+
+    cy.task('getMails').then((mails) => {
+      cy.wrap(mails).should('have.lengthOf', 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].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', 'automated test message');
+    });
   });
 });
diff --git a/tests/System/integration/api/com_contact/Field_Group.cy.js b/tests/System/integration/api/com_contact/Field_Group.cy.js
new file mode 100644
index 0000000000000..ed80eead8d7e6
--- /dev/null
+++ b/tests/System/integration/api/com_contact/Field_Group.cy.js
@@ -0,0 +1,69 @@
+describe('Test that group field contact API endpoint', () => {
+  afterEach(() => cy.task('queryDB', 'DELETE FROM #__fields_groups'));
+
+  ['contact', 'mail', 'categories'].forEach((context) => {
+    it(`can deliver a list of group fields (${context})`, () => {
+      cy.db_createFieldGroup({ title: `automated test group field contacts ${context}`, context: `com_contact.${context}` })
+        .then(() => cy.api_get(`/fields/groups/contacts/${context}`))
+        .then((response) => cy.wrap(response).its('body').its('data.0').its('attributes')
+          .its('title')
+          .should('include', `automated test group field contacts ${context}`));
+    });
+
+    it(`can deliver a single group field (${context})`, () => {
+      cy.db_createFieldGroup({ title: `automated test group field contacts ${context}`, context: `com_contact.${context}` })
+        .then((id) => cy.api_get(`/fields/groups/contacts/${context}/${id}`))
+        .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+          .its('title')
+          .should('include', `automated test group field contacts ${context}`));
+    });
+
+    it(`can create a group field (${context})`, () => {
+      cy.api_post(`/fields/groups/contacts/${context}`, {
+        title: `automated test group field contacts ${context}`,
+        access: 1,
+        context: `com_contact.${context}`,
+        default_value: '',
+        description: '',
+        group_id: 0,
+        label: 'contact group field',
+        language: '*',
+        name: 'contact-group_field',
+        note: '',
+        params: {
+          class: '',
+          display: '2',
+          display_readonly: '2',
+          hint: '',
+          label_class: '',
+          label_render_class: '',
+          layout: '',
+          prefix: '',
+          render_class: '',
+          show_on: '',
+          showlabel: '1',
+          suffix: '',
+        },
+        required: 0,
+        state: 1,
+        type: 'text',
+      })
+        .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+          .its('title')
+          .should('include', `automated test group field contacts ${context}`));
+    });
+
+    it(`can update a group field (${context})`, () => {
+      cy.db_createFieldGroup({ title: 'automated test group field', access: 1, context: `com_contact.${context}` })
+        .then((id) => cy.api_patch(`/fields/groups/contacts/${context}/${id}`, { title: `updated automated test group field ${context}` }))
+        .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+          .its('title')
+          .should('include', `updated automated test group field ${context}`));
+    });
+
+    it(`can delete a group field (${context})`, () => {
+      cy.db_createFieldGroup({ title: 'automated test group field', context: `com_contact.${context}`, state: -2 })
+        .then((id) => cy.api_delete(`/fields/groups/contacts/${context}/${id}`));
+    });
+  });
+});
diff --git a/tests/System/integration/api/com_contact/Fields.cy.js b/tests/System/integration/api/com_contact/Fields.cy.js
new file mode 100644
index 0000000000000..c6e5edb55abd7
--- /dev/null
+++ b/tests/System/integration/api/com_contact/Fields.cy.js
@@ -0,0 +1,69 @@
+describe('Test that field contact API endpoint', () => {
+  afterEach(() => cy.task('queryDB', 'DELETE FROM #__fields'));
+
+  ['contact', 'mail', 'categories'].forEach((context) => {
+    it(`can deliver a list of fields (${context})`, () => {
+      cy.db_createField({ title: `automated test field contacts ${context}`, context: `com_contact.${context}` })
+        .then(() => cy.api_get(`/fields/contacts/${context}`))
+        .then((response) => cy.wrap(response).its('body').its('data.0').its('attributes')
+          .its('title')
+          .should('include', `automated test field contacts ${context}`));
+    });
+
+    it(`can deliver a single field (${context})`, () => {
+      cy.db_createField({ title: `automated test field contacts ${context}`, context: `com_contact.${context}` })
+        .then((id) => cy.api_get(`/fields/contacts/${context}/${id}`))
+        .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+          .its('title')
+          .should('include', `automated test field contacts ${context}`));
+    });
+
+    it(`can create a field (${context})`, () => {
+      cy.api_post(`/fields/contacts/${context}`, {
+        title: `automated test field contacts ${context}`,
+        access: 1,
+        context: `com_contact.${context}`,
+        default_value: '',
+        description: '',
+        group_id: 0,
+        label: 'contact field',
+        language: '*',
+        name: 'contact-field',
+        note: '',
+        params: {
+          class: '',
+          display: '2',
+          display_readonly: '2',
+          hint: '',
+          label_class: '',
+          label_render_class: '',
+          layout: '',
+          prefix: '',
+          render_class: '',
+          show_on: '',
+          showlabel: '1',
+          suffix: '',
+        },
+        required: 0,
+        state: 1,
+        type: 'text',
+      })
+        .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+          .its('title')
+          .should('include', `automated test field contacts ${context}`));
+    });
+
+    it(`can update a field (${context})`, () => {
+      cy.db_createField({ title: 'automated test field', context: `com_contact.${context}` })
+        .then((id) => cy.api_patch(`/fields/contacts/${context}/${id}`, { title: `updated automated test field ${context}` }))
+        .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+          .its('title')
+          .should('include', `updated automated test field ${context}`));
+    });
+
+    it(`can delete a field (${context})`, () => {
+      cy.db_createField({ title: 'automated test field', context: `com_contact.${context}`, state: -2 })
+        .then((id) => cy.api_delete(`/fields/contacts/${context}/${id}`));
+    });
+  });
+});
diff --git a/tests/System/integration/api/com_content/Articles.cy.js b/tests/System/integration/api/com_content/Articles.cy.js
index c90c477059308..d1a31b94160cd 100644
--- a/tests/System/integration/api/com_content/Articles.cy.js
+++ b/tests/System/integration/api/com_content/Articles.cy.js
@@ -9,6 +9,14 @@ describe('Test that content API endpoint', () => {
         .should('include', 'automated test article'));
   });
 
+  it('can deliver a single article', () => {
+    cy.db_createArticle({ title: 'automated test article' })
+      .then((article) => cy.api_get(`/content/articles/${article.id}`))
+      .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+        .its('title')
+        .should('include', 'automated test article'));
+  });
+
   it('can create an article', () => {
     cy.db_createCategory({ extension: 'com_content' })
       .then((categoryId) => cy.api_post('/content/articles', {
@@ -35,13 +43,14 @@ describe('Test that content API endpoint', () => {
 
   it('can update an article', () => {
     cy.db_createArticle({ title: 'automated test article' })
-      .then((id) => cy.api_patch(`/content/articles/${id}`, { title: 'updated automated test article' }))
+      .then((article) => cy.api_patch(`/content/articles/${article.id}`, { title: 'updated automated test article' }))
       .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
         .its('title')
         .should('include', 'updated automated test article'));
   });
 
   it('can delete an article', () => {
-    cy.db_createArticle({ title: 'automated test article', state: -2 }).then((id) => cy.api_delete(`/content/articles/${id}`));
+    cy.db_createArticle({ title: 'automated test article', state: -2 })
+      .then((article) => cy.api_delete(`/content/articles/${article.id}`));
   });
 });
diff --git a/tests/System/integration/api/com_content/Categories.cy.js b/tests/System/integration/api/com_content/Categories.cy.js
new file mode 100644
index 0000000000000..ae7629fe3a27e
--- /dev/null
+++ b/tests/System/integration/api/com_content/Categories.cy.js
@@ -0,0 +1,33 @@
+describe('Test that content categories API endpoint', () => {
+  afterEach(() => cy.task('queryDB', "DELETE FROM #__categories WHERE title = 'automated test content category'"));
+
+  it('can display a list of categories', () => {
+    cy.db_createCategory({ title: 'automated test content category', extension: 'com_content' })
+      .then((id) => cy.db_createArticle({ title: 'automated test article', catid: id }))
+      .then(() => cy.api_get('/content/categories'))
+      .then((response) => cy.api_responseContains(response, 'title', 'automated test content category'));
+  });
+
+  it('can display a single category', () => {
+    cy.db_createCategory({ title: 'automated test content category', extension: 'com_content' })
+      .then((id) => cy.api_get(`/content/categories/${id}`))
+      .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+        .its('title')
+        .should('include', 'automated test content category'));
+  });
+
+  it('can create a category', () => {
+    cy.api_post('/content/categories', { title: 'automated test content category' })
+      .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+        .its('title')
+        .should('include', 'automated test content category'));
+  });
+
+  it('can update a category', () => {
+    cy.db_createCategory({ title: 'automated test content category', extension: 'com_content' })
+      .then((id) => cy.api_patch(`/content/categories/${id}`, { title: 'updated automated test content category' }))
+      .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+        .its('title')
+        .should('include', 'updated automated test content category'));
+  });
+});
diff --git a/tests/System/integration/api/com_content/Field_Group.cy.js b/tests/System/integration/api/com_content/Field_Group.cy.js
new file mode 100644
index 0000000000000..efff6a46cec8d
--- /dev/null
+++ b/tests/System/integration/api/com_content/Field_Group.cy.js
@@ -0,0 +1,70 @@
+describe('Test that group field content API endpoint', () => {
+  afterEach(() => cy.task('queryDB', 'DELETE FROM #__fields_groups'));
+
+  ['article', 'categories'].forEach((context) => {
+    const endpoint = context === 'article' ? 'articles' : context;
+    it(`can deliver a list of group fields (${context})`, () => {
+      cy.db_createFieldGroup({ title: `automated test group field content ${context}`, context: `com_content.${context}` })
+        .then(() => cy.api_get(`/fields/groups/content/${endpoint}`))
+        .then((response) => cy.wrap(response).its('body').its('data.0').its('attributes')
+          .its('title')
+          .should('include', `automated test group field content ${context}`));
+    });
+
+    it(`can deliver a single group field (${context})`, () => {
+      cy.db_createFieldGroup({ title: `automated test group field content ${context}`, context: `com_content.${context}` })
+        .then((id) => cy.api_get(`/fields/groups/content/${endpoint}/${id}`))
+        .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+          .its('title')
+          .should('include', `automated test group field content ${context}`));
+    });
+
+    it(`can create a group field (${context})`, () => {
+      cy.api_post(`/fields/groups/content/${endpoint}`, {
+        title: `automated test group field content ${context}`,
+        access: 1,
+        context: `com_content.${context}`,
+        default_value: '',
+        description: '',
+        group_id: 0,
+        label: 'content group field',
+        language: '*',
+        name: 'content-group_field',
+        note: '',
+        params: {
+          class: '',
+          display: '2',
+          display_readonly: '2',
+          hint: '',
+          label_class: '',
+          label_render_class: '',
+          layout: '',
+          prefix: '',
+          render_class: '',
+          show_on: '',
+          showlabel: '1',
+          suffix: '',
+        },
+        required: 0,
+        state: 1,
+        type: 'text',
+      })
+        .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+          .its('title')
+          .should('include', `automated test group field content ${context}`));
+    });
+
+    it(`can update a group field (${context})`, () => {
+      cy.db_createFieldGroup({ title: 'automated test group field', access: 1, context: `com_content.${context}` })
+        .then((id) => cy.api_patch(`/fields/groups/content/${endpoint}/${id}`, { title: `updated automated test group field ${context}` }))
+        .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+          .its('title')
+          .should('include', `updated automated test group field ${context}`));
+    });
+
+    it(`can delete a group field (${context})`, () => {
+      cy.db_createFieldGroup({ title: 'automated test group field', context: `com_content.${context}`, state: -2 })
+        .then((id) => cy.api_delete(`/fields/groups/content/${endpoint}/${id}`));
+    });
+  });
+});
diff --git a/tests/System/integration/api/com_content/Fields.cy.js b/tests/System/integration/api/com_content/Fields.cy.js
new file mode 100644
index 0000000000000..eed03245e3f43
--- /dev/null
+++ b/tests/System/integration/api/com_content/Fields.cy.js
@@ -0,0 +1,70 @@
+describe('Test that field content API endpoint', () => {
+  afterEach(() => cy.task('queryDB', 'DELETE FROM #__fields'));
+
+  ['article', 'categories'].forEach((context) => {
+    const endpoint = context === 'article' ? 'articles' : context;
+    it(`can deliver a list of fields (${context})`, () => {
+      cy.db_createField({ title: `automated test field content ${context}`, context: `com_content.${context}` })
+        .then(() => cy.api_get(`/fields/content/${endpoint}`))
+        .then((response) => cy.wrap(response).its('body').its('data.0').its('attributes')
+          .its('title')
+          .should('include', `automated test field content ${context}`));
+    });
+
+    it(`can deliver a single field (${context})`, () => {
+      cy.db_createField({ title: `automated test field content ${context}`, context: `com_content.${context}` })
+        .then((id) => cy.api_get(`/fields/content/${endpoint}/${id}`))
+        .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+          .its('title')
+          .should('include', `automated test field content ${context}`));
+    });
+
+    it(`can create a field (${context})`, () => {
+      cy.api_post(`/fields/content/${endpoint}`, {
+        title: `automated test field content ${context}`,
+        access: 1,
+        context: `com_content.${context}`,
+        default_value: '',
+        description: '',
+        group_id: 0,
+        label: 'content field',
+        language: '*',
+        name: `content-field-${context}`,
+        note: '',
+        params: {
+          class: '',
+          display: '2',
+          display_readonly: '2',
+          hint: '',
+          label_class: '',
+          label_render_class: '',
+          layout: '',
+          prefix: '',
+          render_class: '',
+          show_on: '',
+          showlabel: '1',
+          suffix: '',
+        },
+        required: 0,
+        state: 1,
+        type: 'text',
+      })
+        .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+          .its('title')
+          .should('include', `automated test field content ${context}`));
+    });
+
+    it(`can update a field (${context})`, () => {
+      cy.db_createField({ title: 'automated test field', context: `com_content.${context}`, access: 1 })
+        .then((id) => cy.api_patch(`/fields/content/${endpoint}/${id}`, { title: `updated automated test field ${context}` }))
+        .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+          .its('title')
+          .should('include', `updated automated test field ${context}`));
+    });
+
+    it(`can delete a field (${context})`, () => {
+      cy.db_createField({ title: 'automated test field', context: `com_content.${context}`, state: -2 })
+        .then((id) => cy.api_delete(`/fields/content/${endpoint}/${id}`));
+    });
+  });
+});
diff --git a/tests/System/integration/api/com_media/Files.cy.js b/tests/System/integration/api/com_media/Files.cy.js
index 067239de47f5a..a0217613f281c 100644
--- a/tests/System/integration/api/com_media/Files.cy.js
+++ b/tests/System/integration/api/com_media/Files.cy.js
@@ -6,35 +6,25 @@ describe('Test that media files API endpoint', () => {
   it('can deliver a list of files', () => {
     cy.api_get('/media/files')
       .then((response) => {
-        cy.wrap(response).its('body').its('data.0').its('attributes')
-          .its('name')
-          .should('include', 'banners');
-        cy.wrap(response).its('body').its('data.4').its('attributes')
-          .its('name')
-          .should('include', 'joomla_black.png');
+        cy.api_responseContains(response, 'name', 'banners');
+        cy.api_responseContains(response, 'name', 'joomla_black.png');
       });
   });
 
   it('can deliver a list of files in a subfolder', () => {
     cy.api_get('/media/files/sampledata/cassiopeia/')
-      .then((response) => cy.wrap(response).its('body').its('data.0').its('attributes')
-        .its('name')
-        .should('include', 'nasa1-1200.jpg'));
+      .then((response) => cy.api_responseContains(response, 'name', 'nasa1-1200.jpg'));
   });
 
   it('can deliver a list of files with an adapter', () => {
     cy.api_get('/media/files/local-images:/sampledata/cassiopeia/')
-      .then((response) => cy.wrap(response).its('body').its('data.0').its('attributes')
-        .its('name')
-        .should('include', 'nasa1-1200.jpg'));
+      .then((response) => cy.api_responseContains(response, 'name', 'nasa1-1200.jpg'));
   });
 
   it('can search in filenames', () => {
     cy.api_get('/media/files?filter[search]=joomla')
       .then((response) => {
-        cy.wrap(response).its('body').its('data.0').its('attributes')
-          .its('name')
-          .should('include', 'joomla_black.png');
+        cy.api_responseContains(response, 'name', 'joomla_black.png');
         cy.wrap(response).its('body').its('data').should('have.length', 1);
       });
   });
diff --git a/tests/System/integration/api/com_newsfeed/Categories.cy.js b/tests/System/integration/api/com_newsfeed/Categories.cy.js
new file mode 100644
index 0000000000000..3174fb9abb1f9
--- /dev/null
+++ b/tests/System/integration/api/com_newsfeed/Categories.cy.js
@@ -0,0 +1,8 @@
+describe('Test that newsfeed categories API endpoint', () => {
+  it('can display a list of categories', () => {
+    cy.db_createCategory({ title: 'automated test category', extension: 'com_newsfeeds' })
+      .then((id) => cy.db_createNewsFeed({ name: 'automated test feed', catid: id }))
+      .then(() => cy.api_get('/newsfeeds/categories'))
+      .then((response) => cy.api_responseContains(response, 'title', 'automated test category'));
+  });
+});
diff --git a/tests/System/integration/api/com_newsfeed/NewsFeed.cy.js b/tests/System/integration/api/com_newsfeed/NewsFeed.cy.js
new file mode 100644
index 0000000000000..daa2a601d127e
--- /dev/null
+++ b/tests/System/integration/api/com_newsfeed/NewsFeed.cy.js
@@ -0,0 +1,71 @@
+describe('Test that newsfeed API endpoint', () => {
+  ['joomla.org'].forEach((file) => {
+    it(`can deliver a list of feeds from ${file}`, () => {
+      cy.db_createNewsFeed({ name: 'automated test feed', link: `${Cypress.config('baseUrl')}/tests/System/data/com_newsfeeds/${file}.xml` })
+        .then(() => cy.api_get('/newsfeeds/feeds'))
+        .then((response) => cy.wrap(response).its('body').its('data.0').its('attributes')
+          .its('name')
+          .should('include', 'automated test feed'));
+    });
+
+    it('can create a feed', () => {
+      cy.db_createCategory({ extension: 'com_newsfeeds' })
+        .then((categoryId) => cy.api_post('/newsfeeds/feeds', {
+          name: 'automated test feed',
+          alias: 'test-feed',
+          link: `${Cypress.config('baseUrl')}/tests/System/data/com_newsfeeds/${file}.xml`,
+          catid: categoryId,
+          published: 1,
+          language: '*',
+          metadesc: '',
+          metakey: '',
+          description: '',
+          images: {
+            float_first: '',
+            float_second: '',
+            image_first: '',
+            image_first_alt: '',
+            image_first_caption: '',
+            image_second: '',
+            image_second_alt: '',
+            image_second_caption: '',
+          },
+          metadata: {
+            hits: '',
+            rights: '',
+            robots: '',
+            tags: {
+              tags: '',
+              typeAlias: null,
+            },
+          },
+          params: {
+            feed_character_count: '',
+            feed_display_order: '',
+            newsfeed_layout: '',
+            show_feed_description: '',
+            show_feed_image: '',
+            show_item_description: '',
+          },
+        }))
+        .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+          .its('name')
+          .should('include', 'automated test feed'));
+    });
+
+    it('can update a feed', () => {
+      cy.db_createNewsFeed({ name: 'automated test contact', access: 1, link: `${Cypress.config('baseUrl')}/tests/System/data/com_newsfeeds/${file}.xml` })
+        .then((feed) => cy.api_patch(`/newsfeeds/feeds/${feed.id}`, { name: 'updated automated test feed' }))
+        .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+          .its('name')
+          .should('include', 'updated automated test feed'));
+    });
+
+    it('can delete a feed', () => {
+      cy.db_createNewsFeed({
+        name: 'automated test contact', access: 1, link: `${Cypress.config('baseUrl')}/tests/System/data/com_newsfeeds/${file}.xml`, published: -2,
+      })
+        .then((feed) => cy.api_delete(`/newsfeeds/feeds/${feed.id}`));
+    });
+  });
+});
diff --git a/tests/System/integration/api/com_privacy/Request.cy.js b/tests/System/integration/api/com_privacy/Request.cy.js
new file mode 100644
index 0000000000000..f9aec422b45d2
--- /dev/null
+++ b/tests/System/integration/api/com_privacy/Request.cy.js
@@ -0,0 +1,27 @@
+describe('Test privacy request API endpoint', () => {
+  afterEach(() => cy.task('queryDB', 'DELETE FROM #__privacy_requests'));
+
+  it('can get a list of requests', () => {
+    cy.db_createPrivacyRequest()
+      .then(() => cy.api_get('/privacy/requests'))
+      .then((response) => cy.api_responseContains(response, 'email', 'test@example.com'));
+  });
+
+  it('can list a single request', () => {
+    cy.db_createPrivacyRequest()
+      .then((id) => cy.api_get(`/privacy/requests/${id}`))
+      .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+        .its('status')
+        .should('equal', 0));
+  });
+
+  it('can create a request', () => {
+    cy.api_post('/privacy/requests ', {
+      email: 'test@example.com',
+      request_type: 'export',
+    })
+      .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+        .its('email')
+        .should('include', 'test@example.com'));
+  });
+});
diff --git a/tests/System/integration/api/com_tags/Tags.cy.js b/tests/System/integration/api/com_tags/Tags.cy.js
new file mode 100644
index 0000000000000..880c5dfcee143
--- /dev/null
+++ b/tests/System/integration/api/com_tags/Tags.cy.js
@@ -0,0 +1,33 @@
+describe('Test that tags API endpoint', () => {
+  afterEach(() => cy.task('queryDB', 'DELETE FROM #__tags WHERE id > 1'));
+
+  it('can deliver a list of tags', () => {
+    cy.db_createTag({ title: 'automated test tag' })
+      .then(() => cy.api_get('/tags'))
+      .then((response) => cy.wrap(response).its('body').its('data.0').its('attributes')
+        .its('title')
+        .should('include', 'automated test tag'));
+  });
+
+  it('can create a tag', () => {
+    cy.api_post('/tags', {
+      title: 'automated test tag', parent_id: 1, level: 1, description: '', language: '*',
+    })
+      .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+        .its('title')
+        .should('include', 'automated test tag'));
+  });
+
+  it('can update a tag', () => {
+    cy.db_createTag({ title: 'automated test tag' })
+      .then((id) => cy.api_patch(`/tags/${id}`, { title: 'updated automated test tag' }))
+      .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+        .its('title')
+        .should('include', 'updated automated test tag'));
+  });
+
+  it('can delete a tag', () => {
+    cy.db_createTag({ title: 'automated test tag', published: -2 })
+      .then((id) => cy.api_delete(`/tags/${id}`));
+  });
+});
diff --git a/tests/System/integration/api/com_users/Users.cy.js b/tests/System/integration/api/com_users/Users.cy.js
new file mode 100644
index 0000000000000..14f2217520433
--- /dev/null
+++ b/tests/System/integration/api/com_users/Users.cy.js
@@ -0,0 +1,62 @@
+describe('Test that users API endpoint', () => {
+  afterEach(() => cy.task('queryDB', "DELETE FROM #__users WHERE name = 'automated test user'"));
+
+  it('can deliver a list of users', () => {
+    cy.db_createUser({ name: 'automated test user', username: 'automated_test_username' })
+      .then(() => cy.api_get('/users'))
+      .then((response) => cy.api_responseContains(response, 'name', 'automated test user'));
+  });
+
+  it('can create a user', () => {
+    cy.api_post('/users', {
+      block: '0',
+      email: 'test1@mail.com',
+      groups: [
+        '2',
+      ],
+      id: '0',
+      lastResetTime: '',
+      lastvisitDate: '',
+      name: 'automated test user',
+      params: {
+        admin_language: '',
+        admin_style: '',
+        editor: '',
+        helpsite: '',
+        language: '',
+        timezone: '',
+      },
+      password: 'qwertyqwerty123',
+      password2: 'qwertyqwerty123',
+      registerDate: '',
+      requireReset: '0',
+      resetCount: '0',
+      sendEmail: '0',
+      username: 'automated_test_username',
+    })
+      .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+        .its('name')
+        .should('include', 'automated test user'));
+  });
+
+  it('can update a user', () => {
+    cy.db_createUser({ name: 'automated test user' })
+      .then((id) => {
+        const updatedUserData = {
+          name: 'updated automated test user',
+          groups: [
+            '2',
+          ],
+        };
+        return cy.api_patch(`/users/${id}`, updatedUserData);
+      })
+      .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+        .its('name')
+        .should('include', 'updated automated test user'));
+  });
+
+  it('can delete a user', () => {
+    cy.db_createUser({ name: 'automated test user' })
+      .then((id) => cy.api_delete(`/users/${id}`));
+  });
+});
diff --git a/tests/System/integration/install/Installation.cy.js b/tests/System/integration/install/Installation.cy.js
index 12e5a8a548e5d..d9a9c846d8344 100644
--- a/tests/System/integration/install/Installation.cy.js
+++ b/tests/System/integration/install/Installation.cy.js
@@ -27,8 +27,11 @@ describe('Install Joomla', () => {
       // Update to the correct secret for the API tests because of the bearer token
       let content = fileContent.replace(/^.*\$secret.*$/mg, "public $secret = 'tEstValue';");
 
-      // Turn off mailing
-      content = content.replace(/^.*\$mailonline.*$/mg, 'public $mailonline = false;');
+      // Setup mailing
+      content = content.replace(/^.*\$mailonline.*$/mg, 'public $mailonline = true;');
+      content = content.replace(/^.*\$mailer.*$/mg, 'public $mailer = \'smtp\';');
+      content = content.replace(/^.*\$smtphost.*$/mg, `public $smtphost = '${Cypress.env('smtp_host')}';`);
+      content = content.replace(/^.*\$smtpport.*$/mg, `public $smtpport = '${Cypress.env('smtp_port')}';`);
 
       // Write the modified content back to the configuration file
       cy.task('writeFile', { path: 'configuration.php', content });
diff --git a/tests/System/integration/site/components/com_contact/Categories.cy.js b/tests/System/integration/site/components/com_contact/Categories.cy.js
index 808773bd00d49..678d62cb308c1 100644
--- a/tests/System/integration/site/components/com_contact/Categories.cy.js
+++ b/tests/System/integration/site/components/com_contact/Categories.cy.js
@@ -1,5 +1,5 @@
-describe('Test that the Categories of com_contact ', () => {
-  it('can display a list of categories of contacts in menu item', () => {
+describe('Test in frontend that the contact categories view', () => {
+  it('can display a list of contact categories without a menu item', () => {
     cy.db_createCategory({ title: 'automated test category 1', extension: 'com_contact' })
       .then((id) => cy.db_createContact({ name: 'automated test contact 1', catid: id }))
       .then(() => cy.db_createCategory({ title: 'automated test category 2', extension: 'com_contact' }))
@@ -8,7 +8,7 @@ describe('Test that the Categories of com_contact ', () => {
         await cy.db_createContact({ name: 'automated test contact 3', catid: id });
       })
       .then(() => {
-        cy.visit('index.php?option=com_contact&view=categories');
+        cy.visit('/index.php?option=com_contact&view=categories');
 
         cy.contains('automated test category 1');
         cy.contains('automated test category 2');
@@ -16,4 +16,24 @@ describe('Test that the Categories of com_contact ', () => {
         cy.get(':nth-child(3) > .page-header > .badge').contains('Contact Count: 2');
       });
   });
+
+  it('can display a list of categories in a menu item', () => {
+    cy.db_createCategory({ title: 'automated test category 1', extension: 'com_contact' })
+      .then((id) => cy.db_createContact({ name: 'automated test contact 1', catid: id }))
+      .then(() => cy.db_createCategory({ title: 'automated test category 2', extension: 'com_contact' }))
+      .then(async (id) => {
+        await cy.db_createContact({ name: 'automated test contact 2', catid: id });
+        await cy.db_createContact({ name: 'automated test contact 3', catid: id });
+      })
+      .then(() => cy.db_createMenuItem({ title: 'automated test categories', link: 'index.php?option=com_contact&view=categories' }))
+      .then(() => {
+        cy.visit('/');
+        cy.get('a:contains(automated test categories)').click();
+
+        cy.contains('automated test category 1');
+        cy.contains('automated test category 2');
+        cy.get(':nth-child(1) > .page-header > .badge').contains('Contact Count: 1');
+        cy.get(':nth-child(2) > .page-header > .badge').contains('Contact Count: 2');
+      });
+  });
 });
diff --git a/tests/System/integration/site/components/com_contact/Category.cy.js b/tests/System/integration/site/components/com_contact/Category.cy.js
index eca265b510700..5e8914b00440d 100644
--- a/tests/System/integration/site/components/com_contact/Category.cy.js
+++ b/tests/System/integration/site/components/com_contact/Category.cy.js
@@ -1,5 +1,5 @@
-describe('Test that the list view ', () => {
-  it('can display a list of contacts in menu item', () => {
+describe('Test in frontend that the contact category view', () => {
+  it('can display a list of contacts in a menu item', () => {
     cy.db_createContact({ name: 'automated test contact 1', featured: 1 })
       .then(() => cy.db_createContact({ name: 'automated test contact 2', featured: 1 }))
       .then(() => cy.db_createContact({ name: 'automated test contact 3', featured: 1 }))
@@ -16,13 +16,13 @@ describe('Test that the list view ', () => {
       });
   });
 
-  it('can display a list of contacts without menu item', () => {
+  it('can display a list of contacts without a menu item', () => {
     cy.db_createContact({ name: 'automated test contact 1' })
-      .then(() => cy.db_createContact({ name: 'automated test contact 2' }))
-      .then(() => cy.db_createContact({ name: 'automated test contact 3' }))
-      .then(() => cy.db_createContact({ name: 'automated test contact 4' }))
-      .then(() => {
-        cy.visit('/index.php?option=com_contact&view=category&id=4');
+      .then((contact) => cy.db_createContact({ name: 'automated test contact 2', featured: 1, catid: contact.catid }))
+      .then((contact) => cy.db_createContact({ name: 'automated test contact 3', featured: 1, catid: contact.catid }))
+      .then((contact) => cy.db_createContact({ name: 'automated test contact 4', featured: 1, catid: contact.catid }))
+      .then((contact) => {
+        cy.visit(`/index.php?option=com_contact&view=category&id=${contact.catid}`);
 
         cy.contains('automated test contact 1');
         cy.contains('automated test contact 2');
@@ -33,7 +33,7 @@ describe('Test that the list view ', () => {
 
   it('can open the contact form in the default layout', () => {
     cy.db_createContact({ name: 'contact 1' })
-      .then(() => cy.db_createMenuItem({ title: 'automated test', link: 'index.php?option=com_contact&view=category&id=4' }))
+      .then((contact) => cy.db_createMenuItem({ title: 'automated test', link: `index.php?option=com_contact&view=category&id=${contact.catid}` }))
       .then(() => {
         cy.doFrontendLogin();
         cy.visit('/');
diff --git a/tests/System/integration/site/components/com_contact/Contact.cy.js b/tests/System/integration/site/components/com_contact/Contact.cy.js
index 2527403e1e849..93d8794df5bf9 100644
--- a/tests/System/integration/site/components/com_contact/Contact.cy.js
+++ b/tests/System/integration/site/components/com_contact/Contact.cy.js
@@ -1,23 +1,23 @@
-describe('Test that the Contact Form', () => {
-  it('can display a Contact Form', () => {
+describe('Test in frontend that the contact details view', () => {
+  it('can display a form', () => {
     cy.db_getUserId().then((id) => cy.db_createContact({ name: 'contact 1', user_id: id }))
-      .then((contactId) => {
-        cy.visit(`index.php?option=com_contact&view=contact&id='${contactId}'`);
+      .then((contact) => {
+        cy.visit(`/index.php?option=com_contact&view=contact&id='${contact.id}'`);
 
         cy.contains('Contact Form');
         cy.get('.m-0').should('exist');
       });
   });
 
-  it('can display an added field', () => {
+  it('can display a custom field', () => {
     cy.db_createFieldGroup({ title: 'automated test_field group', context: 'com_contact.mail' })
       .then((id) => cy.db_createField({
         group_id: id, context: 'com_contact.mail', type: 'checkboxes', fieldparams: JSON.stringify({ options: { options0: { name: 'test value', value: '' } } }),
       }))
       .then(() => cy.db_getUserId())
       .then((userId) => cy.db_createContact({ name: 'automated test contact 1', user_id: userId }))
-      .then((contactId) => {
-        cy.visit(`index.php?option=com_contact&view=contact&id='${contactId}'`);
+      .then((contact) => {
+        cy.visit(`/index.php?option=com_contact&view=contact&id='${contact.id}'`);
 
         cy.contains('automated test_field group').should('exist');
         cy.contains('test field').should('exist');
diff --git a/tests/System/integration/site/components/com_contact/Featured.cy.js b/tests/System/integration/site/components/com_contact/Featured.cy.js
index 85e8b052933e5..82137015ac6f7 100644
--- a/tests/System/integration/site/components/com_contact/Featured.cy.js
+++ b/tests/System/integration/site/components/com_contact/Featured.cy.js
@@ -1,5 +1,5 @@
-describe('Test that the featured contacts menu item type', () => {
-  it('can display featured contact', () => {
+describe('Test in frontend that the contact featured view', () => {
+  it('can display featured contacts', () => {
     cy.db_createContact({ name: 'automated test contact 1', featured: 1 })
       .then(() => cy.db_createContact({ name: 'automated test contact 2', featured: 1 }))
       .then(() => cy.db_createContact({ name: 'automated test contact 3', featured: 1 }))
@@ -23,6 +23,7 @@ describe('Test that the featured contacts menu item type', () => {
       .then(() => {
         cy.visit('/');
         cy.get('a:contains(automated test)').click();
+
         cy.contains('automated test contact 1').should('not.exist');
         cy.contains('automated test contact 2').should('not.exist');
       });
diff --git a/tests/System/integration/site/components/com_contact/Form.cy.js b/tests/System/integration/site/components/com_contact/Form.cy.js
index 08f542ff22011..6913b727544d6 100644
--- a/tests/System/integration/site/components/com_contact/Form.cy.js
+++ b/tests/System/integration/site/components/com_contact/Form.cy.js
@@ -1,13 +1,16 @@
-describe('Test that the form view ', () => {
+describe('Test in frontend that the contact form view', () => {
   afterEach(() => cy.task('queryDB', 'DELETE FROM #__contact_details'));
 
-  it('Can create contact through form view', () => {
+  it('can create a contact through a form', () => {
     cy.doFrontendLogin();
-    cy.visit('index.php?option=com_contact&view=form&layout=edit');
+    cy.visit('/index.php?option=com_contact&view=form&layout=edit');
     cy.get('#jform_name').type('test contact 1');
     cy.get('.mb-2 > .btn-primary').click();
-    cy.visit('index.php?option=com_contact&view=category&id=4');
 
-    cy.contains('test contact 1').should('exist');
+    cy.task('queryDB', 'SELECT catid FROM #__contact_details WHERE name = \'test contact 1\'').then((id) => {
+      cy.visit(`/index.php?option=com_contact&view=category&id=${id[0].catid}`);
+
+      cy.contains('test contact 1').should('exist');
+    });
   });
 });
diff --git a/tests/System/integration/site/components/com_content/Archived.cy.js b/tests/System/integration/site/components/com_content/Archived.cy.js
new file mode 100644
index 0000000000000..5fe28f7cff19c
--- /dev/null
+++ b/tests/System/integration/site/components/com_content/Archived.cy.js
@@ -0,0 +1,40 @@
+describe('Test in frontend that the content archived view', () => {
+  it('can display archived articles in a menu item', () => {
+    cy.db_createMenuItem({ title: 'automated test archive article', link: 'index.php?option=com_content&view=archive' })
+      .then(() => cy.db_createArticle({ title: 'article 1', state: 2 }))
+      .then(() => cy.db_createArticle({ title: 'article 2', state: 2 }))
+      .then(() => {
+        cy.visit('/');
+        cy.get('a:contains(automated test archive article)').click();
+
+        cy.contains('article 1');
+        cy.contains('article 2');
+      });
+  });
+
+  it('can display archived articles without a menu item', () => {
+    cy.db_createArticle({ title: 'article 1', state: 2 })
+      .then(() => cy.db_createArticle({ title: 'article 2', state: 2 }))
+      .then(() => {
+        cy.visit('/index.php?option=com_content&view=archive');
+
+        cy.contains('article 1');
+        cy.contains('article 2');
+      });
+  });
+
+  it('can not display not archived articles', () => {
+    cy.db_createMenuItem({ title: 'automated test archive article', link: 'index.php?option=com_content&view=archive' })
+      .then(() => cy.db_createArticle({ title: 'article 1', state: 2 }))
+      .then(() => cy.db_createArticle({ title: 'article 2', state: 1 }))
+      .then(() => cy.db_createArticle({ title: 'article 3', state: 0 }))
+      .then(() => {
+        cy.visit('/');
+        cy.get('a:contains(automated test archive article)').click();
+
+        cy.contains('article 1');
+        cy.contains('article 2').should('not.exist');
+        cy.contains('article 3').should('not.exist');
+      });
+  });
+});
diff --git a/tests/System/integration/site/components/com_content/Article.cy.js b/tests/System/integration/site/components/com_content/Article.cy.js
new file mode 100644
index 0000000000000..dedc277cc8ad0
--- /dev/null
+++ b/tests/System/integration/site/components/com_content/Article.cy.js
@@ -0,0 +1,27 @@
+describe('Test in frontend that the content article form', () => {
+  afterEach(() => cy.task('queryDB', 'DELETE FROM #__content where title = \'test article\''));
+
+  it('can edit an article in menu item', () => {
+    cy.db_createMenuItem({ title: 'automated test article', link: 'index.php?option=com_content&view=form&layout=edit' })
+      .then(() => {
+        cy.doFrontendLogin();
+        cy.visit('/');
+        cy.get('a:contains(automated test article)').click();
+
+        cy.get('#jform_title').type('test article');
+        cy.get('[data-submit-task="article.save"]').click();
+        cy.get('.success').should('exist');
+        cy.get('[type="success"] > .alert-wrapper > .alert-message').should('contain', 'Article submitted.');
+      });
+  });
+
+  it('can edit an article without menu item', () => {
+    cy.doFrontendLogin();
+    cy.visit('/index.php?option=com_content&view=form&layout=edit');
+
+    cy.get('#jform_title').type('test article');
+    cy.get('[data-submit-task="article.save"]').click();
+    cy.get('.success').should('exist');
+    cy.get('[type="success"] > .alert-wrapper > .alert-message').should('contain', 'Article submitted.');
+  });
+});
diff --git a/tests/System/integration/site/components/com_content/Categories.cy.js b/tests/System/integration/site/components/com_content/Categories.cy.js
new file mode 100644
index 0000000000000..379b4f57cb457
--- /dev/null
+++ b/tests/System/integration/site/components/com_content/Categories.cy.js
@@ -0,0 +1,39 @@
+describe('Test in frontend that the content categories view', () => {
+  it('can display a list of categories without a menu item', () => {
+    cy.db_createCategory({ title: 'automated test category 1', extension: 'com_content' })
+      .then((id) => cy.db_createArticle({ title: 'automated test article 1', catid: id }))
+      .then(() => cy.db_createCategory({ title: 'automated test category 2', extension: 'com_content' }))
+      .then(async (id) => {
+        await cy.db_createArticle({ title: 'automated test article 2', catid: id });
+        await cy.db_createArticle({ title: 'automated test article 3', catid: id });
+      })
+      .then(() => {
+        cy.visit('/index.php?option=com_content&view=categories');
+
+        cy.contains('automated test category 1');
+        cy.get(':nth-child(1) > .com-content-categories__item-title-wrapper > .com-content-categories__item-title > .badge').contains('Article Count: 1');
+        cy.contains('automated test category 2');
+        cy.get(':nth-child(2) > .com-content-categories__item-title-wrapper > .com-content-categories__item-title > .badge').contains('Article Count: 2');
+      });
+  });
+
+  it('can display a list of categories in a menu item', () => {
+    cy.db_createCategory({ title: 'automated test category 1', extension: 'com_content' })
+      .then((id) => cy.db_createArticle({ title: 'automated test article 1', catid: id }))
+      .then(() => cy.db_createCategory({ title: 'automated test category 2', extension: 'com_content' }))
+      .then(async (id) => {
+        await cy.db_createArticle({ title: 'automated test article 2', catid: id });
+        await cy.db_createArticle({ title: 'automated test article 3', catid: id });
+      })
+      .then(() => cy.db_createMenuItem({ title: 'automated test categories', link: 'index.php?option=com_content&view=categories' }))
+      .then(() => {
+        cy.visit('/');
+        cy.get('a:contains(automated test categories)').click();
+
+        cy.contains('automated test category 1');
+        cy.get(':nth-child(1) > .com-content-categories__item-title-wrapper > .com-content-categories__item-title > .badge').contains('Article Count: 1');
+        cy.contains('automated test category 2');
+        cy.get(':nth-child(2) > .com-content-categories__item-title-wrapper > .com-content-categories__item-title > .badge').contains('Article Count: 2');
+      });
+  });
+});
diff --git a/tests/System/integration/site/components/com_content/Category.cy.js b/tests/System/integration/site/components/com_content/Category.cy.js
index ab622d1fb4bf3..5ae782476b634 100644
--- a/tests/System/integration/site/components/com_content/Category.cy.js
+++ b/tests/System/integration/site/components/com_content/Category.cy.js
@@ -1,14 +1,14 @@
-describe('Test that the articles category menu item type ', () => {
+describe('Test in frontend that the content category view', () => {
   ['default', 'blog'].forEach((layout) => {
     it(`can display a list of articles in the ${layout} layout in a menu item`, () => {
       cy.db_createArticle({ title: 'article 1' })
-        .then(() => cy.db_createArticle({ title: 'article 2' }))
-        .then(() => cy.db_createArticle({ title: 'article 3' }))
-        .then(() => cy.db_createArticle({ title: 'article 4' }))
-        .then(() => cy.db_createMenuItem({
+        .then((article) => cy.db_createArticle({ title: 'article 2', catid: article.catid }))
+        .then((article) => cy.db_createArticle({ title: 'article 3', catid: article.catid }))
+        .then((article) => cy.db_createArticle({ title: 'article 4', catid: article.catid }))
+        .then((article) => cy.db_createMenuItem({
           title: 'automated test',
           alias: 'automated-test',
-          link: `index.php?option=com_content&view=category&id=2&layout=${layout}`,
+          link: `index.php?option=com_content&view=category&id=${article.catid}&layout=${layout}`,
           path: 'automated-test/root',
         }))
         .then(() => {
@@ -24,11 +24,11 @@ describe('Test that the articles category menu item type ', () => {
 
     it(`can display a list of articles in the ${layout} layout without a menu item`, () => {
       cy.db_createArticle({ title: 'article 1' })
-        .then(() => cy.db_createArticle({ title: 'article 2' }))
-        .then(() => cy.db_createArticle({ title: 'article 3' }))
-        .then(() => cy.db_createArticle({ title: 'article 4' }))
-        .then(() => {
-          cy.visit(`/index.php?option=com_content&view=category&id=2&layout=${layout}`);
+        .then((article) => cy.db_createArticle({ title: 'article 2', catid: article.catid }))
+        .then((article) => cy.db_createArticle({ title: 'article 3', catid: article.catid }))
+        .then((article) => cy.db_createArticle({ title: 'article 4', catid: article.catid }))
+        .then((article) => {
+          cy.visit(`/index.php?option=com_content&view=category&id=${article.catid}&layout=${layout}`);
 
           cy.contains('article 1');
           cy.contains('article 2');
@@ -40,10 +40,10 @@ describe('Test that the articles category menu item type ', () => {
 
   it('can open the article form in the default layout', () => {
     cy.db_createArticle({ title: 'article 1' })
-      .then(() => cy.db_createMenuItem({
+      .then((article) => cy.db_createMenuItem({
         title: 'automated test',
         alias: 'automated-test',
-        link: 'index.php?option=com_content&view=category&id=2&layout=default',
+        link: `index.php?option=com_content&view=category&id=${article.catid}&layout=default`,
         path: 'automated-test/root',
       }))
       .then(() => {
diff --git a/tests/System/integration/site/components/com_content/Featured.cy.js b/tests/System/integration/site/components/com_content/Featured.cy.js
index 77873656f8043..fdf66d2443bd4 100644
--- a/tests/System/integration/site/components/com_content/Featured.cy.js
+++ b/tests/System/integration/site/components/com_content/Featured.cy.js
@@ -1,4 +1,4 @@
-describe('Test that the featured articles menu item type', () => {
+describe('Test in frontend that the content featured view', () => {
   it('can display an article', () => {
     cy.db_createArticle({ title: 'automated test article', featured: 1 }).then(() => {
       cy.visit('/');
@@ -7,7 +7,7 @@ describe('Test that the featured articles menu item type', () => {
     });
   });
 
-  it('can not display not featured articles article', () => {
+  it('can not display not featured articles', () => {
     cy.db_createArticle({ title: 'automated test article', featured: 0 }).then(() => {
       cy.visit('/');
 
diff --git a/tests/System/integration/site/components/com_finder/Search.js b/tests/System/integration/site/components/com_finder/Search.js
new file mode 100644
index 0000000000000..e4be3f23e0fc3
--- /dev/null
+++ b/tests/System/integration/site/components/com_finder/Search.js
@@ -0,0 +1,12 @@
+describe('Test in frontend that the smart search view', () => {
+  it('can display smart search', () => {
+    cy.db_createMenuItem({ title: 'automated test smart search', link: 'index.php?option=com_finder&view=search' })
+      .then(() => {
+        cy.visit('/');
+        cy.get('a:contains(automated test smart search)').click();
+
+        cy.get('#q').should('exist');
+        cy.get('.input-group > .btn-primary').should('exist');
+      });
+  });
+});
diff --git a/tests/System/integration/site/components/com_newsfeed/Categories.cy.js b/tests/System/integration/site/components/com_newsfeed/Categories.cy.js
new file mode 100644
index 0000000000000..854d9684eec0a
--- /dev/null
+++ b/tests/System/integration/site/components/com_newsfeed/Categories.cy.js
@@ -0,0 +1,19 @@
+describe('Test in frontend that the newsfeeds categories view', () => {
+  it('can display a list of categories', () => {
+    cy.db_createCategory({ title: 'automated test category 1', extension: 'com_newsfeeds' })
+      .then((id) => cy.db_createNewsFeed({ name: 'automated test feed 1', catid: id }))
+      .then(() => cy.db_createCategory({ title: 'automated test category 2', extension: 'com_newsfeeds' }))
+      .then(async (id) => {
+        await cy.db_createNewsFeed({ name: 'automated test feed 2', catid: id });
+        await cy.db_createNewsFeed({ name: 'automated test feed 3', catid: id });
+      })
+      .then(() => {
+        cy.visit('/index.php?option=com_newsfeeds&view=categories');
+
+        cy.contains('automated test category 1');
+        cy.contains('automated test category 2');
+        cy.get(':nth-child(2) > .page-header > .badge').contains('# News feeds 1');
+        cy.get(':nth-child(3) > .page-header > .badge').contains('# News feeds 2');
+      });
+  });
+});
diff --git a/tests/System/integration/site/components/com_newsfeed/Category.cy.js b/tests/System/integration/site/components/com_newsfeed/Category.cy.js
new file mode 100644
index 0000000000000..816f580f10274
--- /dev/null
+++ b/tests/System/integration/site/components/com_newsfeed/Category.cy.js
@@ -0,0 +1,33 @@
+describe('Test in frontend that the newsfeeds category view', () => {
+  it('can display a list of feeds in a menu item', () => {
+    cy.db_createNewsFeed({ name: 'automated test feed 1' })
+      .then((feed) => cy.db_createNewsFeed({ name: 'automated test feed 2', catid: feed.catid }))
+      .then((feed) => cy.db_createNewsFeed({ name: 'automated test feed 3', catid: feed.catid }))
+      .then((feed) => cy.db_createNewsFeed({ name: 'automated test feed 4', catid: feed.catid }))
+      .then((feed) => cy.db_createMenuItem({ title: 'automated test feeds', link: `index.php?option=com_newsfeeds&view=category&id=${feed.catid}` }))
+      .then(() => {
+        cy.visit('/');
+        cy.get('a:contains(automated test feeds)').click();
+
+        cy.contains('automated test feed 1');
+        cy.contains('automated test feed 2');
+        cy.contains('automated test feed 3');
+        cy.contains('automated test feed 4');
+      });
+  });
+
+  it('can display a list of feeds without a menu item', () => {
+    cy.db_createNewsFeed({ name: 'automated test feed 1' })
+      .then((feed) => cy.db_createNewsFeed({ name: 'automated test feed 2', catid: feed.catid }))
+      .then((feed) => cy.db_createNewsFeed({ name: 'automated test feed 3', catid: feed.catid }))
+      .then((feed) => cy.db_createNewsFeed({ name: 'automated test feed 4', catid: feed.catid }))
+      .then((feed) => {
+        cy.visit(`/index.php?option=com_newsfeeds&view=category&id=${feed.catid}`);
+
+        cy.contains('automated test feed 1');
+        cy.contains('automated test feed 2');
+        cy.contains('automated test feed 3');
+        cy.contains('automated test feed 4');
+      });
+  });
+});
diff --git a/tests/System/integration/site/components/com_newsfeed/NewsFeed.cy.js b/tests/System/integration/site/components/com_newsfeed/NewsFeed.cy.js
new file mode 100644
index 0000000000000..c633bbc9cc29c
--- /dev/null
+++ b/tests/System/integration/site/components/com_newsfeed/NewsFeed.cy.js
@@ -0,0 +1,27 @@
+describe('Test in frontend that the newsfeeds details view', () => {
+  ['joomla.org'].forEach((file) => {
+    it(`can display a feed in a menu item from ${file}`, () => {
+      cy.db_createNewsFeed({ name: 'automated test feed 1', link: `${Cypress.config('baseUrl')}/tests/System/data/com_newsfeeds/${file}.xml` })
+        .then((feed) => cy.db_createMenuItem({ title: 'automated test feeds', link: `index.php?option=com_newsfeeds&view=newsfeed&id=${feed.id}` }))
+        .then(() => {
+          cy.visit('/');
+          cy.get('a:contains(automated test feed)').click();
+
+          cy.contains('automated test feed 1');
+          cy.get('.com-newsfeeds-newsfeed__items').should('exist');
+          cy.get('.com-newsfeeds-newsfeed__items').children().should('have.length', 5);
+        });
+    });
+
+    it(`can display a feed without a menu item from ${file}`, () => {
+      cy.db_createNewsFeed({ name: 'automated test feed 1', link: `${Cypress.config('baseUrl')}/tests/System/data/com_newsfeeds/${file}.xml` })
+        .then((feed) => {
+          cy.visit(`/index.php?option=com_newsfeeds&view=newsfeed&id=${feed.id}`);
+
+          cy.contains('automated test feed 1');
+          cy.get('.com-newsfeeds-newsfeed__items').should('exist');
+          cy.get('.com-newsfeeds-newsfeed__items').children().should('have.length', 5);
+        });
+    });
+  });
+});
diff --git a/tests/System/integration/site/components/com_privacy/Request.cy.js b/tests/System/integration/site/components/com_privacy/Request.cy.js
new file mode 100644
index 0000000000000..6064fbee328ef
--- /dev/null
+++ b/tests/System/integration/site/components/com_privacy/Request.cy.js
@@ -0,0 +1,111 @@
+describe('Test in frontend that the privacy request view', () => {
+  beforeEach(() => {
+    cy.task('clearEmails');
+    cy.doFrontendLogin();
+  });
+  afterEach(() => cy.task('queryDB', 'DELETE FROM #__privacy_requests'));
+
+  it('can submit an information request of type export without a menu item', () => {
+    cy.visit('/index.php?option=com_privacy&view=request');
+    cy.get('#jform_request_type').select('Export');
+    cy.get('.controls > .btn').click();
+
+    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.');
+      cy.wrap(mails).should('have.lengthOf', 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[1].body).should('have.string', 'Someone has created a request to export all personal information related to this email address at ');
+    });
+  });
+
+  it('can submit an information request of type export in a menu item', () => {
+    cy.db_createMenuItem({ title: 'Automated export information', link: 'index.php?option=com_privacy&view=request' })
+      .then(() => {
+        cy.visit('/');
+        cy.get('a:contains(Automated export information)').click();
+        cy.get('#jform_request_type').select('Export');
+        cy.get('.controls > .btn').click();
+
+        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.');
+          cy.wrap(mails).should('have.lengthOf', 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[1].body).should('have.string', 'Someone has created a request to export all personal information related to this email address at ');
+        });
+      });
+  });
+
+  it('can submit an information request of type remove without a menu item', () => {
+    cy.visit('/index.php?option=com_privacy&view=request');
+    cy.get('#jform_request_type').select('Remove');
+    cy.get('.controls > .btn').click();
+
+    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.');
+      cy.wrap(mails).should('have.lengthOf', 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[1].body).should('have.string', 'Someone has created a request to remove all personal information related to this email address at ');
+    });
+  });
+
+  it('can submit an information request of type remove in a menu item', () => {
+    cy.db_createMenuItem({ title: 'Automated remove information', link: 'index.php?option=com_privacy&view=request' })
+      .then(() => {
+        cy.visit('/');
+        cy.get('a:contains(Automated remove information)').click();
+        cy.get('#jform_request_type').select('Remove');
+        cy.get('.controls > .btn').click();
+
+        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.');
+          cy.wrap(mails).should('have.lengthOf', 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[1].body).should('have.string', 'Someone has created a request to remove all personal information related to this email address at ');
+        });
+      });
+  });
+
+  it('can verify link sent to user is valid', () => {
+    cy.visit('/index.php?option=com_privacy&view=request');
+    cy.get('#jform_request_type').select('Export');
+    cy.get('.controls > .btn').click();
+
+    cy.task('getMails').then((mails) => {
+      const str = mails[1].body;
+
+      const firstSplit = str.split('URL: ')[1];
+      const link = firstSplit.split('\n')[0];
+
+      cy.visit(link);
+      cy.get('.controls > .btn').click();
+
+      cy.get('.alert-message').should('have.text', 'Your information request has been confirmed. We will process your request as soon as possible and the export will be sent to your email.');
+    });
+  });
+
+  it('can verify the individual link and password to copy/paste to the user is valid', () => {
+    cy.visit('/index.php?option=com_privacy&view=request');
+    cy.get('#jform_request_type').select('Export');
+    cy.get('.controls > .btn').click();
+
+    cy.task('getMails').then((mails) => {
+      const str = mails[1].body;
+
+      const firstSplitURL = str.split('paste your token into the form.\n')[1];
+      const secondSplitURL = firstSplitURL.split('URL: ')[1];
+      const link = secondSplitURL.split('\n')[0];
+
+      const firstSplitToken = str.split('Token: ')[1];
+      const token = firstSplitToken.split('\n')[0];
+
+      cy.visit(link);
+      cy.get('#jform_confirm_token').type(token);
+      cy.get('.controls > .btn').click();
+      cy.get('.alert-message').should('have.text', 'Your information request has been confirmed. We will process your request as soon as possible and the export will be sent to your email.');
+    });
+  });
+});
diff --git a/tests/System/integration/site/components/com_tag/Tag.cy.js b/tests/System/integration/site/components/com_tag/Tag.cy.js
index 02a1c37489012..b8164c647bea8 100644
--- a/tests/System/integration/site/components/com_tag/Tag.cy.js
+++ b/tests/System/integration/site/components/com_tag/Tag.cy.js
@@ -1,5 +1,5 @@
-describe('Test that the tag view ', () => {
-  it('can display a list of tags in menu item', () => {
+describe('Test in frontend that the tags tag view', () => {
+  it('can display a list of tags in a menu item', () => {
     cy.db_createTag({ title: 'automated test tag 1' })
       .then(() => cy.db_createTag({ title: 'automated test tag 2' }))
       .then(() => cy.db_createTag({ title: 'automated test tag 3' }))
@@ -16,13 +16,13 @@ describe('Test that the tag view ', () => {
       });
   });
 
-  it('can display a list of tags without menu item', () => {
+  it('can display a list of tags without a menu item', () => {
     cy.db_createTag({ title: 'automated test tag 1' })
       .then(() => cy.db_createTag({ title: 'automated test tag 2' }))
       .then(() => cy.db_createTag({ title: 'automated test tag 3' }))
       .then(() => cy.db_createTag({ title: 'automated test tag 4' }))
       .then(() => {
-        cy.visit('index.php?option=com_tags&view=tags');
+        cy.visit('/index.php?option=com_tags&view=tags');
 
         cy.contains('automated test tag 1');
         cy.contains('automated test tag 2');
diff --git a/tests/System/integration/site/components/com_users/Login.cy.js b/tests/System/integration/site/components/com_users/Login.cy.js
index 578f466c44302..e97036d560627 100644
--- a/tests/System/integration/site/components/com_users/Login.cy.js
+++ b/tests/System/integration/site/components/com_users/Login.cy.js
@@ -1,35 +1,31 @@
-describe('Test the login view', () => {
-  it('can log in for test user', () => {
-    cy.db_createUser({
-      name: 'test user', username: 'test', email: 'test@example.com', password: '098f6bcd4621d373cade4e832627b4f6',
-    })
+describe('Test in frontend that the users login view', () => {
+  it('can log in a test user without a menu item', () => {
+    cy.db_createUser({ username: 'test', password: '098f6bcd4621d373cade4e832627b4f6' })
       .then(() => {
-        cy.visit('index.php?option=com_users&view=login');
-
+        cy.visit('/index.php?option=com_users&view=login');
         cy.get('#username').type('test');
         cy.get('#password').type('test');
         cy.get('#remember').check();
         cy.get('.controls > .btn').click();
+        cy.visit('/index.php?option=com_users&view=login');
 
-        cy.get('#system-message-container').should('contain.text', 'You have been logged in.');
+        cy.get('.com-users-logout').should('contain.text', 'Log out');
       });
   });
 
-  it('testing log in for test user through menu item', () => {
-    cy.db_createUser({
-      name: 'test user', username: 'test', email: 'test@example.com', password: '098f6bcd4621d373cade4e832627b4f6',
-    })
+  it('can log in a test user in a menu item', () => {
+    cy.db_createUser({ username: 'test', password: '098f6bcd4621d373cade4e832627b4f6' })
       .then(() => cy.db_createMenuItem({ title: 'Automated test login', link: 'index.php?option=com_users&view=login' }))
       .then(() => {
         cy.visit('/');
-
         cy.get('a:contains(Automated test login)').click();
         cy.get('#username').type('test');
         cy.get('#password').type('test');
         cy.get('#remember').check();
         cy.get('.controls > .btn').click();
+        cy.get('a:contains(Automated test login)').click();
 
-        cy.get('#system-message-container').should('contain.text', 'You have been logged in.');
+        cy.get('.com-users-logout').should('contain.text', 'Log out');
       });
   });
 });
diff --git a/tests/System/integration/site/components/com_users/Logout.cy.js b/tests/System/integration/site/components/com_users/Logout.cy.js
new file mode 100644
index 0000000000000..0798a83dec41f
--- /dev/null
+++ b/tests/System/integration/site/components/com_users/Logout.cy.js
@@ -0,0 +1,24 @@
+describe('Test in frontend that the users logout view', () => {
+  it('can log out the user without a menu item', () => {
+    // Make sure we are really logged in
+    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');
+    // This is disabled for now as it looks like cypress has an issue after redirect with the session
+    // cy.get('#system-message-container').should('contain.text', 'You have been logged out.');
+  });
+
+  it('can log out the user in a menu item', () => {
+    cy.db_createMenuItem({ title: 'Automated logout', link: 'index.php?option=com_users&view=login&layout=logout&task=user.menulogout' })
+      .then(() => {
+        // Make sure we are really logged in
+        cy.doFrontendLogin(null, null, false);
+        cy.visit('/');
+        cy.get('a:contains(Automated logout)').click();
+
+        cy.contains(`Hi ${Cypress.env('name')}`).should('not.exist');
+        cy.get('#system-message-container').should('contain.text', 'You have been logged out.');
+      });
+  });
+});
diff --git a/tests/System/integration/site/components/com_users/Profile.cy.js b/tests/System/integration/site/components/com_users/Profile.cy.js
new file mode 100644
index 0000000000000..f225afec6e969
--- /dev/null
+++ b/tests/System/integration/site/components/com_users/Profile.cy.js
@@ -0,0 +1,39 @@
+describe('Test in frontend that the users profile view', () => {
+  it('can display a user profile for a test user without a menu item', () => {
+    cy.db_createUser({
+      name: 'automated test user', username: 'automatedtestuser', password: '098f6bcd4621d373cade4e832627b4f6', registerDate: '2023-03-01 20:00:00',
+    })
+      .then(() => {
+        cy.doFrontendLogin('automatedtestuser', 'test', false);
+        cy.visit('/index.php?option=com_users&view=profile');
+
+        cy.get('#users-profile-core').should('contain.text', 'Profile');
+        cy.get('#users-profile-core').should('contain.text', 'Name');
+        cy.get('#users-profile-core').should('contain.text', 'automated test user');
+        cy.get('#users-profile-core').should('contain.text', 'Username');
+        cy.get('#users-profile-core').should('contain.text', 'automatedtestuser');
+        cy.get('#users-profile-core').should('contain.text', 'Registered Date');
+        cy.get('#users-profile-core').should('contain.text', 'Wednesday, 01 March 2023');
+      });
+  });
+
+  it('can display a user profile for a test user in a menu item', () => {
+    cy.db_createUser({
+      name: 'automated test user', username: 'automatedtestuser', password: '098f6bcd4621d373cade4e832627b4f6', registerDate: '2023-03-01 20:00:00',
+    })
+      .then(() => cy.db_createMenuItem({ title: 'Automated test user profile', link: 'index.php?option=com_users&view=profile' }))
+      .then(() => {
+        cy.doFrontendLogin('automatedtestuser', 'test', false);
+        cy.visit('/');
+        cy.get('a:contains(Automated test user profile)').click();
+
+        cy.get('#users-profile-core').should('contain.text', 'Profile');
+        cy.get('#users-profile-core').should('contain.text', 'Name');
+        cy.get('#users-profile-core').should('contain.text', 'automated test user');
+        cy.get('#users-profile-core').should('contain.text', 'Username');
+        cy.get('#users-profile-core').should('contain.text', 'automatedtestuser');
+        cy.get('#users-profile-core').should('contain.text', 'Registered Date');
+        cy.get('#users-profile-core').should('contain.text', 'Wednesday, 01 March 2023');
+      });
+  });
+});
diff --git a/tests/System/integration/site/components/com_users/Profile_Edit.cy.js b/tests/System/integration/site/components/com_users/Profile_Edit.cy.js
new file mode 100644
index 0000000000000..d40ff2636fcc3
--- /dev/null
+++ b/tests/System/integration/site/components/com_users/Profile_Edit.cy.js
@@ -0,0 +1,57 @@
+describe('Test in frontend that the users profile view edit layout', () => {
+  it('can display a user form without a menu item', () => {
+    cy.doFrontendLogin();
+    cy.visit('/index.php?option=com_users&view=profile&layout=edit');
+
+    cy.get('#member-profile > :nth-child(1) > legend').should('contain.text', 'Edit Your Profile');
+  });
+
+  it('can display a user form in a menu item', () => {
+    cy.db_createMenuItem({ title: 'Automated test edit', link: 'index.php?option=com_users&view=profile&layout=edit' })
+      .then(() => {
+        cy.doFrontendLogin();
+        cy.visit('/');
+        cy.get('a:contains(Automated test edit)').click();
+
+        cy.get('#member-profile > :nth-child(1) > legend').should('contain.text', 'Edit Your Profile');
+      });
+  });
+
+  it('can edit a test user without a menu item', () => {
+    cy.db_createUser({
+      name: 'automated test user 2', username: 'automatedtestuser2', password: '098f6bcd4621d373cade4e832627b4f6',
+    })
+      .then(() => {
+        cy.doFrontendLogin('automatedtestuser2', 'test', false);
+        cy.visit('/index.php?option=com_users&view=profile&layout=edit');
+
+        cy.get('#jform_name').clear().type('automated test user edited');
+        cy.get('#jform_email1').clear().type('testedited@example.com');
+        cy.get('.controls > .btn-primary').click({ force: true });
+
+        cy.get('#system-message-container').contains('Profile saved.');
+        cy.get('#users-profile-core').should('contain.text', 'Name');
+        cy.get('#users-profile-core').should('contain.text', 'automated test user edited');
+      });
+  });
+
+  it('can edit a test user in a menu item', () => {
+    cy.db_createUser({
+      name: 'automated test user', username: 'automatedtestuser', password: '098f6bcd4621d373cade4e832627b4f6',
+    });
+    cy.db_createMenuItem({ title: 'Automated test edit test user', link: 'index.php?option=com_users&view=profile&layout=edit' })
+      .then(() => {
+        cy.doFrontendLogin('automatedtestuser', 'test', false);
+        cy.visit('/');
+        cy.get('a:contains(Automated test edit)').click();
+
+        cy.get('#jform_name').clear().type('automated test user edited');
+        cy.get('#jform_email1').clear().type('testedited@example.com');
+        cy.get('.controls > .btn-primary').should('be.visible').click({ force: true });
+
+        cy.get('#system-message-container').contains('Profile saved.');
+        cy.get('#jform_name').should('have.value', 'automated test user edited');
+        cy.get('#jform_email1').should('have.value', 'testedited@example.com');
+      });
+  });
+});
diff --git a/tests/System/integration/site/components/com_users/Registration.cy.js b/tests/System/integration/site/components/com_users/Registration.cy.js
new file mode 100644
index 0000000000000..5cc44ace40ca2
--- /dev/null
+++ b/tests/System/integration/site/components/com_users/Registration.cy.js
@@ -0,0 +1,20 @@
+describe('Test in frontend that the users registration view', () => {
+  beforeEach(() => cy.db_updateExtensionParameter('allowUserRegistration', '1', 'com_users'));
+  afterEach(() => cy.db_updateExtensionParameter('allowUserRegistration', '0', 'com_users'));
+
+  it('can display a registration form for a test user without a menu item', () => {
+    cy.visit('/index.php?option=com_users&view=registration');
+
+    cy.get('.com-users-registration__form').should('contain.text', 'User Registration');
+  });
+
+  it('can display a registration form for a test user in a menu item', () => {
+    cy.db_createMenuItem({ title: 'Automated test registration', link: 'index.php?option=com_users&view=registration' })
+      .then(() => {
+        cy.visit('/');
+        cy.get('a:contains(Automated test registration)').click();
+
+        cy.get('.com-users-registration__form').should('contain.text', 'User Registration');
+      });
+  });
+});
diff --git a/tests/System/integration/site/components/com_users/Remind.cy.js b/tests/System/integration/site/components/com_users/Remind.cy.js
new file mode 100644
index 0000000000000..cfff552d39d77
--- /dev/null
+++ b/tests/System/integration/site/components/com_users/Remind.cy.js
@@ -0,0 +1,57 @@
+describe('Test in frontend that the users remind view', () => {
+  beforeEach(() => cy.task('clearEmails'));
+
+  it('can send a reminder email for a test user in a menu item', () => {
+    cy.db_createUser({ name: 'test user', email: 'test@example.com' })
+      .then(() => cy.db_createMenuItem({
+        title: 'Automated test reminder', alias: 'test-reminder', path: 'test-reminder', link: 'index.php?option=com_users&view=remind',
+      }))
+      .then(() => {
+        cy.visit('/');
+        cy.get('a:contains(Automated test reminder)').click();
+        cy.get('#jform_email').type('test@example.com');
+        cy.get('.controls > .btn').click();
+
+        cy.task('getMails').then((mails) => {
+          cy.get('#system-message-container').should('contain.text', 'If the email address you entered is registered on this site you will shortly receive an email with a reminder.');
+
+          cy.wrap(mails).should('have.lengthOf', 1);
+          cy.wrap(mails[0].body).should('have.string', 'A username reminder has been requested');
+          cy.wrap(mails[0].body).should('have.string', '/test-reminder');
+          cy.wrap(mails[0].sender).should('equal', Cypress.env('email'));
+          cy.wrap(mails[0].receivers).should('have.property', 'test@example.com');
+        });
+      });
+  });
+
+  it('can send a reminder email for a test user without a menu item', () => {
+    cy.db_createUser({ name: 'test user', email: 'test@example.com' })
+      .then(() => {
+        cy.visit('/index.php?option=com_users&view=remind');
+        cy.get('#jform_email').type('test@example.com');
+        cy.get('.controls > .btn').click();
+
+        cy.task('getMails').then((mails) => {
+          cy.get('#system-message-container').should('contain.text', 'If the email address you entered is registered on this site you will shortly receive an email with a reminder.');
+
+          cy.wrap(mails).should('have.lengthOf', 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].receivers).should('have.property', 'test@example.com');
+        });
+      });
+  });
+
+  it('can not send a reminder email for a user which is not registered', () => {
+    cy.visit('/index.php?option=com_users&view=remind');
+    cy.get('#jform_email').type('test@example.com');
+    cy.get('.controls > .btn').click();
+
+    cy.task('getMails').then((mails) => {
+      cy.get('#system-message-container').should('contain.text', 'If the email address you entered is registered on this site you will shortly receive an email with a reminder.');
+
+      cy.wrap(mails).should('have.lengthOf', 0);
+    });
+  });
+});
diff --git a/tests/System/integration/site/components/com_users/Reset.cy.js b/tests/System/integration/site/components/com_users/Reset.cy.js
new file mode 100644
index 0000000000000..c70f3d50178f0
--- /dev/null
+++ b/tests/System/integration/site/components/com_users/Reset.cy.js
@@ -0,0 +1,63 @@
+describe('Test in frontend that the users reset view', () => {
+  beforeEach(() => cy.task('clearEmails'));
+
+  it('can send a reset email for a test user without a menu item', () => {
+    cy.db_createUser({ email: 'test@example.com' })
+      .then(() => {
+        cy.visit('/index.php?option=com_users&view=reset');
+        cy.get('#jform_email').type('test@example.com');
+        cy.get('.controls > .btn').click();
+
+        cy.task('getMails').then((mails) => {
+          cy.get('#system-message-container').should('contain.text', 'If the email address you entered is registered on this site you will shortly receive an email with a link to reset the password for your account.');
+
+          cy.wrap(mails).should('have.lengthOf', 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].receivers).should('have.property', 'test@example.com');
+        });
+      });
+  });
+
+  it('can send a reset email for a test user in a menu item', () => {
+    cy.db_createUser({ email: 'test@example.com' })
+      .then(() => cy.db_createMenuItem({
+        title: 'Automated test reset', alias: 'test-reset', path: 'test-reset', link: 'index.php?option=com_users&view=reset',
+      }))
+      .then(() => {
+        cy.visit('/');
+        cy.get('a:contains(Automated test reset)').click();
+        cy.get('#jform_email').type('test@example.com');
+        cy.get('.controls > .btn').click();
+
+        cy.task('getMails').then((mails) => {
+          cy.get('#system-message-container').should('contain.text', 'If the email address you entered is registered on this site you will shortly receive an email with a link to reset the password for your account.');
+
+          cy.wrap(mails).should('have.lengthOf', 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].receivers).should('have.property', 'test@example.com');
+        });
+      });
+  });
+
+  it('can not send a reset email for a user which is not registered', () => {
+    cy.visit('/index.php?option=com_users&view=reset');
+    cy.get('#jform_email').type('test@example.com');
+    cy.get('.controls > .btn').click();
+
+    cy.task('getMails').then((mails) => {
+      cy.get('#system-message-container').should('contain.text', 'If the email address you entered is registered on this site you will shortly receive an email with a link to reset the password for your account.');
+
+      cy.wrap(mails).should('have.lengthOf', 0);
+    });
+  });
+
+  it('can show the profile page when logged in', () => {
+    cy.doFrontendLogin();
+    cy.visit('/index.php?option=com_users&view=reset');
+    cy.get('#users-profile-core').should('contain.text', 'Profile');
+  });
+});
diff --git a/tests/System/integration/site/components/com_wrapper/Wrapper.cy.js b/tests/System/integration/site/components/com_wrapper/Wrapper.cy.js
new file mode 100644
index 0000000000000..45f3888a8ddff
--- /dev/null
+++ b/tests/System/integration/site/components/com_wrapper/Wrapper.cy.js
@@ -0,0 +1,11 @@
+describe('Test in frontend that the wrapper view', () => {
+  it('can display wrapper', () => {
+    cy.db_createMenuItem({ title: 'automated test wrapper', link: 'index.php?option=com_wrapper&view=wrapper', params: JSON.stringify({ url: 'http://localhost/administrator/index.php' }) })
+      .then(() => {
+        cy.visit('/');
+        cy.get('a:contains(automated test wrapper)').click();
+
+        cy.get('.com-wrapper__iframe').should('exist');
+      });
+  });
+});
diff --git a/tests/System/integration/site/modules/mod_articles_archive/Default.cy.js b/tests/System/integration/site/modules/mod_articles_archive/Default.cy.js
index 8054afed4a961..b87c4f6647bfd 100644
--- a/tests/System/integration/site/modules/mod_articles_archive/Default.cy.js
+++ b/tests/System/integration/site/modules/mod_articles_archive/Default.cy.js
@@ -1,5 +1,5 @@
-describe('Test the articles archive module', () => {
-  it('can load in frontend and showing a list of months with archived articles', () => {
+describe('Test in frontend that the articles archive module', () => {
+  it('can display a list of months with archived articles', () => {
     cy.db_createArticle({ state: 2, created: '2022-09-09 20:00:00', modified: '2022-09-09 20:00:00' })
       .then(() => cy.db_createModule({ module: 'mod_articles_archive' }))
       .then(() => {
diff --git a/tests/System/integration/site/modules/mod_articles_categories/Default.cy.js b/tests/System/integration/site/modules/mod_articles_categories/Default.cy.js
new file mode 100644
index 0000000000000..26dddb3aa5ab7
--- /dev/null
+++ b/tests/System/integration/site/modules/mod_articles_categories/Default.cy.js
@@ -0,0 +1,11 @@
+describe('Test in frontend that the articles categories module', () => {
+  it('can display the title of the categories', () => {
+    cy.db_createCategory({ title: 'automated test category' })
+      .then(() => cy.db_createModule({ module: 'mod_articles_categories' }))
+      .then(() => {
+        cy.visit('/');
+
+        cy.contains('li', 'automated test category');
+      });
+  });
+});
diff --git a/tests/System/integration/site/modules/mod_articles_category/Default.cy.js b/tests/System/integration/site/modules/mod_articles_category/Default.cy.js
index a05f73d158bcc..796e6b3bb5700 100644
--- a/tests/System/integration/site/modules/mod_articles_category/Default.cy.js
+++ b/tests/System/integration/site/modules/mod_articles_category/Default.cy.js
@@ -1,5 +1,5 @@
-describe('Test the articles category module', () => {
-  it('can load in frontend and showing the title of the articles', () => {
+describe('Test in frontend that the articles category module', () => {
+  it('can display the title of the articles', () => {
     cy.db_createCategory({ extension: 'com_content' })
       .then(async (categoryId) => {
         await cy.db_createArticle({ title: 'automated test article', catid: categoryId });
diff --git a/tests/System/integration/site/modules/mod_articles_latest/Default.cy.js b/tests/System/integration/site/modules/mod_articles_latest/Default.cy.js
index 5cbd2b59003d7..487e0ccae2b2c 100644
--- a/tests/System/integration/site/modules/mod_articles_latest/Default.cy.js
+++ b/tests/System/integration/site/modules/mod_articles_latest/Default.cy.js
@@ -1,5 +1,5 @@
-describe('Test that the latest articles module', () => {
-  it('can load in frontend without ordering parameter', () => {
+describe('Test in frontend that the latest articles module', () => {
+  it('can load without ordering parameter', () => {
     cy.db_createArticle({ title: 'automated test article' })
       .then(() => cy.db_createModule({ module: 'mod_articles_latest' }))
       .then(() => {
diff --git a/tests/System/integration/site/modules/mod_articles_news/Default.cy.js b/tests/System/integration/site/modules/mod_articles_news/Default.cy.js
index a8b7a5e47e309..dfefbaeac4e03 100644
--- a/tests/System/integration/site/modules/mod_articles_news/Default.cy.js
+++ b/tests/System/integration/site/modules/mod_articles_news/Default.cy.js
@@ -1,5 +1,5 @@
-describe('Test that the news module', () => {
-  it('can load in frontend and showing the title of the articles', () => {
+describe('Test in frontend that the news module', () => {
+  it('can display the title of the articles', () => {
     cy.db_createArticle({ title: 'automated test article' })
       .then(() => cy.db_createModule({ module: 'mod_articles_news', params: JSON.stringify({ item_title: 1, item_heading: 'h3' }) }))
       .then(() => {
diff --git a/tests/System/integration/site/modules/mod_articles_popular/Default.cy.js b/tests/System/integration/site/modules/mod_articles_popular/Default.cy.js
index c739e3f429e7d..9c4edaa1a80cb 100644
--- a/tests/System/integration/site/modules/mod_articles_popular/Default.cy.js
+++ b/tests/System/integration/site/modules/mod_articles_popular/Default.cy.js
@@ -1,5 +1,5 @@
-describe('Test that the popular articles module', () => {
-  it('can load in frontend and shows the title of the test article ', () => {
+describe('Test in frontend that the popular articles module', () => {
+  it('can display the title of the test article', () => {
     cy.db_createCategory({ extension: 'com_content' })
       .then(async (categoryId) => {
         await cy.db_createArticle({ title: 'automated test article', catid: categoryId });
diff --git a/tests/System/integration/site/modules/mod_banners/Default.cy.js b/tests/System/integration/site/modules/mod_banners/Default.cy.js
index 7275d0b2a67a6..2785c88799673 100644
--- a/tests/System/integration/site/modules/mod_banners/Default.cy.js
+++ b/tests/System/integration/site/modules/mod_banners/Default.cy.js
@@ -1,4 +1,4 @@
-describe('Test that the banner module', () => {
+describe('Test in frontend that the banner module', () => {
   it('can display banners', () => {
     cy.db_createBanner({ custombannercode: 'automated test banner 1' })
       .then(() => cy.db_createBanner({ custombannercode: 'automated test banner 2' }))
diff --git a/tests/System/integration/site/modules/mod_breadcrumbs/Default.cy.js b/tests/System/integration/site/modules/mod_breadcrumbs/Default.cy.js
new file mode 100644
index 0000000000000..002c3bfa9e56a
--- /dev/null
+++ b/tests/System/integration/site/modules/mod_breadcrumbs/Default.cy.js
@@ -0,0 +1,9 @@
+describe('Test in frondend that the breadcrumbs module', () => {
+  it('can display the breadcrumb items', () => {
+    cy.db_createModule({ module: 'mod_breadcrumbs' }).then(() => {
+      cy.visit('/');
+
+      cy.contains('li', 'You are here:');
+    });
+  });
+});
diff --git a/tests/System/integration/site/modules/mod_custom/Default.cy.js b/tests/System/integration/site/modules/mod_custom/Default.cy.js
new file mode 100644
index 0000000000000..1d9f5aa81f9a5
--- /dev/null
+++ b/tests/System/integration/site/modules/mod_custom/Default.cy.js
@@ -0,0 +1,9 @@
+describe('Test in frontend that the custom module', () => {
+  it('can display the custom text', () => {
+    cy.db_createModule({ module: 'mod_custom', content: '<p>Automated test text</p>' }).then(() => {
+      cy.visit('/');
+
+      cy.contains('Automated test text');
+    });
+  });
+});
diff --git a/tests/System/integration/site/modules/mod_footer/Default.cy.js b/tests/System/integration/site/modules/mod_footer/Default.cy.js
index 96514ab2ae0ab..43d45004bf44f 100644
--- a/tests/System/integration/site/modules/mod_footer/Default.cy.js
+++ b/tests/System/integration/site/modules/mod_footer/Default.cy.js
@@ -1,5 +1,5 @@
-describe('Test that the footer module', () => {
-  it('can load in frontend and shows the copyright message from Joomla', () => {
+describe('Test in frontend that the footer module', () => {
+  it('can display the copyright message from Joomla', () => {
     cy.db_createModule({ module: 'mod_footer' }).then(() => {
       cy.visit('/');
 
diff --git a/tests/System/integration/site/modules/mod_login/Default.cy.js b/tests/System/integration/site/modules/mod_login/Default.cy.js
index f6ea62c31b08c..0cc08d9a4623f 100644
--- a/tests/System/integration/site/modules/mod_login/Default.cy.js
+++ b/tests/System/integration/site/modules/mod_login/Default.cy.js
@@ -1,5 +1,5 @@
-describe('Test that the login module', () => {
-  it('can log in and log out in frontend with the default credentials', () => {
+describe('Test in frontend that the login module', () => {
+  it('can log in and out with the default credentials', () => {
     cy.doFrontendLogin(null, null, false);
     cy.doFrontendLogout();
   });
@@ -17,7 +17,7 @@ describe('Test that the login module', () => {
       cy.get('input[name="remember"]').check();
       cy.get('.mod-login__submit > .btn').click();
 
-      cy.get('.alert-wrapper').should('contain.text', 'You have been logged in.');
+      cy.get('.mod-login-logout').should('contain.text', 'Hi automated test user');
     });
   });
 });
diff --git a/tests/System/integration/site/modules/mod_related_items/Default.cy.js b/tests/System/integration/site/modules/mod_related_items/Default.cy.js
new file mode 100644
index 0000000000000..9860b639cad4c
--- /dev/null
+++ b/tests/System/integration/site/modules/mod_related_items/Default.cy.js
@@ -0,0 +1,13 @@
+describe('Test in frontend that the related items module', () => {
+  it('can display a list of related articles based on the metakey field', () => {
+    cy.db_createArticle({ title: 'Main Article', metakey: 'joomla', featured: 1 })
+      .then(() => cy.db_createArticle({ title: 'article with joomla keyword', metakey: 'joomla' }))
+      .then(() => cy.db_createModule({ module: 'mod_related_items' }))
+      .then(() => {
+        cy.visit('/');
+        cy.contains('a', 'Main Article').click();
+
+        cy.contains('li', 'article with joomla keyword');
+      });
+  });
+});
diff --git a/tests/System/integration/site/modules/mod_users_latest/Default.cy.js b/tests/System/integration/site/modules/mod_users_latest/Default.cy.js
index 1d2083edf870d..dbacc66c88782 100644
--- a/tests/System/integration/site/modules/mod_users_latest/Default.cy.js
+++ b/tests/System/integration/site/modules/mod_users_latest/Default.cy.js
@@ -1,5 +1,5 @@
-describe('Test that the users latest module', () => {
-  it('can load in frontend and displays the latest registered users', () => {
+describe('Test in frontend that the users latest module', () => {
+  it('can display the latest registered users', () => {
     cy.db_createUser({ username: 'automatedtestuser' })
       .then(() => cy.db_createModule({ module: 'mod_users_latest' }))
       .then(() => {
diff --git a/tests/System/plugins/db.js b/tests/System/plugins/db.js
new file mode 100644
index 0000000000000..02ee7b83c89af
--- /dev/null
+++ b/tests/System/plugins/db.js
@@ -0,0 +1,147 @@
+const mysql = require('mysql');
+const postgres = require('postgres');
+
+// Items cache which are added by an insert statement
+let insertedItems = [];
+
+/**
+ * Does run the given query against the database from the configuration. It caches all inserted items.
+ *
+ * @param {string} query
+ * @param {object} config The config
+ * @returns Promise
+ */
+function queryTestDB(joomlaQuery, config) {
+  // Substitute the joomla table prefix
+  let query = joomlaQuery.replaceAll('#__', config.env.db_prefix);
+
+  // Parse the table name
+  const tableNameOfInsert = query.match(/insert\s+into\s+(.*?)\s/i);
+
+  // Find an inserted item
+  let insertItem = tableNameOfInsert && tableNameOfInsert.length > 1 && insertedItems.find((item) => item.table === tableNameOfInsert[1]);
+
+  // If it is an insert query, but there is no cache object, create one
+  if (tableNameOfInsert && tableNameOfInsert.length > 1 && !insertItem) {
+    insertItem = { table: tableNameOfInsert[1], rows: [] };
+
+    // Push it to the cache
+    insertedItems.push(insertItem);
+  }
+
+  // Check if the DB is from postgres
+  if (config.env.db_type === 'pgsql' || config.env.db_type === 'PostgreSQL (PDO)') {
+    const connection = postgres({
+      host: config.env.db_host,
+      port: config.env.db_port,
+      database: config.env.db_name,
+      username: config.env.db_user,
+      password: config.env.db_password,
+      idle_timeout: 1,
+      max_lifetime: 1,
+    });
+
+    // Postgres delivers the data direct as result of the insert query
+    if (insertItem) {
+      query += ' returning *';
+    }
+
+    // Postgres needs double quotes
+    query = query.replaceAll('`', '"');
+
+    return connection.unsafe(query).then((result) => {
+      // Select query should always return an array
+      if (query.indexOf('SELECT') === 0 && !Array.isArray(result)) {
+        return [result];
+      }
+
+      if (!insertItem || result.length === 0) {
+        return result;
+      }
+
+      // Push the id to the cache when it is an insert operation
+      if (insertItem && result.length && result[0].id) {
+        insertItem.rows.push(result[0].id);
+      }
+
+      // Normalize the object
+      return { insertId: result[0].id };
+    });
+  }
+
+  // Return a promise which runs the query
+  return new Promise((resolve, reject) => {
+    // Create the connection and connect
+    const connection = mysql.createConnection({
+      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,
+    });
+
+    // Perform the query
+    connection.query(query, (error, results) => {
+      connection.end();
+
+      // Reject when an error
+      if (error && error.errno) {
+        return reject(error);
+      }
+
+      // Push the id to the cache when it is an insert operation
+      if (insertItem && results && results.insertId) {
+        insertItem.rows.push(results.insertId);
+      }
+
+      // Resolve the result
+      return resolve(results);
+    });
+  });
+}
+
+/**
+ * Deletes the inserted items from the database.
+ *
+ * @param {object} config The configuration
+ *
+ * @returns null
+ */
+function deleteInsertedItems(config) {
+  // Holds the promises for the deleted items
+  const promises = [];
+
+  // Loop over the cached items
+  insertedItems.forEach((item) => {
+    // When there is nothing to delete, ignore it
+    if (item.rows.length < 1) {
+      return;
+    }
+
+    // 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`) {
+        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));
+      }
+
+      if (item.table === `${config.env.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`) {
+        promises.push(queryTestDB(`DELETE FROM #__modules_menu WHERE moduleid IN (${item.rows.join(',')})`, config));
+      }
+    }));
+  });
+
+  // Clear the cache
+  insertedItems = [];
+
+  // Return the promise which waits for all delete queries
+  return Promise.all(promises);
+}
+
+module.exports = { queryTestDB, deleteInsertedItems };
diff --git a/tests/System/plugins/fs.js b/tests/System/plugins/fs.js
new file mode 100644
index 0000000000000..b33d05dacd5b1
--- /dev/null
+++ b/tests/System/plugins/fs.js
@@ -0,0 +1,36 @@
+const fs = require('fs');
+const fspath = require('path');
+
+/**
+ * Deletes a folder with the given path recursive.
+ *
+ * @param {string} path The path
+ * @param {object} config The config
+ *
+ * @returns null
+ */
+function deleteFolder(path, config) {
+  fs.rmSync(`${config.env.cmsPath}/${path}`, { recursive: true, force: true });
+
+  return null;
+}
+
+/**
+ * Writes the given content to a file for the given path.
+ *
+ * @param {string} path The path
+ * @param {mixed} content The content
+ * @param {object} config The config
+ *
+ * @returns null
+ */
+function writeFile(path, content, config) {
+  fs.mkdirSync(fspath.dirname(`${config.env.cmsPath}/${path}`), { recursive: true, mode: 0o777 });
+  fs.chmod(fspath.dirname(`${config.env.cmsPath}/${path}`), 0o777);
+  fs.writeFileSync(`${config.env.cmsPath}/${path}`, content);
+  fs.chmod(`${config.env.cmsPath}/${path}`, 0o777);
+
+  return null;
+}
+
+module.exports = { writeFile, deleteFolder };
diff --git a/tests/System/plugins/index.js b/tests/System/plugins/index.js
index 8e07513a05116..ce228d8765c00 100644
--- a/tests/System/plugins/index.js
+++ b/tests/System/plugins/index.js
@@ -1,180 +1,6 @@
-const mysql = require('mysql');
-const postgres = require('postgres');
-const fs = require('fs');
-const fspath = require('path');
-
-/**
- * Deletes a folder with the given path recursive.
- *
- * @param {string} path The path
- * @param {object} config The config
- *
- * @returns null
- */
-function deleteFolder(path, config) {
-  fs.rmSync(`${config.env.cmsPath}/${path}`, { recursive: true, force: true });
-
-  return null;
-}
-
-/**
- * Writes the given content to a file for the given path.
- *
- * @param {string} path The path
- * @param {mixed} content The content
- * @param {object} config The config
- *
- * @returns null
- */
-function writeFile(path, content, config) {
-  fs.mkdirSync(fspath.dirname(`${config.env.cmsPath}/${path}`), { recursive: true, mode: 0o777 });
-  fs.chmod(fspath.dirname(`${config.env.cmsPath}/${path}`), 0o777);
-  fs.writeFileSync(`${config.env.cmsPath}/${path}`, content);
-  fs.chmod(`${config.env.cmsPath}/${path}`, 0o777);
-
-  return null;
-}
-
-// Rows cache of items which got inserted
-let insertedItems = [];
-
-/**
- * Does run the given query against the database from the configuration. It caches all inserted items.
- *
- * @param {string} query
- * @param {object} config The config
- * @returns Promise
- */
-function queryTestDB(joomlaQuery, config) {
-  // Substitute the joomla table prefix
-  let query = joomlaQuery.replaceAll('#__', config.env.db_prefix);
-
-  // Parse the table name
-  const tableNameOfInsert = query.match(/insert\s+into\s+(.*?)\s/i);
-
-  // Find an inserted item
-  let insertItem = tableNameOfInsert && tableNameOfInsert.length > 1 && insertedItems.find((item) => item.table === tableNameOfInsert[1]);
-
-  // If it is an insert query, but there is no cache object, create one
-  if (tableNameOfInsert && tableNameOfInsert.length > 1 && !insertItem) {
-    insertItem = { table: tableNameOfInsert[1], rows: [] };
-
-    // Push it to the cache
-    insertedItems.push(insertItem);
-  }
-
-  // Check if the DB is from postgres
-  if (config.env.db_type === 'pgsql' || config.env.db_type === 'PostgreSQL (PDO)') {
-    const connection = postgres({
-      host: config.env.db_host,
-      database: config.env.db_name,
-      username: config.env.db_user,
-      password: config.env.db_password,
-      idle_timeout: 1,
-      max_lifetime: 1,
-    });
-
-    // Postgres delivers the data direct as result of the insert query
-    if (insertItem) {
-      query += ' returning *';
-    }
-
-    // Postgres needs double quotes
-    query = query.replaceAll('\`', '"');
-
-    return connection.unsafe(query).then((result) => {
-      // Select query should always return an array
-      if (query.indexOf('SELECT') === 0 && !Array.isArray(result)) {
-        return [result];
-      }
-
-      if (!insertItem || result.length === 0) {
-        return result;
-      }
-
-      // Push the id to the cache when it is an insert operation
-      if (insertItem && result.length && result[0].id) {
-        insertItem.rows.push(result[0].id);
-      }
-
-      // Normalize the object
-      return { insertId: result[0].id };
-    });
-  }
-
-  // Return a promise when resolves the query
-  return new Promise((resolve, reject) => {
-    // Create the connection and connect
-    const connection = mysql.createConnection({
-      host: config.env.db_host,
-      user: config.env.db_user,
-      password: config.env.db_password,
-      database: config.env.db_name,
-    });
-
-    // Perform the query
-    connection.query(query, (error, results) => {
-      connection.end();
-
-      // Reject when an error
-      if (error && error.errno) {
-        return reject(error);
-      }
-
-      // Push the id to the cache when it is an insert operation
-      if (insertItem && results && results.insertId) {
-        insertItem.rows.push(results.insertId);
-      }
-
-      // Resolve the result
-      return resolve(results);
-    });
-  });
-}
-
-/**
- * Deletes the inserted items from the database.
- *
- * @param {object} config The configuration
- *
- * @returns null
- */
-function deleteInsertedItems(config) {
-  // Holds the promises for the deleted items
-  const promises = [];
-
-  // Loop over the cached items
-  insertedItems.forEach((item) => {
-    // When there is nothing to delete, ignore it
-    if (item.rows.length < 1) {
-      return;
-    }
-
-    // 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`) {
-        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));
-      }
-
-      if (item.table === `${config.env.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`) {
-        promises.push(queryTestDB(`DELETE FROM #__modules_menu WHERE moduleid IN (${item.rows.join(',')})`, config));
-      }
-    }));
-  });
-
-  // Clear the cache
-  insertedItems = [];
-
-  // Return the promise which waits for all delete queries
-  return Promise.all(promises);
-}
+const mail = require('./mail');
+const fs = require('./fs');
+const db = require('./db');
 
 /**
  * Does the setup of the plugins.
@@ -186,10 +12,13 @@ function deleteInsertedItems(config) {
  */
 function setupPlugins(on, config) {
   on('task', {
-    queryDB: (query) => queryTestDB(query, config),
-    cleanupDB: () => deleteInsertedItems(config),
-    writeFile: ({ path, content }) => writeFile(path, content, config),
-    deleteFolder: (path) => deleteFolder(path, config),
+    queryDB: (query) => db.queryTestDB(query, config),
+    cleanupDB: () => db.deleteInsertedItems(config),
+    writeFile: ({ path, content }) => fs.writeFile(path, content, config),
+    deleteFolder: (path) => fs.deleteFolder(path, config),
+    getMails: () => mail.getMails(),
+    clearEmails: () => mail.clearEmails(),
+    startMailServer: () => mail.startMailServer(config),
   });
 }
 
diff --git a/tests/System/plugins/mail.js b/tests/System/plugins/mail.js
new file mode 100644
index 0000000000000..4deea22b85f3e
--- /dev/null
+++ b/tests/System/plugins/mail.js
@@ -0,0 +1,67 @@
+const mailTester = require('smtp-tester');
+
+// The mail server instance
+let mailServer = null;
+
+// The cached mails
+let cachedMails = [];
+
+/**
+ * Returns all cached mails. It waits for maximum 3 seconds till a mail arrives.
+ *
+ * @returns a promise which resolves the cached mails
+ */
+async function getMails() {
+  // Waiting here maximum 3 seconds to get a mail
+  for (let i = 0; i < 3; i += 1) {
+    if (cachedMails.length !== 0) {
+      break;
+    }
+
+    // Sleep for a second
+    /* eslint-disable no-await-in-loop */
+    await new Promise((r) => { setTimeout(r, 1000); });
+    /* eslint-enable no-await-in-loop */
+  }
+
+  return new Promise((resolve) => { resolve(cachedMails); });
+}
+
+/**
+ * Clears the cached mails.
+ *
+ * @returns null
+ */
+function clearEmails() {
+  cachedMails = [];
+
+  return null;
+}
+
+/**
+ * Starts the mail server.
+ *
+ * @returns null
+ */
+function startMailServer(config) {
+  // Check if the mail server is already started
+  if (mailServer !== null) {
+    return null;
+  }
+
+  // Start the mail server on the configured port
+  mailServer = mailTester.init(config.env.smtp_port);
+
+  // Uncomment the next line when you want to see the incoming mails while writing the tests
+  // mailServer.module('logAll');
+
+  // Listen to incoming mails and add them to the internal cache
+  mailServer.bind((addr, id, email) => cachedMails.push(email));
+
+  // Reset the cached mails
+  cachedMails = [];
+
+  return null;
+}
+
+module.exports = { getMails, clearEmails, startMailServer };
diff --git a/tests/System/support/commands/api.js b/tests/System/support/commands/api.js
index e2bc86f59afee..f2067c7c805a1 100644
--- a/tests/System/support/commands/api.js
+++ b/tests/System/support/commands/api.js
@@ -1,3 +1,8 @@
+Cypress.Commands.add('api_responseContains', (response, attribute, value) => {
+  const items = response.body.data.map((item) => ({ attribute: item.attributes[attribute] }));
+  cy.wrap(items).should('deep.include', { attribute: value });
+});
+
 Cypress.Commands.add('api_get', (path) => cy.api_getBearerToken().then((token) => cy.request({ method: 'GET', url: `/api/index.php/v1${path}`, headers: { Authorization: `Bearer ${token}` } })));
 
 Cypress.Commands.add('api_post', (path, body) => cy.api_getBearerToken().then((token) => cy.request({
diff --git a/tests/System/support/commands/db.js b/tests/System/support/commands/db.js
index 4379dd9717c9c..acb5e1df344be 100644
--- a/tests/System/support/commands/db.js
+++ b/tests/System/support/commands/db.js
@@ -1,3 +1,30 @@
+/**
+ * The global cached default categories
+ */
+globalThis.joomlaCategories = [];
+
+/**
+ * Does return the default category id for the given extension with the name 'Uncategorized' from the default installation.
+ *
+ * The data is cached for performance reasons in the globalThis object
+ *
+ * @param {string} extension The extension
+ *
+ * @returns integer
+ */
+function getDefaultCategoryId(extension) {
+  if (globalThis.joomlaCategories[extension] !== undefined) {
+    return cy.wrap(globalThis.joomlaCategories[extension]);
+  }
+
+  return cy.task('queryDB', `SELECT id FROM #__categories where extension = '${extension}' AND title = 'Uncategorised' ORDER BY id ASC LIMIT 1`)
+    .then(async (data) => {
+      // Cache
+      globalThis.joomlaCategories[extension] = data[0].id;
+      return data[0].id;
+    });
+}
+
 /**
  * Returns an insert query for the given database and fields.
  *
@@ -16,11 +43,37 @@ function createInsertQuery(table, values) {
   return query;
 }
 
+/**
+ * Creates a privacy request in the database with the given data.
+ * The privacy request contains some default values when not all required fields are passed in the given data.
+ * The id of the inserted privacy request is returned
+ *
+ * @param {Object} privacyRequest The tag data to insert
+ *
+ * @returns integer
+ */
+Cypress.Commands.add('db_createPrivacyRequest', (privacyRequest) => {
+  const defaultPrivacyRequestOptions = {
+    email: 'test@example.com',
+    requested_at: '2023-01-01 20:00:00',
+    status: '0',
+  };
+
+  return cy.task('queryDB', createInsertQuery('privacy_requests', { ...defaultPrivacyRequestOptions, ...privacyRequest })).then(async (info) => info.insertId);
+});
+
+/**
+ * Creates an article in the database with the given data. The article contains some default values when
+ * not all required fields are passed in the given data. The id of the inserted article is returned.
+ *
+ * @param {Object} articleData The article data to insert
+ *
+ * @returns Object
+ */
 Cypress.Commands.add('db_createArticle', (articleData) => {
   const defaultArticleOptions = {
     title: 'test article',
     alias: 'test-article',
-    catid: 2,
     introtext: '',
     fulltext: '',
     featured: 0,
@@ -38,22 +91,37 @@ Cypress.Commands.add('db_createArticle', (articleData) => {
 
   const article = { ...defaultArticleOptions, ...articleData };
 
-  return cy.task('queryDB', createInsertQuery('content', article))
-    .then(async (info) => {
+  return getDefaultCategoryId('com_content')
+    .then((id) => {
+      if (article.catid === undefined) {
+        article.catid = id;
+      }
+
+      return cy.task('queryDB', createInsertQuery('content', article));
+    }).then(async (info) => {
+      article.id = info.insertId;
+
       if (article.featured === 1) {
-        await cy.task('queryDB', `INSERT INTO #__content_frontpage (content_id, ordering) VALUES ('${info.insertId}', '1')`);
+        await cy.task('queryDB', `INSERT INTO #__content_frontpage (content_id, ordering) VALUES ('${article.id}', '1')`);
       }
-      await cy.task('queryDB', `INSERT INTO #__workflow_associations (item_id, stage_id, extension) VALUES (${info.insertId}, 1, 'com_content.article')`);
+      await cy.task('queryDB', `INSERT INTO #__workflow_associations (item_id, stage_id, extension) VALUES (${article.id}, 1, 'com_content.article')`);
 
-      return info.insertId;
+      return article;
     });
 });
 
-Cypress.Commands.add('db_createContact', (contact) => {
+/**
+ * Creates a contact in the database with the given data. The contact contains some default values when
+ * not all required fields are passed in the given data. The id of the inserted contact is returned.
+ *
+ * @param {Object} contactData The contact data to insert
+ *
+ * @returns Object
+ */
+Cypress.Commands.add('db_createContact', (contactData) => {
   const defaultContactOptions = {
     name: 'test contact',
     alias: 'test-contact',
-    catid: 4,
     published: 1,
     access: 1,
     language: '*',
@@ -64,15 +132,35 @@ Cypress.Commands.add('db_createContact', (contact) => {
     params: '',
   };
 
-  return cy.task('queryDB', createInsertQuery('contact_details', { ...defaultContactOptions, ...contact }))
-    .then(async (info) => info.insertId);
+  const contact = { ...defaultContactOptions, ...contactData };
+
+  return getDefaultCategoryId('com_contact')
+    .then((id) => {
+      if (contact.catid === undefined) {
+        contact.catid = id;
+      }
+
+      return cy.task('queryDB', createInsertQuery('contact_details', contact));
+    })
+    .then(async (info) => {
+      contact.id = info.insertId;
+
+      return contact;
+    });
 });
 
-Cypress.Commands.add('db_createBanner', (banner) => {
+/**
+ * Creates a banner in the database with the given data. The banner contains some default values when
+ * not all required fields are passed in the given data. The id of the inserted banner is returned.
+ *
+ * @param {Object} bannerData The banner data to insert
+ *
+ * @returns Object
+ */
+Cypress.Commands.add('db_createBanner', (bannerData) => {
   const defaultBannerOptions = {
     name: 'test banner',
     alias: 'test-banner',
-    catid: 3,
     state: 1,
     type: 1,
     language: '*',
@@ -83,85 +171,104 @@ Cypress.Commands.add('db_createBanner', (banner) => {
     params: '',
   };
 
-  return cy.task('queryDB', createInsertQuery('banners', { ...defaultBannerOptions, ...banner })).then(async (info) => info.insertId);
-});
+  const banner = { ...defaultBannerOptions, ...bannerData };
 
-Cypress.Commands.add('db_createMenuItem', (menuItemData) => {
-  const defaultMenuItemOptions = {
-    title: 'test menu item',
-    alias: 'test-menu-item',
-    menutype: 'mainmenu',
-    type: 'component',
-    link: 'index.php?option=com_content',
-    component_id: 19,
-    path: 'test-menu-item',
-    parent_id: 1,
-    level: 1,
-    published: 1,
-    access: 1,
-    language: '*',
-    params: '',
-    img: '',
-  };
-
-  // Create the data to insert
-  const menuItem = { ...defaultMenuItemOptions, ...menuItemData };
-
-  // Extract the component from the link
-  const component = (new URLSearchParams(menuItem.link.replace('index.php', ''))).get('option');
+  return getDefaultCategoryId('com_banners')
+    .then((id) => {
+      if (banner.catid === undefined) {
+        banner.catid = id;
+      }
 
-  // Search for the component
-  return cy.task('queryDB', `SELECT extension_id FROM #__extensions WHERE name = '${component}'`).then((id) => {
-    // Get the correct component id from the extensions record
-    menuItem.component_id = id[0].extension_id;
+      return cy.task('queryDB', createInsertQuery('banners', banner));
+    })
+    .then(async (info) => {
+      banner.id = info.insertId;
 
-    // Create the menu item
-    return cy.task('queryDB', createInsertQuery('menu', menuItem)).then(async (info) => info.insertId);
-  });
+      return banner;
+    });
 });
 
-Cypress.Commands.add('db_createModule', (module) => {
-  const defaultModuleOptions = {
-    title: 'test module',
-    position: 'sidebar-right',
-    module: '',
-    client_id: 0,
-    access: 1,
-    published: 1,
-    language: '*',
-    params: '',
+/**
+ * Creates a banner client in the database with the given data. The banner client contains some default values when
+ * not all required fields are passed in the given data. The id of the inserted banner client is returned.
+ *
+ * @param {Object} bannerClientData The banner data to insert
+ *
+ * @returns Object
+ */
+Cypress.Commands.add('db_createBannerClient', (bannerClientData) => {
+  const defaultBannerClientOptions = {
+    name: 'test banner client',
+    contact: 'test banner client',
+    state: 0,
+    extrainfo: '',
   };
 
-  return cy.task('queryDB', createInsertQuery('modules', { ...defaultModuleOptions, ...module }))
+  const bannerclient = { ...defaultBannerClientOptions, ...bannerClientData };
+
+  return cy.task('queryDB', createInsertQuery('banner_clients', bannerclient))
     .then(async (info) => {
-      await cy.task('queryDB', `INSERT INTO #__modules_menu (moduleid, menuid) VALUES ('${info.insertId}', '0')`);
+      bannerclient.id = info.insertId;
 
-      return info.insertId;
+      return bannerclient;
     });
 });
 
-Cypress.Commands.add('db_createUser', (userData) => {
-  const defaultUserOptions = {
-    name: 'test user',
-    username: 'test',
-    email: 'test@example.com',
-    password: '098f6bcd4621d373cade4e832627b4f6', // Is the md5 of the word 'test'
-    block: 0,
-    registerDate: '2023-03-01 20:00:00',
+/**
+ * Creates a newsfeed in the database with the given data. The newsfeed contains some default values when
+ * not all required fields are passed in the given data. The id of the inserted newsfeed is returned.
+ *
+ * @param {Object} newsFeedData The newsfeed data to insert
+ *
+ * @returns Object
+ */
+Cypress.Commands.add('db_createNewsFeed', (newsFeedData) => {
+  const defaultNewsfeedOptions = {
+    name: 'test feed',
+    alias: 'test-feed',
+    link: '',
+    published: 1,
+    numarticles: 5,
+    checked_out: 0,
+    checked_out_time: '2023-01-01 20:00:00',
+    rtl: 0,
+    access: 1,
+    language: '*',
+    created: '2023-01-01 20:00:00',
+    modified: '2023-01-01 20:00:00',
+    metakey: '',
+    metadata: '',
+    metadesc: '',
+    description: '',
     params: '',
+    images: '',
   };
-  const user = { ...defaultUserOptions, ...userData };
 
-  const groupId = user.group_id ?? 2; // Default the group id to registered
-  delete user.group_id;
+  const newsFeed = { ...defaultNewsfeedOptions, ...newsFeedData };
 
-  return cy.task('queryDB', createInsertQuery('users', user)).then(async (info) => {
-    await cy.task('queryDB', `INSERT INTO #__user_usergroup_map (user_id, group_id) VALUES ('${info.insertId}', '${groupId}')`);
+  return getDefaultCategoryId('com_newsfeeds')
+    .then((id) => {
+      if (newsFeed.catid === undefined) {
+        newsFeed.catid = id;
+      }
 
-    return info.insertId;
-  });
+      return cy.task('queryDB', createInsertQuery('newsfeeds', newsFeed));
+    })
+    .then(async (info) => {
+      newsFeed.id = info.insertId;
+
+      return newsFeed;
+    });
 });
 
+/**
+ * Creates a category in the database with the given data. The category contains some default values when
+ * not all required fields are passed in the given data. The id of the inserted category is returned.
+ *
+ * @param {Object} categoryData The category data to insert
+ *
+ * @returns integer
+ */
 Cypress.Commands.add('db_createCategory', (category) => {
   const defaultCategoryOptions = {
     title: 'test category',
@@ -183,23 +290,14 @@ Cypress.Commands.add('db_createCategory', (category) => {
   return cy.task('queryDB', createInsertQuery('categories', { ...defaultCategoryOptions, ...category })).then(async (info) => info.insertId);
 });
 
-Cypress.Commands.add('db_createFieldGroup', (fieldGroup) => {
-  const defaultFieldGroupOptions = {
-    title: 'test field group',
-    state: 1,
-    language: '*',
-    context: '',
-    note: '',
-    description: '',
-    access: 1,
-    created: '2023-01-01 20:00:00',
-    modified: '2023-01-01 20:00:00',
-    params: '',
-  };
-
-  return cy.task('queryDB', createInsertQuery('fields_groups', { ...defaultFieldGroupOptions, ...fieldGroup })).then(async (info) => info.insertId);
-});
-
+/**
+ * Creates a field in the database with the given data. The field contains some default values when
+ * not all required fields are passed in the given data. The id of the inserted field is returned.
+ *
+ * @param {Object} field The field data to insert
+ *
+ * @returns integer
+ */
 Cypress.Commands.add('db_createField', (field) => {
   const defaultFieldOptions = {
     title: 'test field',
@@ -224,6 +322,39 @@ Cypress.Commands.add('db_createField', (field) => {
   return cy.task('queryDB', createInsertQuery('fields', { ...defaultFieldOptions, ...field })).then(async (info) => info.insertId);
 });
 
+/**
+ * Creates a field group in the database with the given data. The field group contains some default values when
+ * not all required fields are passed in the given data. The id of the inserted field group is returned.
+ *
+ * @param {Object} fieldGroup The field group data to insert
+ *
+ * @returns integer
+ */
+Cypress.Commands.add('db_createFieldGroup', (fieldGroup) => {
+  const defaultFieldGroupOptions = {
+    title: 'test field group',
+    state: 1,
+    language: '*',
+    context: '',
+    note: '',
+    description: '',
+    access: 1,
+    created: '2023-01-01 20:00:00',
+    modified: '2023-01-01 20:00:00',
+    params: '',
+  };
+
+  return cy.task('queryDB', createInsertQuery('fields_groups', { ...defaultFieldGroupOptions, ...fieldGroup })).then(async (info) => info.insertId);
+});
+
+/**
+ * Creates a tag in the database with the given data. The tag contains some default values when
+ * not all required fields are passed in the given data. The id of the inserted tag is returned.
+ *
+ * @param {Object} tag The tag data to insert
+ *
+ * @returns integer
+ */
 Cypress.Commands.add('db_createTag', (tag) => {
   const defaultTagOptions = {
     title: 'test tag',
@@ -252,12 +383,124 @@ Cypress.Commands.add('db_createTag', (tag) => {
   return cy.task('queryDB', createInsertQuery('tags', { ...defaultTagOptions, ...tag })).then(async (info) => info.insertId);
 });
 
+/**
+ * Creates an menu item in the database with the given data. The menu item contains some default values when
+ * not all required fields are passed in the given data. The id of the inserted menu item is returned.
+ *
+ * @param {Object} menuItemData The menu item data to insert
+ *
+ * @returns integerd
+ */
+Cypress.Commands.add('db_createMenuItem', (menuItemData) => {
+  const defaultMenuItemOptions = {
+    title: 'test menu item',
+    alias: 'test-menu-item',
+    menutype: 'mainmenu',
+    type: 'component',
+    link: 'index.php?option=com_content',
+    component_id: 19,
+    path: 'test-menu-item',
+    parent_id: 1,
+    level: 1,
+    published: 1,
+    access: 1,
+    language: '*',
+    params: '',
+    img: '',
+  };
+
+  // Create the data to insert
+  const menuItem = { ...defaultMenuItemOptions, ...menuItemData };
+
+  // Extract the component from the link
+  const component = (new URLSearchParams(menuItem.link.replace('index.php', ''))).get('option');
+
+  // Search for the component
+  return cy.task('queryDB', `SELECT extension_id FROM #__extensions WHERE name = '${component}'`).then((id) => {
+    // Get the correct component id from the extensions record
+    menuItem.component_id = id[0].extension_id;
+
+    // Create the menu item
+    return cy.task('queryDB', createInsertQuery('menu', menuItem)).then(async (info) => info.insertId);
+  });
+});
+
+/**
+ * Creates a module in the database with the given data. The module contains some default values when
+ * not all required fields are passed in the given data. The id of the inserted module is returned.
+ *
+ * @param {Object} moduleData The module data to insert
+ *
+ * @returns integer
+ */
+Cypress.Commands.add('db_createModule', (module) => {
+  const defaultModuleOptions = {
+    title: 'test module',
+    position: 'sidebar-right',
+    module: '',
+    client_id: 0,
+    access: 1,
+    published: 1,
+    language: '*',
+    params: '',
+  };
+
+  return cy.task('queryDB', createInsertQuery('modules', { ...defaultModuleOptions, ...module }))
+    .then(async (info) => {
+      await cy.task('queryDB', `INSERT INTO #__modules_menu (moduleid, menuid) VALUES ('${info.insertId}', '0')`);
+
+      return info.insertId;
+    });
+});
+
+/**
+ * Creates a user in the database with the given data. The user contains some default values when
+ * not all required fields are passed in the given data. The id of the inserted user is returned.
+ *
+ * @param {Object} userData The user data to insert
+ *
+ * @returns integer
+ */
+Cypress.Commands.add('db_createUser', (userData) => {
+  const defaultUserOptions = {
+    name: 'test user',
+    username: 'test',
+    email: 'test@example.com',
+    password: '098f6bcd4621d373cade4e832627b4f6', // Is the md5 of the word 'test'
+    block: 0,
+    registerDate: '2023-03-01 20:00:00',
+    params: '',
+  };
+  const user = { ...defaultUserOptions, ...userData };
+
+  const groupId = user.group_id ?? 2; // Default the group id to registered
+  delete user.group_id;
+
+  return cy.task('queryDB', createInsertQuery('users', user)).then(async (info) => {
+    await cy.task('queryDB', `INSERT INTO #__user_usergroup_map (user_id, group_id) VALUES ('${info.insertId}', '${groupId}')`);
+
+    return info.insertId;
+  });
+});
+
+/**
+ * Sets the parameter for the given extension.
+ *
+ * @param {string} key The key
+ * @param {string} value The value
+ * @param {string} extension The extension
+ */
 Cypress.Commands.add('db_updateExtensionParameter', (key, value, extension) => cy.task('queryDB', `SELECT params FROM #__extensions WHERE name = '${extension}'`).then((paramsString) => {
   const params = JSON.parse(paramsString[0].params);
   params[key] = value;
   return cy.task('queryDB', `UPDATE #__extensions SET params = '${JSON.stringify(params)}' WHERE name = '${extension}'`);
 }));
 
+/**
+ * Returns the id of the currently logged in user.
+ *
+ * @returns integer
+ */
 Cypress.Commands.add('db_getUserId', () => {
   cy.task('queryDB', `SELECT id FROM #__users WHERE username = '${Cypress.env('username')}'`)
     .then((id) => {
diff --git a/tests/System/support/index.js b/tests/System/support/index.js
index 12fa7795631c8..43e0237e29b65 100644
--- a/tests/System/support/index.js
+++ b/tests/System/support/index.js
@@ -2,6 +2,7 @@ import './commands';
 import 'joomla-cypress';
 
 before(() => {
+  cy.task('startMailServer');
   Cypress.on('uncaught:exception', (err, runnable) => {
     console.log(`err :${err}`);
     console.log(`runnable :${runnable}`);
diff --git a/tests/Unit/Component/Finder/Administrator/Indexer/ResultTest.php b/tests/Unit/Component/Finder/Administrator/Indexer/ResultTest.php
index 28bf30b240c24..8964c7357c7f7 100644
--- a/tests/Unit/Component/Finder/Administrator/Indexer/ResultTest.php
+++ b/tests/Unit/Component/Finder/Administrator/Indexer/ResultTest.php
@@ -12,7 +12,6 @@
 
 use Joomla\Component\Finder\Administrator\Indexer\Result;
 use Joomla\Tests\Unit\UnitTestCase;
-use ReflectionClass;
 
 /**
  * Test class for \Joomla\Component\Finder\Administrator\Indexer\Result
@@ -72,6 +71,6 @@ public function testSerialize(): void
      */
     private function createNoConstructorMock($class = Result::class): object
     {
-        return (new ReflectionClass($class))->newInstanceWithoutConstructor();
+        return (new \ReflectionClass($class))->newInstanceWithoutConstructor();
     }
 }
diff --git a/tests/Unit/Libraries/Cms/Date/DateTest.php b/tests/Unit/Libraries/Cms/Date/DateTest.php
index 4e3370abb99aa..b0546ad60ad6f 100644
--- a/tests/Unit/Libraries/Cms/Date/DateTest.php
+++ b/tests/Unit/Libraries/Cms/Date/DateTest.php
@@ -163,10 +163,6 @@ public function testMagicGetter()
         $this->assertSame('th', $date->ordinal);
         $this->assertSame('10', $date->week);
         $this->assertSame('1978', $date->year);
-
-        // Test that a notice is generated when accessing something that the magic getter cannot provide.
-        $this->expectNotice();
-        $date->noSuchProperty;
     }
 
     /**
diff --git a/tests/Unit/Libraries/Cms/Document/DocumentAwareTraitTest.php b/tests/Unit/Libraries/Cms/Document/DocumentAwareTraitTest.php
new file mode 100644
index 0000000000000..a41ada99319e0
--- /dev/null
+++ b/tests/Unit/Libraries/Cms/Document/DocumentAwareTraitTest.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * @package     Joomla.UnitTest
+ * @subpackage  Base
+ *
+ * @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\Tests\Unit\Libraries\Cms\Document;
+
+use Joomla\CMS\Document\Document;
+use Joomla\CMS\Document\DocumentAwareTrait;
+use Joomla\Tests\Unit\UnitTestCase;
+
+/**
+ * Test class for \Joomla\CMS\Document\DocumentAwareTrait
+ *
+ * @package     Joomla.UnitTest
+ * @subpackage  MVC
+ * @since       4.4.0
+ */
+class DocumentAwareTraitTest extends UnitTestCase
+{
+    /**
+     * @testdox  The user document can be set and accessed by the trait
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function testGetSetDocument()
+    {
+        $document = new Document();
+        $trait    = new class () {
+            use DocumentAwareTrait;
+
+            public function get(): Document
+            {
+                return $this->getDocument();
+            }
+        };
+
+        $trait->setDocument($document);
+
+        $this->assertEquals($document, $trait->get());
+    }
+
+    /**
+     * @testdox  The user document can be set and accessed by the trait
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function testGetDocumentThrowsException()
+    {
+        $this->expectException(\UnexpectedValueException::class);
+
+        $trait = new class () {
+            use DocumentAwareTrait;
+
+            public function get(): Document
+            {
+                return $this->getDocument();
+            }
+        };
+
+        $trait->get();
+    }
+}
diff --git a/tests/Unit/Libraries/Cms/Feed/FeedEntryTest.php b/tests/Unit/Libraries/Cms/Feed/FeedEntryTest.php
index a44b1dda1d979..37bec5bf2d0b7 100644
--- a/tests/Unit/Libraries/Cms/Feed/FeedEntryTest.php
+++ b/tests/Unit/Libraries/Cms/Feed/FeedEntryTest.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Tests\Unit\Libraries\Cms\Feed;
 
-use InvalidArgumentException;
 use Joomla\CMS\Date\Date;
 use Joomla\CMS\Feed\FeedEntry;
 use Joomla\CMS\Feed\FeedLink;
@@ -148,7 +147,7 @@ public function testSetAuthorWithPerson()
      */
     public function testSetAuthorWithInvalidAuthor()
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(\InvalidArgumentException::class);
         $this->feedEntry->author = 'Jack Sprat';
     }
 
@@ -161,7 +160,7 @@ public function testSetAuthorWithInvalidAuthor()
      */
     public function testSetSourceWithInvalidSource()
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(\InvalidArgumentException::class);
         $this->feedEntry->source = 'Outer Space';
     }
 
@@ -174,7 +173,7 @@ public function testSetSourceWithInvalidSource()
      */
     public function testSetCategoriesWithInvalidProperty()
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(\InvalidArgumentException::class);
         $this->feedEntry->categories = 'Can\'t touch this';
     }
 
diff --git a/tests/Unit/Libraries/Cms/Feed/FeedFactoryTest.php b/tests/Unit/Libraries/Cms/Feed/FeedFactoryTest.php
index 175f05a302a9f..fdf85ea75b37b 100644
--- a/tests/Unit/Libraries/Cms/Feed/FeedFactoryTest.php
+++ b/tests/Unit/Libraries/Cms/Feed/FeedFactoryTest.php
@@ -10,11 +10,9 @@
 
 namespace Joomla\Tests\Unit\Libraries\Cms\Feed;
 
-use InvalidArgumentException;
 use Joomla\CMS\Feed\FeedFactory;
 use Joomla\CMS\Feed\FeedParser;
 use Joomla\Tests\Unit\UnitTestCase;
-use ReflectionClass;
 
 /**
  * Test class for FeedFactory.
@@ -114,7 +112,7 @@ public function testRegisterParser()
      */
     public function testRegisterParserWithInvalidClass()
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(\InvalidArgumentException::class);
         $this->feedFactory->registerParser('does-not-exist', 'NotExistingClass');
     }
 
@@ -126,7 +124,7 @@ public function testRegisterParserWithInvalidClass()
      */
     public function testRegisterParserWithInvalidTag()
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(\InvalidArgumentException::class);
         $parseMock = $this->createMock(FeedParser::class);
         $this->feedFactory->registerParser('42tag', get_class($parseMock));
     }
@@ -145,7 +143,7 @@ public function testFetchFeedParser()
         $this->feedFactory->registerParser($tagName, get_class($parseMock));
 
         // Use reflection to test private method
-        $reflectionClass = new ReflectionClass($this->feedFactory);
+        $reflectionClass = new \ReflectionClass($this->feedFactory);
         $method          = $reflectionClass->getMethod('_fetchFeedParser');
         $method->setAccessible(true);
         $parser = $method->invoke($this->feedFactory, $tagName, new \XMLReader());
@@ -166,7 +164,7 @@ public function testFetchFeedParserWithInvalidTag()
         $this->expectException(\LogicException::class);
 
         // Use reflection to test private method
-        $reflectionClass = new ReflectionClass($this->feedFactory);
+        $reflectionClass = new \ReflectionClass($this->feedFactory);
         $method          = $reflectionClass->getMethod('_fetchFeedParser');
         $method->setAccessible(true);
         $method->invoke($this->feedFactory, 'not-existing', new \XMLReader());
diff --git a/tests/Unit/Libraries/Cms/Feed/FeedLinkTest.php b/tests/Unit/Libraries/Cms/Feed/FeedLinkTest.php
index 20adfb97102b0..5a00cadb65a0a 100644
--- a/tests/Unit/Libraries/Cms/Feed/FeedLinkTest.php
+++ b/tests/Unit/Libraries/Cms/Feed/FeedLinkTest.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Tests\Unit\Libraries\Cms\Feed;
 
-use InvalidArgumentException;
 use Joomla\CMS\Feed\FeedLink;
 use Joomla\Tests\Unit\UnitTestCase;
 
@@ -32,7 +31,7 @@ class FeedLinkTest extends UnitTestCase
      */
     public function testConstructWithInvalidLength()
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(\InvalidArgumentException::class);
         new FeedLink('URI', 'self', 'application/x-pdf', 'en-GB', 'My Link', 'foobar');
     }
 }
diff --git a/tests/Unit/Libraries/Cms/Feed/FeedParserTest.php b/tests/Unit/Libraries/Cms/Feed/FeedParserTest.php
index 6c1915f7c7f08..97e4fc96c3f09 100644
--- a/tests/Unit/Libraries/Cms/Feed/FeedParserTest.php
+++ b/tests/Unit/Libraries/Cms/Feed/FeedParserTest.php
@@ -15,9 +15,7 @@
 use Joomla\CMS\Feed\FeedParser;
 use Joomla\CMS\Feed\Parser\NamespaceParserInterface;
 use Joomla\Tests\Unit\UnitTestCase;
-use ReflectionClass;
 use SimpleXMLElement;
-use XMLReader;
 
 /**
  * Test class for FeedParser.
@@ -97,7 +95,7 @@ public function testParseNamespaceElement()
                 $this->isInstanceOf(Feed::class),
                 $this->callback(
                     function ($value) use ($content) {
-                        return $value instanceof SimpleXMLElement && (string) $value[0] === $content;
+                        return $value instanceof \SimpleXMLElement && (string) $value[0] === $content;
                     }
                 )
             );
@@ -182,7 +180,7 @@ public function testParseElementWithNamespaceEntry()
                 $this->isInstanceOf(FeedEntry::class),
                 $this->callback(
                     function ($value) use ($content) {
-                        return $value instanceof SimpleXMLElement && (string) $value[0] === '';
+                        return $value instanceof \SimpleXMLElement && (string) $value[0] === '';
                     }
                 )
             );
@@ -227,7 +225,7 @@ public function testMoveToNextElement()
         $parser = new FeedParserStub($xmlReader);
 
         // Use reflection to test protected method (it's easier than testing this using the public interface)
-        $reflectionClass = new ReflectionClass($parser);
+        $reflectionClass = new \ReflectionClass($parser);
         $method          = $reflectionClass->getMethod('moveToNextElement');
         $method->setAccessible(true);
 
@@ -272,7 +270,7 @@ public function testMoveToNextElementByName()
         $parser = new FeedParserStub($xmlReader);
 
         // Use reflection to test protected method (it's easier than testing this using the public interface)
-        $reflectionClass = new ReflectionClass($parser);
+        $reflectionClass = new \ReflectionClass($parser);
         $method          = $reflectionClass->getMethod('moveToNextElement');
         $method->setAccessible(true);
 
@@ -305,7 +303,7 @@ public function testMoveToClosingElement()
         $parser = new FeedParserStub($xmlReader);
 
         // Use reflection to test protected method (it's easier than testing this using the public interface)
-        $reflectionClass = new ReflectionClass($parser);
+        $reflectionClass = new \ReflectionClass($parser);
         $method          = $reflectionClass->getMethod('moveToClosingElement');
         $method->setAccessible(true);
 
@@ -313,7 +311,7 @@ public function testMoveToClosingElement()
         $method->invoke($parser);
 
         // Move to the closing element, which should be </root>.
-        $this->assertEquals(XMLReader::END_ELEMENT, $xmlReader->nodeType);
+        $this->assertEquals(\XMLReader::END_ELEMENT, $xmlReader->nodeType);
         $this->assertEquals('root', $xmlReader->name);
     }
 
@@ -334,7 +332,7 @@ public function testMoveToClosingElementWithInternalElements()
         $parser = new FeedParserStub($xmlReader);
 
         // Use reflection to test protected method (it's easier than testing this using the public interface)
-        $reflectionClass = new ReflectionClass($parser);
+        $reflectionClass = new \ReflectionClass($parser);
         $method          = $reflectionClass->getMethod('moveToClosingElement');
         $method->setAccessible(true);
 
@@ -342,7 +340,7 @@ public function testMoveToClosingElementWithInternalElements()
         $method->invoke($parser);
 
         // Ensure that the current node is closing element
-        $this->assertEquals(XMLReader::END_ELEMENT, $xmlReader->nodeType);
+        $this->assertEquals(\XMLReader::END_ELEMENT, $xmlReader->nodeType);
         $this->assertEquals('node', $xmlReader->name);
     }
 
@@ -363,7 +361,7 @@ public function testMoveToClosingElementWithSelfClosingTag()
         $parser = new FeedParserStub($xmlReader);
 
         // Use reflection to test protected method (it's easier than testing this using the public interface)
-        $reflectionClass = new ReflectionClass($parser);
+        $reflectionClass = new \ReflectionClass($parser);
         $method          = $reflectionClass->getMethod('moveToClosingElement');
         $method->setAccessible(true);
 
@@ -381,21 +379,21 @@ public function testMoveToClosingElementWithSelfClosingTag()
      * @param   mixed   $xml     XML
      * @param   mixed   $moveTo  Moveto
      *
-     * @return XMLReader
+     * @return \XMLReader
      *
      * @since 4.0.0
      */
-    protected function getXmlReader($xml, $moveTo): XMLReader
+    protected function getXmlReader($xml, $moveTo): \XMLReader
     {
         // It's hard to mock the xml reader stream, so we use the real object here (but set xml directly)
-        $xmlReader = new XMLReader();
+        $xmlReader = new \XMLReader();
 
         // Set the XML for the internal reader and move the stream to the element.
         $xmlReader->XML($xml);
 
         do {
             $xmlReader->read();
-        } while ($xmlReader->name != $moveTo && $xmlReader->nodeType != XMLReader::END_ELEMENT);
+        } while ($xmlReader->name != $moveTo && $xmlReader->nodeType != \XMLReader::END_ELEMENT);
 
         return $xmlReader;
     }
@@ -495,7 +493,7 @@ public function getProcessFeedEntryCalledWith(): array
      *
      * @since   4.0.0
      */
-    public function processFeedEntry(FeedEntry $entry, SimpleXMLElement $el)
+    public function processFeedEntry(FeedEntry $entry, \SimpleXMLElement $el)
     {
         $this->processFeedEntryCalledWith[] = [
             'entry' => $entry,
@@ -526,7 +524,7 @@ protected function initialise()
      *
      * @since   4.0.0
      */
-    protected function handleCustom(Feed $feed, SimpleXMLElement $el)
+    protected function handleCustom(Feed $feed, \SimpleXMLElement $el)
     {
         $this->handleCustomCalledWith[] = [
             'feed' => $feed,
@@ -554,7 +552,7 @@ class FeedParserStubUnregistered implements NamespaceParserInterface
      *
      * @since   3.1.4
      */
-    public function processElementForFeed(Feed $feed, SimpleXMLElement $el)
+    public function processElementForFeed(Feed $feed, \SimpleXMLElement $el)
     {
     }
 
@@ -568,7 +566,7 @@ public function processElementForFeed(Feed $feed, SimpleXMLElement $el)
      *
      * @since   3.1.4
      */
-    public function processElementForFeedEntry(FeedEntry $entry, SimpleXMLElement $el)
+    public function processElementForFeedEntry(FeedEntry $entry, \SimpleXMLElement $el)
     {
     }
 }
diff --git a/tests/Unit/Libraries/Cms/Feed/FeedTest.php b/tests/Unit/Libraries/Cms/Feed/FeedTest.php
index f2612003889b5..927d52249985d 100644
--- a/tests/Unit/Libraries/Cms/Feed/FeedTest.php
+++ b/tests/Unit/Libraries/Cms/Feed/FeedTest.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Tests\Unit\Libraries\Cms\Feed;
 
-use InvalidArgumentException;
 use Joomla\CMS\Date\Date;
 use Joomla\CMS\Feed\Feed;
 use Joomla\CMS\Feed\FeedEntry;
@@ -181,7 +180,7 @@ public function testSetAuthorWithPerson()
      */
     public function testSetAuthorWithInvalidAuthor()
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(\InvalidArgumentException::class);
         $this->feed->author = 'Jack Sprat';
     }
 
@@ -194,7 +193,7 @@ public function testSetAuthorWithInvalidAuthor()
      */
     public function testSetCategoriesWithInvalidProperty()
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(\InvalidArgumentException::class);
         $this->feed->categories = 'Can\'t touch this';
     }
 
@@ -207,7 +206,7 @@ public function testSetCategoriesWithInvalidProperty()
      */
     public function testSetContributorsWithInvalidProperty()
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(\InvalidArgumentException::class);
         $this->feed->contributors = 'Can\'t touch this';
     }
 
@@ -439,7 +438,7 @@ public function testOffsetGet()
      */
     public function testOffsetSetWithString()
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(\InvalidArgumentException::class);
         $this->feed->offsetSet(1, 'My string');
     }
 
diff --git a/tests/Unit/Libraries/Cms/Feed/Parser/AtomParserTest.php b/tests/Unit/Libraries/Cms/Feed/Parser/AtomParserTest.php
index cd921b65b19be..23de4a73d71fe 100644
--- a/tests/Unit/Libraries/Cms/Feed/Parser/AtomParserTest.php
+++ b/tests/Unit/Libraries/Cms/Feed/Parser/AtomParserTest.php
@@ -15,9 +15,6 @@
 use Joomla\CMS\Feed\FeedLink;
 use Joomla\CMS\Feed\Parser\AtomParser;
 use Joomla\Tests\Unit\UnitTestCase;
-use ReflectionClass;
-use SimpleXMLElement;
-use XMLReader;
 
 /**
  * Test class for AtomParser.
@@ -45,8 +42,8 @@ public function testHandleAuthor()
         ];
 
         // It's currently not possible to mock simple xml element
-        // @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
-        $xmlElement        = new SimpleXMLElement('<author/>');
+        // @link https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+        $xmlElement        = new \SimpleXMLElement('<author/>');
         $xmlElement->name  = $author['name'];
         $xmlElement->email = $author['email'];
         $xmlElement->uri   = $author['uri'];
@@ -59,7 +56,7 @@ public function testHandleAuthor()
 
         // Use reflection to test protected method
         $atomParser      = new AtomParser(new \XMLReader());
-        $reflectionClass = new ReflectionClass($atomParser);
+        $reflectionClass = new \ReflectionClass($atomParser);
         $method          = $reflectionClass->getMethod('handleAuthor');
         $method->setAccessible(true);
         $method->invoke($atomParser, $feedMock, $xmlElement);
@@ -82,8 +79,8 @@ public function testHandleContributor()
         ];
 
         // It's currently not possible to mock simple xml element
-        // @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
-        $xmlElement        = new SimpleXMLElement('<contributor />');
+        // @link https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+        $xmlElement        = new \SimpleXMLElement('<contributor />');
         $xmlElement->name  = $contributor['name'];
         $xmlElement->email = $contributor['email'];
         $xmlElement->uri   = $contributor['uri'];
@@ -96,7 +93,7 @@ public function testHandleContributor()
 
         // Use reflection to test protected method
         $atomParser      = new AtomParser(new \XMLReader());
-        $reflectionClass = new ReflectionClass($atomParser);
+        $reflectionClass = new \ReflectionClass($atomParser);
         $method          = $reflectionClass->getMethod('handleContributor');
         $method->setAccessible(true);
         $method->invoke($atomParser, $feedMock, $xmlElement);
@@ -115,8 +112,8 @@ public function testHandleGenerator()
         $generator = 'Joomla';
 
         // It's currently not possible to mock simple xml element
-        // @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
-        $xmlElement = new SimpleXMLElement('<generator>' . $generator . '</generator>');
+        // @link https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+        $xmlElement = new \SimpleXMLElement('<generator>' . $generator . '</generator>');
 
         $feedMock = $this->createMock(Feed::class);
         $feedMock
@@ -126,7 +123,7 @@ public function testHandleGenerator()
 
         // Use reflection to test protected method
         $atomParser      = new AtomParser(new \XMLReader());
-        $reflectionClass = new ReflectionClass($atomParser);
+        $reflectionClass = new \ReflectionClass($atomParser);
         $method          = $reflectionClass->getMethod('handleGenerator');
         $method->setAccessible(true);
         $method->invoke($atomParser, $feedMock, $xmlElement);
@@ -145,8 +142,8 @@ public function testHandleId()
         $id = 'http://domain.com/path/to/resource';
 
         // It's currently not possible to mock simple xml element
-        // @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
-        $xmlElement = new SimpleXMLElement('<id>' . $id . '</id>');
+        // @link https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+        $xmlElement = new \SimpleXMLElement('<id>' . $id . '</id>');
 
         $feedMock = $this->createMock(Feed::class);
         $feedMock
@@ -156,7 +153,7 @@ public function testHandleId()
 
         // Use reflection to test protected method
         $atomParser      = new AtomParser(new \XMLReader());
-        $reflectionClass = new ReflectionClass($atomParser);
+        $reflectionClass = new \ReflectionClass($atomParser);
         $method          = $reflectionClass->getMethod('handleId');
         $method->setAccessible(true);
         $method->invoke($atomParser, $feedMock, $xmlElement);
@@ -175,8 +172,8 @@ public function testHandleLink()
         $href = 'http://domain.com/path/to/resource';
 
         // It's currently not possible to mock simple xml element
-        // @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
-        $xmlElement = new SimpleXMLElement('<link href="' . $href . '" />');
+        // @link https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+        $xmlElement = new \SimpleXMLElement('<link href="' . $href . '" />');
 
         $feedMock = $this->createMock(Feed::class);
         $feedMock
@@ -193,7 +190,7 @@ function ($param) use ($href) {
 
         // Use reflection to test protected method
         $atomParser      = new AtomParser(new \XMLReader());
-        $reflectionClass = new ReflectionClass($atomParser);
+        $reflectionClass = new \ReflectionClass($atomParser);
         $method          = $reflectionClass->getMethod('handleLink');
         $method->setAccessible(true);
         $method->invoke($atomParser, $feedMock, $xmlElement);
@@ -212,8 +209,8 @@ public function testHandleRights()
         $copyright = 'All Rights Reserved.';
 
         // It's currently not possible to mock simple xml element
-        // @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
-        $xmlElement = new SimpleXMLElement('<rights>' . $copyright . '</rights>');
+        // @link https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+        $xmlElement = new \SimpleXMLElement('<rights>' . $copyright . '</rights>');
 
         $feedMock = $this->createMock(Feed::class);
         $feedMock
@@ -223,7 +220,7 @@ public function testHandleRights()
 
         // Use reflection to test protected method
         $atomParser      = new AtomParser(new \XMLReader());
-        $reflectionClass = new ReflectionClass($atomParser);
+        $reflectionClass = new \ReflectionClass($atomParser);
         $method          = $reflectionClass->getMethod('handleRights');
         $method->setAccessible(true);
         $method->invoke($atomParser, $feedMock, $xmlElement);
@@ -242,8 +239,8 @@ public function testHandleSubtitle()
         $subtitle = 'Lorem Ipsum ...';
 
         // It's currently not possible to mock simple xml element
-        // @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
-        $xmlElement = new SimpleXMLElement('<subtitle>' . $subtitle . '</subtitle>');
+        // @link https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+        $xmlElement = new \SimpleXMLElement('<subtitle>' . $subtitle . '</subtitle>');
 
         $feedMock = $this->createMock(Feed::class);
         $feedMock
@@ -253,7 +250,7 @@ public function testHandleSubtitle()
 
         // Use reflection to test protected method
         $atomParser      = new AtomParser(new \XMLReader());
-        $reflectionClass = new ReflectionClass($atomParser);
+        $reflectionClass = new \ReflectionClass($atomParser);
         $method          = $reflectionClass->getMethod('handleSubtitle');
         $method->setAccessible(true);
         $method->invoke($atomParser, $feedMock, $xmlElement);
@@ -272,8 +269,8 @@ public function testHandleTitle()
         $title = 'My Title.';
 
         // It's currently not possible to mock simple xml element
-        // @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
-        $xmlElement = new SimpleXMLElement('<title>' . $title . '</title>');
+        // @link https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+        $xmlElement = new \SimpleXMLElement('<title>' . $title . '</title>');
 
         $feedMock = $this->createMock(Feed::class);
         $feedMock
@@ -283,7 +280,7 @@ public function testHandleTitle()
 
         // Use reflection to test protected method
         $atomParser      = new AtomParser(new \XMLReader());
-        $reflectionClass = new ReflectionClass($atomParser);
+        $reflectionClass = new \ReflectionClass($atomParser);
         $method          = $reflectionClass->getMethod('handleTitle');
         $method->setAccessible(true);
         $method->invoke($atomParser, $feedMock, $xmlElement);
@@ -302,8 +299,8 @@ public function testHandleUpdated()
         $date = '2019-01-01T00:00:00Z';
 
         // It's currently not possible to mock simple xml element
-        // @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
-        $xmlElement = new SimpleXMLElement('<updated>' . $date . '</updated>');
+        // @link https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+        $xmlElement = new \SimpleXMLElement('<updated>' . $date . '</updated>');
 
         $feedMock = $this->createMock(Feed::class);
         $feedMock
@@ -313,7 +310,7 @@ public function testHandleUpdated()
 
         // Use reflection to test protected method
         $atomParser      = new AtomParser(new \XMLReader());
-        $reflectionClass = new ReflectionClass($atomParser);
+        $reflectionClass = new \ReflectionClass($atomParser);
         $method          = $reflectionClass->getMethod('handleUpdated');
         $method->setAccessible(true);
         $method->invoke($atomParser, $feedMock, $xmlElement);
@@ -330,13 +327,13 @@ public function testInitialiseSetsDefaultVersionWithXmlDocType()
     {
         $dummyXml   = '<?xml version="1.0" encoding="utf-8" ?>
 <feed xmlns="http://www.w3.org/2005/Atom" />';
-        $reader = new XMLReader();
+        $reader = new \XMLReader();
         $reader->xml($dummyXml);
         $atomParser = new AtomParser($reader);
         $atomParser->parse();
 
         // Use reflection to check the value
-        $reflectionClass = new ReflectionClass($atomParser);
+        $reflectionClass = new \ReflectionClass($atomParser);
         $attribute       = $reflectionClass->getProperty('version');
         $attribute->setAccessible(true);
 
@@ -357,7 +354,7 @@ public function testInitialiseSetsDefaultVersion()
 <feed xmlns="http://www.w3.org/2005/Atom">
 <title type="text">Joomla! Unit test</title>
 </feed>';
-        $reader   = new XMLReader();
+        $reader   = new \XMLReader();
         $reader->xml($dummyXml);
         $atomParser = new AtomParser($reader);
 
@@ -376,7 +373,7 @@ public function testInitialiseSetsDefaultVersion()
         $atomParser->parse();
 
         // Use reflection to check the value
-        $reflectionClass = new ReflectionClass($atomParser);
+        $reflectionClass = new \ReflectionClass($atomParser);
         $attribute       = $reflectionClass->getProperty('version');
         $attribute->setAccessible(true);
 
@@ -397,7 +394,7 @@ public function testInitialiseSetsOldVersion()
 <feed  version="0.3" xmlns="http://www.w3.org/2005/Atom">
 <title type="text">Joomla! Unit test</title>
 </feed>';
-        $reader   = new XMLReader();
+        $reader   = new \XMLReader();
         $reader->xml($dummyXml);
         $atomParser = new AtomParser($reader);
 
@@ -416,7 +413,7 @@ public function testInitialiseSetsOldVersion()
         $atomParser->parse();
 
         // Use reflection to check the value
-        $reflectionClass = new ReflectionClass($atomParser);
+        $reflectionClass = new \ReflectionClass($atomParser);
         $attribute       = $reflectionClass->getProperty('version');
         $attribute->setAccessible(true);
 
@@ -434,8 +431,8 @@ public function testInitialiseSetsOldVersion()
     public function testProcessFeedEntry()
     {
         // It's currently not possible to mock simple xml element
-        // @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
-        $xmlElement = new SimpleXMLElement('<entry><id>http://example.com/id</id>
+        // @link https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+        $xmlElement = new \SimpleXMLElement('<entry><id>http://example.com/id</id>
 			<title>title</title><updated>August 25, 1991</updated><summary>summary</summary></entry>');
 
         $feedEntryMock = $this->createMock(FeedEntry::class);
@@ -464,7 +461,7 @@ public function testProcessFeedEntry()
 
         // Use reflection to test protected method
         $atomParser      = new AtomParser(new \XMLReader());
-        $reflectionClass = new ReflectionClass($atomParser);
+        $reflectionClass = new \ReflectionClass($atomParser);
         $method          = $reflectionClass->getMethod('processFeedEntry');
         $method->setAccessible(true);
         $method->invoke($atomParser, $feedEntryMock, $xmlElement);
diff --git a/tests/Unit/Libraries/Cms/Feed/Parser/RssParserTest.php b/tests/Unit/Libraries/Cms/Feed/Parser/RssParserTest.php
index 452f524fb699b..6872a2bcd2874 100644
--- a/tests/Unit/Libraries/Cms/Feed/Parser/RssParserTest.php
+++ b/tests/Unit/Libraries/Cms/Feed/Parser/RssParserTest.php
@@ -16,9 +16,6 @@
 use Joomla\CMS\Feed\FeedPerson;
 use Joomla\CMS\Feed\Parser\RssParser;
 use Joomla\Tests\Unit\UnitTestCase;
-use ReflectionClass;
-use SimpleXMLElement;
-use XMLReader;
 
 /**
  * Test class for RssParser.
@@ -42,8 +39,8 @@ public function testHandleCategory()
         $category = 'IT/Internet/Web development';
 
         // It's currently not possible to mock simple xml element
-        // @see https://github.com/se3bastianbergmann/phpunit-mock-objects/issues/417
-        $xmlElement = new SimpleXMLElement("<category>$category</category>");
+        // @link https://github.com/se3bastianbergmann/phpunit-mock-objects/issues/417
+        $xmlElement = new \SimpleXMLElement("<category>$category</category>");
 
         $feedMock = $this->createMock(Feed::class);
         $feedMock
@@ -53,7 +50,7 @@ public function testHandleCategory()
 
         // Use reflection to test protected method
         $rssParser       = new RssParser(new \XMLReader());
-        $reflectionClass = new ReflectionClass($rssParser);
+        $reflectionClass = new \ReflectionClass($rssParser);
         $method          = $reflectionClass->getMethod('handleCategory');
         $method->setAccessible(true);
         $method->invoke($rssParser, $feedMock, $xmlElement);
@@ -78,8 +75,8 @@ public function testHandleCloud()
         ];
 
         // It's currently not possible to mock simple xml element
-        // @see https://github.com/se3bastianbergmann/phpunit-mock-objects/issues/417
-        $xmlElement = new SimpleXMLElement('<cloud domain="' . $cloud['domain'] . '" port="' . $cloud['port'] .
+        // @link https://github.com/se3bastianbergmann/phpunit-mock-objects/issues/417
+        $xmlElement = new \SimpleXMLElement('<cloud domain="' . $cloud['domain'] . '" port="' . $cloud['port'] .
             '" path="' . $cloud['path'] . '" registerProcedure="' . $cloud['registerProcedure'] .
             '" protocol="' . $cloud['protocol'] . '" />');
 
@@ -103,7 +100,7 @@ function ($value) use ($cloud) {
 
         // Use reflection to test protected method
         $rssParser       = new RssParser(new \XMLReader());
-        $reflectionClass = new ReflectionClass($rssParser);
+        $reflectionClass = new \ReflectionClass($rssParser);
         $method          = $reflectionClass->getMethod('handleCloud');
         $method->setAccessible(true);
         $method->invoke($rssParser, $feedMock, $xmlElement);
@@ -122,8 +119,8 @@ public function testHandleCopyright()
         $copyright = 'All Rights Reserved.';
 
         // It's currently not possible to mock simple xml element
-        // @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
-        $xmlElement = new SimpleXMLElement('<rights>' . $copyright . '</rights>');
+        // @link https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+        $xmlElement = new \SimpleXMLElement('<rights>' . $copyright . '</rights>');
 
         $feedMock = $this->createMock(Feed::class);
         $feedMock
@@ -133,7 +130,7 @@ public function testHandleCopyright()
 
         // Use reflection to test protected method
         $rssParser       = new RssParser(new \XMLReader());
-        $reflectionClass = new ReflectionClass($rssParser);
+        $reflectionClass = new \ReflectionClass($rssParser);
         $method          = $reflectionClass->getMethod('handleCopyright');
         $method->setAccessible(true);
         $method->invoke($rssParser, $feedMock, $xmlElement);
@@ -152,8 +149,8 @@ public function testHandleDescription()
         $subtitle = 'Lorem Ipsum ...';
 
         // It's currently not possible to mock simple xml element
-        // @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
-        $xmlElement = new SimpleXMLElement('<description>' . $subtitle . '</description>');
+        // @link https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+        $xmlElement = new \SimpleXMLElement('<description>' . $subtitle . '</description>');
 
         $feedMock = $this->createMock(Feed::class);
         $feedMock
@@ -163,7 +160,7 @@ public function testHandleDescription()
 
         // Use reflection to test protected method
         $rssParser       = new RssParser(new \XMLReader());
-        $reflectionClass = new ReflectionClass($rssParser);
+        $reflectionClass = new \ReflectionClass($rssParser);
         $method          = $reflectionClass->getMethod('handleDescription');
         $method->setAccessible(true);
         $method->invoke($rssParser, $feedMock, $xmlElement);
@@ -182,8 +179,8 @@ public function testHandleGenerator()
         $generator = 'Joomla';
 
         // It's currently not possible to mock simple xml element
-        // @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
-        $xmlElement = new SimpleXMLElement('<generator>' . $generator . '</generator>');
+        // @link https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+        $xmlElement = new \SimpleXMLElement('<generator>' . $generator . '</generator>');
 
         $feedMock = $this->createMock(Feed::class);
         $feedMock
@@ -193,7 +190,7 @@ public function testHandleGenerator()
 
         // Use reflection to test protected method
         $rssParser       = new RssParser(new \XMLReader());
-        $reflectionClass = new ReflectionClass($rssParser);
+        $reflectionClass = new \ReflectionClass($rssParser);
         $method          = $reflectionClass->getMethod('handleGenerator');
         $method->setAccessible(true);
         $method->invoke($rssParser, $feedMock, $xmlElement);
@@ -217,8 +214,8 @@ public function testHandleImage()
         ];
 
         // It's currently not possible to mock simple xml element
-        // @see https://github.com/se3bastianbergmann/phpunit-mock-objects/issues/417
-        $xmlElement = new SimpleXMLElement('<image><url>' . $image['url'] . '</url><title>' . $image['title'] .
+        // @link https://github.com/se3bastianbergmann/phpunit-mock-objects/issues/417
+        $xmlElement = new \SimpleXMLElement('<image><url>' . $image['url'] . '</url><title>' . $image['title'] .
             '</title><link>' . $image['link'] . '</link><description>' . $image['description'] .
             '</description></image>');
 
@@ -245,7 +242,7 @@ function ($value) use ($image) {
 
         // Use reflection to test protected method
         $rssParser       = new RssParser(new \XMLReader());
-        $reflectionClass = new ReflectionClass($rssParser);
+        $reflectionClass = new \ReflectionClass($rssParser);
         $method          = $reflectionClass->getMethod('handleImage');
         $method->setAccessible(true);
         $method->invoke($rssParser, $feedMock, $xmlElement);
@@ -264,8 +261,8 @@ public function testHandleLanguage()
         $language = 'en-US';
 
         // It's currently not possible to mock simple xml element
-        // @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
-        $xmlElement = new SimpleXMLElement('<language>' . $language . '</language>');
+        // @link https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+        $xmlElement = new \SimpleXMLElement('<language>' . $language . '</language>');
 
         $feedMock = $this->createMock(Feed::class);
         $feedMock
@@ -275,7 +272,7 @@ public function testHandleLanguage()
 
         // Use reflection to test protected method
         $rssParser       = new RssParser(new \XMLReader());
-        $reflectionClass = new ReflectionClass($rssParser);
+        $reflectionClass = new \ReflectionClass($rssParser);
         $method          = $reflectionClass->getMethod('handleLanguage');
         $method->setAccessible(true);
         $method->invoke($rssParser, $feedMock, $xmlElement);
@@ -294,8 +291,8 @@ public function testHandleLastBuildDate()
         $buildDate = 'Sat, 01 Jan 2011 00:00:00 UTC';
 
         // It's currently not possible to mock simple xml element
-        // @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
-        $xmlElement = new SimpleXMLElement('<lastBuildDate>' . $buildDate . '</lastBuildDate>');
+        // @link https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+        $xmlElement = new \SimpleXMLElement('<lastBuildDate>' . $buildDate . '</lastBuildDate>');
 
         $feedMock = $this->createMock(Feed::class);
         $feedMock
@@ -305,7 +302,7 @@ public function testHandleLastBuildDate()
 
         // Use reflection to test protected method
         $rssParser       = new RssParser(new \XMLReader());
-        $reflectionClass = new ReflectionClass($rssParser);
+        $reflectionClass = new \ReflectionClass($rssParser);
         $method          = $reflectionClass->getMethod('handleLastBuildDate');
         $method->setAccessible(true);
         $method->invoke($rssParser, $feedMock, $xmlElement);
@@ -324,8 +321,8 @@ public function testHandleLink()
         $link = 'http://domain.com/path/to/resource';
 
         // It's currently not possible to mock simple xml element
-        // @see https://github.com/se3bastianbergmann/phpunit-mock-objects/issues/417
-        $xmlElement = new SimpleXMLElement("<link href='$link' />");
+        // @link https://github.com/se3bastianbergmann/phpunit-mock-objects/issues/417
+        $xmlElement = new \SimpleXMLElement("<link href='$link' />");
 
         $feedMock = $this->createMock(Feed::class);
         $feedMock
@@ -342,7 +339,7 @@ function ($value) use ($link) {
 
         // Use reflection to test protected method
         $rssParser       = new RssParser(new \XMLReader());
-        $reflectionClass = new ReflectionClass($rssParser);
+        $reflectionClass = new \ReflectionClass($rssParser);
         $method          = $reflectionClass->getMethod('handleLink');
         $method->setAccessible(true);
         $method->invoke($rssParser, $feedMock, $xmlElement);
@@ -364,8 +361,8 @@ public function testHandleManagingEditor()
         ];
 
         // It's currently not possible to mock simple xml element
-        // @see https://github.com/se3bastianbergmann/phpunit-mock-objects/issues/417
-        $xmlElement = new SimpleXMLElement('<managingEditor>' . $editor['email'] . ' ' . $editor['name'] . '</managingEditor>');
+        // @link https://github.com/se3bastianbergmann/phpunit-mock-objects/issues/417
+        $xmlElement = new \SimpleXMLElement('<managingEditor>' . $editor['email'] . ' ' . $editor['name'] . '</managingEditor>');
 
         $feedMock = $this->createMock(Feed::class);
         $feedMock
@@ -384,7 +381,7 @@ function ($value) use ($editor) {
 
         // Use reflection to test protected method
         $rssParser       = new RssParser(new \XMLReader());
-        $reflectionClass = new ReflectionClass($rssParser);
+        $reflectionClass = new \ReflectionClass($rssParser);
         $method          = $reflectionClass->getMethod('handleManagingEditor');
         $method->setAccessible(true);
         $method->invoke($rssParser, $feedMock, $xmlElement);
@@ -403,8 +400,8 @@ public function testHandlePubDate()
         $pubDate = 'Sat, 01 Jan 2011 00:00:00 GMT';
 
         // It's currently not possible to mock simple xml element
-        // @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
-        $xmlElement = new SimpleXMLElement('<pubDate>' . $pubDate . '</pubDate>');
+        // @link https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+        $xmlElement = new \SimpleXMLElement('<pubDate>' . $pubDate . '</pubDate>');
 
         $feedMock = $this->createMock(Feed::class);
         $feedMock
@@ -414,7 +411,7 @@ public function testHandlePubDate()
 
         // Use reflection to test protected method
         $rssParser       = new RssParser(new \XMLReader());
-        $reflectionClass = new ReflectionClass($rssParser);
+        $reflectionClass = new \ReflectionClass($rssParser);
         $method          = $reflectionClass->getMethod('handlePubDate');
         $method->setAccessible(true);
         $method->invoke($rssParser, $feedMock, $xmlElement);
@@ -433,8 +430,8 @@ public function testHandleSkipDays()
         $skipDays = ['Saturday', 'Sunday'];
 
         // It's currently not possible to mock simple xml element
-        // @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
-        $xmlElement = new SimpleXMLElement('<skipDays><day>' . $skipDays[0] . '</day><day>' . $skipDays[1] . '</day></skipDays>');
+        // @link https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+        $xmlElement = new \SimpleXMLElement('<skipDays><day>' . $skipDays[0] . '</day><day>' . $skipDays[1] . '</day></skipDays>');
 
         $feedMock = $this->createMock(Feed::class);
         $feedMock
@@ -444,7 +441,7 @@ public function testHandleSkipDays()
 
         // Use reflection to test protected method
         $rssParser       = new RssParser(new \XMLReader());
-        $reflectionClass = new ReflectionClass($rssParser);
+        $reflectionClass = new \ReflectionClass($rssParser);
         $method          = $reflectionClass->getMethod('handleSkipDays');
         $method->setAccessible(true);
         $method->invoke($rssParser, $feedMock, $xmlElement);
@@ -463,8 +460,8 @@ public function testHandleSkipHours()
         $skipHours = ['0', '10'];
 
         // It's currently not possible to mock simple xml element
-        // @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
-        $xmlElement = new SimpleXMLElement('<skipHours><hour>' . $skipHours[0] . '</hour><hour>' . $skipHours[1] . '</hour></skipHours>');
+        // @link https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+        $xmlElement = new \SimpleXMLElement('<skipHours><hour>' . $skipHours[0] . '</hour><hour>' . $skipHours[1] . '</hour></skipHours>');
 
         $feedMock = $this->createMock(Feed::class);
         $feedMock
@@ -474,7 +471,7 @@ public function testHandleSkipHours()
 
         // Use reflection to test protected method
         $rssParser       = new RssParser(new \XMLReader());
-        $reflectionClass = new ReflectionClass($rssParser);
+        $reflectionClass = new \ReflectionClass($rssParser);
         $method          = $reflectionClass->getMethod('handleSkipHours');
         $method->setAccessible(true);
         $method->invoke($rssParser, $feedMock, $xmlElement);
@@ -493,8 +490,8 @@ public function testHandleTitle()
         $title = 'My Title.';
 
         // It's currently not possible to mock simple xml element
-        // @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
-        $xmlElement = new SimpleXMLElement("<title>$title</title>");
+        // @link https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+        $xmlElement = new \SimpleXMLElement("<title>$title</title>");
 
         $feedMock = $this->createMock(Feed::class);
         $feedMock
@@ -504,7 +501,7 @@ public function testHandleTitle()
 
         // Use reflection to test protected method
         $rssParser       = new RssParser(new \XMLReader());
-        $reflectionClass = new ReflectionClass($rssParser);
+        $reflectionClass = new \ReflectionClass($rssParser);
         $method          = $reflectionClass->getMethod('handleTitle');
         $method->setAccessible(true);
         $method->invoke($rssParser, $feedMock, $xmlElement);
@@ -523,8 +520,8 @@ public function testHandleTtl()
         $ttl = '45';
 
         // It's currently not possible to mock simple xml element
-        // @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
-        $xmlElement = new SimpleXMLElement("<ttl>$ttl</ttl>");
+        // @link https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+        $xmlElement = new \SimpleXMLElement("<ttl>$ttl</ttl>");
 
         $feedMock = $this->createMock(Feed::class);
         $feedMock
@@ -534,7 +531,7 @@ public function testHandleTtl()
 
         // Use reflection to test protected method
         $rssParser       = new RssParser(new \XMLReader());
-        $reflectionClass = new ReflectionClass($rssParser);
+        $reflectionClass = new \ReflectionClass($rssParser);
         $method          = $reflectionClass->getMethod('handleTtl');
         $method->setAccessible(true);
         $method->invoke($rssParser, $feedMock, $xmlElement);
@@ -556,8 +553,8 @@ public function testHandleWebmaster()
         ];
 
         // It's currently not possible to mock simple xml element
-        // @see https://github.com/se3bastianbergmann/phpunit-mock-objects/issues/417
-        $xmlElement = new SimpleXMLElement('<webmaster>' . $webmaster['email'] . ' ' . $webmaster['name'] . '</webmaster>');
+        // @link https://github.com/se3bastianbergmann/phpunit-mock-objects/issues/417
+        $xmlElement = new \SimpleXMLElement('<webmaster>' . $webmaster['email'] . ' ' . $webmaster['name'] . '</webmaster>');
 
         $feedMock = $this->createMock(Feed::class);
         $feedMock
@@ -567,7 +564,7 @@ public function testHandleWebmaster()
 
         // Use reflection to test protected method
         $rssParser       = new RssParser(new \XMLReader());
-        $reflectionClass = new ReflectionClass($rssParser);
+        $reflectionClass = new \ReflectionClass($rssParser);
         $method          = $reflectionClass->getMethod('handleWebmaster');
         $method->setAccessible(true);
         $method->invoke($rssParser, $feedMock, $xmlElement);
@@ -589,7 +586,7 @@ public function testParseSetsVersion()
 		<title>Test Channel</title>
 	</channel>
 </rss>';
-        $reader = new XMLReader();
+        $reader = new \XMLReader();
         $reader->xml($dummyXml);
         $rssParser = new RssParser($reader);
 
@@ -608,7 +605,7 @@ public function testParseSetsVersion()
         $rssParser->parse();
 
         // Use reflection to check the value
-        $reflectionClass = new ReflectionClass($rssParser);
+        $reflectionClass = new \ReflectionClass($rssParser);
         $attribute       = $reflectionClass->getProperty('version');
 
         $attribute->setAccessible(true);
@@ -639,8 +636,8 @@ public function testProcessFeedEntry()
         ];
 
         // It's currently not possible to mock simple xml element
-        // @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
-        $xmlElement = new SimpleXMLElement(
+        // @link https://github.com/sebastianbergmann/phpunit-mock-objects/issues/417
+        $xmlElement = new \SimpleXMLElement(
             '<entry>
 				<link>' . $entry['link'] . '</link>
 				<title>' . $entry['title'] . '</title>
@@ -698,7 +695,7 @@ function ($value) use ($entry) {
 
         // Use reflection to test protected method
         $rssParser       = new RssParser(new \XMLReader());
-        $reflectionClass = new ReflectionClass($rssParser);
+        $reflectionClass = new \ReflectionClass($rssParser);
         $method          = $reflectionClass->getMethod('processFeedEntry');
         $method->setAccessible(true);
         $method->invoke($rssParser, $feedEntryMock, $xmlElement);
diff --git a/tests/Unit/Libraries/Cms/Form/Field/AccessiblemediaFieldTest.php b/tests/Unit/Libraries/Cms/Form/Field/AccessiblemediaFieldTest.php
index ad8b6a5dcd0c9..5a5bc311be038 100644
--- a/tests/Unit/Libraries/Cms/Form/Field/AccessiblemediaFieldTest.php
+++ b/tests/Unit/Libraries/Cms/Form/Field/AccessiblemediaFieldTest.php
@@ -50,7 +50,6 @@ public function testGetWithDefaultValues()
             "preview"       => null,
             "previewWidth"  => null,
             "previewHeight" => null,
-            "didnotexist"   => null,
             "layout"        => null,
         ];
 
@@ -84,27 +83,6 @@ public function testSetAndGetShouldBeEquals()
         }
     }
 
-    /**
-     * Tests setting and getting a property.
-     * A property is used here that is not supported by the field.
-     *
-     * @return  void
-     *
-     * @since   4.0.0
-     */
-    public function testSetAndGetShouldNotBeEquals()
-    {
-        $accessiblemediafield = $this->createAccessiblemediaField();
-        $properties           = [
-            "didnotexist" => "thisshouldbenull",
-        ];
-
-        foreach ($properties as $property => $propertyvalue) {
-            $accessiblemediafield->__set($property, $propertyvalue);
-            $this->assertNotEquals($propertyvalue, $accessiblemediafield->__get($property));
-        }
-    }
-
     /**
      * Tests method to attach a Form object to the field.
      * If no image file is selected, the value is an empty string.
diff --git a/tests/Unit/Libraries/Cms/Html/JHtmlDateTest.php b/tests/Unit/Libraries/Cms/Html/HtmlDateTest.php
similarity index 91%
rename from tests/Unit/Libraries/Cms/Html/JHtmlDateTest.php
rename to tests/Unit/Libraries/Cms/Html/HtmlDateTest.php
index da921ea4aaf87..89b0eafb8791b 100644
--- a/tests/Unit/Libraries/Cms/Html/JHtmlDateTest.php
+++ b/tests/Unit/Libraries/Cms/Html/HtmlDateTest.php
@@ -10,18 +10,18 @@
 
 namespace Joomla\Tests\Unit\Libraries\Cms\Html;
 
-use JHtmlDate;
 use Joomla\CMS\Date\Date;
+use Joomla\CMS\HTML\Helpers\Date as HtmlDate;
 use Joomla\Tests\Unit\UnitTestCase;
 
 /**
- * Test class for JHtmlDate.
+ * Test class for HtmlDate.
  *
  * @package     Joomla.UnitTest
  * @subpackage  Html
  * @since       3.1
  */
-class JHtmlDateTest extends UnitTestCase
+class HtmlDateTest extends UnitTestCase
 {
     /**
      * Test data for the testRelative method
@@ -77,7 +77,7 @@ public function dataTestRelative(): array
     }
 
     /**
-     * Tests the JHtmlDate::relative method.
+     * Tests the HtmlDate::relative method.
      *
      * @param   string  $result  The expected test result
      * @param   string  $date    The date to convert
@@ -92,6 +92,6 @@ public function dataTestRelative(): array
      */
     public function testRelative($result, $date, $unit = null, $time = null)
     {
-        $this->assertEquals($result, JHtmlDate::relative($date, $unit, $time));
+        $this->assertEquals($result, HtmlDate::relative($date, $unit, $time));
     }
 }
diff --git a/tests/Unit/Libraries/Cms/Html/JHtmlNumberTest.php b/tests/Unit/Libraries/Cms/Html/HtmlNumberTest.php
similarity index 95%
rename from tests/Unit/Libraries/Cms/Html/JHtmlNumberTest.php
rename to tests/Unit/Libraries/Cms/Html/HtmlNumberTest.php
index 1cff4ed45d315..e78fd6b9b156a 100644
--- a/tests/Unit/Libraries/Cms/Html/JHtmlNumberTest.php
+++ b/tests/Unit/Libraries/Cms/Html/HtmlNumberTest.php
@@ -10,17 +10,17 @@
 
 namespace Joomla\Tests\Unit\Libraries\Cms\Html;
 
-use JHtmlNumber;
+use Joomla\CMS\HTML\Helpers\Number as HtmlNumber;
 use Joomla\Tests\Unit\UnitTestCase;
 
 /**
- * Test class for JHtmlNumberTest.
+ * Test class for HtmlNumberTest.
  *
  * @package     Joomla.UnitTest
  * @subpackage  Html
  * @since       3.1
  */
-class JHtmlNumberTest extends UnitTestCase
+class HtmlNumberTest extends UnitTestCase
 {
     /**
      * Test...
@@ -225,7 +225,7 @@ public function dataTestBytes(): array
     }
 
     /**
-     * Tests the JHtmlNumber::bytes method.
+     * Tests the HtmlNumber::bytes method.
      *
      * @param   string   $result     The expected result to match against.
      * @param   string   $bytes      The number of bytes. Can be either numeric or suffixed format: 32M, 60K, 12G or 812b
@@ -245,6 +245,6 @@ public function dataTestBytes(): array
      */
     public function testBytes($result, $bytes, $unit = 'auto', $precision = 2, $iec = false)
     {
-        $this->assertEquals($result, JHtmlNumber::bytes($bytes, $unit, $precision, $iec));
+        $this->assertEquals($result, HtmlNumber::bytes($bytes, $unit, $precision, $iec));
     }
 }
diff --git a/tests/Unit/Libraries/Cms/Html/JHtmlStringTest.php b/tests/Unit/Libraries/Cms/Html/HtmlStringTest.php
similarity index 96%
rename from tests/Unit/Libraries/Cms/Html/JHtmlStringTest.php
rename to tests/Unit/Libraries/Cms/Html/HtmlStringTest.php
index e77cf2b753b83..97f50b743f4d1 100644
--- a/tests/Unit/Libraries/Cms/Html/JHtmlStringTest.php
+++ b/tests/Unit/Libraries/Cms/Html/HtmlStringTest.php
@@ -10,17 +10,17 @@
 
 namespace Joomla\Tests\Unit\Libraries\Cms\Html;
 
-use JHtmlString;
+use Joomla\CMS\HTML\Helpers\StringHelper as HtmlString;
 use Joomla\Tests\Unit\UnitTestCase;
 
 /**
- * Tests for JHtmlString.
+ * Tests for HtmlString.
  *
  * @package     Joomla.UnitTest
  * @subpackage  HTML
  * @since       3.1
  */
-class JHtmlStringTest extends UnitTestCase
+class HtmlStringTest extends UnitTestCase
 {
     /**
      * Test cases for truncate.
@@ -417,7 +417,7 @@ public function getTestTruncateComplexData(): array
     }
 
     /**
-     * Tests the JHtmlString::abridge method.
+     * Tests the HtmlString::abridge method.
      *
      * @param   string   $text      The text to truncate.
      * @param   integer  $length    The maximum length of the text.
@@ -431,11 +431,11 @@ public function getTestTruncateComplexData(): array
      */
     public function testAbridge($text, $length, $intro, $expected)
     {
-        $this->assertEquals($expected, JHtmlString::abridge($text, $length, $intro));
+        $this->assertEquals($expected, HtmlString::abridge($text, $length, $intro));
     }
 
     /**
-     * Tests the JHtmlString::truncate method.
+     * Tests the HtmlString::truncate method.
      *
      * @param   string   $text         The text to truncate.
      * @param   integer  $length       The maximum length of the text.
@@ -450,11 +450,11 @@ public function testAbridge($text, $length, $intro, $expected)
      */
     public function testTruncate($text, $length, $noSplit, $allowedHtml, $expected)
     {
-        $this->assertEquals($expected, JHtmlString::truncate($text, $length, $noSplit, $allowedHtml));
+        $this->assertEquals($expected, HtmlString::truncate($text, $length, $noSplit, $allowedHtml));
     }
 
     /**
-     * Tests the JHtmlString::truncateComplex method.
+     * Tests the HtmlString::truncateComplex method.
      *
      * @param   string   $html       The text to truncate.
      * @param   integer  $maxLength  The maximum length of the text.
@@ -468,6 +468,6 @@ public function testTruncate($text, $length, $noSplit, $allowedHtml, $expected)
      */
     public function testTruncateComplex($html, $maxLength, $noSplit, $expected)
     {
-        $this->assertEquals($expected, JHtmlString::truncateComplex($html, $maxLength, $noSplit));
+        $this->assertEquals($expected, HtmlString::truncateComplex($html, $maxLength, $noSplit));
     }
 }
diff --git a/tests/Unit/Libraries/Cms/Html/JHtmlTelTest.php b/tests/Unit/Libraries/Cms/Html/HtmlTelephoneTest.php
similarity index 72%
rename from tests/Unit/Libraries/Cms/Html/JHtmlTelTest.php
rename to tests/Unit/Libraries/Cms/Html/HtmlTelephoneTest.php
index c6a15d2b7c03b..3d087a758803e 100644
--- a/tests/Unit/Libraries/Cms/Html/JHtmlTelTest.php
+++ b/tests/Unit/Libraries/Cms/Html/HtmlTelephoneTest.php
@@ -10,20 +10,20 @@
 
 namespace Joomla\Tests\Unit\Libraries\Cms\Html;
 
-use JHtmlTel;
+use Joomla\CMS\HTML\Helpers\Telephone as HtmlTelephone;
 use Joomla\Tests\Unit\UnitTestCase;
 
 /**
- * Test class for JHtmlTel.
+ * Test class for HtmlTelephone.
  *
  * @package     Joomla.UnitTest
  * @subpackage  Html
  * @since       3.1
  */
-class JHtmlTelTest extends UnitTestCase
+class HtmlTelephoneTest extends UnitTestCase
 {
     /**
-     * Tests the JHtmlTel::tel method.
+     * Tests the HtmlTelephone::tel method.
      *
      * @return  void
      *
@@ -32,25 +32,25 @@ class JHtmlTelTest extends UnitTestCase
     public function testTel()
     {
         $this->assertThat(
-            JHtmlTel::tel('1.9419555555', 'US'),
+            HtmlTelephone::tel('1.9419555555', 'US'),
             $this->stringContains('(941) 955-5555'),
             'Testing for US format'
         );
 
         $this->assertThat(
-            JHtmlTel::tel('49.15123456789', 'EPP'),
+            HtmlTelephone::tel('49.15123456789', 'EPP'),
             $this->stringContains('+49.15123456789'),
             'Testing for EPP format'
         );
 
         $this->assertThat(
-            JHtmlTel::tel('82.12345678', 'ITU-T'),
+            HtmlTelephone::tel('82.12345678', 'ITU-T'),
             $this->stringContains('+82 12 34 56 78'),
             'Testing for ITU-T format'
         );
 
         $this->assertThat(
-            JHtmlTel::tel('1.9413216789', 'ARPA'),
+            HtmlTelephone::tel('1.9413216789', 'ARPA'),
             $this->stringContains('+9.8.7.6.1.2.3.1.4.9.1.e164.arpa'),
             'Testing for ARPA format'
         );
diff --git a/tests/Unit/Libraries/Cms/Image/Filter/FilterBackgroundfillTest.php b/tests/Unit/Libraries/Cms/Image/Filter/FilterBackgroundfillTest.php
index bb2196df55415..186fbd104bc76 100644
--- a/tests/Unit/Libraries/Cms/Image/Filter/FilterBackgroundfillTest.php
+++ b/tests/Unit/Libraries/Cms/Image/Filter/FilterBackgroundfillTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @copyright  (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\Tests\Unit\Libraries\Cms\Image\Filter;
diff --git a/tests/Unit/Libraries/Cms/Image/Filter/FilterBrightnessTest.php b/tests/Unit/Libraries/Cms/Image/Filter/FilterBrightnessTest.php
index fefb05c7bd3cf..5c43d3077a62e 100644
--- a/tests/Unit/Libraries/Cms/Image/Filter/FilterBrightnessTest.php
+++ b/tests/Unit/Libraries/Cms/Image/Filter/FilterBrightnessTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @copyright  (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\Tests\Unit\Libraries\Cms\Image\Filter;
diff --git a/tests/Unit/Libraries/Cms/Image/Filter/FilterContrastTest.php b/tests/Unit/Libraries/Cms/Image/Filter/FilterContrastTest.php
index 6cb88f9db75e0..e894070f3ff47 100644
--- a/tests/Unit/Libraries/Cms/Image/Filter/FilterContrastTest.php
+++ b/tests/Unit/Libraries/Cms/Image/Filter/FilterContrastTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @copyright  (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\Tests\Unit\Libraries\Cms\Image\Filter;
diff --git a/tests/Unit/Libraries/Cms/Image/Filter/FilterEdgedetectTest.php b/tests/Unit/Libraries/Cms/Image/Filter/FilterEdgedetectTest.php
index 06654f60858cf..577e2e1a51350 100644
--- a/tests/Unit/Libraries/Cms/Image/Filter/FilterEdgedetectTest.php
+++ b/tests/Unit/Libraries/Cms/Image/Filter/FilterEdgedetectTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @copyright  (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\Tests\Unit\Libraries\Cms\Image\Filter;
diff --git a/tests/Unit/Libraries/Cms/Image/ImageFilterTest.php b/tests/Unit/Libraries/Cms/Image/ImageFilterTest.php
index 8bd29589952d8..37ca99180563b 100644
--- a/tests/Unit/Libraries/Cms/Image/ImageFilterTest.php
+++ b/tests/Unit/Libraries/Cms/Image/ImageFilterTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @copyright  (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\Tests\Unit\Libraries\Cms\Image;
diff --git a/tests/Unit/Libraries/Cms/Image/ImageTest.php b/tests/Unit/Libraries/Cms/Image/ImageTest.php
index adbc8ef738774..fb4b065817670 100644
--- a/tests/Unit/Libraries/Cms/Image/ImageTest.php
+++ b/tests/Unit/Libraries/Cms/Image/ImageTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @copyright  (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\Tests\Unit\Libraries\Cms\Image;
diff --git a/tests/Unit/Libraries/Cms/Language/LanguageAwareTraitTest.php b/tests/Unit/Libraries/Cms/Language/LanguageAwareTraitTest.php
new file mode 100644
index 0000000000000..379029c6b683b
--- /dev/null
+++ b/tests/Unit/Libraries/Cms/Language/LanguageAwareTraitTest.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * @package     Joomla.UnitTest
+ * @subpackage  Base
+ *
+ * @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\Tests\Unit\Libraries\Cms\Language;
+
+use Joomla\CMS\Language\Language;
+use Joomla\CMS\Language\LanguageAwareTrait;
+use Joomla\Tests\Unit\UnitTestCase;
+
+/**
+ * Test class for \Joomla\CMS\Language\LanguageAwareTrait
+ *
+ * @package     Joomla.UnitTest
+ * @subpackage  MVC
+ * @since       4.4.0
+ */
+class LanguageAwareTraitTest extends UnitTestCase
+{
+    /**
+     * @testdox  The user language can be set and accessed by the trait
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function testGetSetLanguage()
+    {
+        $language = new Language();
+        $trait    = new class () {
+            use LanguageAwareTrait;
+
+            public function get(): Language
+            {
+                return $this->getLanguage();
+            }
+        };
+
+        $trait->setLanguage($language);
+
+        $this->assertEquals($language, $trait->get());
+    }
+
+    /**
+     * @testdox  The user language can be set and accessed by the trait
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function testGetLanguageThrowsException()
+    {
+        $this->expectException(\UnexpectedValueException::class);
+
+        $trait = new class () {
+            use LanguageAwareTrait;
+
+            public function get(): Language
+            {
+                return $this->getLanguage();
+            }
+        };
+
+        $trait->get();
+    }
+}
diff --git a/tests/Unit/Libraries/Cms/MVC/Controller/BaseControllerTest.php b/tests/Unit/Libraries/Cms/MVC/Controller/BaseControllerTest.php
index 70d7d2b4f516b..2f23a80263e85 100644
--- a/tests/Unit/Libraries/Cms/MVC/Controller/BaseControllerTest.php
+++ b/tests/Unit/Libraries/Cms/MVC/Controller/BaseControllerTest.php
@@ -12,6 +12,8 @@
 
 use Exception;
 use Joomla\CMS\Application\CMSApplication;
+use Joomla\CMS\Application\CMSApplicationInterface;
+use Joomla\CMS\Application\CMSWebApplicationInterface;
 use Joomla\CMS\Document\Document;
 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\MVC\Factory\LegacyFactory;
@@ -46,7 +48,7 @@ class BaseControllerTest extends UnitTestCase
     public function testInjectedDependencies()
     {
         $mvcFactory = $this->createStub(MVCFactoryInterface::class);
-        $app        = $this->createStub(CMSApplication::class);
+        $app        = $this->createStub(CMSApplicationInterface::class);
         $input      = new Input();
 
         $controller = new class (['base_path' => __DIR__], $mvcFactory, $app, $input) extends BaseController {
@@ -79,7 +81,7 @@ public function getInput(): Input
      */
     public function testGetInjectedName()
     {
-        $controller = new class (['name' => 'unit test', 'base_path' => __DIR__], $this->createStub(MVCFactoryInterface::class), $this->createStub(CMSApplication::class)) extends BaseController {
+        $controller = new class (['name' => 'unit test', 'base_path' => __DIR__], $this->createStub(MVCFactoryInterface::class), $this->createStub(CMSApplicationInterface::class)) extends BaseController {
         };
 
         $this->assertEquals('unit test', $controller->getName());
@@ -94,7 +96,7 @@ public function testGetInjectedName()
      */
     public function testGetCompiledName()
     {
-        $controller = new class (['base_path' => __DIR__], $this->createStub(MVCFactoryInterface::class), $this->createStub(CMSApplication::class)) extends BaseController {
+        $controller = new class (['base_path' => __DIR__], $this->createStub(MVCFactoryInterface::class), $this->createStub(CMSApplicationInterface::class)) extends BaseController {
         };
 
         $this->assertStringContainsStringIgnoringCase('base', $controller->getName());
@@ -109,7 +111,7 @@ public function testGetCompiledName()
      */
     public function testAvailableTasks()
     {
-        $controller = new class (['base_path' => __DIR__], $this->createStub(MVCFactoryInterface::class), $this->createStub(CMSApplication::class)) extends BaseController {
+        $controller = new class (['base_path' => __DIR__], $this->createStub(MVCFactoryInterface::class), $this->createStub(CMSApplicationInterface::class)) extends BaseController {
             public function unit()
             {
             }
@@ -127,7 +129,7 @@ public function unit()
      */
     public function testUnregisterTask()
     {
-        $controller = new class (['base_path' => __DIR__], $this->createStub(MVCFactoryInterface::class), $this->createStub(CMSApplication::class)) extends BaseController {
+        $controller = new class (['base_path' => __DIR__], $this->createStub(MVCFactoryInterface::class), $this->createStub(CMSApplicationInterface::class)) extends BaseController {
             public function list()
             {
                 return $this->taskMap;
@@ -147,7 +149,7 @@ public function list()
      */
     public function testExecuteTask()
     {
-        $controller = new class (['base_path' => __DIR__], $this->createStub(MVCFactoryInterface::class), $this->createStub(CMSApplication::class)) extends BaseController {
+        $controller = new class (['base_path' => __DIR__], $this->createStub(MVCFactoryInterface::class), $this->createStub(CMSApplicationInterface::class)) extends BaseController {
             public function unit()
             {
                 return 'unit test';
@@ -167,7 +169,7 @@ public function unit()
      */
     public function testExecuteInjectedDefaultTask()
     {
-        $controller = new class (['default_task' => 'unit', 'base_path' => __DIR__], $this->createStub(MVCFactoryInterface::class), $this->createStub(CMSApplication::class)) extends BaseController {
+        $controller = new class (['default_task' => 'unit', 'base_path' => __DIR__], $this->createStub(MVCFactoryInterface::class), $this->createStub(CMSApplicationInterface::class)) extends BaseController {
             public function unit()
             {
                 return 'unit test';
@@ -187,7 +189,7 @@ public function unit()
      */
     public function testExecuteDisplayDefaultTask()
     {
-        $controller = new class (['base_path' => __DIR__], $this->createStub(MVCFactoryInterface::class), $this->createStub(CMSApplication::class)) extends BaseController {
+        $controller = new class (['base_path' => __DIR__], $this->createStub(MVCFactoryInterface::class), $this->createStub(CMSApplicationInterface::class)) extends BaseController {
             public function display($cachable = false, $urlparams = [])
             {
                 return 'unit test';
@@ -207,10 +209,10 @@ public function display($cachable = false, $urlparams = [])
      */
     public function testExecuteTaskWhichDoesntExist()
     {
-        $controller = new class (['default_task' => 'invalid', 'base_path' => __DIR__], $this->createStub(MVCFactoryInterface::class), $this->createStub(CMSApplication::class)) extends BaseController {
+        $controller = new class (['default_task' => 'invalid', 'base_path' => __DIR__], $this->createStub(MVCFactoryInterface::class), $this->createStub(CMSApplicationInterface::class)) extends BaseController {
         };
 
-        $this->expectException(Exception::class);
+        $this->expectException(\Exception::class);
 
         $controller->execute('unit');
     }
@@ -229,7 +231,7 @@ public function testGetModel()
         };
         $mvcFactory->method('createModel')->willReturn($model);
 
-        $controller = new class (['base_path' => __DIR__], $mvcFactory, $this->createStub(CMSApplication::class), new Input()) extends BaseController {
+        $controller = new class (['base_path' => __DIR__], $mvcFactory, $this->createStub(CMSApplicationInterface::class), new Input()) extends BaseController {
         };
 
         $this->assertEquals($model, $controller->getModel());
@@ -247,7 +249,7 @@ public function testGetModelWithInjectedPrefix()
         $mvcFactory = $this->createMock(LegacyFactory::class);
         $mvcFactory->expects($this->once())->method('createModel')->with($this->equalTo('Unit'), $this->equalTo('Test'));
 
-        $controller = new class (['model_prefix' => 'Test', 'base_path' => __DIR__], $mvcFactory, $this->createStub(CMSApplication::class), new Input()) extends BaseController {
+        $controller = new class (['model_prefix' => 'Test', 'base_path' => __DIR__], $mvcFactory, $this->createStub(CMSApplicationInterface::class), new Input()) extends BaseController {
         };
         $controller->getModel('Unit');
     }
@@ -264,7 +266,7 @@ public function testGetModelWithAppNamePrefix()
         $mvcFactory = $this->createMock(MVCFactoryInterface::class);
         $mvcFactory->expects($this->once())->method('createModel')->with($this->equalTo('Unit'), $this->equalTo('Test'));
 
-        $app = $this->createStub(CMSApplication::class);
+        $app = $this->createStub(CMSApplicationInterface::class);
         $app->method('getName')->willReturn('Test');
 
         $controller = new class (['base_path' => __DIR__], $mvcFactory, $app, new Input()) extends BaseController {
@@ -283,7 +285,7 @@ public function testGetNullModel()
     {
         $mvcFactory = $this->createStub(MVCFactoryInterface::class);
 
-        $controller = new class (['base_path' => __DIR__], $mvcFactory, $this->createStub(CMSApplication::class), new Input()) extends BaseController {
+        $controller = new class (['base_path' => __DIR__], $mvcFactory, $this->createStub(CMSApplicationInterface::class), new Input()) extends BaseController {
         };
 
         $this->assertFalse($controller->getModel());
@@ -310,7 +312,7 @@ public function getUser(): User
         $mvcFactory->method('createModel')->willReturn($model);
 
         $user = new User();
-        $app  = $this->createStub(CMSApplication::class);
+        $app  = $this->createStub(CMSApplicationInterface::class);
         $app->method('getIdentity')->willReturn($user);
 
         $controller = new class (['base_path' => __DIR__], $mvcFactory, $app, new Input()) extends BaseController {
@@ -336,7 +338,7 @@ public function display($tpl = null)
         $mvcFactory = $this->createStub(MVCFactoryInterface::class);
         $mvcFactory->method('createView')->willReturn($view);
 
-        $controller = new class (['base_path' => __DIR__], $mvcFactory, $this->createStub(CMSApplication::class), new Input()) extends BaseController {
+        $controller = new class (['base_path' => __DIR__], $mvcFactory, $this->createStub(CMSApplicationInterface::class), new Input()) extends BaseController {
         };
 
         $this->assertEquals($view, $controller->getView('testGetView'));
@@ -355,7 +357,7 @@ public function testGetViewWithInjectedPrefix()
         $mvcFactory->expects($this->once())->method('createView')->with($this->equalTo('Unit'), $this->equalTo('TestView'))
             ->willReturn($this->createStub(AbstractView::class));
 
-        $controller = new class (['name' => 'Test', 'base_path' => __DIR__], $mvcFactory, $this->createStub(CMSApplication::class), new Input()) extends BaseController {
+        $controller = new class (['name' => 'Test', 'base_path' => __DIR__], $mvcFactory, $this->createStub(CMSApplicationInterface::class), new Input()) extends BaseController {
         };
         $controller->getView('Unit');
     }
@@ -371,10 +373,10 @@ public function testGetNullView()
     {
         $mvcFactory = $this->createStub(MVCFactoryInterface::class);
 
-        $controller = new class (['base_path' => __DIR__], $mvcFactory, $this->createStub(CMSApplication::class), new Input()) extends BaseController {
+        $controller = new class (['base_path' => __DIR__], $mvcFactory, $this->createStub(CMSApplicationInterface::class), new Input()) extends BaseController {
         };
 
-        $this->expectException(Exception::class);
+        $this->expectException(\Exception::class);
 
         $controller->getView('testGetNullView');
     }
@@ -404,7 +406,7 @@ public function getUser(): User
         $mvcFactory->method('createView')->willReturn($view);
 
         $user = new User();
-        $app  = $this->createStub(CMSApplication::class);
+        $app  = $this->createStub(CMSApplicationInterface::class);
         $app->method('getIdentity')->willReturn($user);
 
         $controller = new class (['base_path' => __DIR__], $mvcFactory, $app, new Input()) extends BaseController {
@@ -423,7 +425,7 @@ public function getUser(): User
     public function testInjectViewPath()
     {
         $path       = dirname(__DIR__);
-        $controller = new class (['view_path' => $path, 'base_path' => __DIR__], $this->createStub(MVCFactoryInterface::class), $this->createStub(CMSApplication::class)) extends BaseController {
+        $controller = new class (['view_path' => $path, 'base_path' => __DIR__], $this->createStub(MVCFactoryInterface::class), $this->createStub(CMSApplicationInterface::class)) extends BaseController {
             public function getPaths()
             {
                 return $this->paths;
@@ -443,7 +445,7 @@ public function getPaths()
      */
     public function testAddViewPath()
     {
-        $controller = new class (['name' => 'unit test', 'base_path' => __DIR__], $this->createStub(MVCFactoryInterface::class), $this->createStub(CMSApplication::class)) extends BaseController {
+        $controller = new class (['name' => 'unit test', 'base_path' => __DIR__], $this->createStub(MVCFactoryInterface::class), $this->createStub(CMSApplicationInterface::class)) extends BaseController {
             public function getPaths()
             {
                 return $this->paths;
@@ -465,7 +467,7 @@ public function getPaths()
      */
     public function testDisplay()
     {
-        $app = $this->createStub(CMSApplication::class);
+        $app = $this->createStub(CMSWebApplicationInterface::class);
         $app->method('getDocument')->willReturn(new Document());
 
         $view             = new class (['name' => 'test']) extends AbstractView {
@@ -496,7 +498,7 @@ public function display($tpl = null)
      */
     public function testDisplayWithModel()
     {
-        $app = $this->createStub(CMSApplication::class);
+        $app = $this->createStub(CMSWebApplicationInterface::class);
         $app->method('getDocument')->willReturn(new Document());
 
         $model = new class (['name' => 'test']) extends BaseModel {
@@ -528,7 +530,7 @@ public function display($tpl = null)
      */
     public function testCheckEditIdExist()
     {
-        $app = $this->createStub(CMSApplication::class);
+        $app = $this->createStub(CMSWebApplicationInterface::class);
         $app->method('getUserState')->willReturn([1]);
 
         $controller = new class (['base_path' => __DIR__], $this->createStub(MVCFactoryInterface::class), $app, new Input()) extends BaseController {
@@ -550,7 +552,7 @@ public function checkEditId($context, $id)
      */
     public function testCheckEditIdNotExist()
     {
-        $app = $this->createStub(CMSApplication::class);
+        $app = $this->createStub(CMSWebApplicationInterface::class);
         $app->method('getUserState')->willReturn([1]);
 
         $controller = new class (['base_path' => __DIR__], $this->createStub(MVCFactoryInterface::class), $app, new Input()) extends BaseController {
@@ -572,7 +574,7 @@ public function checkEditId($context, $id)
      */
     public function testCheckEditEmptyId()
     {
-        $app = $this->createStub(CMSApplication::class);
+        $app = $this->createStub(CMSWebApplicationInterface::class);
         $app->method('getUserState')->willReturn([1]);
 
         $controller = new class (['base_path' => __DIR__], $this->createStub(MVCFactoryInterface::class), $app, new Input()) extends BaseController {
@@ -594,7 +596,7 @@ public function checkEditId($context, $id)
      */
     public function testHoldEditId()
     {
-        $app = $this->createMock(CMSApplication::class);
+        $app = $this->createMock(CMSWebApplicationInterface::class);
         $app->expects($this->once())->method('setUserState')->with($this->equalTo('unit.id'), $this->equalTo([1]));
 
         $controller = new class (['base_path' => __DIR__], $this->createStub(MVCFactoryInterface::class), $app, new Input()) extends BaseController {
@@ -615,7 +617,7 @@ public function holdEditId($context, $id)
      */
     public function testHoldEditEmptyId()
     {
-        $app = $this->createMock(CMSApplication::class);
+        $app = $this->createMock(CMSWebApplicationInterface::class);
         $app->expects($this->never())->method('setUserState');
 
         $controller = new class (['base_path' => __DIR__], $this->createStub(MVCFactoryInterface::class), $app, new Input()) extends BaseController {
@@ -636,7 +638,7 @@ public function holdEditId($context, $id)
      */
     public function testReleaseEditId()
     {
-        $app = $this->createMock(CMSApplication::class);
+        $app = $this->createMock(CMSWebApplicationInterface::class);
         $app->method('getUserState')->willReturn([1, 2]);
         $app->expects($this->once())->method('setUserState')->with($this->equalTo('unit.id'), $this->equalTo([1 => 2]));
 
@@ -658,7 +660,7 @@ public function releaseEditId($context, $id)
      */
     public function testReleaseInvalidEditId()
     {
-        $app = $this->createMock(CMSApplication::class);
+        $app = $this->createMock(CMSWebApplicationInterface::class);
         $app->method('getUserState')->willReturn([2]);
         $app->expects($this->never())->method('setUserState');
 
@@ -680,7 +682,7 @@ public function releaseEditId($context, $id)
      */
     public function testSetRedirect()
     {
-        $controller = new class (['base_path' => __DIR__], $this->createStub(MVCFactoryInterface::class), $this->createStub(CMSApplication::class), new Input()) extends BaseController {
+        $controller = new class (['base_path' => __DIR__], $this->createStub(MVCFactoryInterface::class), $this->createStub(CMSApplicationInterface::class), new Input()) extends BaseController {
             public function getRedirect()
             {
                 return $this->redirect;
@@ -712,7 +714,7 @@ public function getMessageType()
      */
     public function testSetRedirectWithEmptyType()
     {
-        $controller = new class (['base_path' => __DIR__], $this->createStub(MVCFactoryInterface::class), $this->createStub(CMSApplication::class), new Input()) extends BaseController {
+        $controller = new class (['base_path' => __DIR__], $this->createStub(MVCFactoryInterface::class), $this->createStub(CMSApplicationInterface::class), new Input()) extends BaseController {
             public function getMessageType()
             {
                 return $this->messageType;
@@ -732,7 +734,7 @@ public function getMessageType()
      */
     public function testRedirect()
     {
-        $app = $this->createMock(CMSApplication::class);
+        $app = $this->createMock(CMSWebApplicationInterface::class);
         $app->expects($this->once())->method('redirect')->with($this->equalTo('unit/test'));
         $app->expects($this->once())->method('enqueueMessage')->with($this->equalTo('unit test'));
 
@@ -758,7 +760,7 @@ public function redirect()
      */
     public function testSetMessage()
     {
-        $controller = new class (['base_path' => __DIR__], $this->createStub(MVCFactoryInterface::class), $this->createStub(CMSApplication::class), new Input()) extends BaseController {
+        $controller = new class (['base_path' => __DIR__], $this->createStub(MVCFactoryInterface::class), $this->createStub(CMSApplicationInterface::class), new Input()) extends BaseController {
             public function getMessage()
             {
                 return $this->message;
@@ -784,7 +786,7 @@ public function getMessageType()
      */
     public function testSetMessageTwice()
     {
-        $controller = new class (['base_path' => __DIR__], $this->createStub(MVCFactoryInterface::class), $this->createStub(CMSApplication::class), new Input()) extends BaseController {
+        $controller = new class (['base_path' => __DIR__], $this->createStub(MVCFactoryInterface::class), $this->createStub(CMSApplicationInterface::class), new Input()) extends BaseController {
             public function getMessage()
             {
                 return $this->message;
diff --git a/tests/Unit/Libraries/Cms/MVC/Model/DatabaseModelTest.php b/tests/Unit/Libraries/Cms/MVC/Model/DatabaseModelTest.php
index 64606a9f92cdc..19c8693e6b22d 100644
--- a/tests/Unit/Libraries/Cms/MVC/Model/DatabaseModelTest.php
+++ b/tests/Unit/Libraries/Cms/MVC/Model/DatabaseModelTest.php
@@ -93,7 +93,7 @@ public function testGetTableWhenNull()
         $model = new class (['dbo' => $this->createStub(DatabaseInterface::class)], $mvcFactory) extends BaseDatabaseModel {
         };
 
-        $this->expectException(Exception::class);
+        $this->expectException(\Exception::class);
         $model->getTable();
     }
 
diff --git a/tests/Unit/Libraries/Cms/MVC/Model/StateBehaviorTraitTest.php b/tests/Unit/Libraries/Cms/MVC/Model/StateBehaviorTraitTest.php
index eceb274c72761..e619278cef1b7 100644
--- a/tests/Unit/Libraries/Cms/MVC/Model/StateBehaviorTraitTest.php
+++ b/tests/Unit/Libraries/Cms/MVC/Model/StateBehaviorTraitTest.php
@@ -10,8 +10,8 @@
 
 namespace Joomla\Tests\Unit\Libraries\Cms\MVC\Model;
 
+use Joomla\CMS\MVC\Model\State;
 use Joomla\CMS\MVC\Model\StateBehaviorTrait;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\Tests\Unit\UnitTestCase;
 
 /**
@@ -39,7 +39,7 @@ public function testGetEmptyState()
             use StateBehaviorTrait;
         };
 
-        $this->assertInstanceOf(CMSObject::class, $trait->getState());
+        $this->assertInstanceOf(State::class, $trait->getState());
     }
 
     /**
diff --git a/tests/Unit/Libraries/Cms/MVC/Model/StateTest.php b/tests/Unit/Libraries/Cms/MVC/Model/StateTest.php
new file mode 100644
index 0000000000000..bb9cfa8edd176
--- /dev/null
+++ b/tests/Unit/Libraries/Cms/MVC/Model/StateTest.php
@@ -0,0 +1,119 @@
+<?php
+
+/**
+ * @package     Joomla.UnitTest
+ * @subpackage  Base
+ *
+ * @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\Tests\Unit\Libraries\Cms\MVC\Model;
+
+use Joomla\CMS\MVC\Model\State;
+use Joomla\Tests\Unit\UnitTestCase;
+
+/**
+ * Test class for \Joomla\CMS\MVC\Model\State
+ *
+ * @package     Joomla.UnitTest
+ * @subpackage  MVC
+ *
+ * @testdox     The State
+ *
+ * @since       5.0.0
+ */
+class StateTest extends UnitTestCase
+{
+    /**
+     * @testdox  can set and get a property
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function testGetProperties()
+    {
+        $state = new State();
+        $state->set('unit', 'test');
+
+        $this->assertCount(1, $state->getProperties());
+        $this->assertEquals('test', $state->getProperties()['unit']);
+    }
+
+    /**
+     * @testdox  can access property
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function testGetDirectPropertyAccess()
+    {
+        $state = new State();
+        $state->set('unit', 'test');
+
+        $this->assertEquals('test', $state->unit);
+        $this->assertEquals('test', $state->get('unit'));
+    }
+
+    /**
+     * @testdox  can set a value through the direct property
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function testSetDirectPropertyAccess()
+    {
+        $state       = new State();
+        $state->unit = 'test';
+
+        $this->assertEquals('test', $state->unit);
+        $this->assertEquals('test', $state->get('unit'));
+    }
+
+    /**
+     * @testdox  can return if a property is set
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function testIsSet()
+    {
+        $state       = new State();
+        $state->unit = 'test';
+
+        $this->assertTrue(isset($state->unit));
+    }
+
+    /**
+     * @testdox  can return if a property is not set
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function testIsNotSet()
+    {
+        $state = new State();
+
+        $this->assertFalse(isset($state->unit));
+    }
+
+    /**
+     * @testdox  can set and get an empty value
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function testEmptyValue()
+    {
+        $state = new State();
+        $state->set('unit', '');
+
+        $this->assertEquals('', $state->get('unit', 'test'));
+    }
+}
diff --git a/tests/Unit/Libraries/Cms/Mail/MailerFactoryAwareTraitTest.php b/tests/Unit/Libraries/Cms/Mail/MailerFactoryAwareTraitTest.php
new file mode 100644
index 0000000000000..a802b5205b165
--- /dev/null
+++ b/tests/Unit/Libraries/Cms/Mail/MailerFactoryAwareTraitTest.php
@@ -0,0 +1,116 @@
+<?php
+
+/**
+ * @package     Joomla.UnitTest
+ * @subpackage  Base
+ *
+ * @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\Tests\Unit\Libraries\Cms\Mail;
+
+use Joomla\CMS\Mail\MailerFactoryAwareTrait;
+use Joomla\CMS\Mail\MailerFactoryInterface;
+use Joomla\CMS\Mail\MailerInterface;
+use Joomla\Registry\Registry;
+use Joomla\Tests\Unit\UnitTestCase;
+
+/**
+ * Test class for \Joomla\CMS\Mail\MailerFactoryAwareTrait
+ *
+ * @package     Joomla.UnitTest
+ * @subpackage  Mail
+ * @since       4.4.0
+ */
+class MailerFactoryAwareTraitTest extends UnitTestCase
+{
+    /**
+     * @testdox  The mailer factory can be set and accessed by the trait
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function testGetSetMailerFactory()
+    {
+        $mailerFactory = new class () implements MailerFactoryInterface {
+            public function createMailer(Registry $configuration = null): MailerInterface
+            {
+                return new class () implements MailerInterface {
+                    public function send()
+                    {
+                    }
+
+                    public function setSender(string $fromEmail, string $name = '')
+                    {
+                    }
+
+                    public function setSubject(string $subject)
+                    {
+                    }
+
+                    public function setBody(string $content)
+                    {
+                    }
+
+                    public function addRecipient(string $recipientEmail, string $name = '')
+                    {
+                    }
+
+                    public function addCc(string $ccEmail, string $name = '')
+                    {
+                    }
+
+                    public function addBcc(string $bccEmail, string $name = '')
+                    {
+                    }
+
+                    public function addAttachment(string $data, $name = '', $encoding = 'base64', $type = 'application/octet-stream')
+                    {
+                    }
+
+                    public function addReplyTo(string $replyToEmail, string $name = '')
+                    {
+                    }
+                };
+            }
+        };
+
+        $trait = new class () {
+            use MailerFactoryAwareTrait;
+
+            public function getFactory(): MailerFactoryInterface
+            {
+                return $this->getMailerFactory();
+            }
+        };
+
+        $trait->setMailerFactory($mailerFactory);
+
+        $this->assertEquals($mailerFactory, $trait->getFactory());
+    }
+
+    /**
+     * @testdox  The mailer factory can be set and accessed by the trait
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function testGetMailerFactoryThrowsException()
+    {
+        $this->expectException(\UnexpectedValueException::class);
+
+        $trait = new class () {
+            use MailerFactoryAwareTrait;
+
+            public function getFactory(): MailerFactoryInterface
+            {
+                return $this->getMailerFactory();
+            }
+        };
+
+        $trait->getFactory();
+    }
+}
diff --git a/tests/Unit/Libraries/Cms/Mail/MailerFactoryTest.php b/tests/Unit/Libraries/Cms/Mail/MailerFactoryTest.php
new file mode 100644
index 0000000000000..bbbb1ed213996
--- /dev/null
+++ b/tests/Unit/Libraries/Cms/Mail/MailerFactoryTest.php
@@ -0,0 +1,126 @@
+<?php
+
+/**
+ * @package        Joomla.UnitTest
+ *
+ * @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\Tests\Unit\Libraries\Cms\Mail;
+
+use Joomla\CMS\Mail\Mail;
+use Joomla\CMS\Mail\MailerFactory;
+use Joomla\Registry\Registry;
+use Joomla\Tests\Unit\UnitTestCase;
+
+/**
+ * Test class for \Joomla\CMS\Mail\MailerFactory
+ *
+ * @package     Joomla.UnitTest
+ * @subpackage  Mail
+ * @since       4.4.0
+ */
+class MailerFactoryTest extends UnitTestCase
+{
+    /**
+     * @testdox  The mailer factory creates the correct object
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function testMailer()
+    {
+        $factory = new MailerFactory(new Registry());
+        $mail    = $factory->createMailer();
+
+        $this->assertNotNull($mail);
+        $this->assertInstanceOf(Mail::class, $mail);
+    }
+
+    /**
+     * @testdox  The mailer factory creates an object with the default settings
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function testMailerHasDefaultSettings()
+    {
+        $factory = new MailerFactory(new Registry(['mailfrom' => 'test@example.com']));
+
+        /** @var Mail $mail */
+        $mail = $factory->createMailer();
+
+        $this->assertEquals('test@example.com', $mail->From);
+    }
+
+    /**
+     * @testdox  The mailer factory creates an object with the passed settings
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function testMailerHasPassedSettings()
+    {
+        $factory = new MailerFactory(new Registry());
+
+        /** @var Mail $mail */
+        $mail = $factory->createMailer(new Registry(['mailfrom' => 'test@example.com']));
+
+        $this->assertEquals('test@example.com', $mail->From);
+    }
+
+    /**
+     * @testdox  The mailer factory creates an object with an invalid from address
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function testMailerHasInvalidFromAddress()
+    {
+        $factory = new MailerFactory(new Registry(['mailfrom' => 'testüumlaut@example.com']));
+
+        /** @var Mail $mail */
+        $mail = $factory->createMailer();
+
+        $this->assertEmpty($mail->From);
+    }
+
+    /**
+     * @testdox  The mailer factory creates an object with the passed settings overriding the default settings
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function testMailerHasOverriddenSettings()
+    {
+        $factory = new MailerFactory(new Registry(['mailfrom' => 'default@example.com']));
+
+        /** @var Mail $mail */
+        $mail = $factory->createMailer(new Registry(['mailfrom' => 'test@example.com']));
+
+        $this->assertEquals('test@example.com', $mail->From);
+    }
+
+    /**
+     * @testdox  The mailer factory creates an object with mail type smtp
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function testMailerIsSMTP()
+    {
+        $factory = new MailerFactory(new Registry(['mailer' => 'smtp', 'smtphost' => 'localhost']));
+
+        /** @var Mail $mail */
+        $mail = $factory->createMailer();
+
+        $this->assertEquals('smtp', $mail->Mailer);
+    }
+}
diff --git a/tests/Unit/Libraries/Cms/Microdata/MicrodataTest.php b/tests/Unit/Libraries/Cms/Microdata/MicrodataTest.php
index 57e4ff19e4996..c9e5b8a4c6ca1 100644
--- a/tests/Unit/Libraries/Cms/Microdata/MicrodataTest.php
+++ b/tests/Unit/Libraries/Cms/Microdata/MicrodataTest.php
@@ -12,7 +12,6 @@
 
 use Joomla\CMS\Microdata\Microdata;
 use Joomla\Tests\Unit\UnitTestCase;
-use ReflectionClass;
 
 /**
  * Test class for JMicrodata
@@ -928,7 +927,7 @@ public function testExpectedDisplayType()
         );
 
         // Use reflection to test protected method (it's easier than testing this using the public interface)
-        $reflectionClass = new ReflectionClass($microdata);
+        $reflectionClass = new \ReflectionClass($microdata);
         $method          = $reflectionClass->getMethod('getExpectedDisplayType');
         $method->setAccessible(true);
 
diff --git a/tests/Unit/Libraries/Cms/Object/CMSObjectTest.php b/tests/Unit/Libraries/Cms/Object/CMSObjectTest.php
index d4714dc21a9e2..d68d8e3e2ec79 100644
--- a/tests/Unit/Libraries/Cms/Object/CMSObjectTest.php
+++ b/tests/Unit/Libraries/Cms/Object/CMSObjectTest.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Tests\Unit\Libraries\Cms\Object;
 
-use Exception;
 use Joomla\CMS\Object\CMSObject;
 use Joomla\Tests\Unit\UnitTestCase;
 
@@ -157,7 +156,7 @@ public function testGetError()
             'Should return false, since the error does not exist'
         );
 
-        $exception = new Exception('error');
+        $exception = new \Exception('error');
         $object->setError($exception);
         $this->assertThat(
             $object->getError(3, true),
diff --git a/tests/Unit/Libraries/Cms/Plugin/CMSPluginTest.php b/tests/Unit/Libraries/Cms/Plugin/CMSPluginTest.php
index d1b51795f5d6f..46a27cbfed951 100644
--- a/tests/Unit/Libraries/Cms/Plugin/CMSPluginTest.php
+++ b/tests/Unit/Libraries/Cms/Plugin/CMSPluginTest.php
@@ -19,7 +19,6 @@
 use Joomla\Event\SubscriberInterface;
 use Joomla\Registry\Registry;
 use Joomla\Tests\Unit\UnitTestCase;
-use stdClass;
 
 /**
  * Test class for \Joomla\CMS\Plugin\CMSPlugin
@@ -379,7 +378,7 @@ public function testRegisterListenersNullable()
         $dispatcher = new Dispatcher();
 
         $plugin = new class ($dispatcher, []) extends CMSPlugin {
-            public function onTest(stdClass $event = null)
+            public function onTest(\stdClass $event = null)
             {
             }
         };
diff --git a/tests/Unit/Libraries/Cms/Proxy/ProxyArrayTest.php b/tests/Unit/Libraries/Cms/Proxy/ProxyArrayTest.php
new file mode 100644
index 0000000000000..4e653ecebc68d
--- /dev/null
+++ b/tests/Unit/Libraries/Cms/Proxy/ProxyArrayTest.php
@@ -0,0 +1,165 @@
+<?php
+
+/**
+ * @package     Joomla.UnitTest
+ * @subpackage  Base
+ *
+ * @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\Tests\Unit\Libraries\Cms\Proxy;
+
+use Joomla\CMS\Proxy\ArrayProxy;
+use Joomla\CMS\Proxy\ArrayReadOnlyProxy;
+use Joomla\CMS\Proxy\ObjectReadOnlyProxy;
+use Joomla\Tests\Unit\UnitTestCase;
+
+/**
+ * Test class for \Joomla\CMS\Proxy\ArrayProxy classes
+ *
+ * @package     Joomla.UnitTest
+ * @subpackage  Plugin
+ *
+ * @since  5.0.0
+ */
+class ProxyArrayTest extends UnitTestCase
+{
+    /**
+     * @testdox  Array referencing keep the changes
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function testArrayAccessAndModification()
+    {
+        $data = [
+            'foo'   => 'bar',
+            'child' => (object) [
+                'text' => 'child',
+            ],
+        ];
+
+        $proxy = new ArrayProxy($data);
+
+        $proxy['bar2'] = 'foo2';
+
+        $this->assertEquals($data['bar2'], 'foo2', 'A referenced Array should get a Proxy value');
+        $this->assertEquals($proxy['foo'], 'bar', 'Proxy object should return value from Array');
+    }
+
+    /**
+     * @testdox  Array Countable implementations
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function testArrayCountable()
+    {
+        $data = [
+            'foo'   => 'bar',
+            'child' => (object) [
+                'text' => 'child',
+            ],
+        ];
+
+        $proxy = new ArrayProxy($data);
+
+        $this->assertEquals(count($proxy), 2, 'Countable implementation should count correctly');
+    }
+
+    /**
+     * @testdox  Array Iterator implementations
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function testArrayIterator()
+    {
+        $data = [
+            'foo'   => 'bar',
+            'child' => (object) [
+                'text' => 'child',
+            ],
+        ];
+
+        $proxy = new ArrayProxy($data);
+
+        $this->assertEquals($data, iterator_to_array($proxy));
+    }
+
+    /**
+     * @testdox  Array read-only Iterator implementations
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function testArrayReadOnlyIterator()
+    {
+        $data = [
+            'foo'   => 'bar',
+            'child' => (object) [
+                'text' => 'child',
+            ],
+            'child2' => [
+                'text' => 'child',
+            ],
+        ];
+
+        $proxy  = new ArrayReadOnlyProxy($data);
+        $result = iterator_to_array($proxy);
+
+        $this->assertInstanceOf(ObjectReadOnlyProxy::class, $result['child'], 'Read-only iterator should return ObjectReadOnlyProxy');
+        $this->assertInstanceOf(ArrayReadOnlyProxy::class, $result['child2'], 'Read-only iterator should return ArrayReadOnlyProxy');
+    }
+
+    /**
+     * @testdox  Array read-only access
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function testArrayReadOnlyAccessAndModification()
+    {
+        $data = [
+            'foo'   => 'bar',
+            'child' => (object) [
+                'text' => 'child',
+            ],
+        ];
+
+        $proxy = new ArrayReadOnlyProxy($data);
+
+        $this->expectException(\RuntimeException::class);
+
+        $proxy['foo'] = 'foobar';
+    }
+
+    /**
+     * @testdox  Array read-only access to child
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function testArrayReadOnlyChildAccessAndModification()
+    {
+        $data = [
+            'foo'   => 'bar',
+            'child' => (object) [
+                'text' => 'child',
+            ],
+        ];
+
+        $proxy = new ArrayReadOnlyProxy($data);
+
+        $this->expectException(\RuntimeException::class);
+
+        $proxy['child']->text = 'foobar';
+    }
+}
diff --git a/tests/Unit/Libraries/Cms/Proxy/ProxyObjectTest.php b/tests/Unit/Libraries/Cms/Proxy/ProxyObjectTest.php
new file mode 100644
index 0000000000000..6496477aff982
--- /dev/null
+++ b/tests/Unit/Libraries/Cms/Proxy/ProxyObjectTest.php
@@ -0,0 +1,144 @@
+<?php
+
+/**
+ * @package     Joomla.UnitTest
+ * @subpackage  Base
+ *
+ * @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\Tests\Unit\Libraries\Cms\Proxy;
+
+use Joomla\CMS\Proxy\ArrayReadOnlyProxy;
+use Joomla\CMS\Proxy\ObjectProxy;
+use Joomla\CMS\Proxy\ObjectReadOnlyProxy;
+use Joomla\Tests\Unit\UnitTestCase;
+
+/**
+ * Test class for \Joomla\CMS\Proxy\ObjectProxy classes
+ *
+ * @package     Joomla.UnitTest
+ * @subpackage  Plugin
+ *
+ * @since  5.0.0
+ */
+class ProxyObjectTest extends UnitTestCase
+{
+    /**
+     * @testdox  Object referencing keep the changes
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function testObjectAccessAndModification()
+    {
+        $data = (object) [
+            'foo'   => 'bar',
+            'child' => (object) [
+                'text' => 'child',
+            ],
+        ];
+
+        $proxy = new ObjectProxy($data);
+
+        $proxy->bar2 = 'foo2';
+
+        $this->assertEquals($data->bar2, 'foo2', 'A referenced Object should get a Proxy value');
+        $this->assertEquals($proxy->foo, 'bar', 'Proxy object should return value from Object');
+    }
+
+    /**
+     * @testdox  Object read-only access
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function testObjectReadOnlyAccessAndModification()
+    {
+        $data = (object) [
+            'foo'   => 'bar',
+            'child' => (object) [
+                'text' => 'child',
+            ],
+        ];
+
+        $proxy = new ObjectReadOnlyProxy($data);
+
+        $this->expectException(\RuntimeException::class);
+
+        $proxy->foo = 'foobar';
+    }
+
+    /**
+     * @testdox  Object read-only access to child
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function testObjectReadOnlyChildAccessAndModification()
+    {
+        $data = (object) [
+            'foo'   => 'bar',
+            'child' => (object) [
+                'text' => 'child',
+            ],
+        ];
+
+        $proxy = new ObjectReadOnlyProxy($data);
+
+        $this->expectException(\RuntimeException::class);
+
+        $proxy->child->text = 'foobar';
+    }
+
+    /**
+     * @testdox  Object Iterator implementations
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function testObjectIterator()
+    {
+        $data = (object) [
+            'foo'   => 'bar',
+            'child' => (object) [
+                'text' => 'child',
+            ],
+        ];
+
+        $proxy = new ObjectProxy($data);
+
+        $this->assertEquals((array) $data, iterator_to_array($proxy));
+    }
+
+    /**
+     * @testdox  Object read-only Iterator implementations
+     *
+     * @return  void
+     *
+     * @since   5.0.0
+     */
+    public function testObjectReadOnlyIterator()
+    {
+        $data = (object) [
+            'foo'   => 'bar',
+            'child' => (object) [
+                'text' => 'child',
+            ],
+            'child2' => [
+                'text' => 'child',
+            ],
+        ];
+
+        $proxy  = new ObjectReadOnlyProxy($data);
+        $result = iterator_to_array($proxy);
+
+        $this->assertInstanceOf(ObjectReadOnlyProxy::class, $result['child'], 'Read-only iterator should return ObjectReadOnlyProxy');
+        $this->assertInstanceOf(ArrayReadOnlyProxy::class, $result['child2'], 'Read-only iterator should return ArrayReadOnlyProxy');
+    }
+}
diff --git a/tests/Unit/Libraries/Cms/Toolbar/ToolbarTest.php b/tests/Unit/Libraries/Cms/Toolbar/ToolbarTest.php
index e6e3aae3e64a1..facfcefe405a4 100644
--- a/tests/Unit/Libraries/Cms/Toolbar/ToolbarTest.php
+++ b/tests/Unit/Libraries/Cms/Toolbar/ToolbarTest.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Tests\Unit\Libraries\Cms\Toolbar;
 
-use InvalidArgumentException;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarButton;
 use Joomla\CMS\Toolbar\ToolbarFactoryInterface;
@@ -195,7 +194,7 @@ public function testRenderButtonThrowsUnexpectedValueException()
         $toolbarFactoryMock
             ->expects($this->once())
             ->method('createButton')
-            ->willThrowException(new InvalidArgumentException());
+            ->willThrowException(new \InvalidArgumentException());
 
         $toolbar = new Toolbar('my-toolbar', $toolbarFactoryMock);
 
@@ -236,7 +235,7 @@ public function testLoadButtonTypeReturnsFalseForUnknownButtonTypes()
         $toolbarFactoryMock
             ->expects($this->once())
             ->method('createButton')
-            ->willThrowException(new InvalidArgumentException());
+            ->willThrowException(new \InvalidArgumentException());
 
         $toolbar = new Toolbar('my-toolbar', $toolbarFactoryMock);
 
diff --git a/tests/Unit/Libraries/Cms/User/CurrentUserTraitTest.php b/tests/Unit/Libraries/Cms/User/CurrentUserTraitTest.php
index 30d1081a4a4a0..b2632920792bf 100644
--- a/tests/Unit/Libraries/Cms/User/CurrentUserTraitTest.php
+++ b/tests/Unit/Libraries/Cms/User/CurrentUserTraitTest.php
@@ -15,7 +15,7 @@
 use Joomla\Tests\Unit\UnitTestCase;
 
 /**
- * Test class for \Joomla\CMS\MVC\Model\BaseDatabaseModel
+ * Test class for \Joomla\CMS\MVC\Model\BaseDatabaseModelUser\CurrentUserTrait
  *
  * @package     Joomla.UnitTest
  * @subpackage  MVC
diff --git a/tests/Unit/Libraries/Cms/User/UserFactoryAwareTraitTest.php b/tests/Unit/Libraries/Cms/User/UserFactoryAwareTraitTest.php
new file mode 100644
index 0000000000000..83cd5f983ca57
--- /dev/null
+++ b/tests/Unit/Libraries/Cms/User/UserFactoryAwareTraitTest.php
@@ -0,0 +1,84 @@
+<?php
+
+/**
+ * @package     Joomla.UnitTest
+ * @subpackage  Base
+ *
+ * @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\Tests\Unit\Libraries\Cms\User;
+
+use Joomla\CMS\User\User;
+use Joomla\CMS\User\UserFactoryAwareTrait;
+use Joomla\CMS\User\UserFactoryInterface;
+use Joomla\Tests\Unit\UnitTestCase;
+
+/**
+ * Test class for \Joomla\CMS\User\UserFactoryAwareTrait
+ *
+ * @package     Joomla.UnitTest
+ * @subpackage  MVC
+ * @since       4.4.0
+ */
+class UserFactoryAwareTraitTest extends UnitTestCase
+{
+    /**
+     * @testdox  The user factory can be set and accessed by the trait
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function testGetSetUserFactory()
+    {
+        $userFactory = new class () implements UserFactoryInterface {
+            public function loadUserById(int $id): User
+            {
+                return new User();
+            }
+
+            public function loadUserByUsername(string $username): User
+            {
+                return new User();
+            }
+        };
+
+        $trait = new class () {
+            use UserFactoryAwareTrait;
+
+            public function getFactory(): UserFactoryInterface
+            {
+                return $this->getUserFactory();
+            }
+        };
+
+        $trait->setUserFactory($userFactory);
+
+        $this->assertEquals($userFactory, $trait->getFactory());
+    }
+
+    /**
+     * @testdox  The user factory can be set and accessed by the trait
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function testGetUserFactoryThrowsException()
+    {
+        $this->expectException(\UnexpectedValueException::class);
+
+        $trait = new class () {
+            use UserFactoryAwareTrait;
+
+            public function getFactory(): UserFactoryInterface
+            {
+                return $this->getUserFactory();
+            }
+        };
+
+        $trait->getFactory();
+    }
+}
diff --git a/tests/Unit/Plugin/Authentication/Ldap/LdapPluginTest.php b/tests/Unit/Plugin/Authentication/Ldap/LdapPluginTest.php
index 9b96021cf6696..457b17e3f8746 100644
--- a/tests/Unit/Plugin/Authentication/Ldap/LdapPluginTest.php
+++ b/tests/Unit/Plugin/Authentication/Ldap/LdapPluginTest.php
@@ -24,7 +24,6 @@
 use Symfony\Component\Ldap\Entry;
 use Symfony\Component\Ldap\Exception\LdapException;
 use Symfony\Component\Ldap\LdapInterface;
-use Traversable;
 
 /**
  * Test class for Ldap plugin
@@ -366,7 +365,7 @@ public function toArray(): array
                                             return [];
                                         }
 
-                                        public function getIterator(): Traversable
+                                        public function getIterator(): \Traversable
                                         {
                                             return null;
                                         }
@@ -411,7 +410,7 @@ public function toArray(): array
                                         return [$this->entry];
                                     }
 
-                                    public function getIterator(): Traversable
+                                    public function getIterator(): \Traversable
                                     {
                                         yield $this->entry;
                                     }
diff --git a/tests/Unit/Plugin/Captcha/InvisibleRecaptcha/Extension/InvisibleRecaptchaPluginTest.php b/tests/Unit/Plugin/Captcha/InvisibleRecaptcha/Extension/InvisibleRecaptchaPluginTest.php
deleted file mode 100644
index f8e4205a765fa..0000000000000
--- a/tests/Unit/Plugin/Captcha/InvisibleRecaptcha/Extension/InvisibleRecaptchaPluginTest.php
+++ /dev/null
@@ -1,283 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.UnitTest
- * @subpackage  Extension
- *
- * @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\Tests\Unit\Plugin\Captcha\InvisibleRecaptcha\Extension;
-
-use Joomla\CMS\Application\CMSApplicationInterface;
-use Joomla\CMS\Application\CMSWebApplicationInterface;
-use Joomla\CMS\Document\HtmlDocument;
-use Joomla\CMS\Form\Field\CaptchaField;
-use Joomla\CMS\Language\Language;
-use Joomla\Event\Dispatcher;
-use Joomla\Input\Input;
-use Joomla\Plugin\Captcha\InvisibleReCaptcha\Extension\InvisibleReCaptcha;
-use Joomla\Tests\Unit\UnitTestCase;
-use ReCaptcha\RequestMethod;
-use RuntimeException;
-use SimpleXMLElement;
-
-/**
- * Test class for InvisibleReCaptcha plugin
- *
- * @package     Joomla.UnitTest
- * @subpackage  InvisibleReCaptcha
- *
- * @testdox     The InvisibleReCaptcha plugin
- *
- * @since       4.3.0
- */
-class InvisibleRecaptchaPluginTest extends UnitTestCase
-{
-    /**
-     * Setup
-     *
-     * @return  void
-     *
-     * @since   4.3.0
-     */
-    public function setUp(): void
-    {
-        if (empty($_SERVER['REMOTE_ADDR'])) {
-            $_SERVER['REMOTE_ADDR'] = 'unit.test';
-        }
-    }
-
-    /**
-     * Cleanup
-     *
-     * @return  void
-     *
-     * @since   4.3.0
-     */
-    public function tearDown(): void
-    {
-        if (!empty($_SERVER['REMOTE_ADDR']) && $_SERVER['REMOTE_ADDR'] === 'unit.test') {
-            unset($_SERVER['REMOTE_ADDR']);
-        }
-    }
-
-    /**
-     * @testdox  can init the captcha
-     *
-     * @return  void
-     *
-     * @since   4.3.0
-     */
-    public function testInit()
-    {
-        $document = new HtmlDocument();
-        $language = $this->createStub(Language::class);
-        $language->method('_')->willReturn('test');
-
-        $app = $this->createStub(CMSWebApplicationInterface::class);
-        $app->method('getDocument')->willReturn($document);
-        $app->method('getLanguage')->willReturn($language);
-
-        $plugin = new InvisibleReCaptcha(new Dispatcher(), ['params' => ['public_key' => 'test']], $this->createStub(RequestMethod::class));
-        $plugin->setApplication($app);
-
-        $this->assertTrue($plugin->onInit());
-        $this->assertNotEmpty($document->getWebAssetManager()->getAsset('script', 'plg_captcha_recaptchainvisible'));
-        $this->assertNotEmpty($document->getWebAssetManager()->getAsset('script', 'plg_captcha_recaptchainvisible.api'));
-    }
-
-    /**
-     * @testdox  can init the captcha with a wrong application
-     *
-     * @return  void
-     *
-     * @since   4.3.0
-     */
-    public function testInitWrongApplication()
-    {
-        $plugin = new InvisibleReCaptcha(new Dispatcher(), ['params' => ['public_key' => 'test']], $this->createStub(RequestMethod::class));
-        $plugin->setApplication($this->createStub(CMSApplicationInterface::class));
-
-        $this->assertFalse($plugin->onInit());
-    }
-
-    /**
-     * @testdox  can init the captcha with an empty public key
-     *
-     * @return  void
-     *
-     * @since   4.3.0
-     */
-    public function testInitEmptyPublicKey()
-    {
-        $language = $this->createStub(Language::class);
-        $language->method('_')->willReturn('test');
-
-        $app = $this->createStub(CMSWebApplicationInterface::class);
-        $app->method('getLanguage')->willReturn($language);
-
-        $plugin = new InvisibleReCaptcha(new Dispatcher(), ['params' => []], $this->createStub(RequestMethod::class));
-        $plugin->setApplication($app);
-
-        $this->expectException(RuntimeException::class);
-
-        $plugin->onInit();
-    }
-
-    /**
-     * @testdox  can display the captcha
-     *
-     * @return  void
-     *
-     * @since   4.3.0
-     */
-    public function testDisplay()
-    {
-        $plugin = new InvisibleReCaptcha(new Dispatcher(), ['params' => []], $this->createStub(RequestMethod::class));
-        $plugin->setApplication($this->createStub(CMSWebApplicationInterface::class));
-
-        $html = $plugin->onDisplay();
-
-        $this->assertNotEmpty($html);
-        $this->assertNotEquals($html, strip_tags($html));
-    }
-
-    /**
-     * @testdox  can check successful answer
-     *
-     * @return  void
-     *
-     * @since   4.3.0
-     */
-    public function testResponse()
-    {
-        $language = $this->createStub(Language::class);
-        $language->method('_')->willReturn('test');
-
-        $app = $this->createStub(CMSWebApplicationInterface::class);
-        $app->method('getLanguage')->willReturn($language);
-        $app->method('getInput')->willReturn(new Input(['g-recaptcha-response' => 'test']));
-
-        $method = $this->createStub(RequestMethod::class);
-        $method->method('submit')->willReturn(json_encode(['success' => true]));
-
-        $plugin = new InvisibleReCaptcha(new Dispatcher(), ['params' => ['private_key' => 'test']], $method);
-        $plugin->setApplication($app);
-
-        $this->assertTrue($plugin->onCheckAnswer());
-    }
-
-    /**
-     * @testdox  can check answer with an empty private key
-     *
-     * @return  void
-     *
-     * @since   4.3.0
-     */
-    public function testResponseEmptyPrivateKey()
-    {
-        $language = $this->createStub(Language::class);
-        $language->method('_')->willReturn('test');
-
-        $app = $this->createStub(CMSWebApplicationInterface::class);
-        $app->method('getLanguage')->willReturn($language);
-
-        $plugin = new InvisibleReCaptcha(new Dispatcher(), ['params' => []], $this->createStub(RequestMethod::class));
-        $plugin->setApplication($app);
-
-        $this->expectException(RuntimeException::class);
-
-        $plugin->onCheckAnswer();
-    }
-
-    /**
-     * @testdox  can detect spam
-     *
-     * @return  void
-     *
-     * @since   4.3.0
-     */
-    public function testResponseSpam()
-    {
-        $language = $this->createStub(Language::class);
-        $language->method('_')->willReturn('test');
-
-        $app = $this->createStub(CMSWebApplicationInterface::class);
-        $app->method('getLanguage')->willReturn($language);
-        $app->method('getInput')->willReturn(new Input(['g-recaptcha-response' => '']));
-
-        $plugin = new InvisibleReCaptcha(new Dispatcher(), ['params' => ['private_key' => 'test']], $this->createStub(RequestMethod::class));
-        $plugin->setApplication($app);
-
-        $this->expectException(RuntimeException::class);
-
-        $plugin->onCheckAnswer();
-    }
-
-    /**
-     * @testdox  can check successful answer
-     *
-     * @return  void
-     *
-     * @since   4.3.0
-     */
-    public function testFailedResponse()
-    {
-        $language = $this->createStub(Language::class);
-        $language->method('_')->willReturn('test');
-
-        $app = $this->createStub(CMSWebApplicationInterface::class);
-        $app->method('getLanguage')->willReturn($language);
-        $app->method('getInput')->willReturn(new Input(['g-recaptcha-response' => 'test']));
-
-        $method = $this->createStub(RequestMethod::class);
-        $method->method('submit')->willReturn(json_encode(['success' => false]));
-
-        $plugin = new InvisibleReCaptcha(new Dispatcher(), ['params' => ['private_key' => 'test']], $method);
-        $plugin->setApplication($app);
-
-        $this->expectException(RuntimeException::class);
-
-        $plugin->onCheckAnswer();
-    }
-
-    /**
-     * @testdox  can setup field
-     *
-     * @return  void
-     *
-     * @since   4.3.0
-     */
-    public function testSetupField()
-    {
-        $plugin = new InvisibleReCaptcha(new Dispatcher(), ['params' => ['private_key' => 'test']], $this->createStub(RequestMethod::class));
-        $plugin->setApplication($this->createStub(CMSWebApplicationInterface::class));
-
-        $this->assertNull($plugin->onSetupField(new CaptchaField(), new SimpleXMLElement('<test/>')));
-    }
-
-    /**
-     * @testdox  can return admin capabilities
-     *
-     * @return  void
-     *
-     * @since   4.3.0
-     */
-    public function testPrivacy()
-    {
-        $language = $this->createStub(Language::class);
-        $language->method('_')->willReturn('test');
-
-        $app = $this->createStub(CMSWebApplicationInterface::class);
-        $app->method('getLanguage')->willReturn($language);
-
-        $plugin = new InvisibleReCaptcha(new Dispatcher(), ['params' => ['private_key' => 'test']], $this->createStub(RequestMethod::class));
-        $plugin->setApplication($app);
-
-        $caps = $plugin->onPrivacyCollectAdminCapabilities();
-
-        $this->assertNotEmpty($caps);
-    }
-}
diff --git a/tests/Unit/Plugin/Captcha/Recaptcha/Extension/RecaptchaPluginTest.php b/tests/Unit/Plugin/Captcha/Recaptcha/Extension/RecaptchaPluginTest.php
deleted file mode 100644
index aa81efef5b21a..0000000000000
--- a/tests/Unit/Plugin/Captcha/Recaptcha/Extension/RecaptchaPluginTest.php
+++ /dev/null
@@ -1,290 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.UnitTest
- * @subpackage  Extension
- *
- * @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\Tests\Unit\Plugin\Captcha\Recaptcha\Extension;
-
-use Joomla\CMS\Application\CMSApplicationInterface;
-use Joomla\CMS\Application\CMSWebApplicationInterface;
-use Joomla\CMS\Document\HtmlDocument;
-use Joomla\CMS\Language\Language;
-use Joomla\Event\Dispatcher;
-use Joomla\Input\Input;
-use Joomla\Plugin\Captcha\ReCaptcha\Extension\ReCaptcha;
-use Joomla\Tests\Unit\UnitTestCase;
-use ReCaptcha\RequestMethod;
-use RuntimeException;
-
-/**
- * Test class for ReCaptcha plugin
- *
- * @package     Joomla.UnitTest
- * @subpackage  ReCaptcha
- *
- * @testdox     The ReCaptcha plugin
- *
- * @since       4.3.0
- */
-class RecaptchaPluginTest extends UnitTestCase
-{
-    /**
-     * Setup
-     *
-     * @return  void
-     *
-     * @since   4.3.0
-     */
-    public function setUp(): void
-    {
-        if (empty($_SERVER['REMOTE_ADDR'])) {
-            $_SERVER['REMOTE_ADDR'] = 'unit.test';
-        }
-    }
-
-    /**
-     * Cleanup
-     *
-     * @return  void
-     *
-     * @since   4.3.0
-     */
-    public function tearDown(): void
-    {
-        if (!empty($_SERVER['REMOTE_ADDR']) && $_SERVER['REMOTE_ADDR'] === 'unit.test') {
-            unset($_SERVER['REMOTE_ADDR']);
-        }
-    }
-
-    /**
-     * @testdox  can init the captcha
-     *
-     * @return  void
-     *
-     * @since   4.3.0
-     */
-    public function testInit()
-    {
-        $document = new HtmlDocument();
-        $language = $this->createStub(Language::class);
-        $language->method('_')->willReturn('test');
-
-        $app = $this->createStub(CMSWebApplicationInterface::class);
-        $app->method('getDocument')->willReturn($document);
-        $app->method('getLanguage')->willReturn($language);
-
-        $plugin = new ReCaptcha(new Dispatcher(), ['params' => ['public_key' => 'test']], $this->createStub(RequestMethod::class));
-        $plugin->setApplication($app);
-
-        $this->assertTrue($plugin->onInit());
-        $this->assertNotEmpty($document->getWebAssetManager()->getAsset('script', 'plg_captcha_recaptcha'));
-        $this->assertNotEmpty($document->getWebAssetManager()->getAsset('script', 'plg_captcha_recaptcha.api'));
-    }
-
-    /**
-     * @testdox  can init the captcha with a wrong application
-     *
-     * @return  void
-     *
-     * @since   4.3.0
-     */
-    public function testInitWrongApplication()
-    {
-        $plugin = new ReCaptcha(new Dispatcher(), ['params' => ['public_key' => 'test']], $this->createStub(RequestMethod::class));
-        $plugin->setApplication($this->createStub(CMSApplicationInterface::class));
-
-        $this->assertFalse($plugin->onInit());
-    }
-
-    /**
-     * @testdox  can init the captcha with an empty public key
-     *
-     * @return  void
-     *
-     * @since   4.3.0
-     */
-    public function testInitEmptyPublicKey()
-    {
-        $language = $this->createStub(Language::class);
-        $language->method('_')->willReturn('test');
-
-        $app = $this->createStub(CMSWebApplicationInterface::class);
-        $app->method('getLanguage')->willReturn($language);
-
-        $plugin = new ReCaptcha(new Dispatcher(), ['params' => []], $this->createStub(RequestMethod::class));
-        $plugin->setApplication($app);
-
-        $this->expectException(RuntimeException::class);
-
-        $plugin->onInit();
-    }
-
-    /**
-     * @testdox  can display the captcha
-     *
-     * @return  void
-     *
-     * @since   4.3.0
-     */
-    public function testDisplay()
-    {
-        $plugin = new ReCaptcha(new Dispatcher(), ['params' => []], $this->createStub(RequestMethod::class));
-        $plugin->setApplication($this->createStub(CMSWebApplicationInterface::class));
-
-        $html = $plugin->onDisplay();
-
-        $this->assertNotEmpty($html);
-        $this->assertNotEquals($html, strip_tags($html));
-    }
-
-    /**
-     * @testdox  can check successful answer
-     *
-     * @return  void
-     *
-     * @since   4.3.0
-     */
-    public function testResponse()
-    {
-        $language = $this->createStub(Language::class);
-        $language->method('_')->willReturn('test');
-
-        $app = $this->createStub(CMSWebApplicationInterface::class);
-        $app->method('getLanguage')->willReturn($language);
-        $app->method('getInput')->willReturn(new Input(['g-recaptcha-response' => 'test']));
-
-        $method = $this->createStub(RequestMethod::class);
-        $method->method('submit')->willReturn(json_encode(['success' => true]));
-
-        $plugin = new ReCaptcha(new Dispatcher(), ['params' => ['private_key' => 'test']], $method);
-        $plugin->setApplication($app);
-
-        $this->assertTrue($plugin->onCheckAnswer());
-    }
-
-    /**
-     * @testdox  can check successful answer
-     *
-     * @return  void
-     *
-     * @since   4.3.0
-     */
-    public function testResponseWithCode()
-    {
-        $language = $this->createStub(Language::class);
-        $language->method('_')->willReturn('test');
-
-        $app = $this->createStub(CMSWebApplicationInterface::class);
-        $app->method('getLanguage')->willReturn($language);
-
-        $method = $this->createStub(RequestMethod::class);
-        $method->method('submit')->willReturn(json_encode(['success' => true]));
-
-        $plugin = new ReCaptcha(new Dispatcher(), ['params' => ['private_key' => 'test']], $method);
-        $plugin->setApplication($app);
-
-        $this->assertTrue($plugin->onCheckAnswer('test'));
-    }
-
-    /**
-     * @testdox  can check answer with an empty private key
-     *
-     * @return  void
-     *
-     * @since   4.3.0
-     */
-    public function testResponseEmptyPrivateKey()
-    {
-        $language = $this->createStub(Language::class);
-        $language->method('_')->willReturn('test');
-
-        $app = $this->createStub(CMSWebApplicationInterface::class);
-        $app->method('getLanguage')->willReturn($language);
-
-        $plugin = new ReCaptcha(new Dispatcher(), ['params' => []], $this->createStub(RequestMethod::class));
-        $plugin->setApplication($app);
-
-        $this->expectException(RuntimeException::class);
-
-        $plugin->onCheckAnswer();
-    }
-
-    /**
-     * @testdox  can detect spam
-     *
-     * @return  void
-     *
-     * @since   4.3.0
-     */
-    public function testResponseSpam()
-    {
-        $language = $this->createStub(Language::class);
-        $language->method('_')->willReturn('test');
-
-        $app = $this->createStub(CMSWebApplicationInterface::class);
-        $app->method('getLanguage')->willReturn($language);
-        $app->method('getInput')->willReturn(new Input(['g-recaptcha-response' => '']));
-
-        $plugin = new ReCaptcha(new Dispatcher(), ['params' => ['private_key' => 'test']], $this->createStub(RequestMethod::class));
-        $plugin->setApplication($app);
-
-        $this->expectException(RuntimeException::class);
-
-        $plugin->onCheckAnswer();
-    }
-
-    /**
-     * @testdox  can check successful answer
-     *
-     * @return  void
-     *
-     * @since   4.3.0
-     */
-    public function testFailedResponse()
-    {
-        $language = $this->createStub(Language::class);
-        $language->method('_')->willReturn('test');
-
-        $app = $this->createStub(CMSWebApplicationInterface::class);
-        $app->method('getLanguage')->willReturn($language);
-        $app->method('getInput')->willReturn(new Input(['g-recaptcha-response' => 'test']));
-
-        $method = $this->createStub(RequestMethod::class);
-        $method->method('submit')->willReturn(json_encode(['success' => false]));
-
-        $plugin = new ReCaptcha(new Dispatcher(), ['params' => ['private_key' => 'test']], $method);
-        $plugin->setApplication($app);
-
-        $this->expectException(RuntimeException::class);
-
-        $plugin->onCheckAnswer();
-    }
-
-    /**
-     * @testdox  can return admin capabilities
-     *
-     * @return  void
-     *
-     * @since   4.3.0
-     */
-    public function testPrivacy()
-    {
-        $language = $this->createStub(Language::class);
-        $language->method('_')->willReturn('test');
-
-        $app = $this->createStub(CMSWebApplicationInterface::class);
-        $app->method('getLanguage')->willReturn($language);
-
-        $plugin = new ReCaptcha(new Dispatcher(), ['params' => ['private_key' => 'test']], $this->createStub(RequestMethod::class));
-        $plugin->setApplication($app);
-
-        $caps = $plugin->onPrivacyCollectAdminCapabilities();
-
-        $this->assertNotEmpty($caps);
-    }
-}
diff --git a/tests/Unit/Plugin/Content/ConfirmConsent/Extension/ConfirmConsentTest.php b/tests/Unit/Plugin/Content/ConfirmConsent/Extension/ConfirmConsentTest.php
index 9542f8bc51d3d..6cc414799d9d0 100644
--- a/tests/Unit/Plugin/Content/ConfirmConsent/Extension/ConfirmConsentTest.php
+++ b/tests/Unit/Plugin/Content/ConfirmConsent/Extension/ConfirmConsentTest.php
@@ -13,6 +13,7 @@
 use Joomla\CMS\Application\CMSApplicationInterface;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Language;
+use Joomla\CMS\User\User;
 use Joomla\Event\Dispatcher;
 use Joomla\Plugin\Content\ConfirmConsent\Extension\ConfirmConsent;
 use Joomla\Tests\Unit\UnitTestCase;
@@ -39,6 +40,7 @@ class ConfirmConsentTest extends UnitTestCase
     public function testLoadConsentFieldInForm()
     {
         $form = new Form('com_contact.contact');
+        $form->setCurrentUser(new User());
 
         $app = $this->createStub(CMSApplicationInterface::class);
         $app->method('getLanguage')->willReturn($this->createStub(Language::class));
diff --git a/tests/Unit/Plugin/EditorsXtd/PageBreak/Extension/PageBreakTest.php b/tests/Unit/Plugin/EditorsXtd/PageBreak/Extension/PageBreakTest.php
new file mode 100644
index 0000000000000..1ef73063c1f0d
--- /dev/null
+++ b/tests/Unit/Plugin/EditorsXtd/PageBreak/Extension/PageBreakTest.php
@@ -0,0 +1,103 @@
+<?php
+
+/**
+ * @package     Joomla.UnitTest
+ * @subpackage  Extension
+ *
+ * @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\Tests\Unit\Plugin\EditorsXtd\PageBreak\Extension;
+
+use Joomla\CMS\Application\CMSApplicationInterface;
+use Joomla\CMS\Application\CMSWebApplicationInterface;
+use Joomla\CMS\Document\Document;
+use Joomla\CMS\Language\Language;
+use Joomla\CMS\User\User;
+use Joomla\Event\Dispatcher;
+use Joomla\Plugin\EditorsXtd\PageBreak\Extension\PageBreak;
+use Joomla\Tests\Unit\UnitTestCase;
+
+/**
+ * Test class for PageBreak editor button plugin
+ *
+ * @package     Joomla.UnitTest
+ * @subpackage  PageBreak
+ *
+ * @testdox     The PageBreak plugin
+ *
+ * @since       4.4.0
+ */
+class PageBreakTest extends UnitTestCase
+{
+    /**
+     * @testdox  that the button is properly loaded
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function testButton()
+    {
+        $user = $this->createStub(User::class);
+        $user->method('authorise')->willReturn(true);
+        $user->method('getAuthorisedCategories')->willReturn([]);
+
+        $app = $this->createStub(CMSWebApplicationInterface::class);
+        $app->method('getLanguage')->willReturn($this->createStub(Language::class));
+        $app->method('getIdentity')->willReturn($user);
+        $app->method('getDocument')->willReturn(new Document());
+
+        $dispatcher = new Dispatcher();
+        $plugin     = new PageBreak($dispatcher, ['params' => []]);
+        $plugin->setApplication($app);
+        $button = $plugin->onDisplay('test');
+
+        $this->assertNotNull($button);
+        $this->assertNotEmpty($button->name);
+        $this->assertNotEmpty($button->link);
+        $this->assertNotEmpty($button->options);
+    }
+
+    /**
+     * @testdox  that the user has not enough permission
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function testInvalidPermissions()
+    {
+        $user = $this->createStub(User::class);
+        $user->method('authorise')->willReturn(false);
+        $user->method('getAuthorisedCategories')->willReturn([]);
+
+        $app = $this->createStub(CMSWebApplicationInterface::class);
+        $app->method('getIdentity')->willReturn($user);
+
+        $dispatcher = new Dispatcher();
+        $plugin     = new PageBreak($dispatcher, ['params' => []]);
+        $plugin->setApplication($app);
+        $button = $plugin->onDisplay('test');
+
+        $this->assertNull($button);
+    }
+
+    /**
+     * @testdox  that the button is not returned when a none web CMS application is used
+     *
+     * @return  void
+     *
+     * @since   4.4.0
+     */
+    public function testInvalidApplication()
+    {
+        $dispatcher = new Dispatcher();
+        $plugin     = new PageBreak($dispatcher, ['params' => []]);
+        $plugin->setApplication($this->createStub(CMSApplicationInterface::class));
+        $button = $plugin->onDisplay('test');
+
+        $this->assertNull($button);
+    }
+}
diff --git a/tests/Unit/Plugin/Filesystem/Local/Extension/LocalPluginTest.php b/tests/Unit/Plugin/Filesystem/Local/Extension/LocalPluginTest.php
index a25322bcaba66..b04fc71038f99 100644
--- a/tests/Unit/Plugin/Filesystem/Local/Extension/LocalPluginTest.php
+++ b/tests/Unit/Plugin/Filesystem/Local/Extension/LocalPluginTest.php
@@ -10,9 +10,9 @@
 
 namespace Joomla\Tests\Unit\Plugin\Filesystem\Local\Extension;
 
-use InvalidArgumentException;
 use Joomla\CMS\Application\CMSApplicationInterface;
 use Joomla\CMS\Language\Language;
+use Joomla\CMS\User\User;
 use Joomla\Component\Media\Administrator\Event\MediaProviderEvent;
 use Joomla\Component\Media\Administrator\Provider\ProviderManager;
 use Joomla\Event\Dispatcher;
@@ -104,7 +104,11 @@ public function testAdapters()
     {
         $dispatcher = new Dispatcher();
 
+        $app = $this->createStub(CMSApplicationInterface::class);
+        $app->method('getIdentity')->willReturn(new User());
+
         $plugin   = new Local($dispatcher, ['params' => ['directories' => '[{"directory": "tests"}]']], JPATH_ROOT);
+        $plugin->setApplication($app);
         $adapters = $plugin->getAdapters();
 
         $this->assertCount(1, $adapters);
@@ -118,9 +122,9 @@ public function testAdapters()
      *
      * @since   4.3.0
      */
-    public function testAdaptersInvalidDirectoy()
+    public function testAdaptersInvalidDirectory()
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(\InvalidArgumentException::class);
         $dispatcher = new Dispatcher();
 
         $plugin = new Local($dispatcher, ['params' => ['directories' => '[{"directory": "invalid"}]']], __DIR__);
diff --git a/tests/Unit/Plugin/Task/Requests/Extension/RequestsPluginTest.php b/tests/Unit/Plugin/Task/Requests/Extension/RequestsPluginTest.php
index caa8e446d77d3..83fb1695af5e2 100644
--- a/tests/Unit/Plugin/Task/Requests/Extension/RequestsPluginTest.php
+++ b/tests/Unit/Plugin/Task/Requests/Extension/RequestsPluginTest.php
@@ -239,7 +239,7 @@ public static function isSupported()
         );
         $plugin->standardRoutineHandler($event);
 
-        $this->assertEquals(['basic' => '123'], $transport->headers);
+        $this->assertEquals(['Authorization' => 'basic 123'], $transport->headers);
     }
 
     /**
@@ -254,7 +254,7 @@ public function testExceptionInRequest()
         $transport = new class () implements TransportInterface {
             public function request($method, UriInterface $uri, $data = null, array $headers = [], $timeout = null, $userAgent = null)
             {
-                throw new Exception('test');
+                throw new \Exception('test');
             }
 
             public static function isSupported()
diff --git a/tests/Unit/Plugin/Task/SiteStatus/Extension/SiteStatusPluginTest.php b/tests/Unit/Plugin/Task/SiteStatus/Extension/SiteStatusPluginTest.php
index eddade7c22955..88b3e289820be 100644
--- a/tests/Unit/Plugin/Task/SiteStatus/Extension/SiteStatusPluginTest.php
+++ b/tests/Unit/Plugin/Task/SiteStatus/Extension/SiteStatusPluginTest.php
@@ -267,6 +267,6 @@ public function testInvalidConfigFile()
         $plugin->alterSiteStatus($event);
 
         $this->assertEquals(Status::KNOCKOUT, $event->getResultSnapshot()['status']);
-        $this->assertFileNotExists('/proc/invalid/config.php');
+        $this->assertFileDoesNotExist('/proc/invalid/config.php');
     }
 }
diff --git a/tests/Unit/bootstrap.php b/tests/Unit/bootstrap.php
index f01df3ee36f27..85689d2885b8b 100644
--- a/tests/Unit/bootstrap.php
+++ b/tests/Unit/bootstrap.php
@@ -35,6 +35,13 @@
     define('JPATH_ROOT', JPATH_BASE);
 }
 
+if (!defined('JPATH_PUBLIC')) {
+    define('JPATH_PUBLIC', JPATH_ROOT);
+}
+
+/**
+ * @deprecated 4.4.0 will be removed in 6.0
+ **/
 if (!defined('JPATH_PLATFORM')) {
     define('JPATH_PLATFORM', JPATH_BASE . DIRECTORY_SEPARATOR . 'libraries');
 }
@@ -85,7 +92,7 @@
 
 // Import the library loader if necessary.
 if (!class_exists('JLoader')) {
-    require_once JPATH_PLATFORM . '/loader.php';
+    require_once JPATH_LIBRARIES . '/loader.php';
 
     // If JLoader still does not exist panic.
     if (!class_exists('JLoader')) {
@@ -108,9 +115,6 @@ class_exists('\\Joomla\\CMS\\Autoload\\ClassLoader');
 // Decorate Composer autoloader
 spl_autoload_register([new \Joomla\CMS\Autoload\ClassLoader($loader), 'loadClass'], true, true);
 
-// Register the class aliases for Framework classes that have replaced their Platform equivalents
-require_once JPATH_LIBRARIES . '/classmap.php';
-
 // Load extension classes
 require_once JPATH_LIBRARIES . '/namespacemap.php';
 $extensionPsr4Loader = new \JNamespacePsr4Map();