diff --git a/.drone.yml b/.drone.yml
index 4dd6099a5151b..80282ce15e9b1 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -329,8 +329,35 @@ services:
       POSTGRES_PASSWORD: joomla_ut
       POSTGRES_DB: test_joomla
 
+---
+kind: pipeline
+name: package
+
+steps:
+  - name: packager
+    image: joomlaprojects/docker-images:packager
+    environment:
+      FTP_USERNAME:
+        from_secret: ftpusername
+      FTP_PASSWORD:
+        from_secret: ftppassword
+      FTP_HOSTNAME: ci.joomla.org
+      FTP_PORT: "21"
+      FTP_DEST_DIR: /artifacts
+      FTP_VERIFY: "false"
+      FTP_SECURE: "true"
+      HTTP_ROOT: "https://ci.joomla.org/artifacts"
+      DRONE_PULL_REQUEST: DRONE_PULL_REQUEST
+      DRONE_COMMIT: DRONE_COMMIT
+      GITHUB_TOKEN:
+        from_secret: github_token
+    commands:
+      - if [ $DRONE_REPO_NAME != 'joomla-cms' ]; then echo "The packager only runs on the joomla/joomla-cms repo"; exit 0; fi
+      - /bin/drone_build.sh
+
+
 ---
 kind: signature
-hmac: 06035b7ce5a946d486d499e71b5c80538ae5272929f072b03cfadf4bb3b1fc15
+hmac: a0026c26e94c1443cb0de99edcd5c81a83981c99ea43e5254542c2e4214abe4e
 
 ...
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 0be9be57ae051..1914e099bd843 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1 +1,2 @@
+github: joomla
 custom: https://community.joomla.org/sponsorship-campaigns.html
diff --git a/administrator/components/com_actionlogs/forms/filter_actionlogs.xml b/administrator/components/com_actionlogs/forms/filter_actionlogs.xml
index c64c591b9274c..12de6deef59f2 100644
--- a/administrator/components/com_actionlogs/forms/filter_actionlogs.xml
+++ b/administrator/components/com_actionlogs/forms/filter_actionlogs.xml
@@ -12,7 +12,7 @@
 		<field
 			name="extension"
 			type="extension"
-			label="COM_ACTIONLOGS_SELECT_EXTENSION"
+			label="COM_ACTIONLOGS_EXTENSION"
 			onchange="this.form.submit()"
 			>
 			<option value="">COM_ACTIONLOGS_SELECT_EXTENSION</option>
@@ -20,7 +20,7 @@
 		<field
 			name="dateRange"
 			type="logsdaterange"
-			label="COM_ACTIONLOGS_OPTION_FILTER_DATE"
+			label="COM_ACTIONLOGS_DATE"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_ACTIONLOGS_OPTION_FILTER_DATE</option>
@@ -28,7 +28,7 @@
 		<field
 			name="user"
 			type="logcreator"
-			label="COM_ACTIONLOGS_SELECT_USER"
+			label="COM_ACTIONLOGS_NAME"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_ACTIONLOGS_SELECT_USER</option>
diff --git a/administrator/components/com_actionlogs/src/Field/PlugininfoField.php b/administrator/components/com_actionlogs/src/Field/PlugininfoField.php
index 09e1033921d84..9b96706f8c4fd 100644
--- a/administrator/components/com_actionlogs/src/Field/PlugininfoField.php
+++ b/administrator/components/com_actionlogs/src/Field/PlugininfoField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Actionlogs\Administrator\Field;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\FormField;
diff --git a/administrator/components/com_actionlogs/tmpl/actionlogs/default.php b/administrator/components/com_actionlogs/tmpl/actionlogs/default.php
index 5dff1d4205975..efe10ac126c00 100644
--- a/administrator/components/com_actionlogs/tmpl/actionlogs/default.php
+++ b/administrator/components/com_actionlogs/tmpl/actionlogs/default.php
@@ -36,7 +36,9 @@
 		<?php else : ?>
 			<table class="table" id="logsList">
 				<caption id="captionTable" class="sr-only">
-					<?php echo Text::_('COM_ACTIONLOGS_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+					<?php echo Text::_('COM_ACTIONLOGS_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 				</caption>
 				<thead>
 					<tr>
diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
index 77c7d2074b0a8..c06955a9a218e 100644
--- a/administrator/components/com_admin/script.php
+++ b/administrator/components/com_admin/script.php
@@ -6254,11 +6254,13 @@ public function convertTablesToUtf8mb4($doDbFixMsg = false)
 		// Set required conversion status
 		if ($db->hasUTF8mb4Support())
 		{
-			$converted = 2;
+			$convertedStep1 = 2;
+			$convertedStep2 = 4;
 		}
 		else
 		{
-			$converted = 1;
+			$convertedStep1 = 1;
+			$convertedStep2 = 3;
 		}
 
 		// Check conversion status in database
@@ -6284,73 +6286,123 @@ public function convertTablesToUtf8mb4($doDbFixMsg = false)
 			return;
 		}
 
-		// Nothing to do, saved conversion status from DB is equal to required
-		if ($convertedDB == $converted)
+		// Nothing to do, saved conversion status from DB is equal to required final status
+		if ($convertedDB == $convertedStep2)
 		{
 			return;
 		}
 
-		// Step 1: Drop indexes later to be added again with column lengths limitations at step 2
-		$fileName1 = JPATH_ROOT . '/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-01.sql';
+		$converted = $convertedDB;
+		$hasErrors = false;
 
-		if (is_file($fileName1))
+		// Steps 1 and 2: Convert core tables if necessary and not to be done at later steps
+		if ($convertedDB < $convertedStep1)
 		{
-			$fileContents1 = @file_get_contents($fileName1);
-			$queries1      = $db->splitSql($fileContents1);
+			// Step 1: Drop indexes later to be added again with column lengths limitations at step 2
+			$fileName1 = JPATH_ROOT . '/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-01.sql';
 
-			if (!empty($queries1))
+			if (is_file($fileName1))
 			{
-				foreach ($queries1 as $query1)
+				$fileContents1 = @file_get_contents($fileName1);
+				$queries1      = $db->splitSql($fileContents1);
+
+				if (!empty($queries1))
 				{
-					try
+					foreach ($queries1 as $query1)
 					{
-						$db->setQuery($query1)->execute();
+						try
+						{
+							$db->setQuery($query1)->execute();
+						}
+						catch (Exception $e)
+						{
+							// If the query fails we will go on. It just means the index to be dropped does not exist.
+						}
 					}
-					catch (Exception $e)
+				}
+			}
+
+			// Step 2: Perform the index modifications and conversions
+			$fileName2 = JPATH_ROOT . '/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-02.sql';
+
+			if (is_file($fileName2))
+			{
+				$fileContents2 = @file_get_contents($fileName2);
+				$queries2      = $db->splitSql($fileContents2);
+
+				if (!empty($queries2))
+				{
+					foreach ($queries2 as $query2)
 					{
-						// If the query fails we will go on. It just means the index to be dropped does not exist.
+						try
+						{
+							$db->setQuery($db->convertUtf8mb4QueryToUtf8($query2))->execute();
+						}
+						catch (Exception $e)
+						{
+							$hasErrors = true;
+
+							// Still render the error message from the Exception object
+							JFactory::getApplication()->enqueueMessage($e->getMessage(), 'error');
+						}
 					}
 				}
 			}
-		}
 
-		// Step 2: Perform the index modifications and conversions
-		$fileName2 = JPATH_ROOT . '/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-02.sql';
+			if (!$hasErrors)
+			{
+				$converted = $convertedStep1;
+			}
+		}
 
-		if (is_file($fileName2))
+		// Step 3: Convert action logs and privacy suite tables if necessary and conversion hasn't failed before
+		if (!$hasErrors && $convertedDB < $convertedStep2)
 		{
-			$fileContents2 = @file_get_contents($fileName2);
-			$queries2      = $db->splitSql($fileContents2);
+			$fileName3 = JPATH_ROOT . '/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-03.sql';
 
-			if (!empty($queries2))
+			if (is_file($fileName3))
 			{
-				foreach ($queries2 as $query2)
+				$fileContents3 = @file_get_contents($fileName3);
+				$queries3      = $db->splitSql($fileContents3);
+
+				if (!empty($queries3))
 				{
-					try
+					foreach ($queries3 as $query3)
 					{
-						$db->setQuery($db->convertUtf8mb4QueryToUtf8($query2))->execute();
-					}
-					catch (Exception $e)
-					{
-						$converted = 0;
+						try
+						{
+							$db->setQuery($db->convertUtf8mb4QueryToUtf8($query3))->execute();
+						}
+						catch (Exception $e)
+						{
+							$hasErrors = true;
 
-						// Still render the error message from the Exception object
-						Factory::getApplication()->enqueueMessage($e->getMessage(), 'error');
+							// Still render the error message from the Exception object
+							JFactory::getApplication()->enqueueMessage($e->getMessage(), 'error');
+						}
 					}
 				}
 			}
+
+			if (!$hasErrors)
+			{
+				$converted = $convertedStep2;
+			}
 		}
 
-		if ($doDbFixMsg && $converted == 0)
+		if ($doDbFixMsg && $hasErrors)
 		{
 			// Show an error message telling to check database problems
 			Factory::getApplication()->enqueueMessage(Text::_('JLIB_DATABASE_ERROR_DATABASE_UPGRADE_FAILED'), 'error');
 		}
 
-		// Set flag in database if the update is done.
-		$db->setQuery('UPDATE ' . $db->quoteName('#__utf8_conversion')
-			. ' SET ' . $db->quoteName('converted') . ' = ' . $converted . ';'
-		)->execute();
+		// Set flag in database if the conversion status has changed.
+		if ($converted != $convertedDB)
+		{
+			$db->setQuery('UPDATE ' . $db->quoteName('#__utf8_conversion')
+				. ' SET ' . $db->quoteName('converted') . ' = ' . $converted . ';'
+			)->execute();
+		}
 	}
 
 	/**
diff --git a/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-02.sql b/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-02.sql
index 3edcbd3e7978a..022f77c4a40eb 100644
--- a/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-02.sql
+++ b/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-02.sql
@@ -41,12 +41,12 @@ ALTER TABLE `#__newsfeeds` MODIFY `alias` varchar(400) NOT NULL DEFAULT '';
 ALTER TABLE `#__tags` MODIFY `path` varchar(400) NOT NULL DEFAULT '';
 ALTER TABLE `#__tags` MODIFY `alias` varchar(400) NOT NULL DEFAULT '';
 ALTER TABLE `#__ucm_content` MODIFY `core_type_alias` varchar(400) NOT NULL DEFAULT '' COMMENT 'FK to the content types table';
-ALTER TABLE `#__ucm_content` MODIFY `core_title` varchar(400) NOT NULL;
+ALTER TABLE `#__ucm_content` MODIFY `core_title` varchar(400) NOT NULL DEFAULT '';
 ALTER TABLE `#__ucm_content` MODIFY `core_alias` varchar(400) NOT NULL DEFAULT '';
 ALTER TABLE `#__users` MODIFY `name` varchar(400) NOT NULL DEFAULT '';
 
 --
--- Step 2.2: Convert all tables to utf8mb4 chracter set with utf8mb4_unicode_ci collation
+-- Step 2.2: Convert all tables to utf8mb4 character set with utf8mb4_unicode_ci collation
 -- except #__finder_xxx tables, those will have utf8mb4_general_ci collation.
 -- Note: The database driver for mysql will change utf8mb4 to utf8 if utf8mb4 is not supported
 --
diff --git a/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-03.sql b/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-03.sql
new file mode 100644
index 0000000000000..93fcf9ee3d18d
--- /dev/null
+++ b/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-03.sql
@@ -0,0 +1,33 @@
+--
+-- Step 3 of the UTF-8 Multibyte (utf8mb4) conversion for MySQL
+--
+-- Convert the tables for action logs and the privacy suite which have been
+-- forgotten to be added to the utf8mb4 conversion before.
+--
+-- This file here will be processed with reporting exceptions, in opposite
+-- to the file for step 1.
+--
+
+--
+-- Step 3.1: Convert action logs and privacy suite tables to utf8mb4 character set with
+-- utf8mb4_unicode_ci collation
+-- Note: The database driver for mysql will change utf8mb4 to utf8 if utf8mb4 is not supported
+--
+
+ALTER TABLE `#__action_logs` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__action_logs_extensions` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__action_logs_users` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__action_log_config` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__privacy_consents` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__privacy_requests` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+
+--
+-- Step 3.2: Set default character set and collation for previously converted tables
+--
+
+ALTER TABLE `#__action_logs` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__action_logs_extensions` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__action_logs_users` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__action_log_config` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__privacy_consents` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__privacy_requests` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
diff --git a/administrator/components/com_associations/forms/filter_associations.xml b/administrator/components/com_associations/forms/filter_associations.xml
index 99bd94918208d..f723b314f800f 100644
--- a/administrator/components/com_associations/forms/filter_associations.xml
+++ b/administrator/components/com_associations/forms/filter_associations.xml
@@ -33,7 +33,7 @@
 		<field
 			name="state"
 			type="status"
-			label="JOPTION_SELECT_PUBLISHED"
+			label="JSTATUS"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
@@ -42,7 +42,7 @@
 		<field
 			name="category_id"
 			type="category"
-			label="JOPTION_SELECT_CATEGORY"
+			label="JCATEGORY"
 			published="0,1,2"
 			extension="dynamic"
 			onchange="this.form.submit();"
@@ -53,7 +53,7 @@
 		<field
 			name="menutype"
 			type="menu"
-			label="COM_ASSOCIATIONS_SELECT_MENU"
+			label="COM_ASSOCIATIONS_HEADING_MENUTYPE"
 			clientid="0"
 			onchange="this.form.submit();"
 			>
@@ -63,7 +63,7 @@
 		<field
 			name="access"
 			type="accesslevel"
-			label="JOPTION_SELECT_ACCESS"
+			label="JGRID_HEADING_ACCESS"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_ACCESS</option>
@@ -72,7 +72,7 @@
 		<field
 			name="level"
 			type="integer"
-			label="JOPTION_SELECT_MAX_LEVELS"
+			label="JGLOBAL_MAXLEVEL_LABEL"
 			first="1"
 			last="10"
 			step="1"
diff --git a/administrator/components/com_associations/layouts/joomla/searchtools/default.php b/administrator/components/com_associations/layouts/joomla/searchtools/default.php
index d1eaa88c6b4c6..f8876888a21a4 100644
--- a/administrator/components/com_associations/layouts/joomla/searchtools/default.php
+++ b/administrator/components/com_associations/layouts/joomla/searchtools/default.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
diff --git a/administrator/components/com_associations/src/Field/ItemlanguageField.php b/administrator/components/com_associations/src/Field/ItemlanguageField.php
index 49f0481736bf1..c984147b01d71 100644
--- a/administrator/components/com_associations/src/Field/ItemlanguageField.php
+++ b/administrator/components/com_associations/src/Field/ItemlanguageField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Associations\Administrator\Field;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;
diff --git a/administrator/components/com_associations/src/Field/ItemtypeField.php b/administrator/components/com_associations/src/Field/ItemtypeField.php
index 36da82d7399a6..5e71ba8875923 100644
--- a/administrator/components/com_associations/src/Field/ItemtypeField.php
+++ b/administrator/components/com_associations/src/Field/ItemtypeField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Associations\Administrator\Field;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Form\Field\GroupedlistField;
 use Joomla\CMS\HTML\HTMLHelper;
diff --git a/administrator/components/com_associations/src/Field/Modal/AssociationField.php b/administrator/components/com_associations/src/Field/Modal/AssociationField.php
index ac705d7d6c5d1..a39b0924c1fac 100644
--- a/administrator/components/com_associations/src/Field/Modal/AssociationField.php
+++ b/administrator/components/com_associations/src/Field/Modal/AssociationField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Associations\Administrator\Field\Modal;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\FormField;
diff --git a/administrator/components/com_associations/src/Helper/AssociationsHelper.php b/administrator/components/com_associations/src/Helper/AssociationsHelper.php
index c15edaea1ef0c..409c756bce56f 100644
--- a/administrator/components/com_associations/src/Helper/AssociationsHelper.php
+++ b/administrator/components/com_associations/src/Helper/AssociationsHelper.php
@@ -331,7 +331,7 @@ public static function getAssociationHtmlList($extensionName, $typeName, $itemId
 
 			$url     = Route::_('index.php?' . http_build_query($options));
 			$url     = $allow && $addLink ? $url : '';
-			$text    = strtoupper($language->sef);
+			$text    = $language->lang_code;
 
 			$tooltip = '<strong>' . htmlspecialchars($language->title, ENT_QUOTES, 'UTF-8') . '</strong><br>'
 				. htmlspecialchars($title, ENT_QUOTES, 'UTF-8') . '<br><br>' . $additional;
diff --git a/administrator/components/com_associations/tmpl/associations/default.php b/administrator/components/com_associations/tmpl/associations/default.php
index bde3655c35088..d357e80d170d8 100644
--- a/administrator/components/com_associations/tmpl/associations/default.php
+++ b/administrator/components/com_associations/tmpl/associations/default.php
@@ -50,25 +50,27 @@
 				<?php else : ?>
 					<table class="table" id="associationsList">
 						<caption id="captionTable" class="sr-only">
-							<?php echo Text::_('COM_ASSOCIATIONS_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+							<?php echo Text::_('COM_ASSOCIATIONS_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 						</caption>
 						<thead>
 							<tr>
 								<?php if (!empty($this->typeSupports['state'])) : ?>
-									<th scope="col" style="width:1%" class="text-center">
+									<th scope="col" class="w-1 text-center">
 										<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'state', $listDirn, $listOrder); ?>
 									</th>
 								<?php endif; ?>
 								<th scope="col">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JGLOBAL_TITLE', 'title', $listDirn, $listOrder); ?>
 								</th>
-								<th scope="col" style="width:15%">
+								<th scope="col" class="w-15">
 									<?php echo Text::_('JGRID_HEADING_LANGUAGE'); ?>
 								</th>
 								<th scope="col" class="w-5">
 									<?php echo Text::_('COM_ASSOCIATIONS_HEADING_ASSOCIATION'); ?>
 								</th>
-								<th scope="col" style="width:15%">
+								<th scope="col" class="w-15">
 									<?php echo Text::_('COM_ASSOCIATIONS_HEADING_NO_ASSOCIATION'); ?>
 								</th>
 								<?php if (!empty($this->typeFields['menutype'])) : ?>
@@ -81,7 +83,7 @@
 										<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); ?>
 									</th>
 								<?php endif; ?>
-								<th scope="col" style="width:1%" class="d-none d-md-table-cell">
+								<th scope="col" class="w-1 d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'id', $listDirn, $listOrder); ?>
 								</th>
 							</tr>
diff --git a/administrator/components/com_associations/tmpl/associations/modal.php b/administrator/components/com_associations/tmpl/associations/modal.php
index 9aa4b337a4762..4e44a2f858f32 100644
--- a/administrator/components/com_associations/tmpl/associations/modal.php
+++ b/administrator/components/com_associations/tmpl/associations/modal.php
@@ -53,19 +53,21 @@
 		<?php else : ?>
 			<table class="table" id="associationsList">
 				<caption id="captionTable" class="sr-only">
-					<?php echo Text::_('COM_ASSOCIATIONS_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+					<?php echo Text::_('COM_ASSOCIATIONS_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 				</caption>
 			<thead>
 				<tr>
 					<?php if (!empty($this->typeSupports['state'])) : ?>
-						<th scope="col" style="width:1%" class="center">
+						<th scope="col" class="w-1 center">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'state', $listDirn, $listOrder); ?>
 						</th>
 					<?php endif; ?>
 					<th scope="col">
 						<?php echo HTMLHelper::_('searchtools.sort', 'JGLOBAL_TITLE', 'title', $listDirn, $listOrder); ?>
 					</th>
-					<th scope="col" style="width:15%">
+					<th scope="col" class="w-15">
 						<?php echo Text::_('JGRID_HEADING_LANGUAGE'); ?>
 					</th>
 					<th scope="col" class="w-5">
@@ -81,7 +83,7 @@
 							<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); ?>
 						</th>
 					<?php endif; ?>
-					<th scope="col" style="width:1%" class="d-none d-sm-table-cell">
+					<th scope="col" class="w-1 d-none d-sm-table-cell">
 						<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'id', $listDirn, $listOrder); ?>
 					</th>
 				</tr>
diff --git a/administrator/components/com_banners/forms/filter_banners.xml b/administrator/components/com_banners/forms/filter_banners.xml
index 338ae85cc3568..980b0c354b0eb 100644
--- a/administrator/components/com_banners/forms/filter_banners.xml
+++ b/administrator/components/com_banners/forms/filter_banners.xml
@@ -13,7 +13,7 @@
 		<field
 			name="published"
 			type="status"
-			label="JOPTION_SELECT_PUBLISHED"
+			label="JSTATUS"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
@@ -22,7 +22,7 @@
 		<field
 			name="category_id"
 			type="category"
-			label="JOPTION_SELECT_CATEGORY"
+			label="JCATEGORY"
 			extension="com_banners"
 			onchange="this.form.submit();"
 			addfieldprefix="Joomla\Component\Categories\Administrator\Field"
@@ -33,7 +33,7 @@
 		<field
 			name="client_id"
 			type="bannerclient"
-			label="COM_BANNERS_SELECT_CLIENT"
+			label="COM_BANNERS_HEADING_CLIENT"
 			extension="com_content"
 			onchange="this.form.submit();"
 			>
@@ -43,7 +43,7 @@
 		<field
 			name="language"
 			type="contentlanguage"
-			label="JOPTION_SELECT_LANGUAGE"
+			label="JGRID_HEADING_LANGUAGE"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_LANGUAGE</option>
@@ -53,7 +53,7 @@
 		<field
 			name="level"
 			type="integer"
-			label="JOPTION_SELECT_MAX_LEVELS"
+			label="JGLOBAL_MAXLEVEL_LABEL"
 			first="1"
 			last="10"
 			step="1"
diff --git a/administrator/components/com_banners/forms/filter_clients.xml b/administrator/components/com_banners/forms/filter_clients.xml
index dcc369885984a..a2abba041b7f0 100644
--- a/administrator/components/com_banners/forms/filter_clients.xml
+++ b/administrator/components/com_banners/forms/filter_clients.xml
@@ -13,7 +13,7 @@
 		<field
 			name="state"
 			type="status"
-			label="JOPTION_SELECT_PUBLISHED"
+			label="JSTATUS"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
@@ -22,7 +22,7 @@
 		<field
 			name="purchase_type"
 			type="list"
-			label="COM_BANNERS_SELECT_TYPE"
+			label="COM_BANNERS_HEADING_TYPE"
 			default="0"
 			onchange="this.form.submit();"
 			validate="options"
diff --git a/administrator/components/com_banners/forms/filter_tracks.xml b/administrator/components/com_banners/forms/filter_tracks.xml
index 4c82ef0519d0b..a69040c231de2 100644
--- a/administrator/components/com_banners/forms/filter_tracks.xml
+++ b/administrator/components/com_banners/forms/filter_tracks.xml
@@ -13,7 +13,7 @@
 		<field
 			name="category_id"
 			type="category"
-			label="JOPTION_SELECT_CATEGORY"
+			label="JCATEGORY"
 			extension="com_banners"
 			onchange="this.form.submit();"
 			addfieldprefix="Joomla\Component\Categories\Administrator\Field"
@@ -24,7 +24,7 @@
 		<field
 			name="client_id"
 			type="bannerclient"
-			label="COM_BANNERS_SELECT_CLIENT"
+			label="COM_BANNERS_HEADING_CLIENT"
 			extension="com_content"
 			onchange="this.form.submit();"
 			>
@@ -34,7 +34,7 @@
 		<field
 			name="type"
 			type="list"
-			label="COM_BANNERS_SELECT_TYPE"
+			label="COM_BANNERS_HEADING_TYPE"
 			onchange="this.form.submit();"
 			validate="options"
 			>
@@ -46,7 +46,7 @@
 		<field
 			name="level"
 			type="integer"
-			label="JOPTION_SELECT_MAX_LEVELS"
+			label="JGLOBAL_MAXLEVEL_LABEL"
 			first="1"
 			last="10"
 			step="1"
@@ -59,7 +59,7 @@
 		<field
 			name="begin"
 			type="calendar"
-			label="COM_BANNERS_BEGIN_HINT"
+			label="COM_BANNERS_BEGIN_LABEL"
 			hint="COM_BANNERS_BEGIN_HINT"
 			format="%Y-%m-%d"
 			size="10"
@@ -69,7 +69,7 @@
 		<field
 			name="end"
 			type="calendar"
-			label="COM_BANNERS_END_HINT"
+			label="COM_BANNERS_END_LABEL"
 			hint="COM_BANNERS_END_HINT"
 			format="%Y-%m-%d"
 			size="10"
diff --git a/administrator/components/com_banners/src/Field/BannerclientField.php b/administrator/components/com_banners/src/Field/BannerclientField.php
index 8a9402bb1c9e9..496b118f3e157 100644
--- a/administrator/components/com_banners/src/Field/BannerclientField.php
+++ b/administrator/components/com_banners/src/Field/BannerclientField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Banners\Administrator\Field;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Form\Field\ListField;
 use Joomla\Component\Banners\Administrator\Helper\BannersHelper;
diff --git a/administrator/components/com_banners/src/Field/ClicksField.php b/administrator/components/com_banners/src/Field/ClicksField.php
index 165dd5e6c108f..8db51c2091e99 100644
--- a/administrator/components/com_banners/src/Field/ClicksField.php
+++ b/administrator/components/com_banners/src/Field/ClicksField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Banners\Administrator\Field;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Form\FormField;
 use Joomla\CMS\Language\Text;
diff --git a/administrator/components/com_banners/src/Field/ImpmadeField.php b/administrator/components/com_banners/src/Field/ImpmadeField.php
index 6f5860334e302..922196cc5b790 100644
--- a/administrator/components/com_banners/src/Field/ImpmadeField.php
+++ b/administrator/components/com_banners/src/Field/ImpmadeField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Banners\Administrator\Field;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Form\FormField;
 use Joomla\CMS\Language\Text;
diff --git a/administrator/components/com_banners/src/Field/ImptotalField.php b/administrator/components/com_banners/src/Field/ImptotalField.php
index 9138ee670db8e..cc1b108407774 100644
--- a/administrator/components/com_banners/src/Field/ImptotalField.php
+++ b/administrator/components/com_banners/src/Field/ImptotalField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Banners\Administrator\Field;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Form\FormField;
 use Joomla\CMS\Language\Text;
diff --git a/administrator/components/com_banners/src/Model/TracksModel.php b/administrator/components/com_banners/src/Model/TracksModel.php
index 1451edf0595af..44590b5a4190e 100644
--- a/administrator/components/com_banners/src/Model/TracksModel.php
+++ b/administrator/components/com_banners/src/Model/TracksModel.php
@@ -18,6 +18,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\Database\ParameterType;
+use Joomla\String\StringHelper;
 
 /**
  * Methods supporting a list of tracks.
@@ -170,7 +171,7 @@ protected function getListQuery()
 		// Filter by search in banner name or client name.
 		if ($search = $this->getState('filter.search'))
 		{
-			$search = '%' . strtolower($search) . '%';
+			$search = '%' . StringHelper::strtolower($search) . '%';
 			$query->where('(LOWER(' . $db->quoteName('b.name') . ') LIKE :search1 OR LOWER(' . $db->quoteName('cl.name') . ') LIKE :search2)')
 				->bind([':search1', ':search2'], $search);
 		}
diff --git a/administrator/components/com_banners/src/Service/Html/Banner.php b/administrator/components/com_banners/src/Service/Html/Banner.php
index 59d2bcaac3d7f..95227d09a61d1 100644
--- a/administrator/components/com_banners/src/Service/Html/Banner.php
+++ b/administrator/components/com_banners/src/Service/Html/Banner.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Banners\Administrator\Service\Html;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
diff --git a/administrator/components/com_banners/tmpl/banners/default.php b/administrator/components/com_banners/tmpl/banners/default.php
index ff799818f1d60..817616f4c30ee 100644
--- a/administrator/components/com_banners/tmpl/banners/default.php
+++ b/administrator/components/com_banners/tmpl/banners/default.php
@@ -49,17 +49,19 @@
 				<?php else : ?>
 					<table class="table" id="articleList">
 						<caption id="captionTable" class="sr-only">
-							<?php echo Text::_('COM_BANNERS_BANNERS_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+							<?php echo Text::_('COM_BANNERS_BANNERS_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 						</caption>
 						<thead>
 							<tr>
-								<td style="width:1%" class="text-center">
+								<td class="w-1 text-center">
 									<?php echo HTMLHelper::_('grid.checkall'); ?>
 								</td>
-								<th scope="col" style="width:1%" class="text-center d-none d-md-table-cell">
+								<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', 'fas fa-sort'); ?>
 								</th>
-								<th scope="col" style="width:1%" class="text-center">
+								<th scope="col" class="w-1 text-center">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
 								</th>
 								<th scope="col">
diff --git a/administrator/components/com_banners/tmpl/clients/default.php b/administrator/components/com_banners/tmpl/clients/default.php
index e61267574f472..707adc538b509 100644
--- a/administrator/components/com_banners/tmpl/clients/default.php
+++ b/administrator/components/com_banners/tmpl/clients/default.php
@@ -50,20 +50,22 @@
 				<?php else : ?>
 					<table class="table">
 						<caption id="captionTable" class="sr-only">
-							<?php echo Text::_('COM_BANNERS_CLIENTS_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+							<?php echo Text::_('COM_BANNERS_CLIENTS_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 						</caption>
 						<thead>
 							<tr>
-								<td style="width:1%" class="text-center">
+								<td class="w-1 text-center">
 									<?php echo HTMLHelper::_('grid.checkall'); ?>
 								</td>
-								<th scope="col" style="width:1%" class="text-center">
+								<th scope="col" class="w-1 text-center">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
 								</th>
 								<th scope="col">
 									<?php echo HTMLHelper::_('searchtools.sort', 'COM_BANNERS_HEADING_CLIENT', 'a.name', $listDirn, $listOrder); ?>
 								</th>
-								<th scope="col" style="width:15%" class="d-none d-md-table-cell">
+								<th scope="col" class="w-15 d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'COM_BANNERS_HEADING_CONTACT', 'a.contact', $listDirn, $listOrder); ?>
 								</th>
 								<th scope="col" style="width:3%" class="text-center d-none d-md-table-cell">
diff --git a/administrator/components/com_banners/tmpl/tracks/default.php b/administrator/components/com_banners/tmpl/tracks/default.php
index 8e870a0779dc7..b90f91877e090 100644
--- a/administrator/components/com_banners/tmpl/tracks/default.php
+++ b/administrator/components/com_banners/tmpl/tracks/default.php
@@ -32,14 +32,16 @@
 				<?php else : ?>
 					<table class="table">
 						<caption id="captionTable" class="sr-only">
-							<?php echo Text::_('COM_BANNERS_TRACKS_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+							<?php echo Text::_('COM_BANNERS_TRACKS_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 						</caption>
 						<thead>
 							<tr>
 								<th scope="col" class="title">
 									<?php echo HTMLHelper::_('searchtools.sort', 'COM_BANNERS_HEADING_NAME', 'b.name', $listDirn, $listOrder); ?>
 								</th>
-								<th scope="col" style="width:20%">
+								<th scope="col" class="w-20">
 									<?php echo HTMLHelper::_('searchtools.sort', 'COM_BANNERS_HEADING_CLIENT', 'cl.name', $listDirn, $listOrder); ?>
 								</th>
 								<th scope="col" class="w-10 d-none d-md-table-cell">
diff --git a/administrator/components/com_cache/tmpl/cache/default.php b/administrator/components/com_cache/tmpl/cache/default.php
index 0068affab2f3a..95bf9146438ee 100644
--- a/administrator/components/com_cache/tmpl/cache/default.php
+++ b/administrator/components/com_cache/tmpl/cache/default.php
@@ -39,11 +39,13 @@
 				<?php else : ?>
 				<table class="table">
 					<caption id="captionTable" class="sr-only">
-						<?php echo Text::_('COM_CACHE_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+						<?php echo Text::_('COM_CACHE_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 					</caption>
 						<thead>
 						<tr>
-							<td style="width:1%" class="text-center">
+							<td class="w-1 text-center">
 								<?php echo HTMLHelper::_('grid.checkall'); ?>
 							</td>
 							<th scope="col" class="title">
diff --git a/administrator/components/com_categories/forms/filter_categories.xml b/administrator/components/com_categories/forms/filter_categories.xml
index 0f45caadedf85..c5eaf7c42b37e 100644
--- a/administrator/components/com_categories/forms/filter_categories.xml
+++ b/administrator/components/com_categories/forms/filter_categories.xml
@@ -15,7 +15,7 @@
 		<field
 			name="published"
 			type="status"
-			label="JOPTION_SELECT_PUBLISHED"
+			label="JSTATUS"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
@@ -24,7 +24,7 @@
 		<field
 			name="access"
 			type="accesslevel"
-			label="JOPTION_SELECT_ACCESS"
+			label="JGRID_HEADING_ACCESS"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_ACCESS</option>
@@ -33,7 +33,7 @@
 		<field
 			name="language"
 			type="contentlanguage"
-			label="JOPTION_SELECT_LANGUAGE"
+			label="JGRID_HEADING_LANGUAGE"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_LANGUAGE</option>
@@ -43,7 +43,7 @@
 		<field
 			name="tag"
 			type="tag"
-			label="JOPTION_SELECT_TAG"
+			label="JTAG"
 			hint="JOPTION_SELECT_TAG"
 			multiple="true"
 			mode="nested"
@@ -54,7 +54,7 @@
 		<field
 			name="level"
 			type="integer"
-			label="JOPTION_SELECT_MAX_LEVELS"
+			label="JGLOBAL_MAXLEVEL_LABEL"
 			first="1"
 			last="10"
 			step="1"
diff --git a/administrator/components/com_categories/layouts/joomla/form/field/categoryedit.php b/administrator/components/com_categories/layouts/joomla/form/field/categoryedit.php
index c395f9ed1bc2c..f64148e9a3948 100644
--- a/administrator/components/com_categories/layouts/joomla/form/field/categoryedit.php
+++ b/administrator/components/com_categories/layouts/joomla/form/field/categoryedit.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
diff --git a/administrator/components/com_categories/src/Field/CategoryeditField.php b/administrator/components/com_categories/src/Field/CategoryeditField.php
index 0040b0d964c4e..27773c13965b9 100644
--- a/administrator/components/com_categories/src/Field/CategoryeditField.php
+++ b/administrator/components/com_categories/src/Field/CategoryeditField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Categories\Administrator\Field;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;
diff --git a/administrator/components/com_categories/src/Field/Modal/CategoryField.php b/administrator/components/com_categories/src/Field/Modal/CategoryField.php
index 8c87505cee91a..6a4181ae015f7 100644
--- a/administrator/components/com_categories/src/Field/Modal/CategoryField.php
+++ b/administrator/components/com_categories/src/Field/Modal/CategoryField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Categories\Administrator\Field\Modal;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\FormField;
diff --git a/administrator/components/com_categories/src/Model/CategoryModel.php b/administrator/components/com_categories/src/Model/CategoryModel.php
index 2b9a489c9c924..f77c1265cafce 100644
--- a/administrator/components/com_categories/src/Model/CategoryModel.php
+++ b/administrator/components/com_categories/src/Model/CategoryModel.php
@@ -752,6 +752,11 @@ public function save($data)
 
 		$this->setState($this->getName() . '.id', $table->id);
 
+		if (Factory::getApplication()->input->get('task') == 'editAssociations')
+		{
+			return $this->redirectToAssociations($data);
+		}
+
 		// Clear the cache
 		$this->cleanCache();
 
diff --git a/administrator/components/com_categories/src/Service/HTML/AdministratorService.php b/administrator/components/com_categories/src/Service/HTML/AdministratorService.php
index d2070e2ba7136..d78cbba80b3a4 100644
--- a/administrator/components/com_categories/src/Service/HTML/AdministratorService.php
+++ b/administrator/components/com_categories/src/Service/HTML/AdministratorService.php
@@ -90,7 +90,7 @@ public function association($catid, $extension = 'com_content')
 				{
 					if (in_array($item->lang_code, $content_languages))
 					{
-						$text     = $item->lang_sef ? strtoupper($item->lang_sef) : 'XX';
+						$text     = $item->lang_code;
 						$url      = Route::_('index.php?option=com_categories&task=category.edit&id=' . (int) $item->id . '&extension=' . $extension);
 						$tooltip  = '<strong>' . htmlspecialchars($item->language_title, ENT_QUOTES, 'UTF-8') . '</strong><br>'
 							. htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8');
diff --git a/administrator/components/com_categories/tmpl/categories/default.php b/administrator/components/com_categories/tmpl/categories/default.php
index 9647d730084b8..a0a8e5a6e6239 100644
--- a/administrator/components/com_categories/tmpl/categories/default.php
+++ b/administrator/components/com_categories/tmpl/categories/default.php
@@ -65,17 +65,19 @@
 				<?php else : ?>
 					<table class="table" id="categoryList">
 						<caption id="captionTable" class="sr-only">
-							<?php echo Text::_('COM_CATEGORIES_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+							<?php echo Text::_('COM_CATEGORIES_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 						</caption>
 						<thead>
 							<tr>
-								<td style="width:1%" class="text-center">
+								<td class="w-1 text-center">
 									<?php echo HTMLHelper::_('grid.checkall'); ?>
 								</td>
-								<th scope="col" style="width:1%" class="text-center d-none d-md-table-cell">
+								<th scope="col" class="w-1 text-center d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', '', 'a.lft', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'fas fa-sort'); ?>
 								</th>
-								<th scope="col" style="width:1%" class="text-center">
+								<th scope="col" class="w-1 text-center">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
 								</th>
 								<th scope="col">
diff --git a/administrator/components/com_categories/tmpl/categories/modal.php b/administrator/components/com_categories/tmpl/categories/modal.php
index a848e7b8b8563..d110c26de0f64 100644
--- a/administrator/components/com_categories/tmpl/categories/modal.php
+++ b/administrator/components/com_categories/tmpl/categories/modal.php
@@ -46,11 +46,13 @@
 		<?php else : ?>
 			<table class="table" id="categoryList">
 				<caption id="captionTable" class="sr-only">
-					<?php echo Text::_('COM_CATEGORIES_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+					<?php echo Text::_('COM_CATEGORIES_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 				</caption>
 				<thead>
 					<tr>
-						<th scope="col" style="width:1%" class="text-center">
+						<th scope="col" class="w-1 text-center">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
 						</th>
 						<th scope="col">
@@ -59,10 +61,10 @@
 						<th scope="col" class="w-10 d-none d-md-table-cell">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); ?>
 						</th>
-						<th scope="col" style="width:15%" class="d-none d-md-table-cell">
+						<th scope="col" class="w-15 d-none d-md-table-cell">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language_title', $listDirn, $listOrder); ?>
 						</th>
-						<th scope="col" style="width:1%" class="d-none d-md-table-cell">
+						<th scope="col" class="w-1 d-none d-md-table-cell">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
 						</th>
 					</tr>
diff --git a/administrator/components/com_checkin/tmpl/checkin/default.php b/administrator/components/com_checkin/tmpl/checkin/default.php
index 00bf5b222cda5..86a6b22221b65 100644
--- a/administrator/components/com_checkin/tmpl/checkin/default.php
+++ b/administrator/components/com_checkin/tmpl/checkin/default.php
@@ -27,11 +27,13 @@
 				<?php if ($this->total > 0) : ?>
 					<table id="global-checkin" class="table">
 						<caption id="captionTable" class="sr-only">
-							<?php echo Text::_('COM_CHECKIN_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+							<?php echo Text::_('COM_CHECKIN_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 						</caption>
 							<thead>
 							<tr>
-								<td style="width:1%" class="text-center">
+								<td class="w-1 text-center">
 									<?php echo HTMLHelper::_('grid.checkall'); ?>
 								</td>
 								<th scope="col">
diff --git a/administrator/components/com_config/src/Field/ConfigComponentsField.php b/administrator/components/com_config/src/Field/ConfigComponentsField.php
index 03123ac2e688e..5476a127f228c 100644
--- a/administrator/components/com_config/src/Field/ConfigComponentsField.php
+++ b/administrator/components/com_config/src/Field/ConfigComponentsField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Config\Administrator\Field;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filesystem\File;
diff --git a/administrator/components/com_config/src/Field/FiltersField.php b/administrator/components/com_config/src/Field/FiltersField.php
index 663ff5cf2dbbe..b42e7818a4606 100644
--- a/administrator/components/com_config/src/Field/FiltersField.php
+++ b/administrator/components/com_config/src/Field/FiltersField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Config\Administrator\Field;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\FormField;
diff --git a/administrator/components/com_config/src/View/Component/HtmlView.php b/administrator/components/com_config/src/View/Component/HtmlView.php
index e0732347d0219..03a0bf5a3169d 100644
--- a/administrator/components/com_config/src/View/Component/HtmlView.php
+++ b/administrator/components/com_config/src/View/Component/HtmlView.php
@@ -127,6 +127,10 @@ protected function addToolbar()
 		ToolbarHelper::divider();
 		ToolbarHelper::cancel('component.cancel', 'JTOOLBAR_CLOSE');
 		ToolbarHelper::divider();
-		ToolbarHelper::help('JHELP_COMPONENTS_' . $this->currentComponent . '_OPTIONS');
+
+		$helpUrl = $this->form->getData()->get('helpURL');
+		$helpKey = (string) $this->form->getXml()->config->help['key'];
+		$helpKey = $helpKey ?: 'JHELP_COMPONENTS_' . strtoupper($this->currentComponent) . '_OPTIONS';
+		ToolbarHelper::help($helpKey, (boolean) $helpUrl, null, $this->currentComponent);
 	}
 }
diff --git a/administrator/components/com_contact/forms/filter_contacts.xml b/administrator/components/com_contact/forms/filter_contacts.xml
index acf7e4c3df266..6daff8121058a 100644
--- a/administrator/components/com_contact/forms/filter_contacts.xml
+++ b/administrator/components/com_contact/forms/filter_contacts.xml
@@ -15,7 +15,7 @@
 		<field
 			name="featured"
 			type="list"
-			label="JOPTION_SELECT_FEATURED"
+			label="JFEATURED"
 			onchange="this.form.submit();"
 			default=""
 			validate="options"
@@ -28,7 +28,7 @@
 		<field
 			name="published"
 			type="status"
-			label="JOPTION_SELECT_PUBLISHED"
+			label="JSTATUS"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
@@ -37,7 +37,7 @@
 		<field
 			name="category_id"
 			type="category"
-			label="JOPTION_SELECT_CATEGORY"
+			label="JCATEGORY"
 			extension="com_contact"
 			published="0,1,2"
 			onchange="this.form.submit();"
@@ -48,7 +48,7 @@
 		<field
 			name="access"
 			type="accesslevel"
-			label="JOPTION_SELECT_ACCESS"
+			label="JGRID_HEADING_ACCESS"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_ACCESS</option>
@@ -57,7 +57,7 @@
 		<field
 			name="language"
 			type="contentlanguage"
-			label="JOPTION_SELECT_LANGUAGE"
+			label="JGRID_HEADING_LANGUAGE"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_LANGUAGE</option>
@@ -67,7 +67,7 @@
 		<field
 			name="tag"
 			type="tag"
-			label="JOPTION_SELECT_TAG"
+			label="JTAG"
 			multiple="true"
 			mode="nested"
 			custom="false"
@@ -78,7 +78,7 @@
 		<field
 			name="level"
 			type="integer"
-			label="JOPTION_SELECT_MAX_LEVELS"
+			label="JGLOBAL_MAXLEVEL_LABEL"
 			first="1"
 			last="10"
 			step="1"
diff --git a/administrator/components/com_contact/src/Field/Modal/ContactField.php b/administrator/components/com_contact/src/Field/Modal/ContactField.php
index 85e06d44be884..3148fe3247cbc 100644
--- a/administrator/components/com_contact/src/Field/Modal/ContactField.php
+++ b/administrator/components/com_contact/src/Field/Modal/ContactField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Contact\Administrator\Field\Modal;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\FormField;
diff --git a/administrator/components/com_contact/src/Service/HTML/AdministratorService.php b/administrator/components/com_contact/src/Service/HTML/AdministratorService.php
index 3d5c1e5715358..9f87e14b9c464 100644
--- a/administrator/components/com_contact/src/Service/HTML/AdministratorService.php
+++ b/administrator/components/com_contact/src/Service/HTML/AdministratorService.php
@@ -89,7 +89,7 @@ public function association($contactid)
 				{
 					if (in_array($item->lang_code, $content_languages))
 					{
-						$text = strtoupper($item->lang_sef);
+						$text = $item->lang_code;
 						$url = Route::_('index.php?option=com_contact&task=contact.edit&id=' . (int) $item->id);
 						$tooltip = '<strong>' . htmlspecialchars($item->language_title, ENT_QUOTES, 'UTF-8') . '</strong><br>'
 							. htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8') . '<br>' . Text::sprintf('JCATEGORY_SPRINTF', $item->category_title);
diff --git a/administrator/components/com_contact/tmpl/contacts/default.php b/administrator/components/com_contact/tmpl/contacts/default.php
index a2b5e0c6294fe..f3a841b834ac8 100644
--- a/administrator/components/com_contact/tmpl/contacts/default.php
+++ b/administrator/components/com_contact/tmpl/contacts/default.php
@@ -46,20 +46,22 @@
 				<?php else : ?>
 					<table class="table" id="contactList">
 						<caption id="captionTable" class="sr-only">
-							<?php echo Text::_('COM_CONTACT_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+							<?php echo Text::_('COM_CONTACT_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 						</caption>
 						<thead>
 							<tr>
-								<td style="width:1%" class="text-center">
+								<td class="w-1 text-center">
 									<?php echo HTMLHelper::_('grid.checkall'); ?>
 								</td>
-								<th scope="col" style="width:1%" class="text-center d-none d-md-table-cell">
+								<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', 'fas fa-sort'); ?>
 								</th>
-								<th scope="col" style="width:1%" class="text-center">
+								<th scope="col" class="w-1 text-center">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JFEATURED', 'a.featured', $listDirn, $listOrder); ?>
 								</th>
-								<th scope="col" style="width:1%; min-width:85px" class="text-center">
+								<th scope="col" style="min-width:85px" class="w-1 text-center">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
 								</th>
 								<th scope="col">
diff --git a/administrator/components/com_contact/tmpl/contacts/modal.php b/administrator/components/com_contact/tmpl/contacts/modal.php
index bc2fd1ea4c455..f2020fb9ae933 100644
--- a/administrator/components/com_contact/tmpl/contacts/modal.php
+++ b/administrator/components/com_contact/tmpl/contacts/modal.php
@@ -56,10 +56,12 @@
 			<table class="table table-sm">
 				<thead>
 					<caption id="captionTable" class="sr-only">
-						<?php echo Text::_('COM_CONTACT_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+						<?php echo Text::_('COM_CONTACT_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 					</caption>
 					<tr>
-						<th scope="col" style="width:1%" class="text-center">
+						<th scope="col" class="w-1 text-center">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
 						</th>
 						<th scope="col" class="title">
@@ -68,7 +70,7 @@
 						<th scope="col" class="w-10">
 							<?php echo HTMLHelper::_('searchtools.sort', 'COM_CONTACT_FIELD_LINKED_USER_LABEL', 'ul.name', $listDirn, $listOrder); ?>
 						</th>
-						<th scope="col" style="width:15%" class="d-none d-md-table-cell">
+						<th scope="col" class="w-15 d-none d-md-table-cell">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); ?>
 						</th>
 						<th scope="col" class="w-10 d-none d-md-table-cell">
diff --git a/administrator/components/com_content/forms/filter_articles.xml b/administrator/components/com_content/forms/filter_articles.xml
index 9401ab96a5bc4..7629cc2ad3900 100644
--- a/administrator/components/com_content/forms/filter_articles.xml
+++ b/administrator/components/com_content/forms/filter_articles.xml
@@ -13,7 +13,7 @@
 		<field
 			name="featured"
 			type="list"
-			label="JOPTION_SELECT_FEATURED"
+			label="FEATURED"
 			onchange="this.form.submit();"
 			default=""
 			validate="options"
@@ -47,7 +47,7 @@
 		<field
 			name="category_id"
 			type="category"
-			label="JOPTION_SELECT_CATEGORY"
+			label="JCATEGORY"
 			multiple="true"
 			extension="com_content"
 			layout="joomla.form.field.list-fancy-select"
@@ -59,7 +59,7 @@
 		<field
 			name="access"
 			type="accesslevel"
-			label="JOPTION_SELECT_ACCESS"
+			label="JGRID_HEADING_ACCESS"
 			multiple="true"
 			layout="joomla.form.field.list-fancy-select"
 			hint="JOPTION_SELECT_ACCESS"
@@ -81,7 +81,7 @@
 		<field
 			name="language"
 			type="contentlanguage"
-			label="JOPTION_SELECT_LANGUAGE"
+			label="JGRID_HEADING_LANGUAGE"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_LANGUAGE</option>
@@ -92,7 +92,7 @@
 			name="tag"
 			type="tag"
 			multiple="true"
-			label="JOPTION_SELECT_TAG"
+			label="JTAG"
 			hint="JOPTION_SELECT_TAG"
 			mode="nested"
 			custom="false"
@@ -102,7 +102,7 @@
 		<field
 			name="level"
 			type="integer"
-			label="JOPTION_SELECT_MAX_LEVELS"
+			label="JGLOBAL_MAXLEVEL_LABEL"
 			first="1"
 			last="10"
 			step="1"
diff --git a/administrator/components/com_content/forms/filter_featured.xml b/administrator/components/com_content/forms/filter_featured.xml
index 92335598ee2c4..00590d4b0092a 100644
--- a/administrator/components/com_content/forms/filter_featured.xml
+++ b/administrator/components/com_content/forms/filter_featured.xml
@@ -34,7 +34,7 @@
 		<field
 			name="category_id"
 			type="category"
-			label="JOPTION_SELECT_CATEGORY"
+			label="JCATEGORY"
 			multiple="true"
 			extension="com_content"
 			layout="joomla.form.field.list-fancy-select"
@@ -45,7 +45,7 @@
 		<field
 			name="access"
 			type="accesslevel"
-			label="JOPTION_SELECT_ACCESS"
+			label="JGRID_HEADING_ACCESS"
 			multiple="true"
 			layout="joomla.form.field.list-fancy-select"
 			hint="JOPTION_SELECT_ACCESS"
@@ -67,7 +67,7 @@
 		<field
 			name="language"
 			type="contentlanguage"
-			label="JOPTION_SELECT_LANGUAGE"
+			label="JGRID_HEADING_LANGUAGE"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_LANGUAGE</option>
@@ -77,7 +77,7 @@
 		<field
 			name="tag"
 			type="tag"
-			label="JOPTION_SELECT_TAG"
+			label="JTAG"
 			multiple="true"
 			mode="nested"
 			custom="false"
@@ -88,7 +88,7 @@
 		<field
 			name="level"
 			type="integer"
-			label="JOPTION_SELECT_MAX_LEVELS"
+			label="JGLOBAL_MAXLEVEL_LABEL"
 			first="1"
 			last="10"
 			step="1"
diff --git a/administrator/components/com_content/src/Field/Modal/ArticleField.php b/administrator/components/com_content/src/Field/Modal/ArticleField.php
index bf6449b474d77..135e90cb5c2e7 100644
--- a/administrator/components/com_content/src/Field/Modal/ArticleField.php
+++ b/administrator/components/com_content/src/Field/Modal/ArticleField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Content\Administrator\Field\Modal;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\FormField;
@@ -297,7 +297,7 @@ function jSelectArticle_" . $this->id . "(id, title, catid, object, url, languag
 		$class = $this->required ? ' class="required modal-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', true), ENT_COMPAT, 'UTF-8') . '" value="' . $value . '">';
+			. '" data-text="' . htmlspecialchars(Text::_('COM_CONTENT_SELECT_AN_ARTICLE'), ENT_COMPAT, 'UTF-8') . '" value="' . $value . '">';
 
 		return $html;
 	}
diff --git a/administrator/components/com_content/src/Service/HTML/AdministratorService.php b/administrator/components/com_content/src/Service/HTML/AdministratorService.php
index dd5f06e2adf23..98295295fb0aa 100644
--- a/administrator/components/com_content/src/Service/HTML/AdministratorService.php
+++ b/administrator/components/com_content/src/Service/HTML/AdministratorService.php
@@ -89,7 +89,7 @@ public function association($articleid)
 				{
 					if (in_array($item->lang_code, $content_languages))
 					{
-						$text    = $item->lang_sef ? strtoupper($item->lang_sef) : 'XX';
+						$text    = $item->lang_code;
 						$url     = Route::_('index.php?option=com_content&task=article.edit&id=' . (int) $item->id);
 						$tooltip = '<strong>' . htmlspecialchars($item->language_title, ENT_QUOTES, 'UTF-8') . '</strong><br>'
 							. htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8') . '<br>' . Text::sprintf('JCATEGORY_SPRINTF', $item->category_title);
diff --git a/administrator/components/com_content/tmpl/articles/default.php b/administrator/components/com_content/tmpl/articles/default.php
index 7569abf32ee93..dac644ddec12f 100644
--- a/administrator/components/com_content/tmpl/articles/default.php
+++ b/administrator/components/com_content/tmpl/articles/default.php
@@ -99,20 +99,22 @@
 				<?php else : ?>
 					<table class="table" id="articleList">
 						<caption id="captionTable" class="sr-only">
-							<?php echo Text::_('COM_CONTENT_ARTICLES_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+							<?php echo Text::_('COM_CONTENT_ARTICLES_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 						</caption>
 						<thead>
 							<tr>
-								<td style="width:1%" class="text-center">
+								<td class="w-1 text-center">
 									<?php echo HTMLHelper::_('grid.checkall'); ?>
 								</td>
-								<th scope="col" style="width:1%" class="text-center d-none d-md-table-cell">
+								<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', 'fas fa-sort'); ?>
 								</th>
-								<th scope="col" style="width:1%" class="text-center d-none d-md-table-cell">
+								<th scope="col" class="w-1 text-center d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JFEATURED', 'a.featured', $listDirn, $listOrder); ?>
 								</th>
-								<th scope="col" style="width:1%" class="text-center">
+								<th scope="col" class="w-1 text-center">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
 								</th>
 								<th scope="col" style="min-width:100px">
diff --git a/administrator/components/com_content/tmpl/articles/modal.php b/administrator/components/com_content/tmpl/articles/modal.php
index 60ff3bae12ec4..3e51c9b281d65 100644
--- a/administrator/components/com_content/tmpl/articles/modal.php
+++ b/administrator/components/com_content/tmpl/articles/modal.php
@@ -56,11 +56,13 @@
 		<?php else : ?>
 			<table class="table table-sm">
 				<caption id="captionTable" class="sr-only">
-					<?php echo Text::_('COM_CONTENT_ARTICLES_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+					<?php echo Text::_('COM_CONTENT_ARTICLES_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 				</caption>
 				<thead>
 					<tr>
-						<th scope="col" style="width:1%" class="text-center">
+						<th scope="col" class="w-1 text-center">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
 						</th>
 						<th scope="col" class="title">
@@ -69,13 +71,13 @@
 						<th scope="col" class="w-10 d-none d-md-table-cell">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'a.access', $listDirn, $listOrder); ?>
 						</th>
-						<th scope="col" style="width:15%">
+						<th scope="col" class="w-15">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language', $listDirn, $listOrder); ?>
 						</th>
 						<th scope="col" class="w-5 d-none d-md-table-cell">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JDATE', 'a.created', $listDirn, $listOrder); ?>
 						</th>
-						<th scope="col" style="width:1%" class="d-none d-md-table-cell">
+						<th scope="col" class="w-1 d-none d-md-table-cell">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
 						</th>
 					</tr>
diff --git a/administrator/components/com_content/tmpl/featured/default.php b/administrator/components/com_content/tmpl/featured/default.php
index 34ea936023277..981771af1dcdf 100644
--- a/administrator/components/com_content/tmpl/featured/default.php
+++ b/administrator/components/com_content/tmpl/featured/default.php
@@ -86,20 +86,22 @@
 				<?php else : ?>
 					<table class="table" id="articleList">
 						<caption id="captionTable" class="sr-only">
-							<?php echo Text::_('COM_CONTENT_FEATURED_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+							<?php echo Text::_('COM_CONTENT_FEATURED_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 						</caption>
 						<thead>
 							<tr>
-								<td style="width:1%" class="text-center">
+								<td class="w-1 text-center">
 									<?php echo HTMLHelper::_('grid.checkall'); ?>
 								</td>
-								<th scope="col" style="width:1%" class="text-center d-none d-md-table-cell">
+								<th scope="col" class="w-1 text-center d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', '', 'fp.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'fas fa-sort'); ?>
 								</th>
-								<th scope="col" style="width:1%" class="text-center">
+								<th scope="col" class="w-1 text-center">
 									<?php echo Text::_('JFEATURED'); ?>
 								</th>
-								<th scope="col" style="width:1%; min-width:85px" class="text-center">
+								<th scope="col" style="min-width:85px" class="w-1 text-center">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
 								</th>
 								<th scope="col">
diff --git a/administrator/components/com_contenthistory/tmpl/history/modal.php b/administrator/components/com_contenthistory/tmpl/history/modal.php
index 965452ef952f6..30049696e08b8 100644
--- a/administrator/components/com_contenthistory/tmpl/history/modal.php
+++ b/administrator/components/com_contenthistory/tmpl/history/modal.php
@@ -74,19 +74,19 @@
 			</caption>
 			<thead>
 				<tr>
-					<td style="width:1%" class="text-center">
+					<td class="w-1 text-center">
 						<input type="checkbox" name="checkall-toggle" value="" title="<?php echo Text::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)">
 					</td>
-					<th scope="col" style="width:15%">
+					<th scope="col" class="w-15">
 						<?php echo Text::_('JDATE'); ?>
 					</th>
-					<th scope="col" style="width:15%" class="d-none d-md-table-cell">
+					<th scope="col" class="w-15 d-none d-md-table-cell">
 						<?php echo Text::_('COM_CONTENTHISTORY_VERSION_NOTE'); ?>
 					</th>
 					<th scope="col" class="w-10">
 						<?php echo Text::_('COM_CONTENTHISTORY_KEEP_VERSION'); ?>
 					</th>
-					<th scope="col" style="width:15%" class="d-none d-md-table-cell">
+					<th scope="col" class="w-15 d-none d-md-table-cell">
 						<?php echo Text::_('JAUTHOR'); ?>
 					</th>
 					<th scope="col" class="w-10 text-right">
diff --git a/administrator/components/com_csp/forms/filter_reports.xml b/administrator/components/com_csp/forms/filter_reports.xml
index d63e24b43ef3e..72d1722e0e194 100644
--- a/administrator/components/com_csp/forms/filter_reports.xml
+++ b/administrator/components/com_csp/forms/filter_reports.xml
@@ -13,7 +13,7 @@
 		<field
 			name="published"
 			type="status"
-			label="JOPTION_SELECT_PUBLISHED"
+			label="JSTATUS"
 			optionsFilter="*,0,1,-2"
 			onchange="this.form.submit();"
 			>
@@ -23,7 +23,7 @@
 		<field
 			name="directive"
 			type="sql"
-			label="COM_CSP_FILTER_DIRECTIVE"
+			label="COM_CSP_HEADING_DIRECTIVE"
 			sql_select="directive"
 			sql_from="#__csp"
 			sql_group="directive"
diff --git a/administrator/components/com_csp/tmpl/reports/default.php b/administrator/components/com_csp/tmpl/reports/default.php
index d244d25602c49..01b3ebbe74031 100644
--- a/administrator/components/com_csp/tmpl/reports/default.php
+++ b/administrator/components/com_csp/tmpl/reports/default.php
@@ -65,7 +65,9 @@
 				<?php else : ?>
 					<table class="table" id="articleList">
 						<caption id="captionTable" class="sr-only">
-							<?php echo Text::_('COM_CSP_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+							<?php echo Text::_('COM_CSP_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 						</caption>
 						<thead>
 							<tr>
diff --git a/administrator/components/com_fields/forms/filter_fields.xml b/administrator/components/com_fields/forms/filter_fields.xml
index e82c536760b92..71962f9641073 100644
--- a/administrator/components/com_fields/forms/filter_fields.xml
+++ b/administrator/components/com_fields/forms/filter_fields.xml
@@ -22,7 +22,7 @@
 		<field
 			name="state"
 			type="status"
-			label="JOPTION_SELECT_PUBLISHED"
+			label="JSTATUS"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
@@ -31,7 +31,7 @@
 		<field
 			name="group_id"
 			type="fieldgroups"
-			label="COM_FIELDS_VIEW_FIELDS_SELECT_GROUP"
+			label="COM_FIELDS_FIELD_GROUP_LABEL"
 			state="0,1,2"
 			onchange="this.form.submit();"
 			>
@@ -41,7 +41,7 @@
 		<field
 			name="assigned_cat_ids"
 			type="category"
-			label="COM_FIELDS_VIEW_FIELDS_SELECT_CATEGORY"
+			label="JCATEGORY"
 			onchange="this.form.submit();"
 			addfieldprefix="Joomla\Component\Categories\Administrator\Field"
 			>
@@ -51,7 +51,7 @@
 		<field
 			name="access"
 			type="accesslevel"
-			label="JOPTION_SELECT_ACCESS"
+			label="JGRID_HEADING_ACCESS"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_ACCESS</option>
@@ -60,7 +60,7 @@
 		<field
 			name="language"
 			type="contentlanguage"
-			label="JOPTION_SELECT_LANGUAGE"
+			label="JGRID_HEADING_LANGUAGE"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_LANGUAGE</option>
diff --git a/administrator/components/com_fields/forms/filter_groups.xml b/administrator/components/com_fields/forms/filter_groups.xml
index 5251d595419ad..ea7095cfc80f8 100644
--- a/administrator/components/com_fields/forms/filter_groups.xml
+++ b/administrator/components/com_fields/forms/filter_groups.xml
@@ -21,7 +21,7 @@
 		<field
 			name="state"
 			type="status"
-			label="JOPTION_SELECT_PUBLISHED"
+			label="JSTATUS"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
@@ -30,7 +30,7 @@
 		<field
 			name="access"
 			type="accesslevel"
-			label="JOPTION_SELECT_ACCESS"
+			label="JGRID_HEADING_ACCESS"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_ACCESS</option>
@@ -39,7 +39,7 @@
 		<field
 			name="language"
 			type="contentlanguage"
-			label="JOPTION_SELECT_LANGUAGE"
+			label="JGRID_HEADING_LANGUAGE"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_LANGUAGE</option>
diff --git a/administrator/components/com_fields/src/Plugin/FieldsPlugin.php b/administrator/components/com_fields/src/Plugin/FieldsPlugin.php
index b5bfa1a8f0cd7..817cea59ba11e 100644
--- a/administrator/components/com_fields/src/Plugin/FieldsPlugin.php
+++ b/administrator/components/com_fields/src/Plugin/FieldsPlugin.php
@@ -148,6 +148,11 @@ public function onCustomFieldsPrepareField($context, $item, $field)
 		// Get the path for the layout file
 		$path = PluginHelper::getLayoutPath('fields', $this->_name, $field->type);
 
+		if (!file_exists($path))
+		{
+			$path = JPluginHelper::getLayoutPath('fields', $this->_name, $field->type);
+		}
+
 		// Render the layout
 		ob_start();
 		include $path;
diff --git a/administrator/components/com_fields/tmpl/fields/default.php b/administrator/components/com_fields/tmpl/fields/default.php
index 6bb56c1cd586c..bf66169e066b1 100644
--- a/administrator/components/com_fields/tmpl/fields/default.php
+++ b/administrator/components/com_fields/tmpl/fields/default.php
@@ -60,17 +60,19 @@
 				<?php else : ?>
 					<table class="table" id="fieldList">
 						<caption id="captionTable" class="sr-only">
-							<?php echo Text::_('COM_FIELDS_FIELDS_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+							<?php echo Text::_('COM_FIELDS_FIELDS_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 						</caption>
 						<thead>
 							<tr>
-								<td style="width:1%" class="text-center">
+								<td class="w-1 text-center">
 									<?php echo HTMLHelper::_('grid.checkall'); ?>
 								</td>
-								<th scope="col" style="width:1%" class="text-center d-none d-md-table-cell">
+								<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', 'fas fa-sort'); ?>
 								</th>
-								<th scope="col" style="width:1%" class="text-center">
+								<th scope="col" class="w-1 text-center">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
 								</th>
 								<th scope="col">
diff --git a/administrator/components/com_fields/tmpl/fields/modal.php b/administrator/components/com_fields/tmpl/fields/modal.php
index 7695b5d2f78fe..817fbb9572539 100644
--- a/administrator/components/com_fields/tmpl/fields/modal.php
+++ b/administrator/components/com_fields/tmpl/fields/modal.php
@@ -40,17 +40,19 @@
 		<?php else : ?>
 			<table class="table" id="moduleList">
 				<caption id="captionTable" class="sr-only">
-					<?php echo Text::_('COM_FIELDS_FIELDS_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+					<?php echo Text::_('COM_FIELDS_FIELDS_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 				</caption>
 				<thead>
 					<tr>
-						<th scope="col" style="width:1%" class="center">
+						<th scope="col" class="w-1 center">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
 						</th>
 						<th scope="col" class="title">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
 						</th>
-						<th scope="col" style="width:15%" class="d-none d-md-table-cell">
+						<th scope="col" class="w-15 d-none d-md-table-cell">
 							<?php echo HTMLHelper::_('searchtools.sort', 'COM_FIELDS_FIELD_GROUP_LABEL', 'g.title', $listDirn, $listOrder); ?>
 						</th>
 						<th scope="col" class="w-10 d-none d-md-table-cell">
@@ -62,7 +64,7 @@
 						<th scope="col" class="w-10 d-none d-md-table-cell">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'a.language', $listDirn, $listOrder); ?>
 						</th>
-						<th scope="col" style="width:1%" class="d-none d-md-table-cell">
+						<th scope="col" class="w-1 d-none d-md-table-cell">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
 						</th>
 					</tr>
diff --git a/administrator/components/com_fields/tmpl/groups/default.php b/administrator/components/com_fields/tmpl/groups/default.php
index 1b0c2e9ec0234..eb2be85f2db06 100644
--- a/administrator/components/com_fields/tmpl/groups/default.php
+++ b/administrator/components/com_fields/tmpl/groups/default.php
@@ -58,17 +58,19 @@
 				<?php else : ?>
 					<table class="table" id="groupList">
 						<caption id="captionTable" class="sr-only">
-							<?php echo Text::_('COM_FIELDS_GROUPS_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+							<?php echo Text::_('COM_FIELDS_GROUPS_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 						</caption>
 						<thead>
 							<tr>
-								<td style="width:1%" class="text-center">
+								<td class="w-1 text-center">
 									<?php echo HTMLHelper::_('grid.checkall'); ?>
 								</td>
-								<th scope="col" style="width:1%" class="text-center d-none d-md-table-cell">
+								<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', 'fas fa-sort'); ?>
 								</th>
-								<th scope="col" style="width:1%" class="text-center">
+								<th scope="col" class="w-1 text-center">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
 								</th>
 								<th scope="col">
@@ -82,7 +84,7 @@
 										<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'a.language', $listDirn, $listOrder); ?>
 									</th>
 								<?php endif; ?>
-								<th scope="col" style="width:1%" class="d-none d-md-table-cell">
+								<th scope="col" class="w-1 d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
 								</th>
 							</tr>
diff --git a/administrator/components/com_finder/forms/filter_filters.xml b/administrator/components/com_finder/forms/filter_filters.xml
index f6ece73a8ddda..a473121d38da1 100644
--- a/administrator/components/com_finder/forms/filter_filters.xml
+++ b/administrator/components/com_finder/forms/filter_filters.xml
@@ -13,7 +13,7 @@
 		<field
 			name="state"
 			type="status"
-			label="JOPTION_SELECT_PUBLISHED"
+			label="JSTATUS"
 			optionsFilter="0,1"
 			onchange="this.form.submit();"
 			>
diff --git a/administrator/components/com_finder/forms/filter_index.xml b/administrator/components/com_finder/forms/filter_index.xml
index acc1c4cd1b446..a4d7f578a696e 100644
--- a/administrator/components/com_finder/forms/filter_index.xml
+++ b/administrator/components/com_finder/forms/filter_index.xml
@@ -13,7 +13,7 @@
 		<field
 			name="state"
 			type="status"
-			label="JOPTION_SELECT_PUBLISHED"
+			label="JSTATUS"
 			optionsFilter="0,1"
 			onchange="this.form.submit();"
 			>
@@ -23,7 +23,7 @@
 		<field
 			name="type"
 			type="contenttypes"
-			label="COM_FINDER_MAPS_SELECT_TYPE"
+			label="COM_FINDER_MAPS_HEADING_TYPE"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_FINDER_MAPS_SELECT_TYPE</option>
@@ -32,7 +32,7 @@
 		<field
 			name="content_map"
 			type="contentmap"
-			label="COM_FINDER_FILTER_SELECT_CONTENT_MAP"
+			label="COM_FINDER_MAPS_HEADING_CONTENT_MAP"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_FINDER_FILTER_SELECT_CONTENT_MAP</option>
@@ -41,7 +41,7 @@
 		<field
 			name="language"
 			type="contentlanguage"
-			label="JOPTION_SELECT_LANGUAGE"
+			label="JGRID_HEADING_LANGUAGE"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_LANGUAGE</option>
diff --git a/administrator/components/com_finder/forms/filter_maps.xml b/administrator/components/com_finder/forms/filter_maps.xml
index b37a0f14427b7..5269029a5bdec 100644
--- a/administrator/components/com_finder/forms/filter_maps.xml
+++ b/administrator/components/com_finder/forms/filter_maps.xml
@@ -13,7 +13,7 @@
 		<field
 			name="state"
 			type="status"
-			label="JOPTION_SELECT_PUBLISHED"
+			label="JSTATUS"
 			optionsFilter="0,1"
 			onchange="this.form.submit();"
 			>
@@ -23,7 +23,7 @@
 		<field
 			name="branch"
 			type="branches"
-			label="COM_FINDER_MAPS_SELECT_BRANCH"
+			label="COM_FINDER_MAPS_HEADING_BRANCH"
 			default="0"
 			onchange="this.form.submit();"
 		/>
@@ -31,7 +31,7 @@
 		<field
 			name="level"
 			type="integer"
-			label="JOPTION_SELECT_MAX_LEVELS"
+			label="JGLOBAL_MAXLEVEL_LABEL"
 			first="1"
 			last="2"
 			step="1"
diff --git a/administrator/components/com_finder/src/Field/BranchesField.php b/administrator/components/com_finder/src/Field/BranchesField.php
index 79217bc88540e..96033eef3a3a2 100644
--- a/administrator/components/com_finder/src/Field/BranchesField.php
+++ b/administrator/components/com_finder/src/Field/BranchesField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Finder\Administrator\Field;
 
-defined('JPATH_BASE') or die();
+defined('_JEXEC') or die();
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;
diff --git a/administrator/components/com_finder/src/Field/ContenttypesField.php b/administrator/components/com_finder/src/Field/ContenttypesField.php
index dc96a730107ef..876e1f0f66f56 100644
--- a/administrator/components/com_finder/src/Field/ContenttypesField.php
+++ b/administrator/components/com_finder/src/Field/ContenttypesField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Finder\Administrator\Field;
 
-defined('JPATH_BASE') or die();
+defined('_JEXEC') or die();
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;
diff --git a/administrator/components/com_finder/src/Field/SearchfilterField.php b/administrator/components/com_finder/src/Field/SearchfilterField.php
index 6e00f09c2fe87..69ef4f3dbc0a0 100644
--- a/administrator/components/com_finder/src/Field/SearchfilterField.php
+++ b/administrator/components/com_finder/src/Field/SearchfilterField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Finder\Administrator\Field;
 
-defined('JPATH_BASE') or die();
+defined('_JEXEC') or die();
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;
diff --git a/administrator/components/com_finder/tmpl/filters/default.php b/administrator/components/com_finder/tmpl/filters/default.php
index 00dbb67d8fa51..bb45279d6f9f6 100644
--- a/administrator/components/com_finder/tmpl/filters/default.php
+++ b/administrator/components/com_finder/tmpl/filters/default.php
@@ -36,14 +36,16 @@
 				<?php else : ?>
 				<table class="table">
 					<caption id="captionTable" class="sr-only">
-						<?php echo Text::_('COM_FINDER_FILTERS_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+						<?php echo Text::_('COM_FINDER_FILTERS_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 					</caption>
 					<thead>
 						<tr>
-							<td style="width:1%" class="text-center">
+							<td class="w-1 text-center">
 								<?php echo HTMLHelper::_('grid.checkall'); ?>
 							</td>
-							<th scope="col" style="width:1%">
+							<th scope="col" class="w-1">
 								<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
 							</th>
 							<th scope="col">
@@ -58,7 +60,7 @@
 							<th scope="col" class="w-5 d-none d-md-table-cell">
 								<?php echo HTMLHelper::_('searchtools.sort', 'COM_FINDER_HEADING_MAP_COUNT', 'a.map_count', $listDirn, $listOrder); ?>
 							</th>
-							<th scope="col" style="width:1%" class="d-none d-md-table-cell">
+							<th scope="col" class="w-1 d-none d-md-table-cell">
 								<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.filter_id', $listDirn, $listOrder); ?>
 							</th>
 						</tr>
diff --git a/administrator/components/com_finder/tmpl/index/default.php b/administrator/components/com_finder/tmpl/index/default.php
index 2a0657986edd8..fc1f7e81d8c58 100644
--- a/administrator/components/com_finder/tmpl/index/default.php
+++ b/administrator/components/com_finder/tmpl/index/default.php
@@ -38,14 +38,16 @@
 				<?php else : ?>
 					<table class="table">
 						<caption id="captionTable" class="sr-only">
-							<?php echo Text::_('COM_FINDER_INDEX_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+							<?php echo Text::_('COM_FINDER_INDEX_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 						</caption>
 						<thead>
 							<tr>
-								<td style="width:1%" class="text-center">
+								<td class="w-1 text-center">
 									<?php echo HTMLHelper::_('grid.checkall'); ?>
 								</td>
-								<th scope="col" style="width:1%">
+								<th scope="col" class="w-1">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'l.published', $listDirn, $listOrder); ?>
 								</th>
 								<th scope="col">
@@ -62,10 +64,10 @@
 										<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'l.language', $listDirn, $listOrder); ?>
 									</th>
 								<?php endif; ?>
-								<th scope="col" style="width:15%" class="text-center d-none d-md-table-cell text-center">
+								<th scope="col" class="w-15 d-none d-md-table-cell text-center">
 									<?php echo Text::_('COM_FINDER_INDEX_HEADING_DETAILS'); ?>
 								</th>
-								<th scope="col" style="width:30%" class="d-none d-md-table-cell">
+								<th scope="col" class="w-30 d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'COM_FINDER_INDEX_HEADING_LINK_URL', 'l.url', $listDirn, $listOrder); ?>
 								</th>
 							</tr>
diff --git a/administrator/components/com_finder/tmpl/maps/default.php b/administrator/components/com_finder/tmpl/maps/default.php
index 50ec98956756e..ea4d7b2186520 100644
--- a/administrator/components/com_finder/tmpl/maps/default.php
+++ b/administrator/components/com_finder/tmpl/maps/default.php
@@ -37,29 +37,31 @@
 				<?php else : ?>
 				<table class="table">
 					<caption id="captionTable" class="sr-only">
-						<?php echo Text::_('COM_FINDER_MAPS_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+						<?php echo Text::_('COM_FINDER_MAPS_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 					</caption>
 						<thead>
 						<tr>
-							<td style="width:1%" class="text-center">
+							<td class="w-1 text-center">
 								<?php echo HTMLHelper::_('grid.checkall'); ?>
 							</td>
-							<th scope="col" style="width:1%" class="text-center">
+							<th scope="col" class="w-1 text-center">
 								<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
 							</th>
 							<th scope="col">
 								<?php echo HTMLHelper::_('searchtools.sort', 'JGLOBAL_TITLE', 'branch_title', $listDirn, $listOrder); ?>
 							</th>
 							<?php if (!$branchFilter) : ?>
-								<th scope="col" style="width:1%" class="text-center">
+								<th scope="col" class="w-1 text-center">
 									<?php echo Text::_('COM_FINDER_HEADING_CHILDREN'); ?>
 								</th>
 							<?php endif; ?>
-							<th scope="col" style="width:1%" class="text-center">
+							<th scope="col" class="w-1 text-center">
 								<span class="fas fa-check" aria-hidden="true"></span>
 								<span class="d-none d-md-inline"><?php echo Text::_('COM_FINDER_MAPS_COUNT_PUBLISHED_ITEMS'); ?></span>
 							</th>
-							<th scope="col" style="width:1%" class="text-center">
+							<th scope="col" class="w-1 text-center">
 								<span class="fas fa-times" aria-hidden="true"></span>
 								<span class="d-none d-md-inline"><?php echo Text::_('COM_FINDER_MAPS_COUNT_UNPUBLISHED_ITEMS'); ?></span>
 							</th>
diff --git a/administrator/components/com_finder/tmpl/searches/default.php b/administrator/components/com_finder/tmpl/searches/default.php
index 5593d811b00bc..8a8f04f49300f 100644
--- a/administrator/components/com_finder/tmpl/searches/default.php
+++ b/administrator/components/com_finder/tmpl/searches/default.php
@@ -33,17 +33,19 @@
 				<?php else : ?>
 				<table class="table">
 					<caption id="captionTable" class="sr-only">
-						<?php echo Text::_('COM_FINDER_SEARCHES_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+						<?php echo Text::_('COM_FINDER_SEARCHES_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 					</caption>
 					<thead>
 						<tr>
 							<th scope="col">
 								<?php echo HTMLHelper::_('searchtools.sort', 'COM_FINDER_HEADING_PHRASE', 'a.searchterm', $listDirn, $listOrder); ?>
 							</th>
-							<th scope="col" style="width:15%">
+							<th scope="col" class="w-15">
 								<?php echo HTMLHelper::_('searchtools.sort', 'JGLOBAL_HITS', 'a.hits', $listDirn, $listOrder); ?>
 							</th>
-							<th scope="col" style="width:1%" class="text-center">
+							<th scope="col" class="w-1 text-center">
 								<?php echo Text::_('COM_FINDER_HEADING_RESULTS'); ?>
 							</th>
 						</tr>
diff --git a/administrator/components/com_installer/forms/filter_database.xml b/administrator/components/com_installer/forms/filter_database.xml
index be47f97e80212..1bb857c1e8638 100644
--- a/administrator/components/com_installer/forms/filter_database.xml
+++ b/administrator/components/com_installer/forms/filter_database.xml
@@ -13,7 +13,7 @@
 		<field
 			name="client_id"
 			type="location"
-			label="COM_INSTALLER_VALUE_CLIENT_SELECT"
+			label="COM_INSTALLER_TYPE_CLIENT"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_INSTALLER_VALUE_CLIENT_SELECT</option>
@@ -22,7 +22,7 @@
 		<field
 			name="type"
 			type="type"
-			label="COM_INSTALLER_VALUE_TYPE_SELECT"
+			label="COM_INSTALLER_HEADING_TYPE"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_INSTALLER_VALUE_TYPE_SELECT</option>
@@ -31,7 +31,7 @@
 		<field
 			name="folder"
 			type="folder"
-			label="COM_INSTALLER_VALUE_FOLDER_SELECT"
+			label="COM_INSTALLER_HEADING_FOLDER"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_INSTALLER_VALUE_FOLDER_SELECT</option>
diff --git a/administrator/components/com_installer/forms/filter_discover.xml b/administrator/components/com_installer/forms/filter_discover.xml
index 96645b8f6d70b..886077e816614 100644
--- a/administrator/components/com_installer/forms/filter_discover.xml
+++ b/administrator/components/com_installer/forms/filter_discover.xml
@@ -13,7 +13,7 @@
 		<field
 			name="client_id"
 			type="location"
-			label="COM_INSTALLER_VALUE_CLIENT_SELECT"
+			label="COM_INSTALLER_TYPE_CLIENT"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_INSTALLER_VALUE_CLIENT_SELECT</option>
@@ -22,7 +22,7 @@
 		<field
 			name="type"
 			type="type"
-			label="COM_INSTALLER_VALUE_TYPE_SELECT"
+			label="COM_INSTALLER_HEADING_TYPE"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_INSTALLER_VALUE_TYPE_SELECT</option>
@@ -31,7 +31,7 @@
 		<field
 			name="folder"
 			type="folder"
-			label="COM_INSTALLER_VALUE_FOLDER_SELECT"
+			label="COM_INSTALLER_HEADING_FOLDER"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_INSTALLER_VALUE_FOLDER_SELECT</option>
diff --git a/administrator/components/com_installer/forms/filter_manage.xml b/administrator/components/com_installer/forms/filter_manage.xml
index 13e7d76fe4d0d..950370ea07c6a 100644
--- a/administrator/components/com_installer/forms/filter_manage.xml
+++ b/administrator/components/com_installer/forms/filter_manage.xml
@@ -13,7 +13,7 @@
 		<field
 			name="status"
 			type="extensionstatus"
-			label="JOPTION_SELECT_PUBLISHED"
+			label="JSTATUS"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
@@ -22,7 +22,7 @@
 		<field
 			name="client_id"
 			type="location"
-			label="COM_INSTALLER_VALUE_CLIENT_SELECT"
+			label="COM_INSTALLER_TYPE_CLIENT"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_INSTALLER_VALUE_CLIENT_SELECT</option>
@@ -31,7 +31,7 @@
 		<field
 			name="type"
 			type="type"
-			label="COM_INSTALLER_VALUE_TYPE_SELECT"
+			label="COM_INSTALLER_HEADING_TYPE"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_INSTALLER_VALUE_TYPE_SELECT</option>
@@ -40,7 +40,7 @@
 		<field
 			name="folder"
 			type="folder"
-			label="COM_INSTALLER_VALUE_FOLDER_SELECT"
+			label="COM_INSTALLER_HEADING_FOLDER"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_INSTALLER_VALUE_FOLDER_SELECT</option>
@@ -49,7 +49,7 @@
 		<field
 			name="core"
 			type="list"
-			label="COM_INSTALLER_VALUE_CORE_SELECT"
+			label="COM_INSTALLER_HEADING_TYPE"
 			onchange="this.form.submit();"
 			validate="options"
 			>
diff --git a/administrator/components/com_installer/forms/filter_update.xml b/administrator/components/com_installer/forms/filter_update.xml
index 8ac32ca3da59e..1f2cc40d172ae 100644
--- a/administrator/components/com_installer/forms/filter_update.xml
+++ b/administrator/components/com_installer/forms/filter_update.xml
@@ -12,7 +12,7 @@
 		<field
 			name="client_id"
 			type="location"
-			label="COM_INSTALLER_VALUE_CLIENT_SELECT"
+			label="COM_INSTALLER_TYPE_CLIENT"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_INSTALLER_VALUE_CLIENT_SELECT</option>
@@ -20,7 +20,7 @@
 		<field
 			name="type"
 			type="type"
-			label="COM_INSTALLER_VALUE_TYPE_SELECT"
+			label="COM_INSTALLER_TYPE_CLIENT"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_INSTALLER_VALUE_TYPE_SELECT</option>
@@ -28,7 +28,7 @@
 		<field
 			name="folder"
 			type="folder"
-			label="COM_INSTALLER_VALUE_FOLDER_SELECT"
+			label="COM_INSTALLER_HEADING_FOLDER"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_INSTALLER_VALUE_FOLDER_SELECT</option>
diff --git a/administrator/components/com_installer/forms/filter_updatesites.xml b/administrator/components/com_installer/forms/filter_updatesites.xml
index 42c5d1f0dca57..f3f10f16b51e3 100644
--- a/administrator/components/com_installer/forms/filter_updatesites.xml
+++ b/administrator/components/com_installer/forms/filter_updatesites.xml
@@ -12,7 +12,7 @@
 		<field
 			name="enabled"
 			type="list"
-			label="JOPTION_SELECT_PUBLISHED"
+			label="JSTATUS"
 			onchange="this.form.submit();"
 			validate="options"
 			>
@@ -23,7 +23,7 @@
 		<field
 			name="client_id"
 			type="location"
-			label="COM_INSTALLER_VALUE_CLIENT_SELECT"
+			label="COM_INSTALLER_TYPE_CLIENT"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_INSTALLER_VALUE_CLIENT_SELECT</option>
@@ -31,7 +31,7 @@
 		<field
 			name="type"
 			type="type"
-			label="COM_INSTALLER_VALUE_TYPE_SELECT"
+			label="COM_INSTALLER_HEADING_TYPE"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_INSTALLER_VALUE_TYPE_SELECT</option>
@@ -39,7 +39,7 @@
 		<field
 			name="folder"
 			type="folder"
-			label="COM_INSTALLER_VALUE_FOLDER_SELECT"
+			label="COM_INSTALLER_HEADING_FOLDER"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_INSTALLER_VALUE_FOLDER_SELECT</option>
diff --git a/administrator/components/com_installer/tmpl/database/default.php b/administrator/components/com_installer/tmpl/database/default.php
index 905ae2f7c77b4..d9f0b55a072ec 100644
--- a/administrator/components/com_installer/tmpl/database/default.php
+++ b/administrator/components/com_installer/tmpl/database/default.php
@@ -35,11 +35,13 @@
 						<?php else : ?>
 							<table class="table">
 								<caption id="captionTable" class="sr-only">
-									<?php echo Text::_('COM_INSTALLER_DATABASE_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+									<?php echo Text::_('COM_INSTALLER_DATABASE_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 								</caption>
 								<thead>
 									<tr>
-										<td class="text-center" style="width:1%">
+										<td class="w-1 text-center">
 											<?php echo HTMLHelper::_('grid.checkall'); ?>
 										</td>
 										<th scope="col">
@@ -63,7 +65,7 @@
 										<th scope="col" class="w-10 d-none d-md-table-cell">
 											<?php echo HTMLHelper::_('searchtools.sort', 'COM_INSTALLER_HEADING_FOLDER', 'folder_translated', $listDirection, $listOrder); ?>
 										</th>
-										<th scope="col" class="d-none d-md-table-cell" style="width:1%">
+										<th scope="col" class="w-1 d-none d-md-table-cell">
 											<?php echo HTMLHelper::_('searchtools.sort', 'COM_INSTALLER_HEADING_ID', 'extension_id', $listDirection, $listOrder); ?>
 										</th>
 									</tr>
diff --git a/administrator/components/com_installer/tmpl/discover/default.php b/administrator/components/com_installer/tmpl/discover/default.php
index 6f2c7b02623de..83bc2a03bc0db 100644
--- a/administrator/components/com_installer/tmpl/discover/default.php
+++ b/administrator/components/com_installer/tmpl/discover/default.php
@@ -43,11 +43,13 @@
 					<?php else : ?>
 					<table class="table">
 						<caption id="captionTable" class="sr-only">
-							<?php echo Text::_('COM_INSTALLER_DISCOVER_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+							<?php echo Text::_('COM_INSTALLER_DISCOVER_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 						</caption>
 						<thead>
 							<tr>
-								<td style="width:1%" class="text-center">
+								<td class="w-1 text-center">
 									<?php echo HTMLHelper::_('grid.checkall'); ?>
 								</td>
 								<th scope="col">
@@ -65,13 +67,13 @@
 								<th scope="col" class="w-10 d-none d-md-table-cell">
 									<?php echo Text::_('JDATE'); ?>
 								</th>
-								<th scope="col" style="width:15%" class="d-none d-md-table-cell">
+								<th scope="col" class="w-15 d-none d-md-table-cell">
 									<?php echo Text::_('JAUTHOR'); ?>
 								</th>
 								<th scope="col" class="d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'COM_INSTALLER_HEADING_FOLDER', 'folder_translated', $listDirn, $listOrder); ?>
 								</th>
-								<th scope="col" style="width:1%" class="d-none d-md-table-cell">
+								<th scope="col" class="w-1 d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'extension_id', $listDirn, $listOrder); ?>
 								</th>
 							</tr>
diff --git a/administrator/components/com_installer/tmpl/install/default.php b/administrator/components/com_installer/tmpl/install/default.php
index d3b37aa8649f9..51aadaaa40953 100644
--- a/administrator/components/com_installer/tmpl/install/default.php
+++ b/administrator/components/com_installer/tmpl/install/default.php
@@ -23,6 +23,9 @@
 HTMLHelper::_('stylesheet', 'com_installer/installer.css', ['version' => 'auto', 'relative' => true]);
 HTMLHelper::_('script', 'com_installer/installer.js', ['version' => 'auto', 'relative' => true]);
 
+$this->document->getWebAssetManager()
+	->useScript('webcomponent.core-loader');
+
 $app = Factory::getApplication();
 ?>
 
diff --git a/administrator/components/com_installer/tmpl/languages/default.php b/administrator/components/com_installer/tmpl/languages/default.php
index c45b461d790b9..4c5390644f001 100644
--- a/administrator/components/com_installer/tmpl/languages/default.php
+++ b/administrator/components/com_installer/tmpl/languages/default.php
@@ -34,7 +34,9 @@
 					<?php else : ?>
 					<table class="table">
 						<caption id="captionTable" class="sr-only">
-							<?php echo Text::_('COM_INSTALLER_LANGUAGES_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+							<?php echo Text::_('COM_INSTALLER_LANGUAGES_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 						</caption>
 						<thead>
 							<tr>
@@ -45,7 +47,7 @@
 								<th scope="col" class="w-10 text-center">
 									<?php echo HTMLHelper::_('searchtools.sort', 'COM_INSTALLER_HEADING_LANGUAGE_TAG', 'element', $listDirn, $listOrder); ?>
 								</th>
-								<th scope="col" style="width:15%" class="text-right d-none d-md-table-cell">
+								<th scope="col" class="w-15 text-right d-none d-md-table-cell">
 									<?php echo Text::_('JVERSION'); ?>
 								</th>
 								<th scope="col" style="width:35%" class="d-none d-md-table-cell">
diff --git a/administrator/components/com_installer/tmpl/manage/default.php b/administrator/components/com_installer/tmpl/manage/default.php
index e331a8203674e..e14659ee973b6 100644
--- a/administrator/components/com_installer/tmpl/manage/default.php
+++ b/administrator/components/com_installer/tmpl/manage/default.php
@@ -40,14 +40,16 @@
 					<?php else : ?>
 					<table class="table" id="manageList">
 						<caption id="captionTable" class="sr-only">
-							<?php echo Text::_('COM_INSTALLER_MANAGE_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+							<?php echo Text::_('COM_INSTALLER_MANAGE_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 						</caption>
 						<thead>
 							<tr>
-								<td style="width:1%" class="text-center">
+								<td class="w-1 text-center">
 									<?php echo HTMLHelper::_('grid.checkall'); ?>
 								</td>
-								<th scope="col" style="width:1%" class="text-center">
+								<th scope="col" class="w-1 text-center">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'status', $listDirn, $listOrder); ?>
 								</th>
 								<th scope="col">
@@ -71,13 +73,13 @@
 								<th scope="col" class="w-5 d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'COM_INSTALLER_HEADING_FOLDER', 'folder_translated', $listDirn, $listOrder); ?>
 								</th>
-								<th scope="col" style="width:1%" class="d-none d-md-table-cell">
+								<th scope="col" class="w-1 d-none d-md-table-cell">
 									<?php echo Text::_('COM_INSTALLER_HEADING_LOCKED'); ?>
 								</th>
 								<th scope="col" class="d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'COM_INSTALLER_HEADING_PACKAGE_ID', 'package_id', $listDirn, $listOrder); ?>
 								</th>
-								<th scope="col" style="width:1%" class="d-none d-md-table-cell">
+								<th scope="col" class="w-1 d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'COM_INSTALLER_HEADING_ID', 'extension_id', $listDirn, $listOrder); ?>
 								</th>
 							</tr>
diff --git a/administrator/components/com_installer/tmpl/update/default.php b/administrator/components/com_installer/tmpl/update/default.php
index 7d3f2ef46221a..5c041f39c24b4 100644
--- a/administrator/components/com_installer/tmpl/update/default.php
+++ b/administrator/components/com_installer/tmpl/update/default.php
@@ -40,11 +40,13 @@
 					<?php else : ?>
 						<table class="table">
 							<caption id="captionTable" class="sr-only">
-								<?php echo Text::_('COM_INSTALLER_UPDATE_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+								<?php echo Text::_('COM_INSTALLER_UPDATE_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 							</caption>
 							<thead>
 							<tr>
-								<th style="width:1%" class="text-center">
+								<th class="w-1 text-center">
 									<?php echo HTMLHelper::_('grid.checkall'); ?>
 								</th>
 								<th scope="col">
@@ -71,7 +73,7 @@
 								<th scope="col" class="d-none d-md-table-cell">
 									<?php echo Text::_('COM_INSTALLER_HEADING_INSTALLTYPE'); ?>
 								</th>
-								<th scope="col" style="width:40%" class="d-none d-md-table-cell">
+								<th scope="col" class="w-40 d-none d-md-table-cell">
 									<?php echo Text::_('COM_INSTALLER_HEADING_DETAILSURL'); ?>
 								</th>
 							</tr>
diff --git a/administrator/components/com_installer/tmpl/updatesites/default.php b/administrator/components/com_installer/tmpl/updatesites/default.php
index d8dc554c5537a..15c579d107dcd 100644
--- a/administrator/components/com_installer/tmpl/updatesites/default.php
+++ b/administrator/components/com_installer/tmpl/updatesites/default.php
@@ -38,20 +38,22 @@
 					<?php else : ?>
 					<table class="table">
 						<caption id="captionTable" class="sr-only">
-							<?php echo Text::_('COM_INSTALLER_UPDATESITES_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+							<?php echo Text::_('COM_INSTALLER_UPDATESITES_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 						</caption>
 						<thead>
 							<tr>
-								<td style="width:1%" class="text-center">
+								<td class="w-1 text-center">
 									<?php echo HTMLHelper::_('grid.checkall'); ?>
 								</td>
-								<th scope="col" style="width:1%" class="text-center">
+								<th scope="col" class="w-1 text-center">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'enabled', $listDirn, $listOrder); ?>
 								</th>
 								<th scope="col">
 									<?php echo HTMLHelper::_('searchtools.sort', 'COM_INSTALLER_HEADING_UPDATESITE_NAME', 'update_site_name', $listDirn, $listOrder); ?>
 								</th>
-								<th scope="col" style="width:20%" class="d-none d-md-table-cell">
+								<th scope="col" class="w-20 d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'COM_INSTALLER_HEADING_NAME', 'name', $listDirn, $listOrder); ?>
 								</th>
 								<th scope="col" class="w-10 d-none d-md-table-cell">
diff --git a/administrator/components/com_joomlaupdate/tmpl/update/finaliseconfirm.php b/administrator/components/com_joomlaupdate/tmpl/update/finaliseconfirm.php
index 5611736ccc41e..4f467741d2f6a 100644
--- a/administrator/components/com_joomlaupdate/tmpl/update/finaliseconfirm.php
+++ b/administrator/components/com_joomlaupdate/tmpl/update/finaliseconfirm.php
@@ -69,7 +69,7 @@
 			<div class="control-group">
 				<div class="controls">
 					<div class="input-group">
-						<input name="secretkey" autocomplete="off" id="mod-login-secretkey" type="text" class="form-control" placeholder="<?php echo Text::_('JGLOBAL_SECRETKEY'); ?>" size="15">
+						<input name="secretkey" autocomplete="one-time-code" id="mod-login-secretkey" type="text" class="form-control" placeholder="<?php echo Text::_('JGLOBAL_SECRETKEY'); ?>" size="15">
 						<span class="input-group-append">
 							<span class="input-group-text" title="<?php echo Text::_('JGLOBAL_SECRETKEY_HELP'); ?>">
 								<span class="fas fa-star" aria-hidden="true"></span>
diff --git a/administrator/components/com_joomlaupdate/tmpl/upload/captive.php b/administrator/components/com_joomlaupdate/tmpl/upload/captive.php
index 7ac8fa4c04f5b..a8c9a0abe4303 100644
--- a/administrator/components/com_joomlaupdate/tmpl/upload/captive.php
+++ b/administrator/components/com_joomlaupdate/tmpl/upload/captive.php
@@ -69,7 +69,7 @@
 			<div class="control-group">
 				<div class="controls">
 					<div class="input-group">
-						<input name="secretkey" autocomplete="off" id="mod-login-secretkey" type="text" class="form-control" placeholder="<?php echo Text::_('JGLOBAL_SECRETKEY'); ?>" size="15">
+						<input name="secretkey" autocomplete="one-time-code" id="mod-login-secretkey" type="text" class="form-control" placeholder="<?php echo Text::_('JGLOBAL_SECRETKEY'); ?>" size="15">
 						<span class="input-group-append">
 							<span class="input-group-text" title="<?php echo Text::_('JGLOBAL_SECRETKEY_HELP'); ?>">
 								<span class="fas fa-star" aria-hidden="true"></span>
diff --git a/administrator/components/com_languages/forms/filter_languages.xml b/administrator/components/com_languages/forms/filter_languages.xml
index 3ff87af4bfaa8..d42d0f6a6c8ad 100644
--- a/administrator/components/com_languages/forms/filter_languages.xml
+++ b/administrator/components/com_languages/forms/filter_languages.xml
@@ -12,7 +12,7 @@
 		<field
 			name="published"
 			type="status"
-			label="JOPTION_SELECT_PUBLISHED"
+			label="JSTATUS"
 			optionsFilter="1,0,-2,*"
 			onchange="this.form.submit();"
 			>
@@ -21,7 +21,7 @@
 		<field
 			name="access"
 			type="accesslevel"
-			label="JOPTION_SELECT_ACCESS"
+			label="JGRID_HEADING_ACCESS"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_ACCESS</option>
diff --git a/administrator/components/com_languages/forms/filter_overrides.xml b/administrator/components/com_languages/forms/filter_overrides.xml
index f370d2d53b285..eeb5c68cefc31 100644
--- a/administrator/components/com_languages/forms/filter_overrides.xml
+++ b/administrator/components/com_languages/forms/filter_overrides.xml
@@ -16,7 +16,7 @@
 			type="text"
 			inputmode="search"
 			label="JSEARCH_FILTER"
-			description="COM_LANGUAGES_SEARCH_IN_TITLE"
+			description="COM_LANGUAGES_VIEW_OVERRIDES_FILTER_SEARCH_DESC"
 			hint="JSEARCH_FILTER"
 		/>
 	</fields>
diff --git a/administrator/components/com_languages/src/Field/LanguageclientField.php b/administrator/components/com_languages/src/Field/LanguageclientField.php
index a625202f6cdba..4edcc8ce2ef79 100644
--- a/administrator/components/com_languages/src/Field/LanguageclientField.php
+++ b/administrator/components/com_languages/src/Field/LanguageclientField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Languages\Administrator\Field;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Form\Field\ListField;
 use Joomla\CMS\Language\LanguageHelper;
diff --git a/administrator/components/com_languages/tmpl/installed/default.php b/administrator/components/com_languages/tmpl/installed/default.php
index 2e8afa3884171..a8aa2a1cc57b8 100644
--- a/administrator/components/com_languages/tmpl/installed/default.php
+++ b/administrator/components/com_languages/tmpl/installed/default.php
@@ -34,17 +34,19 @@
 				<?php else : ?>
 				<table class="table">
 					<caption id="captionTable" class="sr-only">
-						<?php echo Text::_('COM_LANGUAGES_INSTALLED_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+						<?php echo Text::_('COM_LANGUAGES_INSTALLED_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 					</caption>
 					<thead>
 						<tr>
-							<td style="width:1%">
+							<td class="w-1">
 								&#160;
 							</td>
-							<th scope="col" style="width:15%">
+							<th scope="col" class="w-15">
 								<?php echo HTMLHelper::_('searchtools.sort', 'JGLOBAL_TITLE', 'name', $listDirn, $listOrder); ?>
 							</th>
-							<th scope="col" style="width:15%" class="d-none d-md-table-cell">
+							<th scope="col" class="w-15 d-none d-md-table-cell">
 								<?php echo HTMLHelper::_('searchtools.sort', 'COM_LANGUAGES_HEADING_TITLE_NATIVE', 'nativeName', $listDirn, $listOrder); ?>
 							</th>
 							<th scope="col" class="text-center">
diff --git a/administrator/components/com_languages/tmpl/languages/default.php b/administrator/components/com_languages/tmpl/languages/default.php
index af197ec2c56e4..a25dc7dd1d73c 100644
--- a/administrator/components/com_languages/tmpl/languages/default.php
+++ b/administrator/components/com_languages/tmpl/languages/default.php
@@ -43,17 +43,19 @@
 				<?php else : ?>
 					<table class="table" id="contentList">
 						<caption id="captionTable" class="sr-only">
-							<?php echo Text::_('COM_LANGUAGES_CONTENT_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+							<?php echo Text::_('COM_LANGUAGES_CONTENT_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 						</caption>
 						<thead>
 							<tr>
-								<td style="width:1%"  class="text-center">
+								<td class="w-1 text-center">
 									<?php echo HTMLHelper::_('grid.checkall'); ?>
 								</td>
-								<th scope="col" style="width:1%" class="text-center d-none d-md-table-cell">
+								<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', 'fas fa-sort'); ?>
 								</th>
-								<th scope="col" style="width:1%" class="text-center">
+								<th scope="col" class="w-1 text-center">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
 								</th>
 								<th scope="col" class="title">
diff --git a/administrator/components/com_languages/tmpl/overrides/default.php b/administrator/components/com_languages/tmpl/overrides/default.php
index 223dcfd36ac9f..8dcc80cfa1878 100644
--- a/administrator/components/com_languages/tmpl/overrides/default.php
+++ b/administrator/components/com_languages/tmpl/overrides/default.php
@@ -41,14 +41,16 @@
 				<?php else : ?>
 					<table class="table" id="overrideList">
 						<caption id="captionTable" class="sr-only">
-							<?php echo Text::_('COM_LANGUAGES_OVERRIDES_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+							<?php echo Text::_('COM_LANGUAGES_OVERRIDES_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 						</caption>
 						<thead>
 							<tr>
-								<td style="width:1%" class="text-center">
+								<td class="w-1 text-center">
 									<?php echo HTMLHelper::_('grid.checkall'); ?>
 								</td>
-								<th scope="col" style="width:30%">
+								<th scope="col" class="w-30">
 									<?php echo HTMLHelper::_('searchtools.sort', 'COM_LANGUAGES_VIEW_OVERRIDES_KEY', 'key', $listDirn, $listOrder); ?>
 								</th>
 								<th scope="col" class="d-none d-md-table-cell">
diff --git a/administrator/components/com_mails/forms/filter_templates.xml b/administrator/components/com_mails/forms/filter_templates.xml
index 17f85dc9d3c51..429ee29cc8ed2 100644
--- a/administrator/components/com_mails/forms/filter_templates.xml
+++ b/administrator/components/com_mails/forms/filter_templates.xml
@@ -13,7 +13,7 @@
 		<field
 			name="language"
 			type="contentlanguage"
-			label="JOPTION_SELECT_LANGUAGE"
+			label="JGRID_HEADING_LANGUAGE"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_LANGUAGE</option>
@@ -23,7 +23,7 @@
 		<field
 			name="extension"
 			type="sql"
-			label="COM_MAILS_FILTER_OPTION_SELECT_EXTENSION"
+			label="COM_MAILS_HEADING_COMPONENT"
 			query="SELECT SUBSTRING(template_id, 1, POSITION('.' IN template_id) - 1) AS value, SUBSTRING(template_id, 1, POSITION('.' IN template_id) - 1) AS extension FROM #__mail_templates GROUP BY extension ORDER BY extension ASC"
 			translate="true"
 			onchange="this.form.submit();"
diff --git a/administrator/components/com_mails/tmpl/templates/default.php b/administrator/components/com_mails/tmpl/templates/default.php
index a9d0436fd41d9..83ec3d06fbf04 100644
--- a/administrator/components/com_mails/tmpl/templates/default.php
+++ b/administrator/components/com_mails/tmpl/templates/default.php
@@ -30,14 +30,16 @@
 				<?php else : ?>
 					<table class="table" id="templateList">
 						<caption id="captionTable" class="sr-only">
-							<?php echo Text::_('COM_MAILS_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+							<?php echo Text::_('COM_MAILS_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 						</caption>
 						<thead>
 							<tr>
 								<th scope="col" style="min-width:100px">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
 								</th>
-								<th scope="col" style="width:15%" class="d-none d-md-table-cell">
+								<th scope="col" class="w-15 d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'COM_MAILS_HEADING_COMPONENT', 'a.component', $listDirn, $listOrder); ?>
 								</th>
 								<th scope="col" class="w-10 d-md-table-cell">
@@ -46,7 +48,7 @@
 								<th scope="col" class="w-10 d-md-table-cell">
 									<?php echo Text::_('COM_MAILS_HEADING_NO_TEMPLATES_FOR_LANGUAGES'); ?>
 								</th>
-								<th scope="col" style="width:30%" class="d-none d-md-table-cell">
+								<th scope="col" class="w-30 d-none d-md-table-cell">
 									<?php echo Text::_('COM_MAILS_HEADING_DESCRIPTION'); ?>
 								</th>
 								<th scope="col" class="w-10 d-none d-md-table-cell">
@@ -86,7 +88,7 @@
 											<?php if ($language->image) : ?>
 												<?php echo HTMLHelper::_('image', 'mod_languages/' . $language->image . '.gif', $language->title_native, array('title' => $language->title_native), true); ?>
 											<?php else : ?>
-												<span class="badge badge-secondary" title="<?php echo $language->title_native; ?>"><?php echo strtoupper($language->sef); ?></span>
+												<span class="badge badge-secondary" title="<?php echo $language->title_native; ?>"><?php echo $language->lang_code; ?></span>
 											<?php endif; ?>
 										<?php endif; ?>
 									<?php endforeach; ?>
@@ -97,7 +99,7 @@
 											<?php if ($language->image) : ?>
 												<?php echo HTMLHelper::_('image', 'mod_languages/' . $language->image . '.gif', $language->title_native, array('title' => $language->title_native), true); ?>
 											<?php else : ?>
-												<span class="badge badge-secondary"><?php echo strtoupper($language->sef); ?></span>
+												<span class="badge badge-secondary"><?php echo $language->lang_code; ?></span>
 											<?php endif; ?>
 										<?php endif; ?>
 									<?php endforeach; ?>
diff --git a/administrator/components/com_menus/forms/filter_items.xml b/administrator/components/com_menus/forms/filter_items.xml
index 6713db83c60dc..99d6d0feed7e7 100644
--- a/administrator/components/com_menus/forms/filter_items.xml
+++ b/administrator/components/com_menus/forms/filter_items.xml
@@ -34,7 +34,7 @@
 		<field
 			name="published"
 			type="status"
-			label="JOPTION_SELECT_PUBLISHED"
+			label="JSTATUS"
 			optionsFilter="*,0,1,-2"
 			onchange="this.form.submit();"
 			>
@@ -43,7 +43,7 @@
 		<field
 			name="access"
 			type="accesslevel"
-			label="JOPTION_SELECT_ACCESS"
+			label="JGRID_HEADING_ACCESS"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_ACCESS</option>
@@ -51,7 +51,7 @@
 		<field
 			name="language"
 			type="contentlanguage"
-			label="JOPTION_SELECT_LANGUAGE"
+			label="JGRID_HEADING_LANGUAGE"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_LANGUAGE</option>
@@ -60,7 +60,7 @@
 		<field
 			name="level"
 			type="integer"
-			label="JOPTION_SELECT_MAX_LEVELS"
+			label="JGLOBAL_MAXLEVEL_LABEL"
 			first="1"
 			last="10"
 			step="1"
diff --git a/administrator/components/com_menus/forms/filter_itemsadmin.xml b/administrator/components/com_menus/forms/filter_itemsadmin.xml
index e5e5617c7d1ec..dc01f257c17a8 100644
--- a/administrator/components/com_menus/forms/filter_itemsadmin.xml
+++ b/administrator/components/com_menus/forms/filter_itemsadmin.xml
@@ -15,7 +15,7 @@
 	<field
 		name="menutype"
 		type="menu"
-		label="COM_MENUS_SELECT_MENU"
+		label="COM_MENUS_SELECT_MENU_FILTER"
 		accesstype="manage"
 		clientid=""
 		showAll="false"
@@ -37,7 +37,7 @@
 		<field
 			name="published"
 			type="status"
-			label="JOPTION_SELECT_PUBLISHED"
+			label="JSTATUS"
 			optionsFilter="*,0,1,-2"
 			onchange="this.form.submit();"
 			>
@@ -46,7 +46,7 @@
 		<field
 			name="level"
 			type="integer"
-			label="JOPTION_SELECT_MAX_LEVELS"
+			label="JGLOBAL_MAXLEVEL_LABEL"
 			first="1"
 			last="10"
 			step="1"
diff --git a/administrator/components/com_menus/layouts/joomla/menu/edit_modules.php b/administrator/components/com_menus/layouts/joomla/menu/edit_modules.php
index c74177c1f0cc3..eb48edefc3b72 100644
--- a/administrator/components/com_menus/layouts/joomla/menu/edit_modules.php
+++ b/administrator/components/com_menus/layouts/joomla/menu/edit_modules.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
diff --git a/administrator/components/com_menus/layouts/joomla/searchtools/default.php b/administrator/components/com_menus/layouts/joomla/searchtools/default.php
index 5881e26854fcb..9fe45964a5579 100644
--- a/administrator/components/com_menus/layouts/joomla/searchtools/default.php
+++ b/administrator/components/com_menus/layouts/joomla/searchtools/default.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
diff --git a/administrator/components/com_menus/src/Field/ComponentsCategoryField.php b/administrator/components/com_menus/src/Field/ComponentsCategoryField.php
index 1364dfb2cd26b..c7cc644757184 100644
--- a/administrator/components/com_menus/src/Field/ComponentsCategoryField.php
+++ b/administrator/components/com_menus/src/Field/ComponentsCategoryField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Menus\Administrator\Field;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;
diff --git a/administrator/components/com_menus/src/Field/ComponentsfieldgroupField.php b/administrator/components/com_menus/src/Field/ComponentsfieldgroupField.php
index 45b5fc28ecb23..ecaee84bb4ad1 100644
--- a/administrator/components/com_menus/src/Field/ComponentsfieldgroupField.php
+++ b/administrator/components/com_menus/src/Field/ComponentsfieldgroupField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Menus\Administrator\Field;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Access\Access;
 use Joomla\CMS\Factory;
diff --git a/administrator/components/com_menus/src/Field/ComponentsfieldsField.php b/administrator/components/com_menus/src/Field/ComponentsfieldsField.php
index f0ba77bff9878..3d0b697ac1c65 100644
--- a/administrator/components/com_menus/src/Field/ComponentsfieldsField.php
+++ b/administrator/components/com_menus/src/Field/ComponentsfieldsField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Menus\Administrator\Field;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Access\Access;
 use Joomla\CMS\Factory;
diff --git a/administrator/components/com_menus/src/Field/ComponentsworkflowField.php b/administrator/components/com_menus/src/Field/ComponentsworkflowField.php
index 989a64765fe28..4f5d008871351 100644
--- a/administrator/components/com_menus/src/Field/ComponentsworkflowField.php
+++ b/administrator/components/com_menus/src/Field/ComponentsworkflowField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Menus\Administrator\Field;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Access\Access;
 use Joomla\CMS\Factory;
diff --git a/administrator/components/com_menus/src/Field/MenuOrderingField.php b/administrator/components/com_menus/src/Field/MenuOrderingField.php
index c534b44b2852e..44b189facd1d5 100644
--- a/administrator/components/com_menus/src/Field/MenuOrderingField.php
+++ b/administrator/components/com_menus/src/Field/MenuOrderingField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Menus\Administrator\Field;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;
diff --git a/administrator/components/com_menus/src/Field/MenuParentField.php b/administrator/components/com_menus/src/Field/MenuParentField.php
index 744b83a69d29b..dcc0cb23c65ec 100644
--- a/administrator/components/com_menus/src/Field/MenuParentField.php
+++ b/administrator/components/com_menus/src/Field/MenuParentField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Menus\Administrator\Field;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;
diff --git a/administrator/components/com_menus/src/Field/MenuPresetField.php b/administrator/components/com_menus/src/Field/MenuPresetField.php
index bb97edac612ed..f7e00aef01479 100644
--- a/administrator/components/com_menus/src/Field/MenuPresetField.php
+++ b/administrator/components/com_menus/src/Field/MenuPresetField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Menus\Administrator\Field;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Form\Field\ListField;
 use Joomla\CMS\HTML\HTMLHelper;
diff --git a/administrator/components/com_menus/src/Field/MenutypeField.php b/administrator/components/com_menus/src/Field/MenutypeField.php
index 62f6cfc927696..0bbc163648588 100644
--- a/administrator/components/com_menus/src/Field/MenutypeField.php
+++ b/administrator/components/com_menus/src/Field/MenutypeField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Menus\Administrator\Field;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;
diff --git a/administrator/components/com_menus/src/Field/Modal/MenuField.php b/administrator/components/com_menus/src/Field/Modal/MenuField.php
index 8bb33d19df06c..5dc46c099b919 100644
--- a/administrator/components/com_menus/src/Field/Modal/MenuField.php
+++ b/administrator/components/com_menus/src/Field/Modal/MenuField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Menus\Administrator\Field\Modal;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\FormField;
diff --git a/administrator/components/com_menus/src/Model/ItemModel.php b/administrator/components/com_menus/src/Model/ItemModel.php
index 62db2c653870a..d6e3546578376 100644
--- a/administrator/components/com_menus/src/Model/ItemModel.php
+++ b/administrator/components/com_menus/src/Model/ItemModel.php
@@ -1710,6 +1710,11 @@ public function save($data)
 			parent::cleanCache($option);
 		}
 
+		if (Factory::getApplication()->input->get('task') === 'editAssociations')
+		{
+			return $this->redirectToAssociations($data);
+		}
+
 		return true;
 	}
 
diff --git a/administrator/components/com_menus/src/Service/HTML/Menus.php b/administrator/components/com_menus/src/Service/HTML/Menus.php
index 3276f2918cf42..3a1d66177bb1d 100644
--- a/administrator/components/com_menus/src/Service/HTML/Menus.php
+++ b/administrator/components/com_menus/src/Service/HTML/Menus.php
@@ -89,7 +89,7 @@ public function association($itemid)
 				{
 					if (in_array($item->lang_code, $content_languages))
 					{
-						$text    = strtoupper($item->lang_sef);
+						$text    = $item->lang_code;
 						$url     = Route::_('index.php?option=com_menus&task=item.edit&id=' . (int) $item->id);
 						$tooltip = '<strong>' . htmlspecialchars($item->language_title, ENT_QUOTES, 'UTF-8') . '</strong><br>'
 							. htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8') . '<br>' . Text::sprintf('COM_MENUS_MENU_SPRINTF', $item->menu_title);
diff --git a/administrator/components/com_menus/tmpl/item/edit_modules.php b/administrator/components/com_menus/tmpl/item/edit_modules.php
index 176e17b62d6d8..e849f02f71adf 100644
--- a/administrator/components/com_menus/tmpl/item/edit_modules.php
+++ b/administrator/components/com_menus/tmpl/item/edit_modules.php
@@ -57,13 +57,13 @@
 	</caption>
 	<thead>
 		<tr>
-			<th scope="col" style="width:40%">
+			<th scope="col" class="w-40">
 				<?php echo Text::_('COM_MENUS_HEADING_ASSIGN_MODULE'); ?>
 			</th>
-			<th scope="col" style="width:15%">
+			<th scope="col" class="w-15">
 				<?php echo Text::_('COM_MENUS_HEADING_LEVELS'); ?>
 			</th>
-			<th scope="col" style="width:15%">
+			<th scope="col" class="w-15">
 				<?php echo Text::_('COM_MENUS_HEADING_POSITION'); ?>
 			</th>
 			<th scope="col">
diff --git a/administrator/components/com_menus/tmpl/items/default.php b/administrator/components/com_menus/tmpl/items/default.php
index aff952d26e218..cba045182e68a 100644
--- a/administrator/components/com_menus/tmpl/items/default.php
+++ b/administrator/components/com_menus/tmpl/items/default.php
@@ -48,19 +48,21 @@
 				<?php if (!empty($this->items)) : ?>
 					<table class="table" id="itemList">
 						<caption id="captionTable" class="sr-only">
-							<?php echo Text::_('COM_MENUS_ITEMS_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+							<?php echo Text::_('COM_MENUS_ITEMS_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 						</caption>
 						<thead>
 						<tr>
-							<td style="width:1%" class="text-center">
+							<td class="w-1 text-center">
 								<?php echo HTMLHelper::_('grid.checkall'); ?>
 							</td>
 							<?php if ($menuType) : ?>
-								<th scope="col" style="width:1%" class="text-center d-none d-md-table-cell">
+								<th scope="col" class="w-1 text-center d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', '', 'a.lft', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'fas fa-sort'); ?>
 								</th>
 							<?php endif; ?>
-							<th scope="col" style="width:1%" class="text-center">
+							<th scope="col" class="w-1 text-center">
 								<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
 							</th>
 							<th scope="col" class="title">
@@ -216,7 +218,7 @@
 														<?php echo HTMLHelper::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => Text::sprintf('COM_MENUS_GRID_UNSET_LANGUAGE', $item->language_title)), true); ?>
 													<?php else : ?>
 														<span class="badge badge-secondary"
-															  title="<?php echo Text::sprintf('COM_MENUS_GRID_UNSET_LANGUAGE', $item->language_title); ?>"><?php echo $item->language_sef; ?></span>
+															  title="<?php echo Text::sprintf('COM_MENUS_GRID_UNSET_LANGUAGE', $item->language_title); ?>"><?php echo $item->language; ?></span>
 													<?php endif; ?>
 												</a>
 											<?php else : ?>
@@ -224,7 +226,7 @@
 													<?php echo HTMLHelper::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true); ?>
 												<?php else : ?>
 													<span class="badge badge-secondary"
-														  title="<?php echo $item->language_title; ?>"><?php echo $item->language_sef; ?></span>
+														  title="<?php echo $item->language_title; ?>"><?php echo $item->language; ?></span>
 												<?php endif; ?>
 											<?php endif; ?>
 										<?php endif; ?>
diff --git a/administrator/components/com_menus/tmpl/items/modal.php b/administrator/components/com_menus/tmpl/items/modal.php
index 59afccaff7928..a6746f94f3593 100644
--- a/administrator/components/com_menus/tmpl/items/modal.php
+++ b/administrator/components/com_menus/tmpl/items/modal.php
@@ -54,11 +54,13 @@
 		<?php else : ?>
 			<table class="table table-sm">
 				<caption id="captionTable" class="sr-only">
-					<?php echo Text::_('COM_MENUS_ITEMS_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+					<?php echo Text::_('COM_MENUS_ITEMS_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 				</caption>
 				<thead>
 					<tr>
-						<th scope="col" style="width:1%" class="text-center">
+						<th scope="col" class="w-1 text-center">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
 						</th>
 						<th scope="col" class="title">
@@ -73,10 +75,10 @@
 						<th scope="col" class="w-10 d-none d-md-table-cell">
 							<?php echo HTMLHelper::_('searchtools.sort',  'JGRID_HEADING_ACCESS', 'a.access', $listDirn, $listOrder); ?>
 						</th>
-						<th scope="col" style="width:15%" class="d-none d-md-table-cell">
+						<th scope="col" class="w-15 d-none d-md-table-cell">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language', $listDirn, $listOrder); ?>
 						</th>
-						<th scope="col" style="width:1%" class="d-none d-md-table-cell">
+						<th scope="col" class="w-1 d-none d-md-table-cell">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
 						</th>
 					</tr>
@@ -145,7 +147,7 @@
 									<?php if ($item->language_image) : ?>
 										<?php echo HTMLHelper::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true); ?>
 									<?php else : ?>
-										<span class="badge badge-secondary" title="<?php echo $item->language_title; ?>"><?php echo $item->language_sef; ?></span>
+										<span class="badge badge-secondary" title="<?php echo $item->language_title; ?>"><?php echo $item->language; ?></span>
 									<?php endif; ?>
 								<?php endif; ?>
 							<?php endif; ?>
diff --git a/administrator/components/com_menus/tmpl/menus/default.php b/administrator/components/com_menus/tmpl/menus/default.php
index 7c45f2aade97d..4cdc8773a6a34 100644
--- a/administrator/components/com_menus/tmpl/menus/default.php
+++ b/administrator/components/com_menus/tmpl/menus/default.php
@@ -50,11 +50,13 @@
 				<?php else : ?>
 					<table class="table" id="menuList">
 						<caption id="captionTable" class="sr-only">
-							<?php echo Text::_('COM_MENUS_MENUS_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+							<?php echo Text::_('COM_MENUS_MENUS_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 						</caption>
 						<thead>
 							<tr>
-								<td style="width:1%" class="text-center">
+								<td class="w-1 text-center">
 									<?php echo HTMLHelper::_('grid.checkall'); ?>
 								</td>
 								<th scope="col">
diff --git a/administrator/components/com_messages/forms/filter_messages.xml b/administrator/components/com_messages/forms/filter_messages.xml
index 733c150a55266..7fd8d0b159282 100644
--- a/administrator/components/com_messages/forms/filter_messages.xml
+++ b/administrator/components/com_messages/forms/filter_messages.xml
@@ -12,7 +12,7 @@
 		<field
 			name="state"
 			type="MessageStates"
-			label="JOPTION_SELECT_PUBLISHED"
+			label="JSTATUS"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
diff --git a/administrator/components/com_messages/src/Field/MessageStatesField.php b/administrator/components/com_messages/src/Field/MessageStatesField.php
index 6f3b28ec68451..233d018737b6b 100644
--- a/administrator/components/com_messages/src/Field/MessageStatesField.php
+++ b/administrator/components/com_messages/src/Field/MessageStatesField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Messages\Administrator\Field;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Form\Field\ListField;
 use Joomla\Component\Messages\Administrator\Helper\MessagesHelper;
diff --git a/administrator/components/com_messages/tmpl/messages/default.php b/administrator/components/com_messages/tmpl/messages/default.php
index fe084b862a856..3a3c2dc10f09d 100644
--- a/administrator/components/com_messages/tmpl/messages/default.php
+++ b/administrator/components/com_messages/tmpl/messages/default.php
@@ -32,23 +32,25 @@
 		<?php else : ?>
 			<table class="table">
 				<caption id="captionTable" class="sr-only">
-					<?php echo Text::_('COM_MESSAGES_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+					<?php echo Text::_('COM_MESSAGES_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 				</caption>
 				<thead>
 					<tr>
-						<td style="width:1%" class="text-center">
+						<td class="w-1 text-center">
 							<?php echo HTMLHelper::_('grid.checkall'); ?>
 						</td>
 						<th scope="col" class="title">
 							<?php echo HTMLHelper::_('searchtools.sort', 'COM_MESSAGES_HEADING_SUBJECT', 'a.subject', $listDirn, $listOrder); ?>
 						</th>
-						<th scope="col" style="width:1%" class="text-center">
+						<th scope="col" class="w-1 text-center">
 							<?php echo HTMLHelper::_('searchtools.sort', 'COM_MESSAGES_HEADING_READ', 'a.state', $listDirn, $listOrder); ?>
 						</th>
-						<th scope="col" style="width:15%">
+						<th scope="col" class="w-15">
 							<?php echo HTMLHelper::_('searchtools.sort', 'COM_MESSAGES_HEADING_FROM', 'a.user_id_from', $listDirn, $listOrder); ?>
 						</th>
-						<th scope="col" style="width:20%" class="d-none d-md-table-cell">
+						<th scope="col" class="w-20 d-none d-md-table-cell">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JDATE', 'a.date_time', $listDirn, $listOrder); ?>
 						</th>
 					</tr>
diff --git a/administrator/components/com_modules/forms/filter_modules.xml b/administrator/components/com_modules/forms/filter_modules.xml
index b769e30335198..6adc9ec4377f8 100644
--- a/administrator/components/com_modules/forms/filter_modules.xml
+++ b/administrator/components/com_modules/forms/filter_modules.xml
@@ -24,7 +24,7 @@
 		<field
 			name="state"
 			type="status"
-			label="JOPTION_SELECT_PUBLISHED"
+			label="JSTATUS"
 			optionsFilter="*,-2,0,1"
 			onchange="this.form.submit();"
 			>
@@ -33,7 +33,7 @@
 		<field
 			name="position"
 			type="ModulesPosition"
-			label="COM_MODULES_OPTION_SELECT_POSITION"
+			label="COM_MODULES_FIELD_POSITION_LABEL"
 			client="site"
 			onchange="this.form.submit();"
 			>
@@ -42,7 +42,7 @@
 		<field
 			name="module"
 			type="ModulesModule"
-			label="COM_MODULES_OPTION_SELECT_MODULE"
+			label="COM_MODULES_HEADING_MODULE"
 			client="site"
 			onchange="this.form.submit();"
 			>
@@ -51,7 +51,7 @@
 		<field
 			name="menuitem"
 			type="menuitem"
-			label="COM_MODULES_OPTION_SELECT_MENU_ITEM"
+			label="JGLOBAL_MENU_SELECTION"
 			disable="separator,alias,heading,url"
 			onchange="this.form.submit();"
 			>
@@ -61,7 +61,7 @@
 		<field
 			name="access"
 			type="accesslevel"
-			label="JOPTION_SELECT_ACCESS"
+			label="JGRID_HEADING_ACCESS"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_ACCESS</option>
@@ -69,7 +69,7 @@
 		<field
 			name="language"
 			type="contentlanguage"
-			label="JOPTION_SELECT_LANGUAGE"
+			label="JGRID_HEADING_LANGUAGE"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_LANGUAGE</option>
diff --git a/administrator/components/com_modules/forms/filter_modulesadmin.xml b/administrator/components/com_modules/forms/filter_modulesadmin.xml
index 64467893ffbf9..277431394d7aa 100644
--- a/administrator/components/com_modules/forms/filter_modulesadmin.xml
+++ b/administrator/components/com_modules/forms/filter_modulesadmin.xml
@@ -26,7 +26,7 @@
 		<field
 			name="state"
 			type="status"
-			label="JOPTION_SELECT_PUBLISHED"
+			label="JSTATUS"
 			optionsFilter="*,-2,0,1"
 			onchange="this.form.submit();"
 			>
@@ -44,7 +44,7 @@
 		<field
 			name="module"
 			type="ModulesModule"
-			label="COM_MODULES_OPTION_SELECT_MODULE"
+			label="COM_MODULES_HEADING_MODULE"
 			client="administrator"
 			onchange="this.form.submit();"
 			>
@@ -53,7 +53,7 @@
 		<field
 			name="access"
 			type="accesslevel"
-			label="JOPTION_SELECT_ACCESS"
+			label="JGRID_HEADING_ACCESS"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_ACCESS</option>
@@ -61,7 +61,7 @@
 		<field
 			name="language"
 			type="language"
-			label="JOPTION_SELECT_LANGUAGE"
+			label="JGRID_HEADING_LANGUAGE"
 			client="administrator"
 			onchange="this.form.submit();"
 			>
diff --git a/administrator/components/com_modules/layouts/joomla/form/field/modulespositionedit.php b/administrator/components/com_modules/layouts/joomla/form/field/modulespositionedit.php
index 24dc3e3f74ee2..19fbc777b688e 100644
--- a/administrator/components/com_modules/layouts/joomla/form/field/modulespositionedit.php
+++ b/administrator/components/com_modules/layouts/joomla/form/field/modulespositionedit.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
diff --git a/administrator/components/com_modules/src/Field/ModulesModuleField.php b/administrator/components/com_modules/src/Field/ModulesModuleField.php
index 5245b4a04144a..09dbb58273051 100644
--- a/administrator/components/com_modules/src/Field/ModulesModuleField.php
+++ b/administrator/components/com_modules/src/Field/ModulesModuleField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Modules\Administrator\Field;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Form\Field\ListField;
 use Joomla\Component\Modules\Administrator\Helper\ModulesHelper;
diff --git a/administrator/components/com_modules/src/Field/ModulesPositionField.php b/administrator/components/com_modules/src/Field/ModulesPositionField.php
index 89d00e1fc3bbc..c22633cc6abe7 100644
--- a/administrator/components/com_modules/src/Field/ModulesPositionField.php
+++ b/administrator/components/com_modules/src/Field/ModulesPositionField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Modules\Administrator\Field;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Form\Field\ListField;
 use Joomla\Component\Modules\Administrator\Helper\ModulesHelper;
diff --git a/administrator/components/com_modules/src/Field/ModulesPositioneditField.php b/administrator/components/com_modules/src/Field/ModulesPositioneditField.php
index 7e596dbb20ec8..f61eba3915a21 100644
--- a/administrator/components/com_modules/src/Field/ModulesPositioneditField.php
+++ b/administrator/components/com_modules/src/Field/ModulesPositioneditField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Modules\Administrator\Field;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Form\FormField;
 use Joomla\CMS\HTML\HTMLHelper;
diff --git a/administrator/components/com_modules/src/Model/ModulesModel.php b/administrator/components/com_modules/src/Model/ModulesModel.php
index a07889804c9e7..2d339e8387ecc 100644
--- a/administrator/components/com_modules/src/Model/ModulesModel.php
+++ b/administrator/components/com_modules/src/Model/ModulesModel.php
@@ -16,6 +16,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\Database\ParameterType;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
@@ -424,7 +425,7 @@ protected function getListQuery()
 			}
 			else
 			{
-				$search = '%' . strtolower($search) . '%';
+				$search = '%' . StringHelper::strtolower($search) . '%';
 				$query->extendWhere(
 					'AND',
 					[
diff --git a/administrator/components/com_modules/tmpl/modules/default.php b/administrator/components/com_modules/tmpl/modules/default.php
index d369f2718ae23..a25f8919b358c 100644
--- a/administrator/components/com_modules/tmpl/modules/default.php
+++ b/administrator/components/com_modules/tmpl/modules/default.php
@@ -38,17 +38,19 @@
 		<?php if ($this->total > 0) : ?>
 			<table class="table" id="moduleList">
 				<caption id="captionTable" class="sr-only">
-					<?php echo Text::_('COM_MODULES_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+					<?php echo Text::_('COM_MODULES_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 				</caption>
 				<thead>
 					<tr>
-						<td style="width:1%" class="text-center">
+						<td class="w-1 text-center">
 							<?php echo HTMLHelper::_('grid.checkall'); ?>
 						</td>
-						<th scope="col" style="width:1%" class="text-center d-none d-md-table-cell">
+						<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', 'fas fa-sort'); ?>
 						</th>
-						<th scope="col" style="width:1%; min-width:85px" class="text-center">
+						<th scope="col" style="min-width:85px" class="w-1 text-center">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
 						</th>
 						<th scope="col" class="title">
diff --git a/administrator/components/com_modules/tmpl/modules/modal.php b/administrator/components/com_modules/tmpl/modules/modal.php
index 372dbbb0ff6f4..5e6f89e061513 100644
--- a/administrator/components/com_modules/tmpl/modules/modal.php
+++ b/administrator/components/com_modules/tmpl/modules/modal.php
@@ -46,17 +46,19 @@
 		<?php if ($this->total > 0) : ?>
 		<table class="table" id="moduleList">
 			<caption id="captionTable" class="sr-only">
-				<?php echo Text::_('COM_MODULES_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+				<?php echo Text::_('COM_MODULES_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 			</caption>
 			<thead>
 				<tr>
-					<th scope="col" style="width:1%" class="text-center">
+					<th scope="col" class="w-1 text-center">
 						<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
 					</th>
 					<th scope="col" class="title">
 						<?php echo HTMLHelper::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
 					</th>
-					<th scope="col" style="width:15%" class="d-none d-md-table-cell">
+					<th scope="col" class="w-15 d-none d-md-table-cell">
 						<?php echo HTMLHelper::_('searchtools.sort', 'COM_MODULES_HEADING_POSITION', 'a.position', $listDirn, $listOrder); ?>
 					</th>
 					<th scope="col" class="w-10 d-none d-md-table-cell">
@@ -71,7 +73,7 @@
 					<th scope="col" class="w-10 d-none d-md-table-cell">
 						<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'l.title', $listDirn, $listOrder); ?>
 					</th>
-					<th scope="col" style="width:1%" class="d-none d-md-table-cell">
+					<th scope="col" class="w-1 d-none d-md-table-cell">
 						<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
 					</th>
 				</tr>
diff --git a/administrator/components/com_newsfeeds/forms/filter_newsfeeds.xml b/administrator/components/com_newsfeeds/forms/filter_newsfeeds.xml
index 13f4a20de4173..da1c791e93dbe 100644
--- a/administrator/components/com_newsfeeds/forms/filter_newsfeeds.xml
+++ b/administrator/components/com_newsfeeds/forms/filter_newsfeeds.xml
@@ -15,7 +15,7 @@
 		<field
 			name="published"
 			type="status"
-			label="JOPTION_SELECT_PUBLISHED"
+			label="JSTATUS"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
@@ -24,7 +24,7 @@
 		<field
 			name="category_id"
 			type="category"
-			label="JOPTION_SELECT_CATEGORY"
+			label="JCATEGORY"
 			extension="com_newsfeeds"
 			addfieldprefix="Joomla\Component\Categories\Administrator\Field"
 			onchange="this.form.submit();"
@@ -35,7 +35,7 @@
 		<field
 			name="access"
 			type="accesslevel"
-			label="JOPTION_SELECT_ACCESS"
+			label="JGRID_HEADING_ACCESS"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_ACCESS</option>
@@ -44,7 +44,7 @@
 		<field
 			name="language"
 			type="contentlanguage"
-			label="JOPTION_SELECT_LANGUAGE"
+			label="JGRID_HEADING_LANGUAGE"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_LANGUAGE</option>
@@ -54,7 +54,7 @@
 		<field
 			name="tag"
 			type="tag"
-			label="JOPTION_SELECT_TAG"
+			label="JTAG"
 			hint="JOPTION_SELECT_TAG"
 			multiple="true"
 			mode="nested"
@@ -65,7 +65,7 @@
 		<field
 			name="level"
 			type="integer"
-			label="JOPTION_SELECT_MAX_LEVELS"
+			label="JGLOBAL_MAXLEVEL_LABEL"
 			first="1"
 			last="10"
 			step="1"
diff --git a/administrator/components/com_newsfeeds/src/Field/Modal/NewsfeedField.php b/administrator/components/com_newsfeeds/src/Field/Modal/NewsfeedField.php
index 02f1c2e1f498f..ffbdabbd88648 100644
--- a/administrator/components/com_newsfeeds/src/Field/Modal/NewsfeedField.php
+++ b/administrator/components/com_newsfeeds/src/Field/Modal/NewsfeedField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Newsfeeds\Administrator\Field\Modal;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\FormField;
diff --git a/administrator/components/com_newsfeeds/src/Field/NewsfeedsField.php b/administrator/components/com_newsfeeds/src/Field/NewsfeedsField.php
index 36dc3b3b92e3b..4ec61b3084a2b 100644
--- a/administrator/components/com_newsfeeds/src/Field/NewsfeedsField.php
+++ b/administrator/components/com_newsfeeds/src/Field/NewsfeedsField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Newsfeeds\Administrator\Field;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;
diff --git a/administrator/components/com_newsfeeds/src/Service/HTML/AdministratorService.php b/administrator/components/com_newsfeeds/src/Service/HTML/AdministratorService.php
index f63f4d97b6854..1e7f93f162136 100644
--- a/administrator/components/com_newsfeeds/src/Service/HTML/AdministratorService.php
+++ b/administrator/components/com_newsfeeds/src/Service/HTML/AdministratorService.php
@@ -93,7 +93,7 @@ public function association($newsfeedid)
 				{
 					if (in_array($item->lang_code, $content_languages))
 					{
-						$text    = strtoupper($item->lang_sef);
+						$text    = $item->lang_code;
 						$url     = Route::_('index.php?option=com_newsfeeds&task=newsfeed.edit&id=' . (int) $item->id);
 						$tooltip = '<strong>' . htmlspecialchars($item->language_title, ENT_QUOTES, 'UTF-8') . '</strong><br>'
 							. htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8') . '<br>' . Text::sprintf('JCATEGORY_SPRINTF', $item->category_title);
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php b/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php
index dbdf77289fd3f..83d7d40edbc1e 100644
--- a/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php
+++ b/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php
@@ -45,14 +45,16 @@
 				<?php else : ?>
 					<table class="table" id="newsfeedList">
 						<caption id="captionTable" class="sr-only">
-							<?php echo Text::_('COM_NEWSFEEDS_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+							<?php echo Text::_('COM_NEWSFEEDS_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 						</caption>
 						<thead>
 							<tr>
-								<td style="width:1%" class="text-center">
+								<td class="w-1 text-center">
 									<?php echo HTMLHelper::_('grid.checkall'); ?>
 								</td>
-								<th scope="col" style="width:1%" class="text-center d-none d-md-table-cell">
+								<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', 'fas fa-sort'); ?>
 								</th>
 								<th scope="col" style="min-width:85px" class="w-5 text-center">
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php b/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php
index 7506ed136f283..3731bdeee72fa 100644
--- a/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php
+++ b/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php
@@ -39,23 +39,25 @@
 		<?php else : ?>
 			<table class="table table-sm">
 				<caption id="captionTable" class="sr-only">
-					<?php echo Text::_('COM_NEWSFEEDS_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+					<?php echo Text::_('COM_NEWSFEEDS_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 				</caption>
 				<thead>
 					<tr>
-						<th scope="col" style="width:1%" class="text-center">
+						<th scope="col" class="w-1 text-center">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
 						</th>
 						<th scope="col" class="title">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.name', $listDirn, $listOrder); ?>
 						</th>
-						<th scope="col" style="width:15%" class="d-none d-md-table-cell">
+						<th scope="col" class="w-15 d-none d-md-table-cell">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); ?>
 						</th>
-						<th scope="col" style="width:15%" class="d-none d-md-table-cell">
+						<th scope="col" class="w-15 d-none d-md-table-cell">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language_title', $listDirn, $listOrder); ?>
 						</th>
-						<th scope="col" style="width:1%" class="d-none d-md-table-cell">
+						<th scope="col" class="w-1 d-none d-md-table-cell">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
 						</th>
 					</tr>
diff --git a/administrator/components/com_plugins/forms/filter_plugins.xml b/administrator/components/com_plugins/forms/filter_plugins.xml
index e3dc1ec74f664..b413a4a93e841 100644
--- a/administrator/components/com_plugins/forms/filter_plugins.xml
+++ b/administrator/components/com_plugins/forms/filter_plugins.xml
@@ -13,7 +13,7 @@
 		<field
 			name="enabled"
 			type="plugin_status"
-			label="JOPTION_SELECT_PUBLISHED"
+			label="JSTATUS"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
@@ -22,7 +22,7 @@
 		<field
 			name="folder"
 			type="PluginType"
-			label="COM_PLUGINS_OPTION_FOLDER"
+			label="COM_PLUGINS_FOLDER_HEADING"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_PLUGINS_OPTION_FOLDER</option>
@@ -31,7 +31,7 @@
 		<field
 			name="element"
 			type="PluginElement"
-			label="COM_PLUGINS_OPTION_ELEMENT"
+			label="COM_PLUGINS_ELEMENT_HEADING"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_PLUGINS_OPTION_ELEMENT</option>
@@ -40,7 +40,7 @@
 		<field
 			name="access"
 			type="accesslevel"
-			label="JOPTION_SELECT_ACCESS"
+			label="JGRID_HEADING_ACCESS"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_ACCESS</option>
diff --git a/administrator/components/com_plugins/src/Field/PluginorderingField.php b/administrator/components/com_plugins/src/Field/PluginorderingField.php
index f8b51e4826781..2a53e342debc0 100644
--- a/administrator/components/com_plugins/src/Field/PluginorderingField.php
+++ b/administrator/components/com_plugins/src/Field/PluginorderingField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Plugins\Administrator\Field;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\OrderingField;
diff --git a/administrator/components/com_plugins/tmpl/plugins/default.php b/administrator/components/com_plugins/tmpl/plugins/default.php
index 5fadd1431b503..0c69f920533e5 100644
--- a/administrator/components/com_plugins/tmpl/plugins/default.php
+++ b/administrator/components/com_plugins/tmpl/plugins/default.php
@@ -40,17 +40,19 @@
 		<?php else : ?>
 			<table class="table" id="pluginList">
 				<caption id="captionTable" class="sr-only">
-					<?php echo Text::_('COM_PLUGINS_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+					<?php echo Text::_('COM_PLUGINS_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 				</caption>
 				<thead>
 					<tr>
-						<td style="width:1%" class="text-center">
+						<td class="w-1 text-center">
 							<?php echo HTMLHelper::_('grid.checkall'); ?>
 						</td>
-						<th scope="col" style="width:1%" class="text-center d-none d-md-table-cell">
+						<th scope="col" class="w-1 text-center d-none d-md-table-cell">
 							<?php echo HTMLHelper::_('searchtools.sort', '', 'ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'fas fa-sort'); ?>
 						</th>
-						<th scope="col" style="width:1%" class="text-center">
+						<th scope="col" class="w-1 text-center">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'enabled', $listDirn, $listOrder); ?>
 						</th>
 						<th scope="col" class="title">
diff --git a/administrator/components/com_privacy/forms/filter_consents.xml b/administrator/components/com_privacy/forms/filter_consents.xml
index bb8ea1c3d92b3..bc418f048f692 100644
--- a/administrator/components/com_privacy/forms/filter_consents.xml
+++ b/administrator/components/com_privacy/forms/filter_consents.xml
@@ -54,8 +54,10 @@
 			<option value="u.name DESC">JGLOBAL_NAME_DESC</option>
 			<option value="u.username ASC">COM_PRIVACY_HEADING_USERNAME_ASC</option>
 			<option value="u.username DESC">COM_PRIVACY_HEADING_USERNAME_DESC</option>
-			<option value="u.user_id ASC">COM_PRIVACY_HEADING_USERID_ASC</option>
-			<option value="u.user_id DESC">COM_PRIVACY_HEADING_USERID_DESC</option>
+			<option value="a.user_id ASC">COM_PRIVACY_HEADING_USERID_ASC</option>
+			<option value="a.user_id DESC">COM_PRIVACY_HEADING_USERID_DESC</option>
+			<option value="a.subject ASC">COM_PRIVACY_HEADING_SUBJECT_ASC</option>
+			<option value="a.subject DESC">COM_PRIVACY_HEADING_SUBJECT_DESC</option>	
 			<option value="a.created ASC">COM_PRIVACY_HEADING_CREATED_ASC</option>
 			<option value="a.created DESC">COM_PRIVACY_HEADING_CREATED_DESC</option>
 			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
diff --git a/administrator/components/com_privacy/forms/filter_requests.xml b/administrator/components/com_privacy/forms/filter_requests.xml
index 0f1b4e8e7d1ba..570b48bc466bf 100644
--- a/administrator/components/com_privacy/forms/filter_requests.xml
+++ b/administrator/components/com_privacy/forms/filter_requests.xml
@@ -13,7 +13,7 @@
 		<field
 			name="status"
 			type="requeststatus"
-			label="JOPTION_SELECT_PUBLISHED"
+			label="JSTATUS"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
@@ -22,7 +22,7 @@
 		<field
 			name="request_type"
 			type="requesttype"
-			label="COM_PRIVACY_SELECT_REQUEST_TYPE"
+			label="COM_PRIVACY_HEADING_REQUEST_TYPE"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_PRIVACY_SELECT_REQUEST_TYPE</option>
diff --git a/administrator/components/com_privacy/src/Model/ConsentsModel.php b/administrator/components/com_privacy/src/Model/ConsentsModel.php
index 799150c4fd879..cbf5549dfb5f3 100644
--- a/administrator/components/com_privacy/src/Model/ConsentsModel.php
+++ b/administrator/components/com_privacy/src/Model/ConsentsModel.php
@@ -37,7 +37,9 @@ public function __construct($config = [])
 		if (empty($config['filter_fields']))
 		{
 			$config['filter_fields'] = [
-				'id', 'a.id', 'a.user_id',
+				'id', 'a.id',
+				'user_id', 'a.user_id',
+				'subject', 'a.subject',
 				'created', 'a.created',
 				'username', 'u.username',
 				'name', 'u.name',
diff --git a/administrator/components/com_privacy/tmpl/consents/default.php b/administrator/components/com_privacy/tmpl/consents/default.php
index c7946744ce875..0ad414481de7f 100644
--- a/administrator/components/com_privacy/tmpl/consents/default.php
+++ b/administrator/components/com_privacy/tmpl/consents/default.php
@@ -43,11 +43,13 @@
 		<?php else : ?>
 			<table class="table" id="consentList">
 				<caption id="captionTable" class="sr-only">
-					<?php echo Text::_('COM_PRIVACY_TABLE_CONSENTS_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+					<?php echo Text::_('COM_PRIVACY_TABLE_CONSENTS_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 				</caption>
 				<thead>
 					<tr>
-						<td style="width:1%" class="text-center">
+						<td class="w-1 text-center">
 							<?php echo HTMLHelper::_('grid.checkall'); ?>
 						</td>
 						<th scope="col" class="w-5 text-center">
diff --git a/administrator/components/com_privacy/tmpl/request/default.php b/administrator/components/com_privacy/tmpl/request/default.php
index 4713b27194528..1c30391a456e5 100644
--- a/administrator/components/com_privacy/tmpl/request/default.php
+++ b/administrator/components/com_privacy/tmpl/request/default.php
@@ -22,7 +22,7 @@
 ?>
 <form action="<?php echo Route::_('index.php?option=com_privacy&view=request&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="item-form" class="form-validate">
 	<div class="row mt-3">
-		<div class="col-12 col-md-6 mb-3">
+		<div class="col-12 col-md-4 mb-3">
 			<div class="card">
 				<h3 class="card-header"><?php echo Text::_('COM_PRIVACY_HEADING_REQUEST_INFORMATION'); ?></h3>
 				<div class="card-body">
@@ -42,7 +42,7 @@
 				</div>
 			</div>
 		</div>
-		<div class="col-12 col-md-6 mb-3">
+		<div class="col-12 col-md-8 mb-3">
 			<div class="card">
 				<h3 class="card-header"><?php echo Text::_('COM_PRIVACY_HEADING_ACTION_LOG'); ?></h3>
 				<div class="card-body">
diff --git a/administrator/components/com_privacy/tmpl/requests/default.php b/administrator/components/com_privacy/tmpl/requests/default.php
index 9619fa5597a61..bbbf8201437a5 100644
--- a/administrator/components/com_privacy/tmpl/requests/default.php
+++ b/administrator/components/com_privacy/tmpl/requests/default.php
@@ -41,7 +41,9 @@
 		<?php else : ?>
 			<table class="table" id="requestList">
 				<caption id="captionTable" class="sr-only">
-					<?php echo Text::_('COM_PRIVACY_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+					<?php echo Text::_('COM_PRIVACY_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 				</caption>
 				<thead>
 					<tr>
@@ -57,10 +59,10 @@
 						<th scope="col" class="w-10">
 							<?php echo HTMLHelper::_('searchtools.sort', 'COM_PRIVACY_HEADING_REQUEST_TYPE', 'a.request_type', $listDirn, $listOrder); ?>
 						</th>
-						<th scope="col" style="width:15%">
+						<th scope="col" class="w-15">
 							<?php echo HTMLHelper::_('searchtools.sort', 'COM_PRIVACY_HEADING_REQUESTED_AT', 'a.requested_at', $listDirn, $listOrder); ?>
 						</th>
-						<th scope="col" style="width:1%" >
+						<th scope="col" class="w-1">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
 						</th>
 					</tr>
diff --git a/administrator/components/com_redirect/forms/filter_links.xml b/administrator/components/com_redirect/forms/filter_links.xml
index 89bf25c37e3ac..f6ffc9d4c3a1e 100644
--- a/administrator/components/com_redirect/forms/filter_links.xml
+++ b/administrator/components/com_redirect/forms/filter_links.xml
@@ -12,7 +12,7 @@
 		<field
 			name="state"
 			type="redirect_status"
-			label="JOPTION_SELECT_PUBLISHED"
+			label="JSTATUS"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
@@ -20,7 +20,7 @@
 		<field
 			name="http_status"
 			type="Redirect"
-			label="COM_REDIRECT_FILTER_SELECT_OPTION_HTTP_HEADER"
+			label="COM_REDIRECT_HEADING_STATUS_CODE"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_REDIRECT_FILTER_SELECT_OPTION_HTTP_HEADER</option>
diff --git a/administrator/components/com_redirect/layouts/toolbar/batch.php b/administrator/components/com_redirect/layouts/toolbar/batch.php
index 642c0c1e90ce7..cbc13f3d44812 100644
--- a/administrator/components/com_redirect/layouts/toolbar/batch.php
+++ b/administrator/components/com_redirect/layouts/toolbar/batch.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\HTML\HTMLHelper;
 
diff --git a/administrator/components/com_redirect/src/Field/RedirectField.php b/administrator/components/com_redirect/src/Field/RedirectField.php
index c9418066d027e..ddf78387002bb 100644
--- a/administrator/components/com_redirect/src/Field/RedirectField.php
+++ b/administrator/components/com_redirect/src/Field/RedirectField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Redirect\Administrator\Field;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Form\Field\ListField;
 use Joomla\CMS\HTML\HTMLHelper;
diff --git a/administrator/components/com_redirect/tmpl/links/default.php b/administrator/components/com_redirect/tmpl/links/default.php
index f0b94d8b07d97..1f2723e359d5b 100644
--- a/administrator/components/com_redirect/tmpl/links/default.php
+++ b/administrator/components/com_redirect/tmpl/links/default.php
@@ -59,14 +59,16 @@
 		<?php else : ?>
 			<table class="table">
 				<caption id="captionTable" class="sr-only">
-					<?php echo Text::_('COM_REDIRECTS_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+					<?php echo Text::_('COM_REDIRECTS_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 				</caption>
 				<thead>
 					<tr>
-						<td style="width:1%" class="text-center">
+						<td class="w-1 text-center">
 							<?php echo HTMLHelper::_('grid.checkall'); ?>
 						</td>
-						<th scope="col" style="width:1%" class="text-center">
+						<th scope="col" class="w-1 text-center">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
 						</th>
 						<th scope="col" class="title">
@@ -78,16 +80,16 @@
 						<th scope="col" class="d-none d-md-table-cell">
 							<?php echo HTMLHelper::_('searchtools.sort', 'COM_REDIRECT_HEADING_REFERRER', 'a.referer', $listDirn, $listOrder); ?>
 						</th>
-						<th scope="col" style="width:1%" class="d-none d-md-table-cell">
+						<th scope="col" class="w-1 d-none d-md-table-cell">
 							<?php echo HTMLHelper::_('searchtools.sort', 'COM_REDIRECT_HEADING_CREATED_DATE', 'a.created_date', $listDirn, $listOrder); ?>
 						</th>
-						<th scope="col" style="width:1%" class="d-none d-md-table-cell">
+						<th scope="col" class="w-1 d-none d-md-table-cell">
 							<?php echo HTMLHelper::_('searchtools.sort', 'COM_REDIRECT_HEADING_HITS', 'a.hits', $listDirn, $listOrder); ?>
 						</th>
-						<th scope="col" style="width:1%" class="d-none d-md-table-cell">
+						<th scope="col" class="w-1 d-none d-md-table-cell">
 							<?php echo HTMLHelper::_('searchtools.sort', 'COM_REDIRECT_HEADING_STATUS_CODE', 'a.header', $listDirn, $listOrder); ?>
 						</th>
-						<th scope="col" style="width:1%" class="d-none d-md-table-cell">
+						<th scope="col" class="w-1 d-none d-md-table-cell">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
 						</th>
 					</tr>
diff --git a/administrator/components/com_tags/forms/filter_tags.xml b/administrator/components/com_tags/forms/filter_tags.xml
index f403ee1b925a9..d828d86d73ebc 100644
--- a/administrator/components/com_tags/forms/filter_tags.xml
+++ b/administrator/components/com_tags/forms/filter_tags.xml
@@ -12,7 +12,7 @@
 		<field
 			name="published"
 			type="status"
-			label="JOPTION_SELECT_PUBLISHED"
+			label="JSTATUS"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
@@ -20,7 +20,7 @@
 		<field
 			name="access"
 			type="accesslevel"
-			label="JOPTION_SELECT_ACCESS"
+			label="JGRID_HEADING_ACCESS"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_ACCESS</option>
@@ -28,7 +28,7 @@
 		<field
 			name="language"
 			type="contentlanguage"
-			label="JOPTION_SELECT_LANGUAGE"
+			label="JGRID_HEADING_LANGUAGE"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_LANGUAGE</option>
@@ -37,7 +37,7 @@
         <field
 			name="level"
 			type="integer"
-			label="JOPTION_SELECT_MAX_LEVELS"
+			label="JGLOBAL_MAXLEVEL_LABEL"
 			first="1"
 			last="10"
 			step="1"
@@ -48,7 +48,7 @@
 		<field
 			name="extension"
 			type="aliastag"
-			label="COM_TAGS_SELECT_TAGTYPE"
+			label="COM_TAGS_HEADING_TAGTYPE"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_TAGS_SELECT_TAGTYPE</option>
diff --git a/administrator/components/com_tags/tmpl/tags/default.php b/administrator/components/com_tags/tmpl/tags/default.php
index 89ad2b3ff53e4..c0e00434c89fd 100644
--- a/administrator/components/com_tags/tmpl/tags/default.php
+++ b/administrator/components/com_tags/tmpl/tags/default.php
@@ -71,17 +71,19 @@
 		<?php else : ?>
 			<table class="table" id="categoryList">
 				<caption id="captionTable" class="sr-only">
-					<?php echo Text::_('COM_TAGS_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+					<?php echo Text::_('COM_TAGS_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 				</caption>
 				<thead>
 					<tr>
-						<td style="width:1%" class="text-center">
+						<td class="w-1 text-center">
 							<?php echo HTMLHelper::_('grid.checkall'); ?>
 						</td>
-						<th scope="col" style="width:1%" class="d-none d-md-table-cell center">
+						<th scope="col" class="w-1 d-none d-md-table-cell center">
 							<?php echo HTMLHelper::_('searchtools.sort', '', 'a.lft', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'fas fa-sort'); ?>
 						</th>
-						<th scope="col" style="width:1%" class="text-center">
+						<th scope="col" class="w-1 text-center">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
 						</th>
 						<th scope="col">
@@ -89,22 +91,22 @@
 						</th>
 
 						<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_published')) : ?>
-							<th scope="col" style="width:1%" class="text-center d-none d-md-table-cell">
+							<th scope="col" class="w-1 text-center d-none d-md-table-cell">
 								<span class="fas fa-check" aria-hidden="true" title="<?php echo Text::_('COM_TAGS_COUNT_PUBLISHED_ITEMS'); ?>"><span class="sr-only"><?php echo Text::_('COM_TAGS_COUNT_PUBLISHED_ITEMS'); ?></span></span>
 							</th>
 						<?php endif; ?>
 						<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_unpublished')) : ?>
-							<th scope="col" style="width:1%" class="text-center d-none d-md-table-cell">
+							<th scope="col" class="w-1 text-center d-none d-md-table-cell">
 								<span class="fas fa-times" aria-hidden="true" title="<?php echo Text::_('COM_TAGS_COUNT_UNPUBLISHED_ITEMS'); ?>"><span class="sr-only"><?php echo Text::_('COM_TAGS_COUNT_UNPUBLISHED_ITEMS'); ?></span></span>
 							</th>
 						<?php endif; ?>
 						<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_archived')) : ?>
-							<th scope="col" style="width:1%" class="text-center d-none d-md-table-cell">
+							<th scope="col" class="w-1 text-center d-none d-md-table-cell">
 								<span class="fas fa-folder" aria-hidden="true" title="<?php echo Text::_('COM_TAGS_COUNT_ARCHIVED_ITEMS'); ?>"><span class="sr-only"><?php echo Text::_('COM_TAGS_COUNT_ARCHIVED_ITEMS'); ?></span></span>
 							</th>
 						<?php endif; ?>
 						<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_trashed')) : ?>
-							<th scope="col" style="width:1%" class="text-center d-none d-md-table-cell">
+							<th scope="col" class="w-1 text-center d-none d-md-table-cell">
 								<span class="fas fa-trash" aria-hidden="true" title="<?php echo Text::_('COM_TAGS_COUNT_TRASHED_ITEMS'); ?>"><span class="sr-only"><?php echo Text::_('COM_TAGS_COUNT_TRASHED_ITEMS'); ?></span></span>
 							</th>
 						<?php endif; ?>
diff --git a/administrator/components/com_templates/src/Model/StylesModel.php b/administrator/components/com_templates/src/Model/StylesModel.php
index 296694cbc4146..5b23fb78e84fd 100644
--- a/administrator/components/com_templates/src/Model/StylesModel.php
+++ b/administrator/components/com_templates/src/Model/StylesModel.php
@@ -16,6 +16,7 @@
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\Database\ParameterType;
+use Joomla\String\StringHelper;
 
 /**
  * Methods supporting a list of template style records.
@@ -111,7 +112,7 @@ protected function getStoreId($id = '')
 	/**
 	 * Build an SQL query to load the list data.
 	 *
-	 * @return  \JDatabaseQuery
+	 * @return  \Joomla\Database\DatabaseQuery
 	 */
 	protected function getListQuery()
 	{
@@ -244,7 +245,7 @@ protected function getListQuery()
 			}
 			else
 			{
-				$search = '%' . strtolower($search) . '%';
+				$search = '%' . StringHelper::strtolower($search) . '%';
 				$query->extendWhere(
 					'AND',
 					[
diff --git a/administrator/components/com_templates/src/Model/TemplatesModel.php b/administrator/components/com_templates/src/Model/TemplatesModel.php
index f97a344dfa4ba..ddbf8195d9d9a 100644
--- a/administrator/components/com_templates/src/Model/TemplatesModel.php
+++ b/administrator/components/com_templates/src/Model/TemplatesModel.php
@@ -18,6 +18,7 @@
 use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\Component\Templates\Administrator\Helper\TemplatesHelper;
 use Joomla\Database\ParameterType;
+use Joomla\String\StringHelper;
 
 /**
  * Methods supporting a list of template extension records.
@@ -154,7 +155,7 @@ protected function getListQuery()
 			}
 			else
 			{
-				$search = '%' . strtolower($search) . '%';
+				$search = '%' . StringHelper::strtolower($search) . '%';
 				$query->extendWhere(
 					'AND',
 					[
diff --git a/administrator/components/com_templates/tmpl/styles/default.php b/administrator/components/com_templates/tmpl/styles/default.php
index ce45e7b5d33f2..29a2109eb9254 100644
--- a/administrator/components/com_templates/tmpl/styles/default.php
+++ b/administrator/components/com_templates/tmpl/styles/default.php
@@ -31,11 +31,13 @@
 				<?php if ($this->total > 0) : ?>
 					<table class="table" id="styleList">
 						<caption id="captionTable" class="sr-only">
-							<?php echo Text::_('COM_TEMPLATES_STYLES_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+							<?php echo Text::_('COM_TEMPLATES_STYLES_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 						</caption>
 						<thead>
 							<tr>
-								<td style="width:1%" class="text-center">
+								<td class="w-1 text-center">
 									<?php echo HTMLHelper::_('grid.checkall'); ?>
 								</td>
 								<th scope="col">
@@ -67,7 +69,7 @@
 								$canChange = $user->authorise('core.edit.state', 'com_templates');
 							?>
 							<tr class="row<?php echo $i % 2; ?>">
-								<td style="width:1%" class="text-center">
+								<td class="w-1 text-center">
 									<?php echo HTMLHelper::_('grid.id', $i, $item->id); ?>
 								</td>
 								<th scope="row">
@@ -98,14 +100,14 @@
 											<?php if ($item->image) : ?>
 												<?php echo HTMLHelper::_('image', 'mod_languages/' . $item->image . '.gif', $item->language_title, array('title' => Text::sprintf('COM_TEMPLATES_GRID_UNSET_LANGUAGE', $item->language_title)), true); ?>
 											<?php else : ?>
-												<span class="badge badge-secondary" title="<?php echo Text::sprintf('COM_TEMPLATES_GRID_UNSET_LANGUAGE', $item->language_title); ?>"><?php echo $item->language_sef; ?></span>
+												<span class="badge badge-secondary" title="<?php echo Text::sprintf('COM_TEMPLATES_GRID_UNSET_LANGUAGE', $item->language_title); ?>"><?php echo $item->home; ?></span>
 											<?php endif; ?>
 										</a>
 									<?php else : ?>
 										<?php if ($item->image) : ?>
 											<?php echo HTMLHelper::_('image', 'mod_languages/' . $item->image . '.gif', $item->language_title, array('title' => $item->language_title), true); ?>
 										<?php else : ?>
-											<span class="badge badge-secondary" title="<?php echo $item->language_title; ?>"><?php echo $item->language_sef; ?></span>
+											<span class="badge badge-secondary" title="<?php echo $item->language_title; ?>"><?php echo $item->home; ?></span>
 										<?php endif; ?>
 									<?php endif; ?>
 								</td>
diff --git a/administrator/components/com_templates/tmpl/template/default_updated_files.php b/administrator/components/com_templates/tmpl/template/default_updated_files.php
index 0e4a4d767754d..5006080be892c 100644
--- a/administrator/components/com_templates/tmpl/template/default_updated_files.php
+++ b/administrator/components/com_templates/tmpl/template/default_updated_files.php
@@ -32,7 +32,7 @@
 								<th scope="col" style="width:7%">
 									<?php echo Text::_('COM_TEMPLATES_OVERRIDE_CHECKED'); ?>
 								</th>
-								<th scope="col" style="width:30%">
+								<th scope="col" class="w-30">
 									<?php echo Text::_('COM_TEMPLATES_OVERRIDE_TEMPLATE_FILE'); ?>
 								</th>
 								<th scope="col">
diff --git a/administrator/components/com_templates/tmpl/templates/default.php b/administrator/components/com_templates/tmpl/templates/default.php
index f895ab756adbf..541e60e93fe31 100644
--- a/administrator/components/com_templates/tmpl/templates/default.php
+++ b/administrator/components/com_templates/tmpl/templates/default.php
@@ -30,14 +30,16 @@
 				<?php if ($this->total > 0) : ?>
 					<table class="table" id="template-mgr">
 						<caption id="captionTable" class="sr-only">
-							<?php echo Text::_('COM_TEMPLATES_TEMPLATES_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+							<?php echo Text::_('COM_TEMPLATES_TEMPLATES_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 						</caption>
 						<thead>
 							<tr>
-								<th scope="col" class="col1template d-none d-md-table-cell" style="width:20%">
+								<th scope="col" class="w-20 col1template d-none d-md-table-cell">
 									<?php echo Text::_('COM_TEMPLATES_HEADING_IMAGE'); ?>
 								</th>
-								<th scope="col" style="width:30%">
+								<th scope="col" class="w-30">
 									<?php echo HTMLHelper::_('searchtools.sort', 'COM_TEMPLATES_HEADING_TEMPLATE', 'a.element', $listDirn, $listOrder); ?>
 								</th>
 								<th scope="col" class="w-10 d-none d-md-table-cell text-center">
diff --git a/administrator/components/com_users/forms/filter_debuggroup.xml b/administrator/components/com_users/forms/filter_debuggroup.xml
index c4ec4e0ab1766..59d75223ccb65 100644
--- a/administrator/components/com_users/forms/filter_debuggroup.xml
+++ b/administrator/components/com_users/forms/filter_debuggroup.xml
@@ -13,7 +13,7 @@
 		<field
 			name="component"
 			type="Components"
-			label="COM_USERS_OPTION_SELECT_COMPONENT"
+			label="COM_USERS_OPTION_LABEL_COMPONENT"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_USERS_OPTION_SELECT_COMPONENT</option>
@@ -22,7 +22,7 @@
 		<field
 			name="level_start"
 			type="Levels"
-			label="COM_USERS_OPTION_SELECT_LEVEL_START"
+			label="COM_USERS_OPTION_LABEL_LEVEL_START"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_USERS_OPTION_SELECT_LEVEL_START</option>
@@ -31,7 +31,7 @@
 		<field
 			name="level_end"
 			type="Levels"
-			label="COM_USERS_OPTION_SELECT_LEVEL_END"
+			label="COM_USERS_OPTION_LABEL_LEVEL_END"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_USERS_OPTION_SELECT_LEVEL_END</option>
diff --git a/administrator/components/com_users/forms/filter_debuguser.xml b/administrator/components/com_users/forms/filter_debuguser.xml
index fd68281efab18..930a41fdc7fa2 100644
--- a/administrator/components/com_users/forms/filter_debuguser.xml
+++ b/administrator/components/com_users/forms/filter_debuguser.xml
@@ -12,7 +12,7 @@
 		<field
 			name="component"
 			type="Components"
-			label="COM_USERS_OPTION_SELECT_COMPONENT"
+			label="COM_USERS_OPTION_LABEL_COMPONENT"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_USERS_OPTION_SELECT_COMPONENT</option>
@@ -20,7 +20,7 @@
 		<field
 			name="level_start"
 			type="Levels"
-			label="COM_USERS_OPTION_SELECT_LEVEL_START"
+			label="COM_USERS_OPTION_LABEL_LEVEL_START"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_USERS_OPTION_SELECT_LEVEL_START</option>
@@ -28,7 +28,7 @@
 		<field
 			name="level_end"
 			type="Levels"
-			label="COM_USERS_OPTION_SELECT_LEVEL_END"
+			label="COM_USERS_OPTION_LABEL_LEVEL_END"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_USERS_OPTION_SELECT_LEVEL_END</option>
diff --git a/administrator/components/com_users/forms/filter_notes.xml b/administrator/components/com_users/forms/filter_notes.xml
index 0a83c547e6148..51066ff0a51aa 100644
--- a/administrator/components/com_users/forms/filter_notes.xml
+++ b/administrator/components/com_users/forms/filter_notes.xml
@@ -12,7 +12,7 @@
 		<field
 			name="published"
 			type="status"
-			label="JOPTION_SELECT_PUBLISHED"
+			label="JSTATUS"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
@@ -20,7 +20,7 @@
 		<field
 			name="category_id"
 			type="category"
-			label="JOPTION_SELECT_CATEGORY"
+			label="JCATEGORY"
 			extension="com_users"
 			onchange="this.form.submit();"
 			>
@@ -29,7 +29,7 @@
 		<field
 			name="level"
 			type="integer"
-			label="JOPTION_SELECT_MAX_LEVELS"
+			label="JGLOBAL_MAXLEVEL_LABEL"
 			first="1"
 			last="10"
 			step="1"
diff --git a/administrator/components/com_users/forms/filter_users.xml b/administrator/components/com_users/forms/filter_users.xml
index 87a7049d0b37a..104fa32b161f4 100644
--- a/administrator/components/com_users/forms/filter_users.xml
+++ b/administrator/components/com_users/forms/filter_users.xml
@@ -12,7 +12,7 @@
 		<field
 			name="state"
 			type="userstate"
-			label="COM_USERS_FILTER_STATE"
+			label="JSTATUS"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_USERS_FILTER_STATE</option>
@@ -20,7 +20,7 @@
 		<field
 			name="active"
 			type="useractive"
-			label="COM_USERS_FILTER_ACTIVE"
+			label="COM_USERS_HEADING_ACTIVATED"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_USERS_FILTER_ACTIVE</option>
@@ -28,7 +28,7 @@
 		<field
 			name="group_id"
 			type="usergrouplist"
-			label="COM_USERS_FILTER_USERGROUP"
+			label="COM_USERS_HEADING_GROUPS"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_USERS_FILTER_USERGROUP</option>
@@ -36,7 +36,7 @@
 		<field
 			name="lastvisitrange"
 			type="lastvisitdaterange"
-			label="COM_USERS_OPTION_FILTER_LAST_VISIT_DATE"
+			label="COM_USERS_HEADING_LAST_VISIT_DATE"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_USERS_OPTION_FILTER_LAST_VISIT_DATE</option>
@@ -44,7 +44,7 @@
 		<field
 			name="range"
 			type="registrationdaterange"
-			label="COM_USERS_OPTION_FILTER_DATE"
+			label="COM_USERS_HEADING_REGISTRATION_DATE"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_USERS_OPTION_FILTER_DATE</option>
diff --git a/administrator/components/com_users/src/Field/GroupparentField.php b/administrator/components/com_users/src/Field/GroupparentField.php
index 105f1990082dc..2ed7b8d75a6a4 100644
--- a/administrator/components/com_users/src/Field/GroupparentField.php
+++ b/administrator/components/com_users/src/Field/GroupparentField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Users\Administrator\Field;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Access\Access;
 use Joomla\CMS\Factory;
diff --git a/administrator/components/com_users/src/Field/LevelsField.php b/administrator/components/com_users/src/Field/LevelsField.php
index e8b4ed201a377..b3723dfaf5139 100644
--- a/administrator/components/com_users/src/Field/LevelsField.php
+++ b/administrator/components/com_users/src/Field/LevelsField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Users\Administrator\Field;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Form\Field\ListField;
 use Joomla\Component\Users\Administrator\Helper\DebugHelper;
diff --git a/administrator/components/com_users/src/Model/LevelModel.php b/administrator/components/com_users/src/Model/LevelModel.php
index ee6b598821f80..47ac68de1ec47 100644
--- a/administrator/components/com_users/src/Model/LevelModel.php
+++ b/administrator/components/com_users/src/Model/LevelModel.php
@@ -45,6 +45,26 @@ class LevelModel extends AdminModel
 	 */
 	protected function canDelete($record)
 	{
+		$groups = json_decode($record->rules);
+
+		if ($groups === null)
+		{
+			throw new RuntimeException('Invalid rules schema');
+		}
+
+		$isAdmin = JFactory::getUser()->authorise('core.admin');
+
+		// Check permissions
+		foreach ($groups as $group)
+		{
+			if (!$isAdmin && JAccess::checkGroup($group, 'core.admin'))
+			{
+				$this->setError(JText::_('JERROR_ALERTNOAUTHOR'));
+
+				return false;
+			}
+		}
+
 		// Check if the access level is being used by any content.
 		if ($this->levelsInUse === null)
 		{
@@ -276,11 +296,11 @@ public function validate($form, $data, $group = null)
 			{
 				if (Access::checkGroup((int) $groups[$i]->id, 'core.admin'))
 				{
-					if (in_array($groups[$i]->id, $rules) && !in_array($groups[$i]->id, $data['rules']))
+					if (in_array((int) $groups[$i]->id, $rules) && !in_array((int) $groups[$i]->id, $data['rules']))
 					{
 						$data['rules'][] = (int) $groups[$i]->id;
 					}
-					elseif (!in_array($groups[$i]->id, $rules) && in_array($groups[$i]->id, $data['rules']))
+					elseif (!in_array((int) $groups[$i]->id, $rules) && in_array((int) $groups[$i]->id, $data['rules']))
 					{
 						$this->setError(Text::_('JLIB_USER_ERROR_NOT_SUPERADMIN'));
 
diff --git a/administrator/components/com_users/tmpl/debuggroup/default.php b/administrator/components/com_users/tmpl/debuggroup/default.php
index b49351c401a28..a40cacb59b442 100644
--- a/administrator/components/com_users/tmpl/debuggroup/default.php
+++ b/administrator/components/com_users/tmpl/debuggroup/default.php
@@ -23,7 +23,9 @@
 		<div class="table-responsive">
 			<table class="table">
 				<caption id="captionTable" class="sr-only">
-					<?php echo Text::_('COM_USERS_DEBUG_GROUP_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+					<?php echo Text::_('COM_USERS_DEBUG_GROUP_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 				</caption>
 				<thead>
 					<tr>
diff --git a/administrator/components/com_users/tmpl/debuguser/default.php b/administrator/components/com_users/tmpl/debuguser/default.php
index 83f6f007a82ae..f4884c648a5bb 100644
--- a/administrator/components/com_users/tmpl/debuguser/default.php
+++ b/administrator/components/com_users/tmpl/debuguser/default.php
@@ -23,7 +23,9 @@
 		<div class="table-responsive">
 			<table class="table">
 				<caption id="captionTable" class="sr-only">
-					<?php echo Text::_('COM_USERS_DEBUG_USER_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+					<?php echo Text::_('COM_USERS_DEBUG_USER_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 				</caption>
 				<thead>
 					<tr>
diff --git a/administrator/components/com_users/tmpl/groups/default.php b/administrator/components/com_users/tmpl/groups/default.php
index a55d53805e1fe..a5ade6f7076d4 100644
--- a/administrator/components/com_users/tmpl/groups/default.php
+++ b/administrator/components/com_users/tmpl/groups/default.php
@@ -39,11 +39,13 @@
 				<?php else : ?>
 					<table class="table" id="groupList">
 						<caption id="captionTable" class="sr-only">
-							<?php echo Text::_('COM_USERS_GROUPS_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+							<?php echo Text::_('COM_USERS_GROUPS_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 						</caption>
 						<thead>
 							<tr>
-								<td style="width:1%" class="text-center">
+								<td class="w-1 text-center">
 									<?php echo HTMLHelper::_('grid.checkall'); ?>
 								</td>
 								<th scope="col">
diff --git a/administrator/components/com_users/tmpl/levels/default.php b/administrator/components/com_users/tmpl/levels/default.php
index 19ee4fa8da619..abf42a2d6ac67 100644
--- a/administrator/components/com_users/tmpl/levels/default.php
+++ b/administrator/components/com_users/tmpl/levels/default.php
@@ -45,14 +45,16 @@
 				<?php else : ?>
 					<table class="table" id="levelList">
 						<caption id="captionTable" class="sr-only">
-							<?php echo Text::_('COM_USERS_LEVELS_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+							<?php echo Text::_('COM_USERS_LEVELS_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 						</caption>
 						<thead>
 							<tr>
-								<td style="width:1%" class="text-center">
+								<td class="w-1 text-center">
 									<?php echo HTMLHelper::_('grid.checkall'); ?>
 								</td>
-								<th scope="col" style="width:1%" class="text-center d-none d-md-table-cell">
+								<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', 'fas fa-sort'); ?>
 								</th>
 								<th scope="col">
@@ -61,7 +63,7 @@
 								<th scope="col" class="d-none d-md-table-cell">
 									<?php echo Text::_('COM_USERS_USER_GROUPS_HAVING_ACCESS'); ?>
 								</th>
-								<th scope="col" style="width:1%" class="d-none d-md-table-cell">
+								<th scope="col" class="w-1 d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
 								</th>
 							</tr>
diff --git a/administrator/components/com_users/tmpl/notes/default.php b/administrator/components/com_users/tmpl/notes/default.php
index c08d8ca8391c7..4068c8cf78701 100644
--- a/administrator/components/com_users/tmpl/notes/default.php
+++ b/administrator/components/com_users/tmpl/notes/default.php
@@ -36,26 +36,28 @@
 				<?php else : ?>
 				<table class="table">
 					<caption id="captionTable" class="sr-only">
-						<?php echo Text::_('COM_USERS_NOTES_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+						<?php echo Text::_('COM_USERS_NOTES_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 					</caption>
 					<thead>
 						<tr>
-							<td style="width:1%" class="text-center">
+							<td class="w-1 text-center">
 								<?php echo HTMLHelper::_('grid.checkall'); ?>
 							</td>
-							<th scope="col" style="width:1%" class="text-center">
+							<th scope="col" class="w-1 text-center">
 								<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
 							</th>
 							<th scope="col">
 								<?php echo HTMLHelper::_('searchtools.sort', 'COM_USERS_HEADING_SUBJECT', 'a.subject', $listDirn, $listOrder); ?>
 							</th>
-							<th scope="col" style="width:20%" class="d-none d-md-table-cell">
+							<th scope="col" class="w-20 d-none d-md-table-cell">
 								<?php echo HTMLHelper::_('searchtools.sort', 'COM_USERS_HEADING_USER', 'u.name', $listDirn, $listOrder); ?>
 							</th>
 							<th scope="col" class="w-10 d-none d-md-table-cell">
 								<?php echo HTMLHelper::_('searchtools.sort', 'COM_USERS_HEADING_REVIEW', 'a.review_time', $listDirn, $listOrder); ?>
 							</th>
-							<th scope="col" style="width:1%" class="d-none d-md-table-cell">
+							<th scope="col" class="w-1 d-none d-md-table-cell">
 								<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
 							</th>
 						</tr>
diff --git a/administrator/components/com_users/tmpl/users/default.php b/administrator/components/com_users/tmpl/users/default.php
index 93dea807cf986..ab6a0e43f247d 100644
--- a/administrator/components/com_users/tmpl/users/default.php
+++ b/administrator/components/com_users/tmpl/users/default.php
@@ -42,11 +42,13 @@
 				<?php else : ?>
 					<table class="table" id="userList">
 						<caption id="captionTable" class="sr-only">
-							<?php echo Text::_('COM_USERS_USERS_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+							<?php echo Text::_('COM_USERS_USERS_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 						</caption>
 						<thead>
 							<tr>
-								<td style="width:1%" class="text-center">
+								<td class="w-1 text-center">
 									<?php echo HTMLHelper::_('grid.checkall'); ?>
 								</td>
 								<th scope="col">
diff --git a/administrator/components/com_users/tmpl/users/modal.php b/administrator/components/com_users/tmpl/users/modal.php
index cc96cea8171d0..f0922a161638e 100644
--- a/administrator/components/com_users/tmpl/users/modal.php
+++ b/administrator/components/com_users/tmpl/users/modal.php
@@ -44,7 +44,9 @@
 		<?php else : ?>
 		<table class="table table-sm">
 			<caption id="captionTable" class="sr-only">
-				<?php echo Text::_('COM_USERS_USERS_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+				<?php echo Text::_('COM_USERS_USERS_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 			</caption>
 			<thead>
 				<tr>
@@ -54,16 +56,16 @@
 					<th scope="col" class="w-25">
 						<?php echo HTMLHelper::_('searchtools.sort', 'JGLOBAL_USERNAME', 'a.username', $listDirn, $listOrder); ?>
 					</th>
-					<th scope="col" style="width:1%" class="text-center">
+					<th scope="col" class="w-1 text-center">
 						<?php echo HTMLHelper::_('searchtools.sort', 'COM_USERS_HEADING_ENABLED', 'a.block', $listDirn, $listOrder); ?>
 					</th>
-					<th scope="col" style="width:1%" class="text-center">
+					<th scope="col" class="w-1 text-center">
 						<?php echo HTMLHelper::_('searchtools.sort', 'COM_USERS_HEADING_ACTIVATED', 'a.activation', $listDirn, $listOrder); ?>
 					</th>
 					<th scope="col" class="w-25">
 						<?php echo Text::_('COM_USERS_HEADING_GROUPS'); ?>
 					</th>
-					<th scope="col" style="width:1%">
+					<th scope="col" class="w-1">
 						<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
 					</th>
 				</tr>
diff --git a/administrator/components/com_workflow/forms/filter_stages.xml b/administrator/components/com_workflow/forms/filter_stages.xml
index 5b9e5c156b9c8..0223055580aab 100644
--- a/administrator/components/com_workflow/forms/filter_stages.xml
+++ b/administrator/components/com_workflow/forms/filter_stages.xml
@@ -11,7 +11,7 @@
 		<field
 			name="published"
 			type="status"
-			label="JOPTION_SELECT_PUBLISHED"
+			label="JSTATUS"
 			onchange="this.form.submit();"
 			filter="-2,0,1"
 			>
@@ -20,7 +20,7 @@
 		<field
 			name="condition"
 			type="workflowcondition"
-			label="COM_WORKFLOW_SELECT_CONDITION"
+			label="COM_WORKFLOW_CONDITION"
 			onchange="this.form.submit();"
 			>
 			<option value="">COM_WORKFLOW_SELECT_CONDITION</option>
diff --git a/administrator/components/com_workflow/forms/filter_transitions.xml b/administrator/components/com_workflow/forms/filter_transitions.xml
index 0305d3c1df72d..4a839964ea748 100644
--- a/administrator/components/com_workflow/forms/filter_transitions.xml
+++ b/administrator/components/com_workflow/forms/filter_transitions.xml
@@ -11,7 +11,7 @@
 		<field
 			name="published"
 			type="status"
-			label="JOPTION_SELECT_PUBLISHED"
+			label="JSTATUS"
 			onchange="this.form.submit();"
 			filter="-2,0,1"
 			>
@@ -20,7 +20,7 @@
 		<field
 			name="from_stage"
 			type="sql"
-			label="COM_WORKFLOW_SELECT_FROM_STAGE"
+			label="COM_WORKFLOW_FROM_STAGE"
 			onchange="this.form.submit();"
 			sql_select="id as value, title as from_stage"
 			sql_from="#__workflow_stages"
@@ -30,7 +30,7 @@
 		<field
 			name="to_stage"
 			type="sql"
-			label="COM_WORKFLOW_SELECT_TO_STAGE"
+			label="COM_WORKFLOW_TO_STAGE"
 			onchange="this.form.submit();"
 			sql_select="id as value, title as to_stage"
 			sql_from="#__workflow_stages"
diff --git a/administrator/components/com_workflow/forms/filter_workflows.xml b/administrator/components/com_workflow/forms/filter_workflows.xml
index 1fe64dea0c4ff..cfd1063ba0274 100644
--- a/administrator/components/com_workflow/forms/filter_workflows.xml
+++ b/administrator/components/com_workflow/forms/filter_workflows.xml
@@ -12,7 +12,7 @@
 		<field
 			name="published"
 			type="status"
-			label="JOPTION_SELECT_PUBLISHED"
+			label="JSTATUS"
 			onchange="this.form.submit();"
 			filter="-2,0,1"
 			>
diff --git a/administrator/components/com_workflow/tmpl/stages/default.php b/administrator/components/com_workflow/tmpl/stages/default.php
index d973ee551ef20..4c120af9dbc8e 100644
--- a/administrator/components/com_workflow/tmpl/stages/default.php
+++ b/administrator/components/com_workflow/tmpl/stages/default.php
@@ -56,20 +56,22 @@
 				<?php else: ?>
 					<table class="table">
 						<caption id="captionTable" class="sr-only">
-							<?php echo Text::_('COM_WORKFLOW_STAGES_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+							<?php echo Text::_('COM_WORKFLOW_STAGES_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 						</caption>
 						<thead>
 							<tr>
-								<td style="width:1%" class="text-center d-none d-md-table-cell">
+								<td class="w-1 text-center d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('grid.checkall'); ?>
 								</td>
-								<th scope="col" style="width:1%" class="text-center d-none d-md-table-cell">
+								<th scope="col" class="w-1 text-center d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', '', 's.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'fas fa-sort'); ?>
 								</th>
-								<th scope="col" style="width:1%" class="text-center d-none d-md-table-cell">
+								<th scope="col" class="w-1 text-center d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 's.condition', $listDirn, $listOrder); ?>
 								</th>
-								<th scope="col" style="width:1%" class="text-center d-none d-md-table-cell">
+								<th scope="col" class="w-1 text-center d-none d-md-table-cell">
 									<?php echo Text::_('COM_WORKFLOW_DEFAULT'); ?>
 								</th>
 								<th scope="col" class="w-10 d-none d-md-table-cell">
@@ -78,7 +80,7 @@
 								<th scope="col" class="w-10 d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'COM_WORKFLOW_CONDITION', 's.condition', $listDirn, $listOrder); ?>
 								</th>
-								<th scope="col" style="width:1%" class="d-none d-md-table-cell">
+								<th scope="col" class="w-1 d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'COM_WORKFLOW_ID', 's.id', $listDirn, $listOrder); ?>
 								</th>
 							</tr>
diff --git a/administrator/components/com_workflow/tmpl/transitions/default.php b/administrator/components/com_workflow/tmpl/transitions/default.php
index e4eb75beaabfc..91d6c1f9ae9a5 100644
--- a/administrator/components/com_workflow/tmpl/transitions/default.php
+++ b/administrator/components/com_workflow/tmpl/transitions/default.php
@@ -56,26 +56,28 @@
 				<?php else: ?>
 					<table class="table">
 						<caption id="captionTable" class="sr-only">
-							<?php echo Text::_('COM_WORKFLOW_TRANSITIONS_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+							<?php echo Text::_('COM_WORKFLOW_TRANSITIONS_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 						</caption>
 						<thead>
 							<tr>
-								<td style="width:1%" class="text-center d-none d-md-table-cell">
+								<td class="w-1 text-center d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('grid.checkall'); ?>
 								</td>
-								<th scope="col" style="width:1%" class="text-center d-none d-md-table-cell">
+								<th scope="col" class="w-1 text-center d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', '', 't.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'fas fa-sort'); ?>
 								</th>
-								<th scope="col" style="width:1%" class="text-center d-none d-md-table-cell">
+								<th scope="col" class="w-1 text-center d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 't.published', $listDirn, $listOrder); ?>
 								</th>
-								<th scope="col" style="width:20%">
+								<th scope="col" class="w-20">
 									<?php echo HTMLHelper::_('searchtools.sort', 'COM_WORKFLOW_NAME', 't.title', $listDirn, $listOrder); ?>
 								</th>
-								<th scope="col" style="width:20%" class="d-none d-md-table-cell">
+								<th scope="col" class="w-20 d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'COM_WORKFLOW_FROM_STAGE', 'from_stage', $listDirn, $listOrder); ?>
 								</th>
-								<th scope="col" style="width:20%" class="d-none d-md-table-cell">
+								<th scope="col" class="w-20 d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'COM_WORKFLOW_TO_STAGE', 'to_stage', $listDirn, $listOrder); ?>
 								</th>
 								<th scope="col" style="width:3%" class="d-none d-md-table-cell">
diff --git a/administrator/components/com_workflow/tmpl/workflows/default.php b/administrator/components/com_workflow/tmpl/workflows/default.php
index 152f05d989d43..c88e604c933da 100644
--- a/administrator/components/com_workflow/tmpl/workflows/default.php
+++ b/administrator/components/com_workflow/tmpl/workflows/default.php
@@ -63,17 +63,19 @@
 				<?php else: ?>
 					<table class="table">
 						<caption id="captionTable" class="sr-only">
-							<?php echo Text::_('COM_WORKFLOW_WORKFLOWS_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>
+							<?php echo Text::_('COM_WORKFLOW_WORKFLOWS_TABLE_CAPTION'); ?>,
+							<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
+							<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
 						</caption>
 						<thead>
 							<tr>
-								<td style="width:1%" class="text-center d-none d-md-table-cell">
+								<td class="w-1 text-center d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('grid.checkall'); ?>
 								</td>
-								<th scope="col" style="width:1%" class="text-center d-none d-md-table-cell">
+								<th scope="col" class="w-1 text-center d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', '', 'w.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'fas fa-sort'); ?>
 								</th>
-								<th scope="col"  style="width:1%" class="text-center d-none d-md-table-cell">
+								<th scope="col" class="w-1 text-center d-none d-md-table-cell">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'w.published', $listDirn, $listOrder); ?>
 								</th>
 								<th class="d-none d-md-table-cell">
diff --git a/administrator/language/en-GB/com_finder.ini b/administrator/language/en-GB/com_finder.ini
index 7938b847e6d4f..3453a143ef085 100644
--- a/administrator/language/en-GB/com_finder.ini
+++ b/administrator/language/en-GB/com_finder.ini
@@ -154,6 +154,9 @@ COM_FINDER_MAPS="Maps"
 COM_FINDER_MAPS_CONFIRM_DELETE_PROMPT="Are you sure you want to delete the selected map(s)?"
 COM_FINDER_MAPS_COUNT_PUBLISHED_ITEMS="Published Indexed Content"
 COM_FINDER_MAPS_COUNT_UNPUBLISHED_ITEMS="Unpublished Indexed Content"
+COM_FINDER_MAPS_HEADING_BRANCH="Map Group"
+COM_FINDER_MAPS_HEADING_CONTENT_MAP="Content Map"
+COM_FINDER_MAPS_HEADING_TYPE="Content Type"
 COM_FINDER_MAPS_MULTILANG="Note: Language filter system plugin has been enabled, so this branch will not be used."
 COM_FINDER_MAPS_N_ITEMS_DELETED="%d maps deleted."
 COM_FINDER_MAPS_N_ITEMS_DELETED_1="Map deleted."
diff --git a/administrator/language/en-GB/com_joomlaupdate.ini b/administrator/language/en-GB/com_joomlaupdate.ini
index 9f2d7b499f0a1..57d3de4f98666 100644
--- a/administrator/language/en-GB/com_joomlaupdate.ini
+++ b/administrator/language/en-GB/com_joomlaupdate.ini
@@ -47,7 +47,7 @@ COM_JOOMLAUPDATE_VIEW_DEFAULT_COMPATIBILITY_CHECK="Joomla! %s Compatibility Chec
 COM_JOOMLAUPDATE_VIEW_DEFAULT_DB_NOT_SUPPORTED="Your database type is not supported"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_DB_NOT_SUPPORTED_DESC="An update to Joomla %1$s was found, but your current database type is not supported by the new version.<br>For further details take a look at <a href=\"https://downloads.joomla.org/technical-requirements\">the minimum requirements for Joomla %1$s</a>."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_BREAK="Extensions marked with <span class='badge badge-danger'>No</span> or <span class='badge badge-secondary'>Missing Compatibility Tag</span> might break your website. Please consult with the developer before updating."
-COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_MISSING_TAG="Extensions marked with <span class='badge badge-secondary'>Missing Compatibility Tag</span> indicate the developer did not add a compatibility tag in the extension's XML."
+COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_MISSING_TAG="Extensions marked with <span class='badge badge-secondary'>Missing Compatibility Tag</span> indicate the developer has not included <a href='https://docs.joomla.org/Special:MyLanguage/Deploying_an_Update_Server' target='_blank' rel='noopener noreferrer'>compatibility information.</a>"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_UPDATE_REQUIRED="Extensions marked with <span class='badge badge-warning'>Yes (X.X.X)</span> might require an update."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_DIRECTIVE="Directive"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_DOWNLOAD_IN_PROGRESS="Downloading update file. Please wait ..."
diff --git a/administrator/language/en-GB/com_menus.ini b/administrator/language/en-GB/com_menus.ini
index ba2ca836c85ab..5070018a01b89 100644
--- a/administrator/language/en-GB/com_menus.ini
+++ b/administrator/language/en-GB/com_menus.ini
@@ -112,6 +112,7 @@ COM_MENUS_ITEMS_REBUILD_FAILED="Failed rebuilding Menu Items list."
 COM_MENUS_ITEMS_REBUILD_SUCCESS="Menu items list rebuilt."
 COM_MENUS_ITEMS_SEARCH_FILTER="Search in title, alias and notes. Prefix with ID: to search for a menu item ID."
 COM_MENUS_ITEMS_SEARCH_FILTER_LABEL="Search Menu Items"
+COM_MENUS_ITEMS_SET_HOME_0="No menu item set to home."
 COM_MENUS_ITEMS_SET_HOME_1="Menu item set to home."
 COM_MENUS_ITEMS_SET_HOME_MORE="%d menu items set to home."
 COM_MENUS_ITEMS_TABLE_CAPTION="Table of Menu Items"
diff --git a/administrator/language/en-GB/com_privacy.ini b/administrator/language/en-GB/com_privacy.ini
index 7cd9ef526fc3e..47d9f1e529370 100644
--- a/administrator/language/en-GB/com_privacy.ini
+++ b/administrator/language/en-GB/com_privacy.ini
@@ -108,6 +108,8 @@ COM_PRIVACY_HEADING_REQUESTED_AT_ASC="Requested ascending"
 COM_PRIVACY_HEADING_REQUESTED_AT_DESC="Requested descending"
 COM_PRIVACY_HEADING_STATUS_ASC="Status ascending"
 COM_PRIVACY_HEADING_STATUS_DESC="Status descending"
+COM_PRIVACY_HEADING_SUBJECT_ASC="Subject ascending"
+COM_PRIVACY_HEADING_SUBJECT_DESC="Subject descending"
 COM_PRIVACY_HEADING_USERID="User ID"
 COM_PRIVACY_HEADING_USERID_ASC="User ID ascending"
 COM_PRIVACY_HEADING_USERID_DESC="User ID descending"
diff --git a/administrator/language/en-GB/com_tags.ini b/administrator/language/en-GB/com_tags.ini
index cf7d71d7afbf5..f57758e6795f4 100644
--- a/administrator/language/en-GB/com_tags.ini
+++ b/administrator/language/en-GB/com_tags.ini
@@ -65,6 +65,7 @@ COM_TAGS_FILTER_SEARCH_LABEL="Search Tags"
 COM_TAGS_FLOAT_LABEL="Float"
 COM_TAGS_HAS_SUBCATEGORY_ITEMS="%d items are assigned to this tag's subtags."
 COM_TAGS_HAS_SUBCATEGORY_ITEMS_1="An item is assigned to one of this tag's subtags."
+COM_TAGS_HEADING_TAGTYPE="Tag Type"
 COM_TAGS_INCLUDE="Include"
 COM_TAGS_INCLUDE_CHILDREN_LABEL="Child Tags"
 COM_TAGS_ITEMS_SEARCH_FILTER="Search"
diff --git a/administrator/language/en-GB/com_users.ini b/administrator/language/en-GB/com_users.ini
index c135efd50ef69..de0492208591e 100644
--- a/administrator/language/en-GB/com_users.ini
+++ b/administrator/language/en-GB/com_users.ini
@@ -235,6 +235,12 @@ COM_USERS_NOTES_N_ITEMS_UNPUBLISHED_1="User Note unpublished."
 COM_USERS_NOTES_TABLE_CAPTION="Table of User Notes"
 COM_USERS_OPTION_FILTER_DATE="- Select Registration Date -"
 COM_USERS_OPTION_FILTER_LAST_VISIT_DATE="- Select Last Visit Date -"
+COM_USERS_OPTION_LABEL_COMPONENT="Component"
+COM_USERS_OPTION_LABEL_LEVEL_END="-End Level"
+COM_USERS_OPTION_LABEL_LEVEL_START="Start Level"
+COM_USERS_OPTION_LEVEL_CATEGORY="%d (top category)"
+COM_USERS_OPTION_LEVEL_COMPONENT="%d (component)"
+COM_USERS_OPTION_LEVEL_DEEPER="%d (deeper)"
 COM_USERS_OPTION_RANGE_NEVER="never"
 COM_USERS_OPTION_RANGE_PAST_1MONTH="in the last month"
 COM_USERS_OPTION_RANGE_PAST_3MONTH="in the last 3 months"
@@ -243,9 +249,6 @@ COM_USERS_OPTION_RANGE_PAST_WEEK="in the last week"
 COM_USERS_OPTION_RANGE_PAST_YEAR="in the last year"
 COM_USERS_OPTION_RANGE_POST_YEAR="more than a year ago"
 COM_USERS_OPTION_RANGE_TODAY="today"
-COM_USERS_OPTION_LEVEL_CATEGORY="%d (top category)"
-COM_USERS_OPTION_LEVEL_COMPONENT="%d (component)"
-COM_USERS_OPTION_LEVEL_DEEPER="%d (deeper)"
 COM_USERS_OPTION_SELECT_COMPONENT="- Select Component -"
 COM_USERS_OPTION_SELECT_LEVEL_END="- Select End Level -"
 COM_USERS_OPTION_SELECT_LEVEL_START="- Select Start Level -"
diff --git a/administrator/language/en-GB/joomla.ini b/administrator/language/en-GB/joomla.ini
index 934a3baea2c5e..15e68a5a206fd 100644
--- a/administrator/language/en-GB/joomla.ini
+++ b/administrator/language/en-GB/joomla.ini
@@ -431,6 +431,7 @@ JGLOBAL_FILTER_TAGS_DESC="2. List additional tags, separating each tag name with
 JGLOBAL_FILTER_TAGS_LABEL="Filter Tags<sup>2</sup>"
 JGLOBAL_FILTER_TYPE_DESC="1. Blacklist allows all tags and attributes except for those in the blacklist.<br><strong>--</strong> Tags for the Default Blacklist include: 'applet', 'body', 'bgsound', 'base', 'basefont', 'canvas', 'embed', 'frame', 'frameset', 'head', 'html', 'id', 'iframe', 'ilayer', 'layer', 'link', 'meta', 'name', 'object', 'script', 'style', 'title', 'xml'<br><strong>--</strong> Attributes for the Default Blacklist include: 'action', 'background', 'codebase', 'dynsrc', 'lowsrc', 'formaction'<br><strong>--</strong> You can blacklist additional tags and attributes by adding to the Filter Tags and Filter Attributes fields, separating each tag or attribute name with a comma.<br><strong>--</strong> Custom Blacklist allows you to override the Default Blacklist. Add the tags and attributes to be blacklisted in the Filter Tags and Filter Attributes fields.</p><p>Whitelist allows only the tags listed in the Filter Tags and Filter Attributes fields.</p><p>No HTML removes all HTML tags from the content when it is saved.</p><p>Please note that these settings work regardless of the editor that you are using. <br>Even if you are using a WYSIWYG editor, the filtering settings may strip additional tags and attributes prior to saving information in the database."
 JGLOBAL_FILTER_TYPE_LABEL="Filter Type<sup>1</sup>"
+JGLOBAL_FILTERED_BY="Filtered by:"
 JGLOBAL_FULL_TEXT="Full Text"
 JGLOBAL_GT="&gt;"
 JGLOBAL_HISTORY_LIMIT_OPTIONS_DESC="The maximum number of old versions of an item to save. If zero, all old versions will be saved."
@@ -524,8 +525,8 @@ JGLOBAL_PASSWORD="Password"
 JGLOBAL_PASSWORD_RESET_REQUIRED="You are required to reset your password before proceeding."
 JGLOBAL_PERMISSIONS_ANCHOR="Set Permissions"
 JGLOBAL_PREVIEW="Preview"
-JGLOBAL_PREVIEW_POSITION="<span>Position&nbsp;:</span> %s"
-JGLOBAL_PREVIEW_STYLE="<span>Style&nbsp;:</span> %s"
+JGLOBAL_PREVIEW_POSITION="<span>Position:</span> %s"
+JGLOBAL_PREVIEW_STYLE="<span>Style:</span> %s"
 JGLOBAL_PUBLISHED_DATE="Published Date"
 JGLOBAL_RANDOM_ORDER="Random Order"
 JGLOBAL_RATINGS="Ratings"
diff --git a/administrator/language/en-GB/lib_joomla.ini b/administrator/language/en-GB/lib_joomla.ini
index 248c82b7b22f7..2e1412bfa9558 100644
--- a/administrator/language/en-GB/lib_joomla.ini
+++ b/administrator/language/en-GB/lib_joomla.ini
@@ -232,12 +232,13 @@ JLIB_DATABASE_ERROR_REORDER_UPDATE_ROW_FAILED="%s: :reorder update the row %s fa
 JLIB_DATABASE_ERROR_ROOT_NODE_NOT_FOUND="Root node not found."
 JLIB_DATABASE_ERROR_STORE_FAILED_UPDATE_ASSET_ID="The asset_id field could not be updated."
 JLIB_DATABASE_ERROR_STORE_FAILED="%1$s: :store failed<br>%2$s"
+JLIB_DATABASE_ERROR_USERGROUP_PARENT_ID_NOT_VALID="There has to be at least one root usergroup"
 JLIB_DATABASE_ERROR_USERGROUP_TITLE="User group must have a title."
 JLIB_DATABASE_ERROR_USERGROUP_TITLE_EXISTS="User group title already exists. Title must be unique with the same parent."
 JLIB_DATABASE_ERROR_USERLEVEL_NAME_EXISTS="Level with the name &quot;%s&quot; already exists."
 JLIB_DATABASE_ERROR_USERNAME_CANNOT_CHANGE="Can't use this username."
 JLIB_DATABASE_ERROR_USERNAME_INUSE="Username in use."
-JLIB_DATABASE_ERROR_VALID_AZ09="Please enter a valid username. No space at beginning or end, at least %d characters and must <strong>not</strong> have the following characters: < > \ &quot; ' &#37; ; ( ) &."
+JLIB_DATABASE_ERROR_VALID_AZ09="Please enter a valid username. No space at beginning or end, at least %d characters, must <strong>not</strong> have the following characters: < > \ &quot; ' &#37; ; ( ) & and be less than 150 characters long."
 JLIB_DATABASE_ERROR_VALID_MAIL="The email address you entered is invalid. Please enter another email address."
 JLIB_DATABASE_ERROR_VIEWLEVEL="Viewlevel must have a title."
 JLIB_DATABASE_FUNCTION_NOERROR="DB function reports no errors."
diff --git a/administrator/modules/mod_latest/tmpl/default.php b/administrator/modules/mod_latest/tmpl/default.php
index 4602591cea169..63286631e0899 100644
--- a/administrator/modules/mod_latest/tmpl/default.php
+++ b/administrator/modules/mod_latest/tmpl/default.php
@@ -18,9 +18,9 @@
 	<caption class="sr-only"><?php echo $module->title; ?></caption>
 	<thead>
 		<tr>
-			<th scope="col" style="width:60%"><?php echo Text::_('JGLOBAL_TITLE'); ?></th>
-			<th scope="col" style="width:20%"><?php echo Text::_('JAUTHOR'); ?></th>
-			<th scope="col" style="width:20%"><?php echo Text::_('JDATE'); ?></th>
+			<th scope="col" class="w-60"><?php echo Text::_('JGLOBAL_TITLE'); ?></th>
+			<th scope="col" class="w-20"><?php echo Text::_('JAUTHOR'); ?></th>
+			<th scope="col" class="w-20"><?php echo Text::_('JDATE'); ?></th>
 		</tr>
 	</thead>
 	<tbody>
diff --git a/administrator/modules/mod_latestactions/tmpl/default.php b/administrator/modules/mod_latestactions/tmpl/default.php
index 14d94d870d9a9..11a21109d14e6 100644
--- a/administrator/modules/mod_latestactions/tmpl/default.php
+++ b/administrator/modules/mod_latestactions/tmpl/default.php
@@ -19,8 +19,8 @@
 	<caption class="sr-only"><?php echo $module->title; ?></caption>
 	<thead>
 		<tr>
-			<th scope="col" style="width:80%"><?php echo Text::_('MOD_LATESTACTIONS_ACTION'); ?></th>
-			<th scope="col" style="width:20%"><?php echo Text::_('JDATE'); ?></th>
+			<th scope="col" class="w-80"><?php echo Text::_('MOD_LATESTACTIONS_ACTION'); ?></th>
+			<th scope="col" class="w-20"><?php echo Text::_('JDATE'); ?></th>
 		</tr>
 	</thead>
 	<tbody>
diff --git a/administrator/modules/mod_logged/tmpl/default.php b/administrator/modules/mod_logged/tmpl/default.php
index cb82b988cd226..f8f060a31c0d3 100644
--- a/administrator/modules/mod_logged/tmpl/default.php
+++ b/administrator/modules/mod_logged/tmpl/default.php
@@ -25,8 +25,8 @@
 					<?php echo Text::_('MOD_LOGGED_NAME'); ?>
 				<?php endif; ?>
 			</th>
-			<th scope="col" style="width:30%"><?php echo Text::_('JCLIENT'); ?></th>
-			<th scope="col" style="width:20%"><?php echo Text::_('JDATE'); ?></th>
+			<th scope="col" class="w-30"><?php echo Text::_('JCLIENT'); ?></th>
+			<th scope="col" class="w-20"><?php echo Text::_('JDATE'); ?></th>
 		</tr>
 	</thead>
 	<tbody>
diff --git a/administrator/modules/mod_login/tmpl/default.php b/administrator/modules/mod_login/tmpl/default.php
index e7380877f04ba..20f4eaf6a16f4 100644
--- a/administrator/modules/mod_login/tmpl/default.php
+++ b/administrator/modules/mod_login/tmpl/default.php
@@ -85,7 +85,7 @@ class="form-control input-full"
 
 					<input
 						name="secretkey"
-						autocomplete="off"
+						autocomplete="one-time-code"
 						id="mod-login-secretkey"
 						type="text"
 						class="form-control"
diff --git a/administrator/modules/mod_popular/tmpl/default.php b/administrator/modules/mod_popular/tmpl/default.php
index 48fae54e7a09b..f5ebd98d19919 100644
--- a/administrator/modules/mod_popular/tmpl/default.php
+++ b/administrator/modules/mod_popular/tmpl/default.php
@@ -18,9 +18,9 @@
 	<caption class="sr-only"><?php echo $module->title; ?></caption>
 	<thead>
 		<tr>
-			<th scope="col" style="width:60%"><?php echo Text::_('JGLOBAL_TITLE'); ?></th>
-			<th scope="col" style="width:20%"><?php echo Text::_('JGLOBAL_HITS'); ?></th>
-			<th scope="col" style="width:20%"><?php echo Text::_('JDATE'); ?></th>
+			<th scope="col" class="w-60"><?php echo Text::_('JGLOBAL_TITLE'); ?></th>
+			<th scope="col" class="w-20"><?php echo Text::_('JGLOBAL_HITS'); ?></th>
+			<th scope="col" class="w-20"><?php echo Text::_('JDATE'); ?></th>
 		</tr>
 	</thead>
 	<tbody>
diff --git a/administrator/modules/mod_privacy_dashboard/tmpl/default.php b/administrator/modules/mod_privacy_dashboard/tmpl/default.php
index c9b78ddbadfc4..23f130bf92363 100644
--- a/administrator/modules/mod_privacy_dashboard/tmpl/default.php
+++ b/administrator/modules/mod_privacy_dashboard/tmpl/default.php
@@ -22,9 +22,9 @@
 	<caption class="sr-only"><?php echo $module->title; ?></caption>
 	<thead>
 		<tr>
-			<th scope="col" style="width:40%"><?php echo Text::_('COM_PRIVACY_DASHBOARD_HEADING_REQUEST_TYPE'); ?></th>
-			<th scope="col" style="width:40%"><?php echo Text::_('COM_PRIVACY_DASHBOARD_HEADING_REQUEST_STATUS'); ?></th>
-			<th scope="col" style="width:20%"><?php echo Text::_('COM_PRIVACY_DASHBOARD_HEADING_REQUEST_COUNT'); ?></th>
+			<th scope="col" class="w-40"><?php echo Text::_('COM_PRIVACY_DASHBOARD_HEADING_REQUEST_TYPE'); ?></th>
+			<th scope="col" class="w-40"><?php echo Text::_('COM_PRIVACY_DASHBOARD_HEADING_REQUEST_STATUS'); ?></th>
+			<th scope="col" class="w-20"><?php echo Text::_('COM_PRIVACY_DASHBOARD_HEADING_REQUEST_COUNT'); ?></th>
 		</tr>
 	</thead>
 	<tbody>
diff --git a/administrator/modules/mod_privacy_status/tmpl/default.php b/administrator/modules/mod_privacy_status/tmpl/default.php
index eadf4c3e0e71e..19c97546706d7 100644
--- a/administrator/modules/mod_privacy_status/tmpl/default.php
+++ b/administrator/modules/mod_privacy_status/tmpl/default.php
@@ -15,7 +15,7 @@
 <table class="table">
 	<thead>
 		<tr>
-			<th scope="col" style="width:20%;"><?php echo Text::_('COM_PRIVACY_DASHBOARD_HEADING_STATUS'); ?></th>
+			<th scope="col" class="w-20"><?php echo Text::_('COM_PRIVACY_DASHBOARD_HEADING_STATUS'); ?></th>
 			<th scope="col"><?php echo Text::_('COM_PRIVACY_DASHBOARD_HEADING_CHECK'); ?></th>
 		</tr>
 	</thead>
diff --git a/administrator/templates/atum/index.php b/administrator/templates/atum/index.php
index c7ddc667bb12b..c2dd393507c84 100644
--- a/administrator/templates/atum/index.php
+++ b/administrator/templates/atum/index.php
@@ -117,7 +117,7 @@
 <div id="wrapper" class="d-flex wrapper<?php echo $hiddenMenu ? '0' : ''; ?>">
 	<?php // Sidebar ?>
 	<?php if (!$hiddenMenu) : ?>
-		<button class="navbar-toggler toggler-burger collapsed" type="button" data-toggle="collapse" data-target="#sidebar-wrapper" aria-controls="sidebar-wrapper" aria-expanded="false" aria-label="Toggle navigation">
+		<button class="navbar-toggler toggler-burger collapsed" type="button" data-toggle="collapse" data-target="#sidebar-wrapper" aria-controls="sidebar-wrapper" aria-expanded="false" aria-label="<?php echo Text::_('JTOGGLE_SIDEBAR_MENU'); ?>">
 			<span class="navbar-toggler-icon"></span>
 		</button>
 
diff --git a/administrator/templates/atum/scss/blocks/_utilities.scss b/administrator/templates/atum/scss/blocks/_utilities.scss
index 3b6ebbc7172be..beaa21a3d09ee 100644
--- a/administrator/templates/atum/scss/blocks/_utilities.scss
+++ b/administrator/templates/atum/scss/blocks/_utilities.scss
@@ -80,10 +80,38 @@
 
 // Sizing
 
+.w-1 {
+  width: 1%;
+}
+
 .w-5 {
-  width: 5% !important;
+  width: 5%;
 }
 
 .w-10 {
-  width: 10% !important;
+  width: 10%;
+}
+
+.w-15 {
+  width: 15%;
+}
+
+.w-20 {
+  width: 20%;
+}
+
+.w-30 {
+  width: 30%;
+}
+
+.w-40 {
+  width: 40%;
+}
+
+.w-60 {
+  width: 60%;
+}
+
+.w-80 {
+  width: 80%;
 }
\ No newline at end of file
diff --git a/api/language/en-GB/joomla.ini b/api/language/en-GB/joomla.ini
index 893522131b08e..d37b6df5223aa 100644
--- a/api/language/en-GB/joomla.ini
+++ b/api/language/en-GB/joomla.ini
@@ -41,6 +41,7 @@ JH6="h6"
 
 ERROR="Error"
 INFO="Info"
+MESSAGE="Message"
 NOTICE="Notice"
 MESSAGE="Message"
 WARNING="Warning"
diff --git a/build/media_source/com_associations/js/admin-associations-modal.es6.js b/build/media_source/com_associations/js/admin-associations-modal.es6.js
index 7e0462219ad1f..5285bd08b93c6 100644
--- a/build/media_source/com_associations/js/admin-associations-modal.es6.js
+++ b/build/media_source/com_associations/js/admin-associations-modal.es6.js
@@ -8,12 +8,12 @@ Joomla = window.Joomla || {};
   'use strict';
 
   document.addEventListener('DOMContentLoaded', () => {
-    const target = window.parent.document.getElementById('target-association');
+    const targetAssociation = window.parent.document.getElementById('target-association');
     const links = [].slice.call(document.querySelectorAll('.select-link'));
 
     links.forEach((item) => {
-      item.addEventListener('click', (event) => {
-        target.src = `${target.getAttribute('data-editurl')}&task=${target.getAttribute('data-item')}.edit&id=${parseInt(event.target.getAttribute('data-id'), 10)}`;
+      item.addEventListener('click', ({ target }) => {
+        targetAssociation.src = `${targetAssociation.getAttribute('data-editurl')}&task=${targetAssociation.getAttribute('data-item')}.edit&id=${parseInt(target.getAttribute('data-id'), 10)}`;
         window.parent.Joomla.Modal.getCurrent().close();
       });
     });
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 71d655bad652b..fc8ae64521700 100644
--- a/build/media_source/com_associations/js/associations-edit.es6.js
+++ b/build/media_source/com_associations/js/associations-edit.es6.js
@@ -156,7 +156,7 @@ Joomla = window.Joomla || {};
 
     // When changing the language
     if (formControlLanguage) {
-      formControlLanguage.addEventListener('change', (event) => {
+      formControlLanguage.addEventListener('change', ({ target }) => {
         // Remove message if any
         Joomla.removeMessages();
 
@@ -195,7 +195,7 @@ Joomla = window.Joomla || {};
         }
 
         // If the selected language is All hide the fields and add a message
-        const selectedLanguage = event.target.value;
+        const selectedLanguage = target.value;
 
         if (selectedLanguage === '*') {
           Joomla.showAssociationMessage();
diff --git a/build/media_source/com_banners/js/admin-banner-edit.es6.js b/build/media_source/com_banners/js/admin-banner-edit.es6.js
index b17f023cfaae1..7bd9e93d4f587 100644
--- a/build/media_source/com_banners/js/admin-banner-edit.es6.js
+++ b/build/media_source/com_banners/js/admin-banner-edit.es6.js
@@ -34,8 +34,8 @@
       updateBannerFields(jformType.value);
 
       // Hide/show parameters when the type has been selected
-      jformType.addEventListener('change', (event) => {
-        updateBannerFields(event.target.value);
+      jformType.addEventListener('change', ({ target }) => {
+        updateBannerFields(target.value);
       });
     }
   });
diff --git a/build/media_source/com_cache/js/admin-cache-default.es6.js b/build/media_source/com_cache/js/admin-cache-default.es6.js
index 108c3e8169289..b6cc7c3fa2bd2 100644
--- a/build/media_source/com_cache/js/admin-cache-default.es6.js
+++ b/build/media_source/com_cache/js/admin-cache-default.es6.js
@@ -10,8 +10,8 @@ Joomla = window.Joomla || {};
 
   document.addEventListener('DOMContentLoaded', () => {
     [].slice.call(document.querySelectorAll('.cache-entry')).forEach((el) => {
-      el.addEventListener('click', (event) => {
-        Joomla.isChecked(event.currentTarget.checked);
+      el.addEventListener('click', ({ currentTarget }) => {
+        Joomla.isChecked(currentTarget.checked);
       });
     });
   });
diff --git a/build/media_source/com_categories/js/shared-categories-accordion.es6.js b/build/media_source/com_categories/js/shared-categories-accordion.es6.js
index 391cd01ff1edb..fe10efd379591 100644
--- a/build/media_source/com_categories/js/shared-categories-accordion.es6.js
+++ b/build/media_source/com_categories/js/shared-categories-accordion.es6.js
@@ -16,8 +16,8 @@
    * Handle the category toggle button click event
    * @param event
    */
-  const handleCategoryToggleButtonClick = (event) => {
-    const button = event.currentTarget;
+  const handleCategoryToggleButtonClick = ({ currentTarget }) => {
+    const button = currentTarget;
     const icon = button.querySelector('span');
 
     // Toggle icon class
diff --git a/build/media_source/com_cpanel/js/admin-cpanel-default.es6.js b/build/media_source/com_cpanel/js/admin-cpanel-default.es6.js
index f459061b97d8f..7a0fde2e67510 100644
--- a/build/media_source/com_cpanel/js/admin-cpanel-default.es6.js
+++ b/build/media_source/com_cpanel/js/admin-cpanel-default.es6.js
@@ -36,7 +36,7 @@
     if (cpanelModules) {
       const links = [].slice.call(cpanelModules.querySelectorAll('.unpublish-module'));
       links.forEach((link) => {
-        link.addEventListener('click', (event) => Joomla.unpublishModule(event.target));
+        link.addEventListener('click', ({ target }) => Joomla.unpublishModule(target));
       });
     }
 
diff --git a/build/media_source/com_fields/js/admin-field-edit.es6.js b/build/media_source/com_fields/js/admin-field-edit.es6.js
index f2d0ed9dc229d..1482ed232f17a 100644
--- a/build/media_source/com_fields/js/admin-field-edit.es6.js
+++ b/build/media_source/com_fields/js/admin-field-edit.es6.js
@@ -9,9 +9,9 @@ document.addEventListener('DOMContentLoaded', () => {
   const title = document.getElementById('jform_title');
   title.dpOldValue = title.value;
 
-  title.addEventListener('change', (event) => {
+  title.addEventListener('change', ({ currentTarget }) => {
     const label = document.getElementById('jform_label');
-    const changedTitle = event.currentTarget;
+    const changedTitle = currentTarget;
 
     if (changedTitle.dpOldValue === label.value) {
       label.value = changedTitle.value;
diff --git a/build/media_source/com_finder/js/finder.es6.js b/build/media_source/com_finder/js/finder.es6.js
index e621a2fbc499f..8a83a45de31ea 100644
--- a/build/media_source/com_finder/js/finder.es6.js
+++ b/build/media_source/com_finder/js/finder.es6.js
@@ -10,20 +10,20 @@
   }
 
   // Handle the autocomplete
-  const onKeyUp = (event) => {
-    if (event.target.value.length > 1) {
-      event.target.awesomplete.list = [];
+  const onKeyUp = ({ target }) => {
+    if (target.value.length > 1) {
+      target.awesomplete.list = [];
 
       Joomla.request({
-        url: `${Joomla.getOptions('finder-search').url}&q=${event.target.value}`,
+        url: `${Joomla.getOptions('finder-search').url}&q=${target.value}`,
         method: 'GET',
-        data: { q: event.target.value },
+        data: { q: target.value },
         perform: true,
         headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
         onSuccess: (resp) => {
           const response = JSON.parse(resp);
           if (Object.prototype.toString.call(response.suggestions) === '[object Array]') {
-            event.target.awesomplete.list = response.suggestions;
+            target.awesomplete.list = response.suggestions;
           }
         },
         onError: (xhr) => {
diff --git a/build/media_source/com_joomlaupdate/js/default.es5.js b/build/media_source/com_joomlaupdate/js/default.es5.js
index 33763785a16c2..d0f67711d9c22 100644
--- a/build/media_source/com_joomlaupdate/js/default.es5.js
+++ b/build/media_source/com_joomlaupdate/js/default.es5.js
@@ -64,19 +64,19 @@ Joomla = window.Joomla || {};
 			downloadMsg      = document.getElementById('downloadMessage');
 
 		if (extractionMethod) {
-			extractionMethod.addEventListener('change', function(event) {
+			extractionMethod.addEventListener('change', function() {
 				Joomla.extractionMethodHandler(extractionMethod, 'row_ftp');
 			});
 		}
 
 		if (uploadMethod) {
-			uploadMethod.addEventListener('change', function(event) {
+			uploadMethod.addEventListener('change', function() {
 				Joomla.extractionMethodHandler(uploadMethod, 'upload_ftp');
 			});
 		}
 
 		if (uploadButton) {
-			uploadButton.addEventListener('click', function(event) {
+			uploadButton.addEventListener('click', function() {
 				if (downloadMsg) {
 					downloadMsg.classList.remove('hidden');
 				}
diff --git a/build/media_source/com_languages/js/admin-language-edit-change-flag.es6.js b/build/media_source/com_languages/js/admin-language-edit-change-flag.es6.js
index d826827442bf1..14d0d627351f4 100644
--- a/build/media_source/com_languages/js/admin-language-edit-change-flag.es6.js
+++ b/build/media_source/com_languages/js/admin-language-edit-change-flag.es6.js
@@ -3,8 +3,8 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 document.addEventListener('DOMContentLoaded', () => {
-  document.getElementById('jform_image').addEventListener('change', (event) => {
-    const flagSelectedValue = event.currentTarget.value;
+  document.getElementById('jform_image').addEventListener('change', ({ currentTarget }) => {
+    const flagSelectedValue = currentTarget.value;
     const flagimage = document.getElementById('flag').querySelector('img');
     const src = `${Joomla.getOptions('system.paths').rootFull}/media/mod_languages/images/${flagSelectedValue}.gif`;
 
diff --git a/build/media_source/com_languages/js/admin-override-edit-refresh-searchstring.es6.js b/build/media_source/com_languages/js/admin-override-edit-refresh-searchstring.es6.js
index d033eccdc680f..2df3d11d63822 100644
--- a/build/media_source/com_languages/js/admin-override-edit-refresh-searchstring.es6.js
+++ b/build/media_source/com_languages/js/admin-override-edit-refresh-searchstring.es6.js
@@ -4,7 +4,7 @@
  */
 
 document.addEventListener('DOMContentLoaded', () => {
-  document.getElementById('jform_searchstring').addEventListener('focus', (event) => {
+  document.getElementById('jform_searchstring').addEventListener('focus', ({ srcElement }) => {
     if (!Joomla.overrider.states.refreshed) {
       const expired = document.getElementById('overrider-spinner').getAttribute('data-search-string-expired');
       if (expired) {
@@ -12,7 +12,7 @@ document.addEventListener('DOMContentLoaded', () => {
         Joomla.overrider.states.refreshed = true;
       }
     }
-    event.srcElement.classList.remove('invalid');
+    srcElement.classList.remove('invalid');
   }, false);
 
   document.getElementById('more-results-button').addEventListener('click', () => {
diff --git a/build/media_source/com_mails/js/admin-email-template-edit.es6.js b/build/media_source/com_mails/js/admin-email-template-edit.es6.js
index 96e7460a375d3..dfa5c1e4e9afd 100644
--- a/build/media_source/com_mails/js/admin-email-template-edit.es6.js
+++ b/build/media_source/com_mails/js/admin-email-template-edit.es6.js
@@ -77,11 +77,11 @@
       const bodySwitcher = document.querySelectorAll('input[type=radio][name="jform[body_switcher]"]');
       const htmlBodySwitcher = document.querySelectorAll('input[type=radio][name="jform[htmlbody_switcher]"]');
 
-      const subjectSwitcherChangeHandler = (event) => {
-        if (event.target.value === '0') {
+      const subjectSwitcherChangeHandler = ({ target }) => {
+        if (target.value === '0') {
           this.inputSubject.disabled = true;
           this.inputSubject.value = this.templateData.subject ? this.templateData.subject.master : '';
-        } else if (event.target.value === '1') {
+        } else if (target.value === '1') {
           this.inputSubject.disabled = false;
           this.inputSubject.value = this.templateData.subject ? this.templateData.subject.translated : '';
         } else {
@@ -94,14 +94,14 @@
         radio.addEventListener('change', subjectSwitcherChangeHandler);
       });
 
-      const bodySwitcherChangeHandler = (event) => {
+      const bodySwitcherChangeHandler = ({ target }) => {
         const tagsContainer = this.form.querySelector('.tags-container-body');
 
-        if (event.target.value === '0') {
+        if (target.value === '0') {
           this.setBodyValue(this.templateData.body ? this.templateData.body.master : '');
           this.inputBody.disabled = true;
           tagsContainer.classList.add('hidden');
-        } else if (event.target.value === '1') {
+        } else if (target.value === '1') {
           this.inputBody.disabled = false;
           this.inputBody.readOnly = false;
           this.setBodyValue(this.templateData.body ? this.templateData.body.translated : '');
@@ -116,14 +116,14 @@
         radio.addEventListener('change', bodySwitcherChangeHandler);
       });
 
-      const htmlBodySwitcherChangeHandler = (event) => {
+      const htmlBodySwitcherChangeHandler = ({ target }) => {
         const tagsContainer = this.form.querySelector('.tags-container-htmlbody');
 
-        if (event.target.value === '0') {
+        if (target.value === '0') {
           this.setHtmlBodyValue(this.templateData.htmlbody ? this.templateData.htmlbody.master : '');
           Joomla.editors.instances[this.inputHtmlBody.id].disable(true);
           tagsContainer.classList.add('hidden');
-        } else if (event.target.value === '1') {
+        } else if (target.value === '1') {
           Joomla.editors.instances[this.inputHtmlBody.id].disable(false);
           this.setHtmlBodyValue(this.templateData.htmlbody ? this.templateData.htmlbody.translated : '');
           tagsContainer.classList.remove('hidden');
diff --git a/build/media_source/com_media/js/edit-images.es6.js b/build/media_source/com_media/js/edit-images.es6.js
index 780e59d6e1f02..af00c7b3b50fe 100644
--- a/build/media_source/com_media/js/edit-images.es6.js
+++ b/build/media_source/com_media/js/edit-images.es6.js
@@ -252,10 +252,10 @@ Joomla.MediaManager = Joomla.MediaManager || {};
 
       // Couple the tabs with the plugin objects
       links.forEach((link) => {
-        link.addEventListener('joomla.tab.shown', (event) => {
+        link.addEventListener('joomla.tab.shown', ({ relatedTarget, target }) => {
           const container = document.getElementById('media-manager-edit-container');
-          if (event.relatedTarget) {
-            Joomla.MediaManager.Edit[event.relatedTarget.id.replace('tab-attrib-', '').toLowerCase()].Deactivate();
+          if (relatedTarget) {
+            Joomla.MediaManager.Edit[relatedTarget.id.replace('tab-attrib-', '').toLowerCase()].Deactivate();
 
             // Clear the DOM
             container.innerHTML = '';
@@ -269,10 +269,10 @@ Joomla.MediaManager = Joomla.MediaManager || {};
 
 
           // Move the container to the correct tab
-          const tab = document.getElementById(event.target.id.replace('tab-', ''));
+          const tab = document.getElementById(target.id.replace('tab-', ''));
           tab.insertAdjacentElement('afterbegin', container);
 
-          activate(event.target.id.replace('tab-attrib-', ''), data);
+          activate(target.id.replace('tab-attrib-', ''), data);
         });
 
         link.click();
diff --git a/build/media_source/com_menus/js/admin-item-edit.es6.js b/build/media_source/com_menus/js/admin-item-edit.es6.js
index f325b69aca1f6..097e7a2f4ae0d 100644
--- a/build/media_source/com_menus/js/admin-item-edit.es6.js
+++ b/build/media_source/com_menus/js/admin-item-edit.es6.js
@@ -39,8 +39,8 @@
     }
   };
 
-  const onChange = (event) => {
-    const menuType = event.target.value;
+  const onChange = ({ target }) => {
+    const menuType = target.value;
 
     Joomla.request({
       url: `index.php?option=com_menus&task=item.getParentItem&menutype=${menuType}`,
diff --git a/build/media_source/com_menus/js/admin-item-edit_modules.es6.js b/build/media_source/com_menus/js/admin-item-edit_modules.es6.js
index e8b80643de1f1..a437443e557a6 100644
--- a/build/media_source/com_menus/js/admin-item-edit_modules.es6.js
+++ b/build/media_source/com_menus/js/admin-item-edit_modules.es6.js
@@ -69,8 +69,8 @@ Joomla = window.Joomla || {};
 
   if (linkElements.length) {
     linkElements.forEach((linkElement) => {
-      linkElement.addEventListener('click', (event) => {
-        const link = baseLink + event.target.getAttribute('data-module-id');
+      linkElement.addEventListener('click', ({ target }) => {
+        const link = baseLink + target.getAttribute('data-module-id');
         const modal = document.getElementById('moduleEditModal');
         const body = modal.querySelector('.modal-body');
         const iFrame = document.createElement('iframe');
@@ -87,13 +87,13 @@ Joomla = window.Joomla || {};
 
   if (elements.length) {
     elements.forEach((element) => {
-      element.addEventListener('click', (event) => {
-        const target = event.target.getAttribute('data-target');
+      element.addEventListener('click', ({ target }) => {
+        const dataTarget = target.getAttribute('data-target');
 
-        if (target) {
+        if (dataTarget) {
           const iframe = document.querySelector('#moduleEditModal iframe');
           const iframeDocument = iframe.contentDocument || iframe.contentWindow.document;
-          iframeDocument.querySelector(target).click();
+          iframeDocument.querySelector(dataTarget).click();
         }
       });
     });
diff --git a/build/media_source/com_modules/js/admin-module-edit_assignment.es6.js b/build/media_source/com_modules/js/admin-module-edit_assignment.es6.js
index e0f2974902dcd..bdbfc6a32b486 100644
--- a/build/media_source/com_modules/js/admin-module-edit_assignment.es6.js
+++ b/build/media_source/com_modules/js/admin-module-edit_assignment.es6.js
@@ -21,7 +21,7 @@
       onChange(element.value);
 
       // Check for changes in the state
-      element.addEventListener('change', (event) => { onChange(event.target.value); });
+      element.addEventListener('change', ({ target }) => { onChange(target.value); });
     }
 
     document.removeEventListener('DOMContentLoaded', onBoot);
diff --git a/build/media_source/com_modules/js/admin-select-modal.es6.js b/build/media_source/com_modules/js/admin-select-modal.es6.js
index d231a95184279..160ff76564a0e 100644
--- a/build/media_source/com_modules/js/admin-select-modal.es6.js
+++ b/build/media_source/com_modules/js/admin-select-modal.es6.js
@@ -10,13 +10,13 @@
     const elems = document.querySelectorAll('#new-modules-list a.select-link');
 
     elems.forEach((elem) => {
-      elem.addEventListener('click', (event) => {
-        let targetElem = event.currentTarget;
+      elem.addEventListener('click', ({ currentTarget, target }) => {
+        let targetElem = currentTarget;
 
         // There is some bug with events in iframe where currentTarget is "null"
         // => prevent this here by bubble up
         if (!targetElem) {
-          targetElem = event.target;
+          targetElem = target;
 
           if (targetElem && !targetElem.classList.contains('select-link')) {
             targetElem = targetElem.parentNode;
diff --git a/build/media_source/layouts/js/joomla/form/field/category-change.es6.js b/build/media_source/layouts/js/joomla/form/field/category-change.es6.js
index a80e1ba2a1646..3b6328832281e 100644
--- a/build/media_source/layouts/js/joomla/form/field/category-change.es6.js
+++ b/build/media_source/layouts/js/joomla/form/field/category-change.es6.js
@@ -29,6 +29,6 @@
       document.querySelector('input[name=task]').value = `${el.getAttribute('data-refresh-section')}.reload`;
     }
 
-    element.form.submit();
+    Joomla.submitform(`${el.getAttribute('data-refresh-section')}.reload`, element.form);
   };
 })(Joomla);
diff --git a/build/media_source/mod_menu/js/admin-menu.es6.js b/build/media_source/mod_menu/js/admin-menu.es6.js
index 2354154ca086e..c609ee9b82cde 100644
--- a/build/media_source/mod_menu/js/admin-menu.es6.js
+++ b/build/media_source/mod_menu/js/admin-menu.es6.js
@@ -134,11 +134,11 @@
     });
 
     // Child open toggle
-    const openToggle = (event) => {
-      let menuItem = event.currentTarget.parentNode;
+    const openToggle = ({ currentTarget }) => {
+      let menuItem = currentTarget.parentNode;
 
       if (menuItem.tagName.toLowerCase() === 'span') {
-        menuItem = event.currentTarget.parentNode.parentNode;
+        menuItem = currentTarget.parentNode.parentNode;
       }
 
       if (menuItem.classList.contains('open')) {
diff --git a/build/media_source/mod_menu/js/menu.es6.js b/build/media_source/mod_menu/js/menu.es6.js
index 554b47985f057..a30fad622c2d7 100644
--- a/build/media_source/mod_menu/js/menu.es6.js
+++ b/build/media_source/mod_menu/js/menu.es6.js
@@ -44,36 +44,32 @@
         spanEl.addEventListener('mouseout', topLevelMouseOut(topLevelEl, settings));
       }
 
-      topLevelEl.addEventListener('mouseover', (event) => {
-        const curEl = event.target;
-        const ulChild = curEl.querySelector('ul');
+      topLevelEl.addEventListener('mouseover', ({ target }) => {
+        const ulChild = target.querySelector('ul');
         if (ulChild) {
           ulChild.setAttribute('aria-hidden', 'false');
           ulChild.classList.add(settings.menuHoverClass);
         }
       });
 
-      topLevelEl.addEventListener('mouseout', (event) => {
-        const curEl = event.target;
-        const ulChild = curEl.querySelector('ul');
+      topLevelEl.addEventListener('mouseout', ({ target }) => {
+        const ulChild = target.querySelector('ul');
         if (ulChild) {
           ulChild.setAttribute('aria-hidden', 'true');
           ulChild.classList.remove(settings.menuHoverClass);
         }
       });
 
-      topLevelEl.addEventListener('focus', (event) => {
-        const curEl = event.target;
-        const ulChild = curEl.querySelector('ul');
+      topLevelEl.addEventListener('focus', ({ target }) => {
+        const ulChild = target.querySelector('ul');
         if (ulChild) {
           ulChild.setAttribute('aria-hidden', 'true');
           ulChild.classList.add(settings.menuHoverClass);
         }
       });
 
-      topLevelEl.addEventListener('blur', (event) => {
-        const curEl = event.target;
-        const ulChild = curEl.querySelector('ul');
+      topLevelEl.addEventListener('blur', ({ target }) => {
+        const ulChild = target.querySelector('ul');
         if (ulChild) {
           ulChild.setAttribute('aria-hidden', 'false');
           ulChild.classList.remove(settings.menuHoverClass);
diff --git a/build/media_source/mod_sampledata/js/sampledata-process.es6.js b/build/media_source/mod_sampledata/js/sampledata-process.es6.js
index 3c13e9f51b15f..38d8adaacab05 100644
--- a/build/media_source/mod_sampledata/js/sampledata-process.es6.js
+++ b/build/media_source/mod_sampledata/js/sampledata-process.es6.js
@@ -148,7 +148,7 @@
     if (sampleDataWrapper) {
       const links = [].slice.call(sampleDataWrapper.querySelectorAll('.apply-sample-data'));
       links.forEach((link) => {
-        link.addEventListener('click', (event) => Joomla.sampledataApply(event.target));
+        link.addEventListener('click', ({ target }) => Joomla.sampledataApply(target));
       });
     }
 
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 32626b5fa3ddc..3227933e32cbf 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
@@ -406,12 +406,12 @@ Joomla = window.Joomla || {};
     const actionButtons = container.querySelectorAll('.button-action');
 
     actionButtons.forEach((elem) => {
-      elem.addEventListener('click', (event) => {
-        const action = event.target.getAttribute('data-action');
+      elem.addEventListener('click', ({ target }) => {
+        const action = target.getAttribute('data-action');
 
         const actionoptions = {};
 
-        [].forEach.call(event.target.attributes, (attrib) => {
+        [].forEach.call(target.attributes, (attrib) => {
           if (/^data-/.test(attrib.name)) {
             const key = attrib.name.substr(5);
 
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 bda8d3d51e133..64004010fded5 100644
--- a/build/media_source/plg_editors_tinymce/js/tinymce.es6.js
+++ b/build/media_source/plg_editors_tinymce/js/tinymce.es6.js
@@ -152,5 +152,5 @@
   /**
    * Initialize when a part of the page was updated
    */
-  document.addEventListener('joomla:updated', (event) => Joomla.JoomlaTinyMCE.setupEditors(event.target));
+  document.addEventListener('joomla:updated', ({ target }) => Joomla.JoomlaTinyMCE.setupEditors(target));
 })(window.tinyMCE, Joomla, window, document);
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 94378680f10e6..c9216e6101d2c 100644
--- a/build/media_source/plg_installer_webinstaller/js/client.es6.js
+++ b/build/media_source/plg_installer_webinstaller/js/client.es6.js
@@ -3,15 +3,11 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-if (!window.jQuery) {
-  throw new Error('WebInstaller plugin requires jQuery');
-}
-
 if (!Joomla) {
   throw new Error('Joomla API is not properly initialised');
 }
 
-((window, document, Joomla, jQuery) => {
+((window, document, Joomla) => {
   'use strict';
 
   const webInstallerOptions = {
@@ -33,7 +29,6 @@ if (!Joomla) {
       cancelButton.addEventListener('click', () => {
         document.getElementById('uploadform-web').classList.add('hidden');
 
-        // jQuery('#jed-container').slideDown(300);
         if (webInstallerOptions.list && document.querySelector('.list-view')) {
           document.querySelector('.list-view').click();
         }
@@ -65,131 +60,136 @@ if (!Joomla) {
         requestUrl += `&ordering=${webInstallerOptions.ordering}`;
       }
 
-      // jQuery('html, body').animate({ scrollTop: 0 }, 0);
       WebInstaller.showLoadingLayer();
 
-      // @todo convert to vanilla, requires more functionality in Joomla.request
-      jQuery.ajax({
-        url: requestUrl,
-        dataType: 'json',
-        cache: true,
-        timeout: 20000,
-        success: (response) => {
-          if (document.getElementById('web-loader')) {
-            document.getElementById('web-loader').classList.add('hidden');
-          }
-
-          const jedContainer = document.getElementById('jed-container');
-          jedContainer.innerHTML = response.data.html;
+      new Promise((resolve, reject) => {
+        Joomla.request({
+          url: requestUrl,
+          onSuccess: (resp) => {
+            let response;
 
-          document.getElementById('com-apps-searchbox').addEventListener('keypress', (event) => {
-            if (event.which === 13) {
-              this.initiateSearch();
+            try {
+              response = JSON.parse(resp);
+            } catch (error) {
+              throw new Error('Failed to parse JSON');
             }
-          });
 
-          document.getElementById('search-extensions').addEventListener('click', () => {
-            this.initiateSearch();
-          });
-
-          document.getElementById('search-reset').addEventListener('click', () => {
-            const searchBox = document.getElementById('com-apps-searchbox');
-            searchBox.value = '';
-            this.initiateSearch();
-          });
+            if (document.getElementById('web-loader')) {
+              document.getElementById('web-loader').classList.add('hidden');
+            }
 
-          const orderingSelect = document.getElementById('com-apps-ordering');
+            const jedContainer = document.getElementById('jed-container');
+            jedContainer.innerHTML = response.data.html;
 
-          if (orderingSelect) {
-            orderingSelect.addEventListener('change', () => {
-              const index = orderingSelect.selectedIndex;
-              webInstallerOptions.ordering = orderingSelect.options[index].value;
-              this.installfromwebajaxsubmit();
+            document.getElementById('com-apps-searchbox').addEventListener('keypress', ({ which }) => {
+              if (which === 13) {
+                this.initiateSearch();
+              }
             });
-          }
 
-          if (webInstallerOptions.options.installfrom_url !== '') {
-            WebInstaller.installfromweb(webInstallerOptions.options.installfrom_url);
-          }
-        },
-        fail: () => {
-          if (document.getElementById('web-loader')) {
-            document.getElementById('web-loader').classList.add('hidden');
-            document.getElementById('web-loader-error').classList.remove('hidden');
-          }
-        },
-        complete: () => {
-          const installAtField = document.getElementById('joomlaapsinstallatinput');
+            document.getElementById('search-extensions').addEventListener('click', () => {
+              this.initiateSearch();
+            });
 
-          if (installAtField) {
-            installAtField.value = webInstallerOptions.options.installat_url;
-          }
+            document.getElementById('search-reset').addEventListener('click', () => {
+              const searchBox = document.getElementById('com-apps-searchbox');
+              searchBox.value = '';
+              this.initiateSearch();
+            });
 
-          this.clickforlinks();
-          WebInstaller.clicker();
+            const orderingSelect = document.getElementById('com-apps-ordering');
 
-          if (webInstallerOptions.view !== 'extension') {
-            [].slice.call(document.querySelectorAll('div.load-extension')).forEach((element) => {
-              element.addEventListener('click', (event) => {
-                event.preventDefault();
-                this.processLinkClick(element.getAttribute('data-url'));
+            if (orderingSelect) {
+              orderingSelect.addEventListener('change', () => {
+                const index = orderingSelect.selectedIndex;
+                webInstallerOptions.ordering = orderingSelect.options[index].value;
+                this.installfromwebajaxsubmit();
               });
+            }
 
-              element.setAttribute('href', '#');
-            });
-          }
+            if (webInstallerOptions.options.installfrom_url !== '') {
+              WebInstaller.installfromweb(webInstallerOptions.options.installfrom_url);
+            }
 
-          if (webInstallerOptions.view === 'extension') {
-            const installExtensionButton = document.getElementById('install-extension');
-            const installExtensionFromExternalButton = document.getElementById('install-extension-from-external');
+            resolve();
+          },
+          onError: (request) => {
+            const errorContainer = document.getElementById('web-loader-error');
+            const loaderContainer = document.getElementById('web-loader');
 
-            if (installExtensionButton) {
-              installExtensionButton.addEventListener('click', () => {
-                WebInstaller.installfromweb(installExtensionButton.getAttribute('data-downloadurl'), installExtensionButton.getAttribute('data-name'));
-              });
+            if (request.responseText && errorContainer) {
+              errorContainer.innerHTML = request.responseText;
             }
 
-            if (installExtensionFromExternalButton) {
-              // @todo Migrate this handler's confirm to a CE dialog
-              installExtensionFromExternalButton.addEventListener('click', () => {
-                const redirectUrl = installExtensionFromExternalButton.getAttribute('data-downloadurl');
-                const redirectConfirm = window.confirm(Joomla.JText._('PLG_INSTALLER_WEBINSTALLER_REDIRECT_TO_EXTERNAL_SITE_TO_INSTALL').replace('[SITEURL]', redirectUrl));
+            if (loaderContainer) {
+              loaderContainer.classList.add('hidden');
+              errorContainer.classList.remove('hidden');
+            }
 
-                if (redirectConfirm !== true) {
-                  return;
-                }
+            reject();
+          },
+        });
+      }).finally(() => {
+        // Promise has been settled.
+        // Run the following whether or not it was a success.
 
-                document.getElementById('adminForm').setAttribute('action', redirectUrl);
-                document.querySelector('input[name=task]').setAttribute('disabled', true);
-                document.querySelector('input[name=install_directory]').setAttribute('disabled', true);
-                document.querySelector('input[name=install_url]').setAttribute('disabled', true);
-                document.querySelector('input[name=installtype]').setAttribute('disabled', true);
-                document.querySelector('input[name=filter_search]').setAttribute('disabled', true);
+        const installAtField = document.getElementById('joomlaapsinstallatinput');
 
-                document.getElementById('adminForm').submit();
-              });
-            }
-          }
+        if (installAtField) {
+          installAtField.value = webInstallerOptions.options.installat_url;
+        }
 
-          if (webInstallerOptions.list && document.querySelector('.list-view')) {
-            document.querySelector('.list-view').click();
-          }
+        this.clickforlinks();
+        WebInstaller.clicker();
 
-          WebInstaller.hideLoadingLayer();
-        },
-        error: (request) => {
-          const errorContainer = document.getElementById('web-loader-error');
-          const loaderContainer = document.getElementById('web-loader');
+        if (webInstallerOptions.view !== 'extension') {
+          [].slice.call(document.querySelectorAll('div.load-extension')).forEach((element) => {
+            element.addEventListener('click', (event) => {
+              event.preventDefault();
+              this.processLinkClick(element.getAttribute('data-url'));
+            });
 
-          if (request.responseText && errorContainer) {
-            errorContainer.innerHTML = request.responseText;
+            element.setAttribute('href', '#');
+          });
+        }
+
+        if (webInstallerOptions.view === 'extension') {
+          const installExtensionButton = document.getElementById('install-extension');
+          const installExtensionFromExternalButton = document.getElementById('install-extension-from-external');
+
+          if (installExtensionButton) {
+            installExtensionButton.addEventListener('click', () => {
+              WebInstaller.installfromweb(installExtensionButton.getAttribute('data-downloadurl'), installExtensionButton.getAttribute('data-name'));
+            });
           }
 
-          if (loaderContainer) {
-            loaderContainer.classList.add('hidden');
-            errorContainer.classList.remove('hidden');
+          if (installExtensionFromExternalButton) {
+            // @todo Migrate this handler's confirm to a CE dialog
+            installExtensionFromExternalButton.addEventListener('click', () => {
+              const redirectUrl = installExtensionFromExternalButton.getAttribute('data-downloadurl');
+              const redirectConfirm = window.confirm(Joomla.JText._('PLG_INSTALLER_WEBINSTALLER_REDIRECT_TO_EXTERNAL_SITE_TO_INSTALL').replace('[SITEURL]', redirectUrl));
+
+              if (redirectConfirm !== true) {
+                return;
+              }
+
+              document.getElementById('adminForm').setAttribute('action', redirectUrl);
+              document.querySelector('input[name=task]').setAttribute('disabled', true);
+              document.querySelector('input[name=install_directory]').setAttribute('disabled', true);
+              document.querySelector('input[name=install_url]').setAttribute('disabled', true);
+              document.querySelector('input[name=installtype]').setAttribute('disabled', true);
+              document.querySelector('input[name=filter_search]').setAttribute('disabled', true);
+
+              document.getElementById('adminForm').submit();
+            });
           }
-        },
+        }
+
+        if (webInstallerOptions.list && document.querySelector('.list-view')) {
+          document.querySelector('.list-view').click();
+        }
+
+        WebInstaller.hideLoadingLayer();
       });
 
       return true;
@@ -299,21 +299,16 @@ if (!Joomla) {
         return false;
       }
 
-      const installUrlField = document.getElementById('install_url');
-      const uploadUrlContainer = document.getElementById('uploadform-web-url');
-
-      installUrlField.value = installUrl;
-      uploadUrlContainer.innerHTML = installUrl;
+      document.getElementById('install_url').value = installUrl;
+      document.getElementById('uploadform-web-url').innerText = installUrl;
 
       if (name) {
-        const nameElement = document.getElementById('uploadform-web-name');
-        nameElement.innerHTML = name;
+        document.getElementById('uploadform-web-name').innerText = name;
         document.getElementById('uploadform-web-name-label').classList.remove('hidden');
       } else {
         document.getElementById('uploadform-web-name-label').classList.add('hidden');
       }
 
-      // jQuery('#jed-container').slideUp(300);
       document.getElementById('uploadform-web').classList.remove('hidden');
 
       return true;
@@ -326,7 +321,7 @@ if (!Joomla) {
 
       // Need to wait for the CE to have inserted the tabs list
       if (installerTabs.firstElementChild.tagName !== 'UL') {
-        setTimeout(initialiser, 50);
+        window.setTimeout(initialiser, 50);
 
         return;
       }
@@ -342,11 +337,9 @@ if (!Joomla) {
         link.click();
       }
 
-      if (link.hasAttribute('active')) {
-        if (!instance) {
-          instance = new WebInstaller();
-          instance.initialise();
-        }
+      if (link.hasAttribute('active') && !instance) {
+        instance = new WebInstaller();
+        instance.initialise();
       }
 
       if (webInstallerOptions.options.installfrom_url !== '') {
@@ -361,6 +354,6 @@ if (!Joomla) {
       });
     };
 
-    setTimeout(initialiser, 50);
+    window.setTimeout(initialiser, 50);
   });
-})(window, document, Joomla, window.jQuery);
+})(window, document, Joomla);
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 07faabf502714..666f2423d42b5 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
@@ -47,20 +47,20 @@ Joomla.MediaManager.Edit = Joomla.MediaManager.Edit || {};
       },
     });
 
-    document.getElementById('jform_crop_x').addEventListener('change', (event) => {
-      Joomla.MediaManager.Edit.crop.cropper.setData({ x: parseInt(event.target.value, 10) });
+    document.getElementById('jform_crop_x').addEventListener('change', ({ target }) => {
+      Joomla.MediaManager.Edit.crop.cropper.setData({ x: parseInt(target.value, 10) });
     });
-    document.getElementById('jform_crop_y').addEventListener('change', (event) => {
-      Joomla.MediaManager.Edit.crop.cropper.setData({ y: parseInt(event.target.value, 10) });
+    document.getElementById('jform_crop_y').addEventListener('change', ({ target }) => {
+      Joomla.MediaManager.Edit.crop.cropper.setData({ y: parseInt(target.value, 10) });
     });
-    document.getElementById('jform_crop_width').addEventListener('change', (event) => {
-      Joomla.MediaManager.Edit.crop.cropper.setData({ width: parseInt(event.target.value, 10) });
+    document.getElementById('jform_crop_width').addEventListener('change', ({ target }) => {
+      Joomla.MediaManager.Edit.crop.cropper.setData({ width: parseInt(target.value, 10) });
     });
-    document.getElementById('jform_crop_height').addEventListener('change', (event) => {
-      Joomla.MediaManager.Edit.crop.cropper.setData({ height: parseInt(event.target.value, 10) });
+    document.getElementById('jform_crop_height').addEventListener('change', ({ target }) => {
+      Joomla.MediaManager.Edit.crop.cropper.setData({ height: parseInt(target.value, 10) });
     });
-    document.getElementById('jform_aspectRatio').addEventListener('change', (event) => {
-      Joomla.MediaManager.Edit.crop.cropper.setAspectRatio(event.target.value);
+    document.getElementById('jform_aspectRatio').addEventListener('change', ({ target }) => {
+      Joomla.MediaManager.Edit.crop.cropper.setAspectRatio(target.value);
     });
 
     // Wait for the image to load its data
diff --git a/build/media_source/plg_media-action_resize/js/resize.es6.js b/build/media_source/plg_media-action_resize/js/resize.es6.js
index b5494306c3577..1848cfe30d023 100644
--- a/build/media_source/plg_media-action_resize/js/resize.es6.js
+++ b/build/media_source/plg_media-action_resize/js/resize.es6.js
@@ -58,16 +58,16 @@ Joomla.MediaManager.Edit = Joomla.MediaManager.Edit || {};
       resizeHeightInputBox.value = image.height;
 
       // The listeners
-      resizeWidthInputBox.addEventListener('change', (event) => {
+      resizeWidthInputBox.addEventListener('change', ({ target }) => {
         resize(
-          parseInt(event.target.value, 10),
-          parseInt(event.target.value, 10) / (image.width / image.height),
+          parseInt(target.value, 10),
+          parseInt(target.value, 10) / (image.width / image.height),
         );
       });
-      resizeHeightInputBox.addEventListener('change', (event) => {
+      resizeHeightInputBox.addEventListener('change', ({ target }) => {
         resize(
-          parseInt(event.target.value, 10) * (image.width / image.height),
-          parseInt(event.target.value, 10),
+          parseInt(target.value, 10) * (image.width / image.height),
+          parseInt(target.value, 10),
         );
       });
 
@@ -84,16 +84,16 @@ Joomla.MediaManager.Edit = Joomla.MediaManager.Edit || {};
       resizeHeight.value = image.height;
 
       // The listeners
-      resizeWidth.addEventListener('input', (event) => {
+      resizeWidth.addEventListener('input', ({ target }) => {
         resize(
-          parseInt(event.target.value, 10),
-          parseInt(event.target.value, 10) / (image.width / image.height),
+          parseInt(target.value, 10),
+          parseInt(target.value, 10) / (image.width / image.height),
         );
       });
-      resizeHeight.addEventListener('input', (event) => {
+      resizeHeight.addEventListener('input', ({ target }) => {
         resize(
-          parseInt(event.target.value, 10) * (image.width / image.height),
-          parseInt(event.target.value, 10),
+          parseInt(target.value, 10) * (image.width / image.height),
+          parseInt(target.value, 10),
         );
       });
     };
diff --git a/build/media_source/plg_media-action_rotate/js/rotate.es6.js b/build/media_source/plg_media-action_rotate/js/rotate.es6.js
index 31d98650366f5..b6dccbd7c416a 100644
--- a/build/media_source/plg_media-action_rotate/js/rotate.es6.js
+++ b/build/media_source/plg_media-action_rotate/js/rotate.es6.js
@@ -59,8 +59,8 @@ Joomla.MediaManager.Edit = Joomla.MediaManager.Edit || {};
   const initRotate = () => {
     const funct = () => {
       // The number input listener
-      document.getElementById('jform_rotate_a').addEventListener('input', (event) => {
-        rotate(parseInt(event.target.value, 10));
+      document.getElementById('jform_rotate_a').addEventListener('input', ({ target }) => {
+        rotate(parseInt(target.value, 10));
 
         // Deselect all buttons
         const elements = [].slice.call(document.querySelectorAll('#jform_rotate_distinct label'));
@@ -73,8 +73,8 @@ Joomla.MediaManager.Edit = Joomla.MediaManager.Edit || {};
       // The 90 degree rotate buttons listeners
       const elements = [].slice.call(document.querySelectorAll('#jform_rotate_distinct label'));
       elements.forEach((element) => {
-        element.addEventListener('click', (event) => {
-          rotate(parseInt(event.target.querySelector('input').value, 10));
+        element.addEventListener('click', ({ target }) => {
+          rotate(parseInt(target.querySelector('input').value, 10));
         });
       });
     };
diff --git a/build/media_source/system/js/fields/joomla-field-fancy-select.w-c.es6.js b/build/media_source/system/js/fields/joomla-field-fancy-select.w-c.es6.js
index a43eab3933591..77a3df96a25ff 100644
--- a/build/media_source/system/js/fields/joomla-field-fancy-select.w-c.es6.js
+++ b/build/media_source/system/js/fields/joomla-field-fancy-select.w-c.es6.js
@@ -183,7 +183,7 @@ window.customElements.define('joomla-field-fancy-select', class extends HTMLElem
 
       const lookupDelay = 300;
       let lookupTimeout = null;
-      this.select.addEventListener('search', (event) => {
+      this.select.addEventListener('search', () => {
         clearTimeout(lookupTimeout);
         lookupTimeout = setTimeout(this.requestLookup.bind(this), lookupDelay);
       });
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 39503067a4e30..6637ae909d82e 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
@@ -430,11 +430,11 @@
       // Mouse interaction
       // - mouse down, enable "draggable" and allow to drag the row,
       // - mouse up, disable "draggable"
-      this.addEventListener('mousedown', (event) => {
+      this.addEventListener('mousedown', ({ target }) => {
         if (touched) return;
 
         // Check for .move button
-        const handler = getMoveHandler(event.target);
+        const handler = getMoveHandler(target);
 
 
         const row = handler ? handler.closest(that.repeatableElement) : null;
@@ -448,7 +448,7 @@
         item = row;
       });
 
-      this.addEventListener('mouseup', (event) => {
+      this.addEventListener('mouseup', () => {
         if (item && !touched) {
           item.setAttribute('draggable', 'false');
           item.setAttribute('aria-grabbed', 'false');
@@ -530,13 +530,13 @@
       });
 
       // dragstart event to initiate mouse dragging
-      this.addEventListener('dragstart', (event) => {
+      this.addEventListener('dragstart', ({ dataTransfer }) => {
         if (item) {
           // We going to move the row
-          event.dataTransfer.effectAllowed = 'move';
+          dataTransfer.effectAllowed = 'move';
 
           // This need to work in Firefox and IE10+
-          event.dataTransfer.setData('text', '');
+          dataTransfer.setData('text', '');
         }
       });
 
@@ -547,17 +547,17 @@
       });
 
       // Handle drag action, move element to hovered position
-      this.addEventListener('dragenter', (event) => {
+      this.addEventListener('dragenter', ({ target }) => {
         // Make sure the target in the correct container
         if (!item || (that.rowsContainer
-          && event.target.closest(that.rowsContainer) !== that.containerWithRows)) {
+          && target.closest(that.rowsContainer) !== that.containerWithRows)) {
           return;
         }
 
         // Find a hovered row, and replace it
-        const row = event.target.matches(that.repeatableElement)
-          ? event.target
-          : event.target.closest(that.repeatableElement);
+        const row = target.matches(that.repeatableElement)
+          ? target
+          : target.closest(that.repeatableElement);
         if (!row) return;
 
         switchRowPositions(item, row);
diff --git a/build/media_source/system/js/fields/joomla-field-user.w-c.es6.js b/build/media_source/system/js/fields/joomla-field-user.w-c.es6.js
index 714c31ca88c0c..3e083c567a9d9 100644
--- a/build/media_source/system/js/fields/joomla-field-user.w-c.es6.js
+++ b/build/media_source/system/js/fields/joomla-field-user.w-c.es6.js
@@ -81,8 +81,8 @@
       }
     }
 
-    buttonClick(event) {
-      this.setValue(event.target.getAttribute('data-user-value'), event.target.getAttribute('data-user-name'));
+    buttonClick({ target }) {
+      this.setValue(target.getAttribute('data-user-value'), target.getAttribute('data-user-name'));
       this.modalClose();
     }
 
diff --git a/build/media_source/system/js/fields/select-colour.es6.js b/build/media_source/system/js/fields/select-colour.es6.js
index 15bd96d980b05..06cef73eef7a6 100644
--- a/build/media_source/system/js/fields/select-colour.es6.js
+++ b/build/media_source/system/js/fields/select-colour.es6.js
@@ -5,8 +5,8 @@
 (() => {
   'use strict';
 
-  const onChange = (event) => {
-    const self = event.target;
+  const onChange = ({ target }) => {
+    const self = target;
     const value = parseInt(self.value, 10);
 
     self.classList.remove('custom-select-success', 'custom-select-danger');
diff --git a/build/media_source/system/js/fields/validate.es6.js b/build/media_source/system/js/fields/validate.es6.js
index c9433544ac3c7..8bbdc23574037 100644
--- a/build/media_source/system/js/fields/validate.es6.js
+++ b/build/media_source/system/js/fields/validate.es6.js
@@ -299,8 +299,8 @@
         } else if (tagName !== 'button' && !(tagName === 'input' && element.getAttribute('type') === 'button')) {
           // Attach validate method only to fields
           if (tagName !== 'fieldset') {
-            element.addEventListener('blur', (event) => this.validate(event.target));
-            element.addEventListener('focus', (event) => this.removeMarking(event.target));
+            element.addEventListener('blur', ({ target }) => this.validate(target));
+            element.addEventListener('focus', ({ target }) => this.removeMarking(target));
             if (element.classList.contains('validate-email') && this.inputEmail) {
               element.setAttribute('type', 'email');
             }
diff --git a/build/media_source/system/js/joomla-toolbar-button.w-c.es6.js b/build/media_source/system/js/joomla-toolbar-button.w-c.es6.js
index 4e1b37038e643..0e7563dcfef93 100755
--- a/build/media_source/system/js/joomla-toolbar-button.w-c.es6.js
+++ b/build/media_source/system/js/joomla-toolbar-button.w-c.es6.js
@@ -70,9 +70,9 @@ window.customElements.define('joomla-toolbar-button', class extends HTMLElement
     this.removeEventListener('click', this.executeTask);
   }
 
-  onChange(event) {
+  onChange({ target }) {
     // Check whether we have selected something
-    this.setDisabled(event.target.value < 1);
+    this.setDisabled(target.value < 1);
   }
 
   setDisabled(disabled) {
diff --git a/build/media_source/system/js/multiselect.es6.js b/build/media_source/system/js/multiselect.es6.js
index a33d06c134ead..1135831d28f75 100644
--- a/build/media_source/system/js/multiselect.es6.js
+++ b/build/media_source/system/js/multiselect.es6.js
@@ -48,17 +48,17 @@
       }
     }
 
-    onCheckallToggleClick(event) {
-      const isChecked = event.target.checked;
+    onCheckallToggleClick({ target }) {
+      const isChecked = target.checked;
 
       this.rows.forEach((row) => {
         this.changeBg(row, isChecked);
       });
     }
 
-    onRowClick(event) {
+    onRowClick({ target, shiftKey }) {
       // Do not interfere with links or buttons
-      if (event.target.tagName && (event.target.tagName.toLowerCase() === 'a' || event.target.tagName.toLowerCase() === 'button')) {
+      if (target.tagName && (target.tagName.toLowerCase() === 'a' || target.tagName.toLowerCase() === 'button')) {
         return;
       }
 
@@ -66,14 +66,14 @@
         return;
       }
 
-      const currentRowNum = this.rows.indexOf(event.target.closest('tr'));
+      const currentRowNum = this.rows.indexOf(target.closest('tr'));
       const currentCheckBox = this.checkallToggle ? currentRowNum + 1 : currentRowNum;
       let isChecked = this.boxes[currentCheckBox].checked;
 
       if (currentCheckBox >= 0) {
-        if (!(event.target.id === this.boxes[currentCheckBox].id)) {
+        if (!(target.id === this.boxes[currentCheckBox].id)) {
           // We will prevent selecting text to prevent artifacts
-          if (event.shiftKey) {
+          if (shiftKey) {
             document.body.style['-webkit-user-select'] = 'none';
             document.body.style['-moz-user-select'] = 'none';
             document.body.style['-ms-user-select'] = 'none';
@@ -88,7 +88,7 @@
         this.changeBg(this.rows[currentCheckBox - 1], isChecked);
 
         // Restore normality
-        if (event.shiftKey) {
+        if (shiftKey) {
           document.body.style['-webkit-user-select'] = 'none';
           document.body.style['-moz-user-select'] = 'none';
           document.body.style['-ms-user-select'] = 'none';
diff --git a/build/media_source/system/js/searchtools.es6.js b/build/media_source/system/js/searchtools.es6.js
index 1e3d8179e0571..1019da0e406a7 100644
--- a/build/media_source/system/js/searchtools.es6.js
+++ b/build/media_source/system/js/searchtools.es6.js
@@ -191,8 +191,8 @@ Joomla = window.Joomla || {};
       this.createOrderField();
 
       this.orderCols.forEach((item) => {
-        item.addEventListener('click', (event) => {
-          const element = event.target.tagName.toLowerCase() === 'span' ? event.target.parentNode : event.target;
+        item.addEventListener('click', ({ target }) => {
+          const element = target.tagName.toLowerCase() === 'span' ? target.parentNode : target;
 
           // Order to set
           const newOrderCol = element.getAttribute('data-order');
@@ -292,6 +292,12 @@ Joomla = window.Joomla || {};
         }
       });
 
+      // If there are no active filters - remove the filtered caption area from the table
+      if (activeFilterCount === 0) {
+        const filteredByCaption = document.getElementById('filteredBy');
+        filteredByCaption.parentNode.removeChild(filteredByCaption);
+      }
+
       // Disable clear button when no filter is active and search is empty
       if (this.clearButton) {
         this.clearButton.disabled = (activeFilterCount === 0) && !this.searchString.length;
@@ -306,6 +312,24 @@ Joomla = window.Joomla || {};
       if (tmpEl) {
         tmpEl.classList.add('active');
       }
+
+      // Add all active filters to the table caption for screen-readers
+      const filteredByCaption = document.getElementById('filteredBy');
+
+      // The caption won't exist if no items match the filters so check for the element first
+      if (filteredByCaption) {
+        let captionContent = '';
+
+        if (element.multiple === true) {
+          const selectedOptions = element.querySelectorAll('option:checked');
+          const selectedTextValues = [].slice.call(selectedOptions).map((el) => el.text);
+          captionContent = `${element.labels[0].textContent} - ${selectedTextValues.join()}`;
+        } else {
+          captionContent = `${element.labels[0].textContent} - ${element.options[element.selectedIndex].text}`;
+        }
+
+        filteredByCaption.textContent += captionContent;
+      }
     }
 
     // eslint-disable-next-line class-methods-use-this
@@ -505,8 +529,8 @@ Joomla = window.Joomla || {};
     const sort = document.getElementById('sorted');
 
     if (sort && sort.hasAttribute('data-caption')) {
-      const caption = sort.getAttribute('data-caption');
-      document.getElementById('captionTable').textContent += caption;
+      const orderedBy = sort.getAttribute('data-caption');
+      document.getElementById('orderedBy').textContent += orderedBy;
     }
 
     if (sort && sort.hasAttribute('data-sort')) {
diff --git a/build/media_source/system/js/showon.es6.js b/build/media_source/system/js/showon.es6.js
index 64e7751c2b151..de877ec604097 100644
--- a/build/media_source/system/js/showon.es6.js
+++ b/build/media_source/system/js/showon.es6.js
@@ -215,10 +215,7 @@
   /**
    * Initialize 'showon' feature when part of the page was updated
    */
-  document.addEventListener('joomla:updated', (event) => {
-    // eslint-disable-next-line prefer-destructuring
-    const target = event.target;
-
+  document.addEventListener('joomla:updated', ({ target }) => {
     // Check is it subform, then wee need to fix some "showon" config
     if (target.classList.contains('subform-repeatable-group')) {
       const elements = [].slice.call(target.querySelectorAll('[data-showon]'));
@@ -236,6 +233,6 @@
     }
 
     // eslint-disable-next-line no-new
-    new Showon(event.target);
+    new Showon(target);
   });
 })(document);
diff --git a/build/media_source/templates/atum/js/template.es6.js b/build/media_source/templates/atum/js/template.es6.js
index a195dd39790c6..da785ef535591 100644
--- a/build/media_source/templates/atum/js/template.es6.js
+++ b/build/media_source/templates/atum/js/template.es6.js
@@ -284,8 +284,8 @@
       if (!navigator.cookieEnabled) {
         Joomla.renderMessages({ error: [Joomla.Text._('JGLOBAL_WARNCOOKIES')] }, undefined, false, 6000);
       }
-      window.addEventListener('joomla:menu-toggle', (event) => {
-        changeLogo(event.detail);
+      window.addEventListener('joomla:menu-toggle', ({ detail }) => {
+        changeLogo(detail);
       });
     }
   });
diff --git a/components/com_ajax/ajax.php b/components/com_ajax/ajax.php
index c934fbbc49db3..278aa70883fc5 100644
--- a/components/com_ajax/ajax.php
+++ b/components/com_ajax/ajax.php
@@ -29,6 +29,9 @@
 $app = Factory::getApplication();
 $app->allowCache(false);
 
+// Prevent the api url from being indexed
+$app->setHeader('X-Robots-Tag', 'noindex, nofollow');
+
 // JInput object
 $input = $app->input;
 
diff --git a/components/com_config/forms/config.xml b/components/com_config/forms/config.xml
index 7c428d7bd93d9..8aeeadcf44dfc 100644
--- a/components/com_config/forms/config.xml
+++ b/components/com_config/forms/config.xml
@@ -46,6 +46,7 @@
 			label="COM_CONFIG_FIELD_SITENAME_PAGETITLES_LABEL"
 			default="0"
 			filter="integer"
+			validate="options"
 			>
 			<option value="2">COM_CONFIG_FIELD_VALUE_AFTER</option>
 			<option value="1">COM_CONFIG_FIELD_VALUE_BEFORE</option>
@@ -93,6 +94,7 @@
 			label="COM_CONFIG_FIELD_DEFAULT_LIST_LIMIT_LABEL"
 			default="20"
 			filter="integer"
+			validate="options"
 			>
 			<option value="5">J5</option>
 			<option value="10">J10</option>
diff --git a/components/com_config/forms/modules.xml b/components/com_config/forms/modules.xml
index 86b581dd99dc9..3a517cdd5c0f3 100644
--- a/components/com_config/forms/modules.xml
+++ b/components/com_config/forms/modules.xml
@@ -52,6 +52,7 @@
 			label="JSTATUS"
 			default="1"
 			size="1"
+			validate="options"
 			>
 			<option value="1">JPUBLISHED</option>
 			<option value="0">JUNPUBLISHED</option>
diff --git a/components/com_contact/forms/form.xml b/components/com_contact/forms/form.xml
index f2d4c51845350..745677c258d18 100644
--- a/components/com_contact/forms/form.xml
+++ b/components/com_contact/forms/form.xml
@@ -261,6 +261,7 @@
 			id="published"
 			class="custom-select-color-state"
 			size="1"
+			validate="options"
 		>
 			<option value="1">JPUBLISHED</option>
 			<option value="0">JUNPUBLISHED</option>
@@ -274,6 +275,7 @@
 			type="list"
 			label="JFEATURED"
 			default="0"
+			validate="options"
 		>
 			<option value="0">JNO</option>
 			<option value="1">JYES</option>
diff --git a/components/com_contact/src/Model/CategoryModel.php b/components/com_contact/src/Model/CategoryModel.php
index 2a2d6427b8a49..e2c176251c26e 100644
--- a/components/com_contact/src/Model/CategoryModel.php
+++ b/components/com_contact/src/Model/CategoryModel.php
@@ -501,7 +501,6 @@ public function hit($pk = 0)
 			$pk = (!empty($pk)) ? $pk : (int) $this->getState('category.id');
 
 			$table = Table::getInstance('Category');
-			$table->load($pk);
 			$table->hit($pk);
 		}
 
diff --git a/components/com_contact/src/Model/ContactModel.php b/components/com_contact/src/Model/ContactModel.php
index fd681c85cdaa3..0f01cb7ce34f4 100644
--- a/components/com_contact/src/Model/ContactModel.php
+++ b/components/com_contact/src/Model/ContactModel.php
@@ -464,7 +464,6 @@ public function hit($pk = 0)
 			$pk = $pk ?: (int) $this->getState('contact.id');
 
 			$table = $this->getTable('Contact');
-			$table->load($pk);
 			$table->hit($pk);
 		}
 
diff --git a/components/com_contact/tmpl/categories/default.xml b/components/com_contact/tmpl/categories/default.xml
index bc1de5cf8fa22..c2b391175e703 100644
--- a/components/com_contact/tmpl/categories/default.xml
+++ b/components/com_contact/tmpl/categories/default.xml
@@ -31,6 +31,7 @@
 				label="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -49,6 +50,7 @@
 				type="list"
 				label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="-1">JALL</option>
 				<option value="1">J1</option>
@@ -64,6 +66,7 @@
 				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -75,6 +78,7 @@
 				label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -86,6 +90,7 @@
 				label="COM_CONTACT_FIELD_SHOW_CAT_ITEMS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -99,6 +104,7 @@
 				label="JGLOBAL_SHOW_CATEGORY_TITLE"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -110,6 +116,7 @@
 				label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -121,6 +128,7 @@
 				label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -131,6 +139,7 @@
 				type="list"
 				label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="-1">JALL</option>
 				<option value="0">JNONE</option>
@@ -147,6 +156,7 @@
 				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -158,6 +168,7 @@
 				label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -169,6 +180,7 @@
 				label="COM_CONTACT_FIELD_SHOW_CAT_ITEMS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -183,6 +195,7 @@
 				label="JGLOBAL_FILTER_FIELD_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -194,6 +207,7 @@
 				label="JGLOBAL_DISPLAY_SELECT_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -205,6 +219,7 @@
 				label="JGLOBAL_SHOW_HEADINGS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -216,6 +231,7 @@
 				label="COM_CONTACT_FIELD_CONFIG_POSITION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -227,6 +243,7 @@
 				label="JGLOBAL_EMAIL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -238,6 +255,7 @@
 				label="COM_CONTACT_FIELD_CONFIG_PHONE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -249,6 +267,7 @@
 				label="COM_CONTACT_FIELD_CONFIG_MOBILE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -260,6 +279,7 @@
 				label="COM_CONTACT_FIELD_CONFIG_FAX_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -271,6 +291,7 @@
 				label="COM_CONTACT_FIELD_CONFIG_SUBURB_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -282,6 +303,7 @@
 				label="COM_CONTACT_FIELD_CONFIG_STATE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -293,6 +315,7 @@
 				label="COM_CONTACT_FIELD_CONFIG_COUNTRY_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -304,6 +327,7 @@
 				label="JGLOBAL_PAGINATION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -316,6 +340,7 @@
 				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -330,6 +355,7 @@
 				label="COM_CONTACT_FIELD_CONTACT_SHOW_CATEGORY_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="hide">JHIDE</option>
 				<option value="show_no_link">COM_CONTACT_FIELD_VALUE_NO_LINK</option>
@@ -342,6 +368,7 @@
 				label="COM_CONTACT_FIELD_CONTACT_SHOW_LIST_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -353,6 +380,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_NAME_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -364,6 +392,7 @@
 				label="COM_CONTACT_FIELD_SHOW_TAGS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -375,6 +404,7 @@
 				label="COM_CONTACT_FIELD_SHOW_INFO_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -387,6 +417,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -399,6 +430,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -411,6 +443,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -423,6 +456,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -435,6 +469,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -447,6 +482,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -459,6 +495,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -471,6 +508,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -483,6 +521,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -495,6 +534,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -507,6 +547,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -519,6 +560,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -530,6 +572,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_VCARD_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -541,6 +584,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_MISC_INFO_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -552,6 +596,7 @@
 				label="COM_CONTACT_FIELD_ARTICLES_SHOW_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -563,6 +608,7 @@
 				label="COM_CONTACT_FIELD_ARTICLES_DISPLAY_NUM_LABEL"
 				default=""
 				useglobal="true"
+				validate="options"
 				>
 				<option value="use_contact">COM_CONTACT_FIELD_VALUE_USE_CONTACT_SETTINGS</option>
 				<option value="5">J5</option>
@@ -587,6 +633,7 @@
 				label="COM_CONTACT_FIELD_SHOW_LINKS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -640,6 +687,7 @@
 				label="COM_CONTACT_FIELD_EMAIL_SHOW_FORM_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -651,6 +699,7 @@
 				label="COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -662,6 +711,7 @@
 				label="COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>
@@ -673,6 +723,7 @@
 				label="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>
@@ -695,6 +746,7 @@
 				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
diff --git a/components/com_contact/tmpl/category/default.xml b/components/com_contact/tmpl/category/default.xml
index 06ab7f02e6b17..1aa92afabf18d 100644
--- a/components/com_contact/tmpl/category/default.xml
+++ b/components/com_contact/tmpl/category/default.xml
@@ -39,6 +39,7 @@
 				label="JGLOBAL_SHOW_CATEGORY_TITLE"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -50,6 +51,7 @@
 				label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -61,6 +63,7 @@
 				label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -71,6 +74,7 @@
 				type="list"
 				label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="-1">JALL</option>
 				<option value="0">JNONE</option>
@@ -87,6 +91,7 @@
 				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -99,6 +104,7 @@
 				label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -110,6 +116,7 @@
 				label="COM_CONTACT_FIELD_SHOW_CAT_ITEMS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -125,6 +132,7 @@
 				default=""
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -136,6 +144,7 @@
 				label="JGLOBAL_DISPLAY_SELECT_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -147,6 +156,7 @@
 				label="JGLOBAL_SHOW_HEADINGS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -158,6 +168,7 @@
 				label="COM_CONTACT_FIELD_CONFIG_SHOW_IMAGE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -169,6 +180,7 @@
 				label="COM_CONTACT_FIELD_CONFIG_POSITION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -180,6 +192,7 @@
 				label="JGLOBAL_EMAIL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -191,6 +204,7 @@
 				label="COM_CONTACT_FIELD_CONFIG_PHONE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -202,6 +216,7 @@
 				label="COM_CONTACT_FIELD_CONFIG_MOBILE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -213,6 +228,7 @@
 				label="COM_CONTACT_FIELD_CONFIG_FAX_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -224,6 +240,7 @@
 				label="COM_CONTACT_FIELD_CONFIG_SUBURB_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -235,6 +252,7 @@
 				label="COM_CONTACT_FIELD_CONFIG_STATE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -246,6 +264,7 @@
 				label="COM_CONTACT_FIELD_CONFIG_COUNTRY_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -256,6 +275,7 @@
 				type="list"
 				label="JGLOBAL_PAGINATION_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -268,6 +288,7 @@
 				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -279,6 +300,7 @@
  				type="list"
  				label="COM_CONTACT_NUMBER_CONTACTS_LIST_LABEL"
  				useglobal="true"
+				validate="options"
  				>
  				<option value="5">J5</option>
  				<option value="10">J10</option>
@@ -296,6 +318,7 @@
 				type="list"
 				label="COM_CONTACT_FIELD_INITIAL_SORT_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="name">COM_CONTACT_FIELD_VALUE_NAME</option>
 				<option value="sortname">COM_CONTACT_FIELD_VALUE_SORT_NAME</option>
@@ -323,6 +346,7 @@
 				label="COM_CONTACT_FIELD_CONTACT_SHOW_CATEGORY_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="hide">JHIDE</option>
 				<option value="show_no_link">COM_CONTACT_FIELD_VALUE_NO_LINK</option>
@@ -335,6 +359,7 @@
 				label="COM_CONTACT_FIELD_CONTACT_SHOW_LIST_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -346,6 +371,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_NAME_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -357,6 +383,7 @@
 				label="COM_CONTACT_FIELD_SHOW_TAGS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -368,6 +395,7 @@
 				label="COM_CONTACT_FIELD_SHOW_INFO_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -380,6 +408,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -393,6 +422,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -405,6 +435,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -417,6 +448,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -429,6 +461,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -441,6 +474,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -453,6 +487,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -465,6 +500,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -477,6 +513,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -489,6 +526,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -501,6 +539,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -513,6 +552,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -524,6 +564,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_VCARD_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -535,6 +576,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_MISC_INFO_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -546,6 +588,7 @@
 				label="COM_CONTACT_FIELD_ARTICLES_SHOW_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -557,6 +600,7 @@
 				label="COM_CONTACT_FIELD_ARTICLES_DISPLAY_NUM_LABEL"
 				default=""
 				useglobal="true"
+				validate="options"
 				>
 				<option value="use_contact">COM_CONTACT_FIELD_VALUE_USE_CONTACT_SETTINGS</option>
 				<option value="5">J5</option>
@@ -581,6 +625,7 @@
 				label="COM_CONTACT_FIELD_SHOW_LINKS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -647,6 +692,7 @@
 				label="COM_CONTACT_FIELD_EMAIL_SHOW_FORM_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -658,6 +704,7 @@
 				label="COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -669,6 +716,7 @@
 				label="COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>
@@ -680,6 +728,7 @@
 				label="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>
@@ -702,6 +751,7 @@
 				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
diff --git a/components/com_contact/tmpl/contact/default.xml b/components/com_contact/tmpl/contact/default.xml
index f7904d1241aaf..e2b8a57d5fff9 100644
--- a/components/com_contact/tmpl/contact/default.xml
+++ b/components/com_contact/tmpl/contact/default.xml
@@ -41,6 +41,7 @@
 				label="COM_CONTACT_FIELD_CONTACT_SHOW_CATEGORY_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="hide">JHIDE</option>
 				<option value="show_no_link">COM_CONTACT_FIELD_VALUE_NO_LINK</option>
@@ -53,6 +54,7 @@
 				label="COM_CONTACT_FIELD_CONTACT_SHOW_LIST_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -64,6 +66,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_NAME_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -75,6 +78,7 @@
 				label="COM_CONTACT_FIELD_SHOW_TAGS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -86,6 +90,7 @@
 				label="COM_CONTACT_FIELD_SHOW_INFO_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -98,6 +103,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -110,6 +116,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -122,6 +129,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
@@ -134,6 +142,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -146,6 +155,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -158,6 +168,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -170,6 +181,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -182,6 +194,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -194,6 +207,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -206,6 +220,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -218,6 +233,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -230,6 +246,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -242,6 +259,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -253,6 +271,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_VCARD_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -264,6 +283,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_MISC_INFO_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -275,6 +295,7 @@
 				label="COM_CONTACT_FIELD_ARTICLES_SHOW_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -286,6 +307,7 @@
 				label="COM_CONTACT_FIELD_ARTICLES_DISPLAY_NUM_LABEL"
 				default=""
 				useglobal="true"
+				validate="options"
 				>
 				<option value="use_contact">COM_CONTACT_FIELD_VALUE_USE_CONTACT_SETTINGS</option>
 				<option value="5">J5</option>
@@ -310,6 +332,7 @@
 				label="COM_CONTACT_FIELD_PROFILE_SHOW_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -333,6 +356,7 @@
 				label="COM_CONTACT_FIELD_SHOW_LINKS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -390,6 +414,7 @@
 				label="COM_CONTACT_FIELD_EMAIL_SHOW_FORM_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -401,6 +426,7 @@
 				label="COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -412,6 +438,7 @@
 				label="COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>
@@ -423,6 +450,7 @@
 				label="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>
diff --git a/components/com_contact/tmpl/featured/default.xml b/components/com_contact/tmpl/featured/default.xml
index 68db6ab4ffd1c..2a3f0b5acfbbe 100644
--- a/components/com_contact/tmpl/featured/default.xml
+++ b/components/com_contact/tmpl/featured/default.xml
@@ -23,6 +23,7 @@
 				label="JGLOBAL_DISPLAY_SELECT_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -34,6 +35,7 @@
 				label="JGLOBAL_SHOW_HEADINGS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -45,6 +47,7 @@
 			label="COM_CONTACT_FIELD_CONFIG_POSITION_LABEL"
 			useglobal="true"
 			class="custom-select-color-state"
+			validate="options"
 			>
 			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
@@ -56,6 +59,7 @@
 			label="JGLOBAL_EMAIL"
 			useglobal="true"
 			class="custom-select-color-state"
+			validate="options"
 			>
 			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
@@ -67,6 +71,7 @@
 			label="COM_CONTACT_FIELD_CONFIG_PHONE_LABEL"
 			useglobal="true"
 			class="custom-select-color-state"
+			validate="options"
 			>
 			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
@@ -78,6 +83,7 @@
 			label="COM_CONTACT_FIELD_CONFIG_MOBILE_LABEL"
 			useglobal="true"
 			class="custom-select-color-state"
+			validate="options"
 			>
 			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
@@ -89,6 +95,7 @@
 			label="COM_CONTACT_FIELD_CONFIG_FAX_LABEL"
 			useglobal="true"
 			class="custom-select-color-state"
+			validate="options"
 			>
 			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
@@ -100,6 +107,7 @@
 			label="COM_CONTACT_FIELD_CONFIG_SUBURB_LABEL"
 			useglobal="true"
 			class="custom-select-color-state"
+			validate="options"
 			>
 			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
@@ -111,6 +119,7 @@
 			label="COM_CONTACT_FIELD_CONFIG_STATE_LABEL"
 			useglobal="true"
 			class="custom-select-color-state"
+			validate="options"
 			>
 			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
@@ -122,6 +131,7 @@
 			label="COM_CONTACT_FIELD_CONFIG_COUNTRY_LABEL"
 			useglobal="true"
 			class="custom-select-color-state"
+			validate="options"
 			>
 			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
@@ -133,6 +143,7 @@
 			label="JGLOBAL_PAGINATION_LABEL"
 			useglobal="true"
 			class="custom-select-color-state"
+			validate="options"
 			>
 			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
@@ -145,6 +156,7 @@
 			label="JGLOBAL_PAGINATION_RESULTS_LABEL"
 			useglobal="true"
 			class="custom-select-color-state"
+			validate="options"
 			>
 			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
@@ -160,6 +172,7 @@
 				label="COM_CONTACT_FIELD_SHOW_TAGS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -171,6 +184,7 @@
 				label="COM_CONTACT_FIELD_SHOW_INFO_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -183,6 +197,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -195,6 +210,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -208,6 +224,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -220,6 +237,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -232,6 +250,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -244,6 +263,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -256,6 +276,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -268,6 +289,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -280,6 +302,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -292,6 +315,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -304,6 +328,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -316,6 +341,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -328,6 +354,7 @@
 				useglobal="true"
 				showon="show_info:1"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -339,6 +366,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_VCARD_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -350,6 +378,7 @@
 				label="COM_CONTACT_FIELD_PARAMS_MISC_INFO_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -361,6 +390,7 @@
 				label="COM_CONTACT_FIELD_ARTICLES_SHOW_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -372,6 +402,7 @@
 				label="COM_CONTACT_FIELD_ARTICLES_DISPLAY_NUM_LABEL"
 				default=""
 				useglobal="true"
+				validate="options"
 				>
 				<option value="use_contact">COM_CONTACT_FIELD_VALUE_USE_CONTACT_SETTINGS</option>
 				<option value="5">J5</option>
@@ -396,6 +427,7 @@
 				label="COM_CONTACT_FIELD_SHOW_LINKS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -450,6 +482,7 @@
 				label="COM_CONTACT_FIELD_EMAIL_SHOW_FORM_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -461,6 +494,7 @@
 				label="COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -472,6 +506,7 @@
 				label="COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>
@@ -483,6 +518,7 @@
 				label="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>
diff --git a/components/com_content/forms/article.xml b/components/com_content/forms/article.xml
index d28790a36b7be..953761738838e 100644
--- a/components/com_content/forms/article.xml
+++ b/components/com_content/forms/article.xml
@@ -69,6 +69,7 @@
 			label="JGLOBAL_FIELD_FEATURED_LABEL"
 			id="featured"
 			default="0"
+			validate="options"
 			>
 			<option value="0">JNO</option>
 			<option value="1">JYES</option>
@@ -245,6 +246,7 @@
 				type="list"
 				label="COM_CONTENT_FLOAT_INTRO_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="right">COM_CONTENT_RIGHT</option>
 				<option value="left">COM_CONTENT_LEFT</option>
@@ -277,6 +279,7 @@
 				type="list"
 				label="COM_CONTENT_FLOAT_FULLTEXT_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="right">COM_CONTENT_RIGHT</option>
 				<option value="left">COM_CONTENT_LEFT</option>
diff --git a/components/com_content/forms/filter_articles.xml b/components/com_content/forms/filter_articles.xml
index a66bb7f75502d..1dcbe3d7002c5 100644
--- a/components/com_content/forms/filter_articles.xml
+++ b/components/com_content/forms/filter_articles.xml
@@ -98,7 +98,7 @@
 			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
 			onchange="this.form.submit();"
 			default="a.title ASC"
-		        validate="options"
+			validate="options"
 			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
diff --git a/components/com_content/src/Model/ArticleModel.php b/components/com_content/src/Model/ArticleModel.php
index e5b9f07fc53ae..784891a857743 100644
--- a/components/com_content/src/Model/ArticleModel.php
+++ b/components/com_content/src/Model/ArticleModel.php
@@ -330,7 +330,6 @@ public function hit($pk = 0)
 			$pk = (!empty($pk)) ? $pk : (int) $this->getState('article.id');
 
 			$table = Table::getInstance('Content', 'JTable');
-			$table->load($pk);
 			$table->hit($pk);
 		}
 
diff --git a/components/com_content/src/Model/CategoryModel.php b/components/com_content/src/Model/CategoryModel.php
index 1a294d0a25be7..0f7945a2b3bac 100644
--- a/components/com_content/src/Model/CategoryModel.php
+++ b/components/com_content/src/Model/CategoryModel.php
@@ -517,7 +517,6 @@ public function hit($pk = 0)
 			$pk = (!empty($pk)) ? $pk : (int) $this->getState('category.id');
 
 			$table = Table::getInstance('Category', 'JTable');
-			$table->load($pk);
 			$table->hit($pk);
 		}
 
diff --git a/components/com_content/tmpl/archive/default.xml b/components/com_content/tmpl/archive/default.xml
index 2cfc64ca2e20b..96f3e7ef98b35 100644
--- a/components/com_content/tmpl/archive/default.xml
+++ b/components/com_content/tmpl/archive/default.xml
@@ -37,6 +37,7 @@
 				type="list"
 				label="JGLOBAL_ARTICLE_ORDER_LABEL"
 				default="alpha"
+				validate="options"
 				>
 				<option value="date">JGLOBAL_OLDEST_FIRST</option>
 				<option value="rdate">JGLOBAL_MOST_RECENT_FIRST</option>
@@ -58,6 +59,7 @@
 				type="list"
 				label="JGLOBAL_ORDERING_DATE_LABEL"
 				default="created"
+				validate="options"
 				>
 				<option value="created">JGLOBAL_Created</option>
 				<option value="modified">JGLOBAL_Modified</option>
@@ -69,6 +71,7 @@
 				type="list"
 				label="JGLOBAL_NUMBER_ITEMS_LIST_LABEL"
 				default="5"
+				validate="options"
 				>
 				<option value="5">J5</option>
 				<option value="10">J10</option>
@@ -87,6 +90,7 @@
 				label="JGLOBAL_FILTER_FIELD_LABEL"
 				default=""
 				useglobal="true"
+				validate="options"
 				>
 				<option value="hide">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -112,6 +116,7 @@
 				label="JGLOBAL_SHOW_INTRO_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -124,6 +129,7 @@
 				default=""
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">COM_CONTENT_FIELD_OPTION_ABOVE</option>
@@ -137,6 +143,7 @@
 				label="COM_CONTENT_FIELD_INFOBLOCK_TITLE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option	value="0">JHIDE</option>
 				<option	value="1">JSHOW</option>
@@ -148,6 +155,7 @@
 				label="JGLOBAL_SHOW_CATEGORY_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -159,6 +167,7 @@
 				label="JGLOBAL_LINK_CATEGORY_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>
@@ -170,6 +179,7 @@
 				label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option	value="0">JHIDE</option>
 				<option	value="1">JSHOW</option>
@@ -181,6 +191,7 @@
 				label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option	value="0">JNO</option>
 				<option	value="1">JYES</option>
@@ -193,6 +204,7 @@
 				description="JGLOBAL_LINKED_TITLES_DESC"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>
@@ -204,6 +216,7 @@
 				label="JGLOBAL_SHOW_AUTHOR_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -215,6 +228,7 @@
 				label="JGLOBAL_LINK_AUTHOR_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option	value="0">JNO</option>
 				<option	value="1">JYES</option>
@@ -226,6 +240,7 @@
 				label="JGLOBAL_SHOW_CREATE_DATE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -237,6 +252,7 @@
 				label="JGLOBAL_SHOW_MODIFY_DATE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -248,6 +264,7 @@
 				label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -259,6 +276,7 @@
 				label="JGLOBAL_SHOW_NAVIGATION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -270,6 +288,7 @@
 				label="JGLOBAL_SHOW_HITS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
diff --git a/components/com_content/tmpl/article/default.xml b/components/com_content/tmpl/article/default.xml
index 857fba2d1f0a7..a21ef6df5f885 100644
--- a/components/com_content/tmpl/article/default.xml
+++ b/components/com_content/tmpl/article/default.xml
@@ -42,6 +42,7 @@
 			label="JGLOBAL_SHOW_TITLE_LABEL"
 			useglobal="true"
 			class="custom-select-color-state"
+			validate="options"
 			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
@@ -53,6 +54,7 @@
 			label="JGLOBAL_LINKED_TITLES_LABEL"
 			useglobal="true"
 			class="custom-select-color-state"
+			validate="options"
 			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
@@ -64,6 +66,7 @@
 			label="JGLOBAL_SHOW_INTRO_LABEL"
 			useglobal="true"
 			class="custom-select-color-state"
+			validate="options"
 			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
@@ -74,6 +77,7 @@
 			type="list"
 			label="COM_CONTENT_FIELD_INFOBLOCK_POSITION_LABEL"
 			useglobal="true"
+			validate="options"
 			>
 			<option value="0">COM_CONTENT_FIELD_OPTION_ABOVE</option>
 			<option value="1">COM_CONTENT_FIELD_OPTION_BELOW</option>
@@ -86,6 +90,7 @@
 			label="COM_CONTENT_FIELD_INFOBLOCK_TITLE_LABEL"
 			useglobal="true"
 			class="custom-select-color-state"
+			validate="options"
 			>
 			<option	value="1">JSHOW</option>
 			<option	value="0">JHIDE</option>
@@ -97,6 +102,7 @@
 			label="JGLOBAL_SHOW_CATEGORY_LABEL"
 			useglobal="true"
 			class="custom-select-color-state"
+			validate="options"
 			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
@@ -108,6 +114,7 @@
 			label="JGLOBAL_LINK_CATEGORY_LABEL"
 			useglobal="true"
 			class="custom-select-color-state"
+			validate="options"
 			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
@@ -119,6 +126,7 @@
 			label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL"
 			useglobal="true"
 			class="custom-select-color-state"
+			validate="options"
 			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
@@ -130,6 +138,7 @@
 			label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL"
 			useglobal="true"
 			class="custom-select-color-state"
+			validate="options"
 			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
@@ -152,6 +161,7 @@
 			label="JGLOBAL_SHOW_AUTHOR_LABEL"
 			useglobal="true"
 			class="custom-select-color-state"
+			validate="options"
 			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
@@ -163,6 +173,7 @@
 			label="JGLOBAL_LINK_AUTHOR_LABEL"
 			useglobal="true"
 			class="custom-select-color-state"
+			validate="options"
 			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
@@ -174,6 +185,7 @@
 			label="JGLOBAL_SHOW_CREATE_DATE_LABEL"
 			useglobal="true"
 			class="custom-select-color-state"
+			validate="options"
 			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
@@ -185,6 +197,7 @@
 			label="JGLOBAL_SHOW_MODIFY_DATE_LABEL"
 			useglobal="true"
 			class="custom-select-color-state"
+			validate="options"
 			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
@@ -196,6 +209,7 @@
 			label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL"
 			useglobal="true"
 			class="custom-select-color-state"
+			validate="options"
 			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
@@ -207,6 +221,7 @@
 			label="JGLOBAL_SHOW_NAVIGATION_LABEL"
 			useglobal="true"
 			class="custom-select-color-state"
+			validate="options"
 			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
@@ -218,6 +233,7 @@
 			label="JGLOBAL_SHOW_VOTE_LABEL"
 			useglobal="true"
 			class="custom-select-color-state"
+			validate="options"
 			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
@@ -229,6 +245,7 @@
 			label="JGLOBAL_SHOW_HITS_LABEL"
 			useglobal="true"
 			class="custom-select-color-state"
+			validate="options"
 			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
@@ -240,6 +257,7 @@
 			label="JGLOBAL_SHOW_TAGS_LABEL"
 			useglobal="true"
 			class="custom-select-color-state"
+			validate="options"
 			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
@@ -252,6 +270,7 @@
 			description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC"
 			useglobal="true"
 			class="custom-select-color-state"
+			validate="options"
 			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
@@ -261,6 +280,7 @@
 			type="list"
 			label="COM_CONTENT_FIELD_URLSPOSITION_LABEL"
 			useglobal="true"
+			validate="options"
 			>
 			<option value="0">COM_CONTENT_FIELD_OPTION_ABOVE</option>
 			<option value="1">COM_CONTENT_FIELD_OPTION_BELOW</option>
diff --git a/components/com_content/tmpl/categories/default.xml b/components/com_content/tmpl/categories/default.xml
index 53c61239e2b49..b1ce11d9e47df 100644
--- a/components/com_content/tmpl/categories/default.xml
+++ b/components/com_content/tmpl/categories/default.xml
@@ -34,6 +34,7 @@
 				label="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -52,6 +53,7 @@
 				type="list"
 				label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="-1">JALL</option>
 				<option value="1">J1</option>
@@ -67,6 +69,7 @@
 				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -78,6 +81,7 @@
 				label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -89,6 +93,7 @@
 				label="COM_CONTENT_NUMBER_CATEGORY_ITEMS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -103,6 +108,7 @@
 				label="JGLOBAL_SHOW_CATEGORY_TITLE"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -114,6 +120,7 @@
 				label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -125,6 +132,7 @@
 				label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -135,6 +143,7 @@
 				type="list"
 				label="JGLOBAL_MAXLEVEL_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="-1">JALL</option>
 				<option value="0">JNONE</option>
@@ -151,6 +160,7 @@
 				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -162,6 +172,7 @@
 				label="COM_CONTENT_NO_ARTICLES_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -173,6 +184,7 @@
 				label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -184,6 +196,7 @@
 				label="COM_CONTENT_NUMBER_CATEGORY_ITEMS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -217,6 +230,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_SUBCATEGORY_CONTENT_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="0">JNONE</option>
 				<option value="-1">JALL</option>
@@ -238,6 +252,7 @@
 				type="list"
 				label="JGLOBAL_CATEGORY_ORDER_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="none">JGLOBAL_NO_ORDER</option>
 				<option value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
@@ -250,6 +265,7 @@
 				type="list"
 				label="JGLOBAL_ARTICLE_ORDER_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="front">COM_CONTENT_FEATURED_ORDER</option>
 				<option value="rdate">JGLOBAL_MOST_RECENT_FIRST</option>
@@ -273,6 +289,7 @@
 				type="list"
 				label="JGLOBAL_ORDERING_DATE_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="created">JGLOBAL_CREATED</option>
 				<option value="modified">JGLOBAL_MODIFIED</option>
@@ -288,6 +305,7 @@
 				label="JGLOBAL_DISPLAY_SELECT_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -298,6 +316,7 @@
 				type="list"
 				label="JGLOBAL_FILTER_FIELD_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="hide">JHIDE</option>
 				<option value="title">JGLOBAL_TITLE</option>
@@ -311,6 +330,7 @@
 				label="JGLOBAL_SHOW_HEADINGS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -322,6 +342,7 @@
 				label="JGLOBAL_SHOW_DATE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="created">JGLOBAL_CREATED</option>
@@ -343,6 +364,7 @@
 				label="JGLOBAL_LIST_HITS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -354,6 +376,7 @@
 				label="JGLOBAL_LIST_AUTHOR_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -364,6 +387,7 @@
 				type="list"
 				label="JGLOBAL_NUMBER_ITEMS_LIST_LABEL"
 				default="10"
+				validate="options"
 				>
 				<option value="5">J5</option>
 				<option value="10">J10</option>
@@ -386,6 +410,7 @@
 				label="JGLOBAL_PAGINATION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -398,6 +423,7 @@
 				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -423,6 +449,7 @@
 				label="JGLOBAL_SHOW_TITLE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -434,6 +461,7 @@
 				label="JGLOBAL_LINKED_TITLES_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>
@@ -445,6 +473,7 @@
 				label="JGLOBAL_SHOW_INTRO_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -456,6 +485,7 @@
 				label="JGLOBAL_SHOW_CATEGORY_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -467,6 +497,7 @@
 				label="JGLOBAL_LINK_CATEGORY_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>
@@ -478,6 +509,7 @@
 				label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -489,6 +521,7 @@
 				label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>
@@ -500,6 +533,7 @@
 				label="JGLOBAL_SHOW_AUTHOR_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -511,6 +545,7 @@
 				label="JGLOBAL_LINK_AUTHOR_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>
@@ -522,6 +557,7 @@
 				label="JGLOBAL_SHOW_CREATE_DATE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -533,6 +569,7 @@
 				label="JGLOBAL_SHOW_MODIFY_DATE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -544,6 +581,7 @@
 				label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -555,6 +593,7 @@
 				label="JGLOBAL_SHOW_NAVIGATION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -566,6 +605,7 @@
 				label="JGLOBAL_SHOW_VOTE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option	value="1">JSHOW</option>
@@ -578,6 +618,7 @@
 				description="JGLOBAL_SHOW_READMORE_DESC"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -589,6 +630,7 @@
 				label="JGLOBAL_SHOW_READMORE_TITLE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -600,6 +642,7 @@
 				label="JGLOBAL_SHOW_HITS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -612,6 +655,7 @@
 				description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>
@@ -625,6 +669,7 @@
 				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -635,6 +680,7 @@
 				type="list"
 				label="JGLOBAL_FEED_SUMMARY_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="0">JGLOBAL_INTRO_TEXT</option>
 				<option value="1">JGLOBAL_FULL_TEXT</option>
diff --git a/components/com_content/tmpl/category/blog.xml b/components/com_content/tmpl/category/blog.xml
index 6ac238968d488..11d06e97beea9 100644
--- a/components/com_content/tmpl/category/blog.xml
+++ b/components/com_content/tmpl/category/blog.xml
@@ -49,6 +49,7 @@
 	 				label="JGLOBAL_SHOW_CATEGORY_HEADING_TITLE_TEXT_LABEL"
 					useglobal="true"
 					class="custom-select-color-state"
+					validate="options"
 					>
 					<option value="0">JHIDE</option>
 					<option value="1">JSHOW</option>
@@ -60,6 +61,7 @@
 					label="JGLOBAL_SHOW_CATEGORY_TITLE"
 					useglobal="true"
 					class="custom-select-color-state"
+					validate="options"
 					>
 					<option value="0">JHIDE</option>
 					<option value="1">JSHOW</option>
@@ -71,6 +73,7 @@
 					label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
 					useglobal="true"
 					class="custom-select-color-state"
+					validate="options"
 					>
 					<option value="0">JHIDE</option>
 					<option value="1">JSHOW</option>
@@ -82,6 +85,7 @@
 					label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
 					useglobal="true"
 					class="custom-select-color-state"
+					validate="options"
 					>
 					<option value="0">JHIDE</option>
 					<option value="1">JSHOW</option>
@@ -93,6 +97,7 @@
 					label="JGLOBAL_MAXLEVEL_LABEL"
 					description="JGLOBAL_MAXLEVEL_DESC"
 					useglobal="true"
+					validate="options"
 					>
 					<option value="-1">JALL</option>
 					<option value="0">JNONE</option>
@@ -109,6 +114,7 @@
 					label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
 					useglobal="true"
 					class="custom-select-color-state"
+					validate="options"
 					>
 					<option value="0">JHIDE</option>
 					<option value="1">JSHOW</option>
@@ -120,6 +126,7 @@
 					label="COM_CONTENT_NO_ARTICLES_LABEL"
 					useglobal="true"
 					class="custom-select-color-state"
+					validate="options"
 					>
 					<option value="0">JHIDE</option>
 					<option value="1">JSHOW</option>
@@ -131,6 +138,7 @@
 					label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
 					useglobal="true"
 					class="custom-select-color-state"
+					validate="options"
 					>
 					<option value="0">JHIDE</option>
 					<option value="1">JSHOW</option>
@@ -142,6 +150,7 @@
 					label="COM_CONTENT_NUMBER_CATEGORY_ITEMS_LABEL"
 					useglobal="true"
 					class="custom-select-color-state"
+					validate="options"
 					>
 					<option value="0">JHIDE</option>
 					<option value="1">JSHOW</option>
@@ -153,6 +162,7 @@
 					label="COM_CONTENT_FIELD_SHOW_CAT_TAGS_LABEL"
 					useglobal="true"
 					class="custom-select-color-state"
+					validate="options"
 					>
 					<option value="0">JHIDE</option>
 					<option value="1">JSHOW</option>
@@ -213,6 +223,7 @@
 					type="list"
 					label="JGLOBAL_SHOW_SUBCATEGORY_CONTENT_LABEL"
 					useglobal="true"
+					validate="options"
 					>
 					<option value="0">JNONE</option>
 					<option value="-1">JALL</option>
@@ -234,6 +245,7 @@
 					type="list"
 					label="JGLOBAL_CATEGORY_ORDER_LABEL"
 					useglobal="true"
+					validate="options"
 					>
 					<option value="none">JGLOBAL_NO_ORDER</option>
 					<option value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
@@ -246,6 +258,7 @@
 					type="list"
 					label="JGLOBAL_ARTICLE_ORDER_LABEL"
 					useglobal="true"
+					validate="options"
 					>
 					<option value="front">COM_CONTENT_FEATURED_ORDER</option>
 					<option value="rdate">JGLOBAL_MOST_RECENT_FIRST</option>
@@ -270,6 +283,7 @@
 					type="list"
 					label="JGLOBAL_ORDERING_DATE_LABEL"
 					useglobal="true"
+					validate="options"
 					>
 					<option value="created">JGLOBAL_CREATED</option>
 					<option value="modified">JGLOBAL_MODIFIED</option>
@@ -283,6 +297,7 @@
 					label="JGLOBAL_PAGINATION_LABEL"
 					useglobal="true"
 					class="custom-select-color-state"
+					validate="options"
 					>
 					<option value="0">JHIDE</option>
 					<option value="1">JSHOW</option>
@@ -295,6 +310,7 @@
 					label="JGLOBAL_PAGINATION_RESULTS_LABEL"
 					useglobal="true"
 					class="custom-select-color-state"
+					validate="options"
 					>
 					<option value="0">JHIDE</option>
 					<option value="1">JSHOW</option>
@@ -307,6 +323,7 @@
 					label="JGLOBAL_SHOW_FEATURED_ARTICLES_LABEL"
 					useglobal="true"
 					class="custom-select-color-state"
+					validate="options"
 					>
 					<option value="show">JSHOW</option>
 					<option value="hide">JHIDE</option>
@@ -335,6 +352,7 @@
 				label="JGLOBAL_SHOW_TITLE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">JHIDE</option>
@@ -347,6 +365,7 @@
 				label="JGLOBAL_LINKED_TITLES_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">JNO</option>
@@ -359,6 +378,7 @@
 				label="JGLOBAL_SHOW_INTRO_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">JHIDE</option>
@@ -372,6 +392,7 @@
 				default=""
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">COM_CONTENT_FIELD_OPTION_ABOVE</option>
@@ -385,6 +406,7 @@
 				label="COM_CONTENT_FIELD_INFOBLOCK_TITLE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option	value="0">JHIDE</option>
@@ -397,6 +419,7 @@
 				label="JGLOBAL_SHOW_CATEGORY_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">JHIDE</option>
@@ -409,6 +432,7 @@
 				label="JGLOBAL_LINK_CATEGORY_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">JNO</option>
@@ -421,6 +445,7 @@
 				label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">JHIDE</option>
@@ -433,6 +458,7 @@
 				label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">JNO</option>
@@ -457,6 +483,7 @@
 				label="JGLOBAL_SHOW_AUTHOR_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">JHIDE</option>
@@ -469,6 +496,7 @@
 				label="JGLOBAL_LINK_AUTHOR_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">JNO</option>
@@ -481,6 +509,7 @@
 				label="JGLOBAL_SHOW_CREATE_DATE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">JHIDE</option>
@@ -493,6 +522,7 @@
 				label="JGLOBAL_SHOW_MODIFY_DATE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">JHIDE</option>
@@ -505,6 +535,7 @@
 				label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">JHIDE</option>
@@ -517,6 +548,7 @@
 				label="JGLOBAL_SHOW_NAVIGATION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">JHIDE</option>
@@ -529,6 +561,7 @@
 				label="JGLOBAL_SHOW_VOTE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">JHIDE</option>
@@ -542,6 +575,7 @@
 				description="JGLOBAL_SHOW_READMORE_DESC"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -553,6 +587,7 @@
 				label="JGLOBAL_SHOW_READMORE_TITLE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -564,6 +599,7 @@
 				label="JGLOBAL_SHOW_HITS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">JHIDE</option>
@@ -576,6 +612,7 @@
 				label="COM_CONTENT_FIELD_SHOW_TAGS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">JHIDE</option>
@@ -589,6 +626,7 @@
 				description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">JNO</option>
@@ -603,6 +641,7 @@
 				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -613,6 +652,7 @@
 				type="list"
 				label="JGLOBAL_FEED_SUMMARY_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="0">JGLOBAL_INTRO_TEXT</option>
 				<option value="1">JGLOBAL_FULL_TEXT</option>
diff --git a/components/com_content/tmpl/category/default.xml b/components/com_content/tmpl/category/default.xml
index 991d4302e9dcf..d2ae35ee89bdb 100644
--- a/components/com_content/tmpl/category/default.xml
+++ b/components/com_content/tmpl/category/default.xml
@@ -46,6 +46,7 @@
 				label="JGLOBAL_SHOW_CATEGORY_TITLE"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -57,6 +58,7 @@
 				label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -68,6 +70,7 @@
 				label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -78,6 +81,7 @@
 				type="list"
 				label="JGLOBAL_MAXLEVEL_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="-1">JALL</option>
 				<option value="0">JNONE</option>
@@ -94,6 +98,7 @@
 				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -105,6 +110,7 @@
 				label="COM_CONTENT_NO_ARTICLES_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -116,6 +122,7 @@
 				label="JGLOBAL_SHOW_CATEGORY_HEADING_TITLE_TEXT_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -127,6 +134,7 @@
 				label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -138,6 +146,7 @@
 				label="COM_CONTENT_NUMBER_CATEGORY_ITEMS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -149,6 +158,7 @@
 				label="COM_CONTENT_FIELD_SHOW_CAT_TAGS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -170,6 +180,7 @@
 				label="JGLOBAL_DISPLAY_SELECT_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -180,6 +191,7 @@
 				type="list"
 				label="JGLOBAL_FILTER_FIELD_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="hide">JHIDE</option>
 				<option value="title">JGLOBAL_TITLE</option>
@@ -195,6 +207,7 @@
 				label="JGLOBAL_SHOW_HEADINGS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -205,6 +218,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_DATE_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="created">JGLOBAL_CREATED</option>
@@ -227,6 +241,7 @@
 				label="JGLOBAL_LIST_HITS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -238,6 +253,7 @@
 				label="JGLOBAL_LIST_AUTHOR_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -249,6 +265,7 @@
 				label="JGLOBAL_LIST_VOTES_LABEL"
 				layout="joomla.form.field.radio.switcher"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="0" requires="vote">JHIDE</option>
 				<option value="1" requires="vote">JSHOW</option>
@@ -260,6 +277,7 @@
 				label="JGLOBAL_LIST_RATINGS_LABEL"
 				layout="joomla.form.field.radio.switcher"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="0" requires="vote">JHIDE</option>
 				<option value="1" requires="vote">JSHOW</option>
@@ -276,6 +294,7 @@
 				type="list"
 				label="JGLOBAL_CATEGORY_ORDER_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="none">JGLOBAL_NO_ORDER</option>
 				<option value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
@@ -288,6 +307,7 @@
 				type="list"
 				label="JGLOBAL_ARTICLE_ORDER_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="front">COM_CONTENT_FEATURED_ORDER</option>
 				<option value="rdate">JGLOBAL_MOST_RECENT_FIRST</option>
@@ -312,6 +332,7 @@
 				type="list"
 				label="JGLOBAL_ORDERING_DATE_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="created">JGLOBAL_CREATED</option>
 				<option value="modified">JGLOBAL_MODIFIED</option>
@@ -324,6 +345,7 @@
 				label="JGLOBAL_PAGINATION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -336,6 +358,7 @@
 				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -346,6 +369,7 @@
 				type="list"
 				label="JGLOBAL_NUMBER_ITEMS_LIST_LABEL"
 				default="10"
+				validate="options"
 				>
 				<option value="5">J5</option>
 				<option value="10">J10</option>
@@ -364,6 +388,7 @@
 				label="JGLOBAL_SHOW_FEATURED_ARTICLES_LABEL"
 				useglobal="true"
 				default=""
+				validate="options"
 				>
 				<option value="show">JSHOW</option>
 				<option value="hide">JHIDE</option>
@@ -392,6 +417,7 @@
 				label="JGLOBAL_SHOW_TITLE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -403,6 +429,7 @@
 				label="JGLOBAL_LINKED_TITLES_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>
@@ -414,6 +441,7 @@
 				label="JGLOBAL_SHOW_INTRO_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -425,6 +453,7 @@
 				label="JGLOBAL_SHOW_CATEGORY_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -436,6 +465,7 @@
 				label="JGLOBAL_LINK_CATEGORY_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>
@@ -447,6 +477,7 @@
 				label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -458,6 +489,7 @@
 				label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>
@@ -480,6 +512,7 @@
 				label="JGLOBAL_SHOW_AUTHOR_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -491,6 +524,7 @@
 				label="JGLOBAL_LINK_AUTHOR_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>
@@ -502,6 +536,7 @@
 				label="JGLOBAL_SHOW_CREATE_DATE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -513,6 +548,7 @@
 				label="JGLOBAL_SHOW_MODIFY_DATE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -524,6 +560,7 @@
 				label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -535,6 +572,7 @@
 				label="JGLOBAL_SHOW_NAVIGATION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -546,6 +584,7 @@
 				label="JGLOBAL_SHOW_VOTE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option	value="1">JSHOW</option>
@@ -558,6 +597,7 @@
 				description="JGLOBAL_SHOW_READMORE_DESC"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -569,6 +609,7 @@
 				label="JGLOBAL_SHOW_READMORE_TITLE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -580,6 +621,7 @@
 				label="JGLOBAL_SHOW_HITS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -592,6 +634,7 @@
 				description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>
@@ -605,6 +648,7 @@
 				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -615,6 +659,7 @@
 				type="list"
 				label="JGLOBAL_FEED_SUMMARY_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="0">JGLOBAL_INTRO_TEXT</option>
 				<option value="1">JGLOBAL_FULL_TEXT</option>
diff --git a/components/com_content/tmpl/featured/default.xml b/components/com_content/tmpl/featured/default.xml
index 2ae8c17334de7..d1836a8666d6b 100644
--- a/components/com_content/tmpl/featured/default.xml
+++ b/components/com_content/tmpl/featured/default.xml
@@ -85,6 +85,7 @@
 				type="list"
 				label="JGLOBAL_CATEGORY_ORDER_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="none">JGLOBAL_No_Order</option>
 				<option value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
@@ -97,6 +98,7 @@
 				type="list"
 				label="JGLOBAL_ARTICLE_ORDER_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="front">COM_CONTENT_FEATURED_ORDER</option>
 				<option value="rdate">JGLOBAL_MOST_RECENT_FIRST</option>
@@ -121,6 +123,7 @@
 				type="list"
 				label="JGLOBAL_ORDERING_DATE_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="created">JGLOBAL_CREATED</option>
 				<option value="modified">JGLOBAL_MODIFIED</option>
@@ -133,6 +136,7 @@
 				label="JGLOBAL_PAGINATION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -145,6 +149,7 @@
 				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -170,6 +175,7 @@
 				label="JGLOBAL_SHOW_TITLE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">JHIDE</option>
@@ -182,6 +188,7 @@
 				label="JGLOBAL_LINKED_TITLES_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">JNO</option>
@@ -194,6 +201,7 @@
 				label="JGLOBAL_SHOW_INTRO_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">JHIDE</option>
@@ -207,6 +215,7 @@
 				default=""
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">COM_CONTENT_FIELD_OPTION_ABOVE</option>
@@ -220,6 +229,7 @@
 				label="COM_CONTENT_FIELD_INFOBLOCK_TITLE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option	value="0">JHIDE</option>
@@ -232,6 +242,7 @@
 				label="JGLOBAL_SHOW_CATEGORY_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">JHIDE</option>
@@ -244,6 +255,7 @@
 				label="JGLOBAL_LINK_CATEGORY_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">JNO</option>
@@ -256,6 +268,7 @@
 				label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">JHIDE</option>
@@ -268,6 +281,7 @@
 				label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">JNO</option>
@@ -291,6 +305,7 @@
 				label="JGLOBAL_SHOW_AUTHOR_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">JHIDE</option>
@@ -303,6 +318,7 @@
 				label="JGLOBAL_LINK_AUTHOR_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">JNO</option>
@@ -315,6 +331,7 @@
 				label="JGLOBAL_SHOW_CREATE_DATE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">JHIDE</option>
@@ -327,6 +344,7 @@
 				label="JGLOBAL_SHOW_MODIFY_DATE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">JHIDE</option>
@@ -339,6 +357,7 @@
 				label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">JHIDE</option>
@@ -351,6 +370,7 @@
 				label="JGLOBAL_SHOW_NAVIGATION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">JHIDE</option>
@@ -363,6 +383,7 @@
 				label="JGLOBAL_SHOW_VOTE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">JHIDE</option>
@@ -376,6 +397,7 @@
 				description="JGLOBAL_SHOW_READMORE_DESC"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -387,6 +409,7 @@
 				label="JGLOBAL_SHOW_READMORE_TITLE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -398,6 +421,7 @@
 				label="JGLOBAL_SHOW_HITS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">JHIDE</option>
@@ -410,6 +434,7 @@
 				label="COM_CONTENT_FIELD_SHOW_TAGS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -422,6 +447,7 @@
 				description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
 				<option value="0">JNO</option>
@@ -436,6 +462,7 @@
 				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -446,6 +473,7 @@
 				type="list"
 				label="JGLOBAL_FEED_SUMMARY_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="0">JGLOBAL_INTRO_TEXT</option>
 				<option value="1">JGLOBAL_FULL_TEXT</option>
diff --git a/components/com_finder/tmpl/search/default.xml b/components/com_finder/tmpl/search/default.xml
index dbdf02cd89630..1e632c71ddbb1 100644
--- a/components/com_finder/tmpl/search/default.xml
+++ b/components/com_finder/tmpl/search/default.xml
@@ -34,6 +34,7 @@
 				default=""
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
@@ -45,6 +46,7 @@
 				default=""
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
@@ -56,6 +58,7 @@
 				default=""
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
@@ -68,6 +71,7 @@
 				default=""
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
@@ -79,6 +83,7 @@
 				default=""
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
@@ -98,6 +103,7 @@
 				default=""
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
@@ -109,6 +115,7 @@
 				default=""
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
@@ -158,6 +165,7 @@
 				default=""
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
@@ -169,6 +177,7 @@
 				default=""
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
@@ -180,6 +189,7 @@
 				default=""
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
@@ -190,6 +200,7 @@
 				label="COM_FINDER_CONFIG_SORT_ORDER_LABEL"
 				default=""
 				useglobal="true"
+				validate="options"
 				>
 				<option value="relevance">COM_FINDER_CONFIG_SORT_OPTION_RELEVANCE</option>
 				<option value="date">COM_FINDER_CONFIG_SORT_OPTION_START_DATE</option>
@@ -201,6 +212,7 @@
 				label="COM_FINDER_CONFIG_SORT_DIRECTION_LABEL"
 				default=""
 				useglobal="true"
+				validate="options"
 				>
 				<option value="desc">COM_FINDER_CONFIG_SORT_OPTION_DESCENDING</option>
 				<option value="asc">COM_FINDER_CONFIG_SORT_OPTION_ASCENDING</option>
diff --git a/components/com_newsfeeds/src/Model/CategoryModel.php b/components/com_newsfeeds/src/Model/CategoryModel.php
index 6fddaf15bddd4..6280a3f7ed3f7 100644
--- a/components/com_newsfeeds/src/Model/CategoryModel.php
+++ b/components/com_newsfeeds/src/Model/CategoryModel.php
@@ -418,7 +418,6 @@ public function hit($pk = 0)
 		{
 			$pk    = (!empty($pk)) ? $pk : (int) $this->getState('category.id');
 			$table = Table::getInstance('Category', 'JTable');
-			$table->load($pk);
 			$table->hit($pk);
 		}
 
diff --git a/components/com_newsfeeds/src/Model/NewsfeedModel.php b/components/com_newsfeeds/src/Model/NewsfeedModel.php
index 23517c772ed8b..17b8a608806bd 100644
--- a/components/com_newsfeeds/src/Model/NewsfeedModel.php
+++ b/components/com_newsfeeds/src/Model/NewsfeedModel.php
@@ -227,7 +227,6 @@ public function hit($pk = 0)
 			$pk = (!empty($pk)) ? $pk : (int) $this->getState('newsfeed.id');
 
 			$table = $this->getTable('Newsfeed', 'Administrator');
-			$table->load($pk);
 			$table->hit($pk);
 		}
 
diff --git a/components/com_newsfeeds/tmpl/categories/default.xml b/components/com_newsfeeds/tmpl/categories/default.xml
index 79bc7423c9d64..cc76449844946 100644
--- a/components/com_newsfeeds/tmpl/categories/default.xml
+++ b/components/com_newsfeeds/tmpl/categories/default.xml
@@ -33,6 +33,7 @@
 				label="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -51,6 +52,7 @@
 				type="list"
 				label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="-1">JALL</option>
 				<option value="1">J1</option>
@@ -66,6 +68,7 @@
 				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -77,6 +80,7 @@
 				label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -88,6 +92,7 @@
 				label="COM_NEWSFEEDS_FIELD_SHOW_CAT_ITEMS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -102,6 +107,7 @@
 				label="JGLOBAL_SHOW_CATEGORY_TITLE"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -113,6 +119,7 @@
 				label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -124,6 +131,7 @@
 				label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -134,6 +142,7 @@
 				type="list"
 				label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="-1">JALL</option>
 				<option value="0">JNONE</option>
@@ -150,6 +159,7 @@
 				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -161,6 +171,7 @@
 				label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -173,6 +184,7 @@
 				id="show_cat_items"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -189,6 +201,7 @@
 				default=""
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="hide">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -200,6 +213,7 @@
 				label="JGLOBAL_DISPLAY_SELECT_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -212,6 +226,7 @@
 				id="show_headings"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -224,6 +239,7 @@
 				id="show_articles"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -236,6 +252,7 @@
 				id="show_link"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -247,6 +264,7 @@
 				label="JGLOBAL_PAGINATION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -259,6 +277,7 @@
 				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -273,6 +292,7 @@
 				label="COM_NEWSFEEDS_FIELD_SHOW_FEED_IMAGE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -284,6 +304,7 @@
 				label="COM_NEWSFEEDS_FIELD_SHOW_FEED_DESCRIPTION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -295,6 +316,7 @@
 				label="COM_NEWSFEEDS_FIELD_SHOW_ITEM_DESCRIPTION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
diff --git a/components/com_newsfeeds/tmpl/category/default.xml b/components/com_newsfeeds/tmpl/category/default.xml
index ac68480161a9a..228c4aaf09787 100644
--- a/components/com_newsfeeds/tmpl/category/default.xml
+++ b/components/com_newsfeeds/tmpl/category/default.xml
@@ -39,6 +39,7 @@
 				label="JGLOBAL_SHOW_CATEGORY_TITLE"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -50,6 +51,7 @@
 				label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -61,6 +63,7 @@
 				label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -71,6 +74,7 @@
 				type="list"
 				label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="-1">JALL</option>
 				<option value="0">JNONE</option>
@@ -87,6 +91,7 @@
 				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -98,6 +103,7 @@
 				label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -110,6 +116,7 @@
 				id="show_cat_items"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -124,6 +131,7 @@
 				default=""
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="hide">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -135,6 +143,7 @@
 				label="JGLOBAL_DISPLAY_SELECT_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -147,6 +156,7 @@
 				id="show_headings"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -159,6 +169,7 @@
 				id="show_articles"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -171,6 +182,7 @@
 				id="show_link"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -182,6 +194,7 @@
 				label="JGLOBAL_PAGINATION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -194,6 +207,7 @@
 				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -207,6 +221,7 @@
 				label="COM_NEWSFEEDS_FIELD_SHOW_FEED_IMAGE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -218,6 +233,7 @@
 				label="COM_NEWSFEEDS_FIELD_SHOW_FEED_DESCRIPTION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -229,6 +245,7 @@
 				label="COM_NEWSFEEDS_FIELD_SHOW_ITEM_DESCRIPTION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -247,6 +264,7 @@
 				type="list"
 				label="COM_NEWSFEEDS_FIELD_FEED_DISPLAY_ORDER_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="des">JGLOBAL_MOST_RECENT_FIRST</option>
 				<option value="asc">JGLOBAL_OLDEST_FIRST</option>
diff --git a/components/com_newsfeeds/tmpl/newsfeed/default.xml b/components/com_newsfeeds/tmpl/newsfeed/default.xml
index 8f007c3639671..881398b535a6c 100644
--- a/components/com_newsfeeds/tmpl/newsfeed/default.xml
+++ b/components/com_newsfeeds/tmpl/newsfeed/default.xml
@@ -39,6 +39,7 @@
 				label="COM_NEWSFEEDS_FIELD_SHOW_FEED_IMAGE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -50,6 +51,7 @@
 				label="COM_NEWSFEEDS_FIELD_SHOW_FEED_DESCRIPTION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -61,6 +63,7 @@
 				label="COM_NEWSFEEDS_FIELD_SHOW_ITEM_DESCRIPTION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -72,6 +75,7 @@
 				label="COM_NEWSFEEDS_FIELD_SHOW_TAGS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -90,6 +94,7 @@
 				type="list"
 				label="COM_NEWSFEEDS_FIELD_FEED_DISPLAY_ORDER_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="des">JGLOBAL_MOST_RECENT_FIRST</option>
 				<option value="asc">JGLOBAL_OLDEST_FIRST</option>
diff --git a/components/com_tags/src/Model/TagModel.php b/components/com_tags/src/Model/TagModel.php
index cc25eb467f0ec..f294d93617fa8 100644
--- a/components/com_tags/src/Model/TagModel.php
+++ b/components/com_tags/src/Model/TagModel.php
@@ -353,9 +353,11 @@ public function hit($pk = 0)
 
 			/** @var \Joomla\Component\Tags\Administrator\Table\Tag $table */
 			$table = $this->getTable();
-			$table->load($pk);
 			$table->hit($pk);
 
+			// Load the table data for later
+			$table->load($pk);
+
 			if (!$table->hasPrimaryKey())
 			{
 				throw new \Exception(Text::_('COM_TAGS_TAG_NOT_FOUND'), 404);
diff --git a/components/com_tags/src/View/Tag/HtmlView.php b/components/com_tags/src/View/Tag/HtmlView.php
index 9b680e7261565..56e05b872e6e6 100644
--- a/components/com_tags/src/View/Tag/HtmlView.php
+++ b/components/com_tags/src/View/Tag/HtmlView.php
@@ -153,9 +153,10 @@ public function display($tpl = null)
 			if (!empty($itemElement))
 			{
 				$temp = new Registry($itemElement->params);
-				$itemElement->params = clone $params;
+				$itemElement->params   = clone $params;
 				$itemElement->params->merge($temp);
-				$itemElement->params = (array) json_decode($itemElement->params);
+				$itemElement->params   = (array) json_decode($itemElement->params);
+				$itemElement->metadata = new Registry($itemElement->metadata);
 			}
 		}
 
@@ -353,8 +354,16 @@ protected function _prepareDocument()
 			}
 		}
 
-		// @TODO: create tag feed document
-		// Add alternative feed link
+		if (count($this->item) === 1)
+		{
+			foreach ($this->item[0]->metadata->toArray() as $k => $v)
+			{
+				if ($v)
+				{
+					$this->document->setMetadata($k, $v);
+				}
+			}
+		}
 
 		if ($this->params->get('show_feed_link', 1) == 1)
 		{
diff --git a/components/com_tags/tmpl/tag/default.xml b/components/com_tags/tmpl/tag/default.xml
index e6d48151662b1..ccfcf7a881bbe 100644
--- a/components/com_tags/tmpl/tag/default.xml
+++ b/components/com_tags/tmpl/tag/default.xml
@@ -54,6 +54,7 @@
 				label="COM_TAGS_SHOW_TAG_TITLE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -65,6 +66,7 @@
 				label="COM_TAGS_SHOW_TAG_IMAGE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -76,6 +78,7 @@
 				label="COM_TAGS_SHOW_TAG_DESCRIPTION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -103,6 +106,7 @@
 				label="JGLOBAL_FIELD_FIELD_ORDERING_LABEL"
 				default=""
 				useglobal="true"
+				validate="options"
 				>
 				<option value="c.core_title">JGLOBAL_TITLE</option>
 				<option value="match_count">COM_TAGS_MATCH_COUNT</option>
@@ -116,6 +120,7 @@
 				type="list"
 				label="JGLOBAL_ORDER_DIRECTION_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="ASC">JGLOBAL_ORDER_ASCENDING</option>
 				<option value="DESC">JGLOBAL_ORDER_DESCENDING</option>
@@ -131,6 +136,7 @@
 				label="COM_TAGS_TAG_LIST_SHOW_ITEM_IMAGE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -142,6 +148,7 @@
 				label="COM_TAGS_TAG_LIST_SHOW_ITEM_DESCRIPTION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -162,6 +169,7 @@
 				default=""
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -176,6 +184,7 @@
 				label="JGLOBAL_DISPLAY_SELECT_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -187,6 +196,7 @@
 				label="JGLOBAL_PAGINATION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -199,6 +209,7 @@
 				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -213,6 +224,7 @@
 				type="list"
 				label="COM_TAGS_SEARCH_TYPE_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="0">COM_TAGS_ALL</option>
 				<option value="1">COM_TAGS_ANY</option>
@@ -224,6 +236,7 @@
 				label="COM_TAGS_INCLUDE_CHILDREN_LABEL"
 				default=""
 				useglobal="true"
+				validate="options"
 				>
 				<option value="0">COM_TAGS_EXCLUDE</option>
 				<option value="1">COM_TAGS_INCLUDE</option>
@@ -239,6 +252,7 @@
 				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
diff --git a/components/com_tags/tmpl/tag/list.xml b/components/com_tags/tmpl/tag/list.xml
index efef430fbaa9c..c146d647834b7 100644
--- a/components/com_tags/tmpl/tag/list.xml
+++ b/components/com_tags/tmpl/tag/list.xml
@@ -53,6 +53,7 @@
 				label="COM_TAGS_SHOW_TAG_TITLE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -64,6 +65,7 @@
 				label="COM_TAGS_SHOW_TAG_IMAGE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -75,6 +77,7 @@
 				label="COM_TAGS_SHOW_TAG_DESCRIPTION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -102,6 +105,7 @@
 				label="JGLOBAL_FIELD_FIELD_ORDERING_LABEL"
 				default=""
 				useglobal="true"
+				validate="options"
 				>
 				<option value="c.core_title">JGLOBAL_TITLE</option>
 				<option value="match_count">COM_TAGS_MATCH_COUNT</option>
@@ -115,6 +119,7 @@
 				type="list"
 				label="JGLOBAL_ORDER_DIRECTION_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="ASC">JGLOBAL_ORDER_ASCENDING</option>
 				<option value="DESC">JGLOBAL_ORDER_DESCENDING</option>
@@ -130,6 +135,7 @@
 				label="COM_TAGS_TAG_LIST_SHOW_ITEM_IMAGE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -141,6 +147,7 @@
 				label="COM_TAGS_TAG_LIST_SHOW_ITEM_DESCRIPTION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -161,6 +168,7 @@
 				default=""
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -172,6 +180,7 @@
 				label="JGLOBAL_DISPLAY_SELECT_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -182,6 +191,7 @@
 				type="list"
 				label="COM_TAGS_FIELD_NUMBER_ITEMS_LIST_LABEL"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="">JGLOBAL_USE_GLOBAL</option>
 				<option value="5">J5</option>
@@ -201,6 +211,7 @@
 				label="JGLOBAL_PAGINATION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -213,6 +224,7 @@
 				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -224,6 +236,7 @@
 				label="JGLOBAL_SHOW_DATE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="created">JGLOBAL_CREATED</option>
@@ -248,6 +261,7 @@
 				type="list"
 				label="COM_TAGS_SEARCH_TYPE_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="0">COM_TAGS_ALL</option>
 				<option value="1">COM_TAGS_ANY</option>
@@ -259,6 +273,7 @@
 				label="COM_TAGS_INCLUDE_CHILDREN_LABEL"
 				default=""
 				useglobal="true"
+				validate="options"
 				>
 				<option value="0">COM_TAGS_EXCLUDE</option>
 				<option value="1">COM_TAGS_INCLUDE</option>
@@ -274,6 +289,7 @@
 				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
diff --git a/components/com_tags/tmpl/tags/default.xml b/components/com_tags/tmpl/tags/default.xml
index ac3573912ac31..badc7ce00a353 100644
--- a/components/com_tags/tmpl/tags/default.xml
+++ b/components/com_tags/tmpl/tags/default.xml
@@ -61,6 +61,7 @@
 				type="list"
 				label="COM_TAGS_SHOW_ALL_TAGS_IMAGE_LABEL"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="">JGLOBAL_USE_GLOBAL</option>
 				<option value="0">JHIDE</option>
@@ -78,6 +79,7 @@
 				type="list"
 				label="JGLOBAL_FIELD_FIELD_ORDERING_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="title">JGLOBAL_TITLE</option>
 				<option value="hits">JGLOBAL_HITS</option>
@@ -91,6 +93,7 @@
 				type="list"
 				label="JGLOBAL_ORDER_DIRECTION_LABEL"
 				useglobal="true"
+				validate="options"
 				>
 				<option value="ASC">JGLOBAL_ORDER_ASCENDING</option>
 				<option value="DESC">JGLOBAL_ORDER_DESCENDING</option>
@@ -102,6 +105,7 @@
 				label="COM_TAGS_SHOW_ITEM_IMAGE_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -112,6 +116,7 @@
 				type="list"
 				label="COM_TAGS_SHOW_ITEM_DESCRIPTION_LABEL"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="">JGLOBAL_USE_GLOBAL</option>
 				<option value="0">JHIDE</option>
@@ -131,6 +136,7 @@
 				label="JGLOBAL_HITS"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -156,6 +162,7 @@
 				default=""
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -167,6 +174,7 @@
 				label="JGLOBAL_DISPLAY_SELECT_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -178,6 +186,7 @@
 				label="JGLOBAL_PAGINATION_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -190,6 +199,7 @@
 				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
@@ -203,6 +213,7 @@
 				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
+				validate="options"
 				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
diff --git a/components/com_users/forms/login.xml b/components/com_users/forms/login.xml
index c22731550b15e..805d4ff485fdd 100644
--- a/components/com_users/forms/login.xml
+++ b/components/com_users/forms/login.xml
@@ -30,6 +30,7 @@
 			name="secretkey"
 			type="text"
 			label="JGLOBAL_SECRETKEY"
+			autocomplete="one-time-code"
 			class=""
 			filter="int"
 			size="25"
diff --git a/components/com_users/layouts/joomla/form/renderfield.php b/components/com_users/layouts/joomla/form/renderfield.php
index 4595fd4dcfbf4..579369f84efa8 100644
--- a/components/com_users/layouts/joomla/form/renderfield.php
+++ b/components/com_users/layouts/joomla/form/renderfield.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
diff --git a/components/com_users/tmpl/login/default.xml b/components/com_users/tmpl/login/default.xml
index 0c16a40ff7c83..6f73a6f39ef5c 100644
--- a/components/com_users/tmpl/login/default.xml
+++ b/components/com_users/tmpl/login/default.xml
@@ -58,6 +58,7 @@
 			label="JFIELD_BASIS_LOGIN_DESCRIPTION_SHOW_LABEL"
 			default="1"
 			class="custom-select-color-state"
+			validate="options"
 			>
 			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
@@ -127,6 +128,7 @@
 			label="JFIELD_BASIS_LOGOUT_DESCRIPTION_SHOW_LABEL"
 			default="1"
 			class="custom-select-color-state"
+			validate="options"
 			>
 			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
diff --git a/components/com_wrapper/tmpl/wrapper/default.xml b/components/com_wrapper/tmpl/wrapper/default.xml
index 860eac95d1f75..ee11ebc3e5de7 100644
--- a/components/com_wrapper/tmpl/wrapper/default.xml
+++ b/components/com_wrapper/tmpl/wrapper/default.xml
@@ -30,6 +30,7 @@
 				type="list"
 				label="COM_WRAPPER_FIELD_SCROLLBARS_LABEL"
 				default="auto"
+				validate="options"
 				>
 				<option value="no">JNO</option>
 				<option value="yes">JYES</option>
diff --git a/installation/language/en-GB/joomla.ini b/installation/language/en-GB/joomla.ini
index bf917a1b4de0e..e8e31316b1d04 100644
--- a/installation/language/en-GB/joomla.ini
+++ b/installation/language/en-GB/joomla.ini
@@ -235,6 +235,7 @@ JYES="Yes"
 JLIB_DATABASE_ERROR_CONNECT_MYSQL="Could not connect to MySQL."
 JLIB_DATABASE_ERROR_DATABASE="A Database error occurred."
 JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Unable to load Database Driver: %s"
+JLIB_DATABASE_ERROR_VALID_MAIL="The email address you entered is invalid. Please enter another email address."
 JLIB_ENVIRONMENT_SESSION_EXPIRED="Your session has expired, please reload the page."
 JLIB_FILESYSTEM_ERROR_COPY_FAILED="Copy failed"
 JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :files: Path is not a folder. Path: %s"
diff --git a/installation/language/en-GB/langmetadata.xml b/installation/language/en-GB/langmetadata.xml
index c09adfbd97f77..21436a3be5eb3 100644
--- a/installation/language/en-GB/langmetadata.xml
+++ b/installation/language/en-GB/langmetadata.xml
@@ -9,7 +9,7 @@
 	<copyright>Copyright (C) 2005 - 2020 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<files>
-		<filename>en-GB.ini</filename>
+		<filename>joomla.ini</filename>
 	</files>
 	<metadata>
 		<name>English (en-GB)</name>
diff --git a/installation/language/en-US/joomla.ini b/installation/language/en-US/joomla.ini
index a76239a7821e2..58263f1db816a 100644
--- a/installation/language/en-US/joomla.ini
+++ b/installation/language/en-US/joomla.ini
@@ -59,7 +59,7 @@ INSTL_DATABASE_ENCRYPTION_MODE_LABEL="Connection Encryption"
 INSTL_DATABASE_ENCRYPTION_MODE_VALUE_NONE="Default (server controlled)"
 INSTL_DATABASE_ENCRYPTION_MODE_VALUE_ONE_WAY="One-way authentication"
 INSTL_DATABASE_ENCRYPTION_MODE_VALUE_TWO_WAY="Two-way authentication"
-INSTL_DATABASE_ENCRYPTION_MSG_CONN_NOT_ENCRYPT="You have selected database connection enryption to be used, and a connection could be established, but it was not encrypted. The reason might be that the database server is configured to fall back to an unencrypted connection in case of bad encryption parameters. Either check and correct the database encryption parameters, or change field \"Connection Encryption\" back to \"Default (server controlled)\"."
+INSTL_DATABASE_ENCRYPTION_MSG_CONN_NOT_ENCRYPT="You have selected database connection encryption to be used, and a connection could be established, but it was not encrypted. The reason might be that the database server is configured to fall back to an unencrypted connection in case of bad encryption parameters. Either check and correct the database encryption parameters, or change field \"Connection Encryption\" back to \"Default (server controlled)\"."
 INSTL_DATABASE_ENCRYPTION_MSG_FILE_FIELD_BAD="The file entered in field \"%s\" does not exist or is not accessible."
 INSTL_DATABASE_ENCRYPTION_MSG_FILE_FIELD_EMPTY="Field \"%s\" is empty or doesn't contain a valid path."
 INSTL_DATABASE_ENCRYPTION_MSG_LOCALHOST="You have entered \"localhost\" as host name. Connecting to the database with connection encryption might fail with this. Either change \"localhost\" to \"127.0.0.1\" or \"::1\" or a different host name, or change field \"Connection Encryption\" back to \"Default (server controlled)\"."
@@ -144,7 +144,7 @@ INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Language"
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="Tag"
 INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Joomla was unable to install %s language."
 INSTL_DEFAULTLANGUAGE_DESC="Joomla has installed the following languages. Please select your desired default language for the <strong>Joomla Administrator</strong>."
-INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla has installed the following languages. Please select your desired default language <strong>for the Joomla Frontend</strong>."
+INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla has installed the following languages. Please select your desired default language for the <strong>Joomla Frontend</strong>."
 INSTL_DEFAULTLANGUAGE_FRONTEND="Default Site language"
 INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla was unable to set the language as default. English will be used as default language for the Frontend SITE."
 INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Joomla has set %s as your default SITE language."
@@ -235,6 +235,7 @@ JYES="Yes"
 JLIB_DATABASE_ERROR_CONNECT_MYSQL="Could not connect to MySQL."
 JLIB_DATABASE_ERROR_DATABASE="A Database error occurred."
 JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Unable to load Database Driver: %s"
+JLIB_DATABASE_ERROR_VALID_MAIL="The email address you entered is invalid. Please enter another email address."
 JLIB_ENVIRONMENT_SESSION_EXPIRED="Your session has expired, please reload the page."
 JLIB_FILESYSTEM_ERROR_COPY_FAILED="Copy failed"
 JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :files: Path is not a folder. Path: %s"
diff --git a/installation/language/en-US/langmetadata.xml b/installation/language/en-US/langmetadata.xml
index a19cae5a344d5..3a2570d8be193 100644
--- a/installation/language/en-US/langmetadata.xml
+++ b/installation/language/en-US/langmetadata.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<metafile
-	version="3.9"
-	client="installation">
+<metafile version="3.9" client="installation">
 	<name>English (United States)</name>
-	<version>3.9.12</version>
-	<creationDate>September 2019</creationDate>
+	<version>4.0.0</version>
+	<creationDate>October 2019</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<files>
-		<filename>en-US.ini</filename>
+		<filename>joomla.ini</filename>
 	</files>
 	<metadata>
 		<name>English (en_US)</name>
diff --git a/installation/src/Form/Field/Installation/LanguageField.php b/installation/src/Form/Field/Installation/LanguageField.php
index 549482759253d..69c012de85605 100644
--- a/installation/src/Form/Field/Installation/LanguageField.php
+++ b/installation/src/Form/Field/Installation/LanguageField.php
@@ -8,7 +8,7 @@
 
 namespace Joomla\CMS\Installation\Form\Field\Installation;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;
diff --git a/installation/src/Form/Field/Installation/PrefixField.php b/installation/src/Form/Field/Installation/PrefixField.php
index 5d50d75c56d83..a8faf085262fa 100644
--- a/installation/src/Form/Field/Installation/PrefixField.php
+++ b/installation/src/Form/Field/Installation/PrefixField.php
@@ -8,7 +8,7 @@
 
 namespace Joomla\CMS\Installation\Form\Field\Installation;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\FormField;
diff --git a/installation/src/Form/Rule/PrefixRule.php b/installation/src/Form/Rule/PrefixRule.php
index fc7b742ff4cfb..81ab6a011366c 100644
--- a/installation/src/Form/Rule/PrefixRule.php
+++ b/installation/src/Form/Rule/PrefixRule.php
@@ -8,7 +8,7 @@
 
 namespace Joomla\CMS\Installation\Form\Rule;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Form\FormRule;
 
diff --git a/installation/src/Model/DatabaseModel.php b/installation/src/Model/DatabaseModel.php
index 174d3fd5693ba..57e2ec8998c33 100644
--- a/installation/src/Model/DatabaseModel.php
+++ b/installation/src/Model/DatabaseModel.php
@@ -570,7 +570,7 @@ public function createTables($schema)
 			$query = $db->getQuery(true);
 			$query->clear()
 				->update($db->quoteName('#__utf8_conversion'))
-				->set($db->quoteName('converted') . ' = ' . ($db->hasUTF8mb4Support() ? 2 : 1));
+				->set($db->quoteName('converted') . ' = ' . ($db->hasUTF8mb4Support() ? 4 : 3));
 			$db->setQuery($query);
 
 			try
diff --git a/language/en-GB/joomla.ini b/language/en-GB/joomla.ini
index 594725c362c73..8707109c27a60 100644
--- a/language/en-GB/joomla.ini
+++ b/language/en-GB/joomla.ini
@@ -9,7 +9,6 @@
 ; Keep this string on top
 JERROR_PARSING_LANGUAGE_FILE="&#160;: error(s) in line(s) %s"
 
-
 ERROR="Error"
 INFO="Info"
 MESSAGE="Message"
diff --git a/language/en-GB/lib_joomla.ini b/language/en-GB/lib_joomla.ini
index 37f968e98c167..3805d941e0981 100644
--- a/language/en-GB/lib_joomla.ini
+++ b/language/en-GB/lib_joomla.ini
@@ -232,12 +232,13 @@ JLIB_DATABASE_ERROR_REORDER_UPDATE_ROW_FAILED="%s: :reorder update the row %s fa
 JLIB_DATABASE_ERROR_ROOT_NODE_NOT_FOUND="Root node not found."
 JLIB_DATABASE_ERROR_STORE_FAILED_UPDATE_ASSET_ID="The asset_id field could not be updated."
 JLIB_DATABASE_ERROR_STORE_FAILED="%1$s: :store failed<br>%2$s"
+JLIB_DATABASE_ERROR_USERGROUP_PARENT_ID_NOT_VALID="There has to be at least one root usergroup"
 JLIB_DATABASE_ERROR_USERGROUP_TITLE="User group must have a title."
 JLIB_DATABASE_ERROR_USERGROUP_TITLE_EXISTS="User group title already exists. Title must be unique with the same parent."
 JLIB_DATABASE_ERROR_USERLEVEL_NAME_EXISTS="Level with the name &quot;%s&quot; already exists."
 JLIB_DATABASE_ERROR_USERNAME_CANNOT_CHANGE="Can't use this username."
 JLIB_DATABASE_ERROR_USERNAME_INUSE="Username in use."
-JLIB_DATABASE_ERROR_VALID_AZ09="Please enter a valid username. No space at beginning or end, at least %d characters and must <strong>not</strong> have the following characters: < > \ &quot; ' &#37; ; ( ) &."
+JLIB_DATABASE_ERROR_VALID_AZ09="Please enter a valid username. No space at beginning or end, at least %d characters, must <strong>not</strong> have the following characters: < > \ &quot; ' &#37; ; ( ) & and be less than 150 characters long."
 JLIB_DATABASE_ERROR_VALID_MAIL="The email address you entered is invalid. Please enter another email address."
 JLIB_DATABASE_ERROR_VIEWLEVEL="Viewlevel must have a title."
 JLIB_DATABASE_FUNCTION_NOERROR="DB function reports no errors."
diff --git a/layouts/joomla/content/associations.php b/layouts/joomla/content/associations.php
index a63df1527501a..a49b875a33dff 100644
--- a/layouts/joomla/content/associations.php
+++ b/layouts/joomla/content/associations.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 $items = $displayData;
 
diff --git a/layouts/joomla/content/blog_style_default_item_title.php b/layouts/joomla/content/blog_style_default_item_title.php
index 1a40ea39b7ea5..19e948598aa7d 100644
--- a/layouts/joomla/content/blog_style_default_item_title.php
+++ b/layouts/joomla/content/blog_style_default_item_title.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
diff --git a/layouts/joomla/content/blog_style_default_links.php b/layouts/joomla/content/blog_style_default_links.php
index 7ebee48b37d8e..3ad21e65c12a1 100644
--- a/layouts/joomla/content/blog_style_default_links.php
+++ b/layouts/joomla/content/blog_style_default_links.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Router\Route;
diff --git a/layouts/joomla/content/categories_default.php b/layouts/joomla/content/categories_default.php
index d9c423c288be8..77d94923c0a53 100644
--- a/layouts/joomla/content/categories_default.php
+++ b/layouts/joomla/content/categories_default.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\HTML\HTMLHelper;
 
diff --git a/layouts/joomla/content/categories_default_items.php b/layouts/joomla/content/categories_default_items.php
index 1715a35280f99..078f91f5d4ef5 100644
--- a/layouts/joomla/content/categories_default_items.php
+++ b/layouts/joomla/content/categories_default_items.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 $class     = ' class="first"';
 
diff --git a/layouts/joomla/content/category_default.php b/layouts/joomla/content/category_default.php
index a73fce771b08a..15a7230644f45 100644
--- a/layouts/joomla/content/category_default.php
+++ b/layouts/joomla/content/category_default.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
diff --git a/layouts/joomla/content/full_image.php b/layouts/joomla/content/full_image.php
index 53e1d04d8dc41..c8e0bad650bd1 100644
--- a/layouts/joomla/content/full_image.php
+++ b/layouts/joomla/content/full_image.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 $params  = $displayData->params;
 $images  = json_decode($displayData->images);
diff --git a/layouts/joomla/content/icons.php b/layouts/joomla/content/icons.php
index fa7a0e13348a7..9cb57932db4b6 100644
--- a/layouts/joomla/content/icons.php
+++ b/layouts/joomla/content/icons.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
diff --git a/layouts/joomla/content/icons/create.php b/layouts/joomla/content/icons/create.php
index a2c118d6b4e07..790f022293361 100644
--- a/layouts/joomla/content/icons/create.php
+++ b/layouts/joomla/content/icons/create.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Language\Text;
 
diff --git a/layouts/joomla/content/icons/edit.php b/layouts/joomla/content/icons/edit.php
index 7ec95c0fc9035..5e3810c247513 100644
--- a/layouts/joomla/content/icons/edit.php
+++ b/layouts/joomla/content/icons/edit.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
diff --git a/layouts/joomla/content/icons/edit_lock.php b/layouts/joomla/content/icons/edit_lock.php
index f48fbf6290596..66d8f974974a3 100644
--- a/layouts/joomla/content/icons/edit_lock.php
+++ b/layouts/joomla/content/icons/edit_lock.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
diff --git a/layouts/joomla/content/info_block.php b/layouts/joomla/content/info_block.php
index 8acd8374f24f2..881894c4f6ace 100644
--- a/layouts/joomla/content/info_block.php
+++ b/layouts/joomla/content/info_block.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Language\Text;
 
diff --git a/layouts/joomla/content/info_block/associations.php b/layouts/joomla/content/info_block/associations.php
index 6f2cc40ebcfa2..5ce5ba2575c5e 100644
--- a/layouts/joomla/content/info_block/associations.php
+++ b/layouts/joomla/content/info_block/associations.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
diff --git a/layouts/joomla/content/info_block/author.php b/layouts/joomla/content/info_block/author.php
index 6c527c61eafb5..ee07684282b80 100644
--- a/layouts/joomla/content/info_block/author.php
+++ b/layouts/joomla/content/info_block/author.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
diff --git a/layouts/joomla/content/info_block/category.php b/layouts/joomla/content/info_block/category.php
index 2063a3fbcdf9a..f3eafd073044a 100644
--- a/layouts/joomla/content/info_block/category.php
+++ b/layouts/joomla/content/info_block/category.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
diff --git a/layouts/joomla/content/info_block/create_date.php b/layouts/joomla/content/info_block/create_date.php
index e1ee3befbfac3..f02363528b906 100644
--- a/layouts/joomla/content/info_block/create_date.php
+++ b/layouts/joomla/content/info_block/create_date.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
diff --git a/layouts/joomla/content/info_block/hits.php b/layouts/joomla/content/info_block/hits.php
index b095ecdde3018..c3cbcb4f2c81e 100644
--- a/layouts/joomla/content/info_block/hits.php
+++ b/layouts/joomla/content/info_block/hits.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Language\Text;
 
diff --git a/layouts/joomla/content/info_block/modify_date.php b/layouts/joomla/content/info_block/modify_date.php
index 3ec1c05bc39d5..8f36dbd1260c2 100644
--- a/layouts/joomla/content/info_block/modify_date.php
+++ b/layouts/joomla/content/info_block/modify_date.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
diff --git a/layouts/joomla/content/info_block/parent_category.php b/layouts/joomla/content/info_block/parent_category.php
index c172b16d7e20f..273fd583d56c6 100644
--- a/layouts/joomla/content/info_block/parent_category.php
+++ b/layouts/joomla/content/info_block/parent_category.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
diff --git a/layouts/joomla/content/info_block/publish_date.php b/layouts/joomla/content/info_block/publish_date.php
index 1b6fd55d6e0f7..36c8783f74d77 100644
--- a/layouts/joomla/content/info_block/publish_date.php
+++ b/layouts/joomla/content/info_block/publish_date.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
diff --git a/layouts/joomla/content/intro_image.php b/layouts/joomla/content/intro_image.php
index b7da0e2abdac4..9f47365bb6b1f 100644
--- a/layouts/joomla/content/intro_image.php
+++ b/layouts/joomla/content/intro_image.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Router\Route;
 use Joomla\Component\Content\Site\Helper\RouteHelper;
diff --git a/layouts/joomla/content/language.php b/layouts/joomla/content/language.php
index fceb4086c4497..9da2f92b1f944 100644
--- a/layouts/joomla/content/language.php
+++ b/layouts/joomla/content/language.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
diff --git a/layouts/joomla/content/options_default.php b/layouts/joomla/content/options_default.php
index 5a75fd776b8b5..982fe47fc70f6 100644
--- a/layouts/joomla/content/options_default.php
+++ b/layouts/joomla/content/options_default.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\FormHelper;
diff --git a/layouts/joomla/content/readmore.php b/layouts/joomla/content/readmore.php
index 079c4193f8feb..1192546c72862 100644
--- a/layouts/joomla/content/readmore.php
+++ b/layouts/joomla/content/readmore.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
diff --git a/layouts/joomla/content/tags.php b/layouts/joomla/content/tags.php
index ffcca6c53f0c1..37fcaf07aebb0 100644
--- a/layouts/joomla/content/tags.php
+++ b/layouts/joomla/content/tags.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Router\Route;
diff --git a/layouts/joomla/content/text_filters.php b/layouts/joomla/content/text_filters.php
index da012741b788f..8f5bdb60d6e01 100644
--- a/layouts/joomla/content/text_filters.php
+++ b/layouts/joomla/content/text_filters.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Language\Text;
 
diff --git a/layouts/joomla/edit/admin_modules.php b/layouts/joomla/edit/admin_modules.php
index b114e03ed75a1..65a1831a2960a 100644
--- a/layouts/joomla/edit/admin_modules.php
+++ b/layouts/joomla/edit/admin_modules.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ModuleHelper;
diff --git a/layouts/joomla/edit/associations.php b/layouts/joomla/edit/associations.php
index bfa706e188d26..0c9443d11471a 100644
--- a/layouts/joomla/edit/associations.php
+++ b/layouts/joomla/edit/associations.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
diff --git a/layouts/joomla/edit/fieldset.php b/layouts/joomla/edit/fieldset.php
index 4a129d1eda48f..bdaf8309a2a63 100644
--- a/layouts/joomla/edit/fieldset.php
+++ b/layouts/joomla/edit/fieldset.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 
diff --git a/layouts/joomla/edit/frontediting_modules.php b/layouts/joomla/edit/frontediting_modules.php
index b1b0d71022dc3..4b78d705d6b4c 100644
--- a/layouts/joomla/edit/frontediting_modules.php
+++ b/layouts/joomla/edit/frontediting_modules.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
diff --git a/layouts/joomla/edit/global.php b/layouts/joomla/edit/global.php
index ec38709bc167a..f2310e954a3c0 100644
--- a/layouts/joomla/edit/global.php
+++ b/layouts/joomla/edit/global.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
diff --git a/layouts/joomla/edit/metadata.php b/layouts/joomla/edit/metadata.php
index d190eab4d590c..724fc03512944 100644
--- a/layouts/joomla/edit/metadata.php
+++ b/layouts/joomla/edit/metadata.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Language\Text;
 
diff --git a/layouts/joomla/edit/params.php b/layouts/joomla/edit/params.php
index 1caae35a36ce6..02231e2518ca6 100644
--- a/layouts/joomla/edit/params.php
+++ b/layouts/joomla/edit/params.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
diff --git a/layouts/joomla/edit/publishingdata.php b/layouts/joomla/edit/publishingdata.php
index 84c25a914b76d..a21d03de73276 100644
--- a/layouts/joomla/edit/publishingdata.php
+++ b/layouts/joomla/edit/publishingdata.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 
diff --git a/layouts/joomla/edit/title_alias.php b/layouts/joomla/edit/title_alias.php
index f232c35eca269..a73be65f1ab84 100644
--- a/layouts/joomla/edit/title_alias.php
+++ b/layouts/joomla/edit/title_alias.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 $form  = $displayData->getForm();
 
diff --git a/layouts/joomla/editors/buttons.php b/layouts/joomla/editors/buttons.php
index 60591a7bfffe0..4853ec3896ca6 100644
--- a/layouts/joomla/editors/buttons.php
+++ b/layouts/joomla/editors/buttons.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Language\Text;
 
diff --git a/layouts/joomla/editors/buttons/button.php b/layouts/joomla/editors/buttons/button.php
index fb8b12871baa0..e13f39f349858 100644
--- a/layouts/joomla/editors/buttons/button.php
+++ b/layouts/joomla/editors/buttons/button.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Uri\Uri;
 
diff --git a/layouts/joomla/form/field/calendar.php b/layouts/joomla/form/field/calendar.php
index 197712ed6aeb6..0deafe1787bb0 100644
--- a/layouts/joomla/form/field/calendar.php
+++ b/layouts/joomla/form/field/calendar.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
diff --git a/layouts/joomla/form/field/checkbox.php b/layouts/joomla/form/field/checkbox.php
index f7d946752e476..41e95ab8b786b 100644
--- a/layouts/joomla/form/field/checkbox.php
+++ b/layouts/joomla/form/field/checkbox.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Form\Field\CheckboxField;
 
diff --git a/layouts/joomla/form/field/checkboxes.php b/layouts/joomla/form/field/checkboxes.php
index 0f9303c566978..74aad723d5853 100644
--- a/layouts/joomla/form/field/checkboxes.php
+++ b/layouts/joomla/form/field/checkboxes.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 extract($displayData);
 
diff --git a/layouts/joomla/form/field/color/advanced.php b/layouts/joomla/form/field/color/advanced.php
index 723bad810b1c5..a71c52c3bc850 100644
--- a/layouts/joomla/form/field/color/advanced.php
+++ b/layouts/joomla/form/field/color/advanced.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 
diff --git a/layouts/joomla/form/field/color/simple.php b/layouts/joomla/form/field/color/simple.php
index 1ff910e6a408e..a35b848343436 100644
--- a/layouts/joomla/form/field/color/simple.php
+++ b/layouts/joomla/form/field/color/simple.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
diff --git a/layouts/joomla/form/field/combo.php b/layouts/joomla/form/field/combo.php
index 4ade26bef3c63..0d77452765063 100644
--- a/layouts/joomla/form/field/combo.php
+++ b/layouts/joomla/form/field/combo.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 extract($displayData);
 
diff --git a/layouts/joomla/form/field/contenthistory.php b/layouts/joomla/form/field/contenthistory.php
index 0b7eb1e315303..f2ca6aa6bf702 100644
--- a/layouts/joomla/form/field/contenthistory.php
+++ b/layouts/joomla/form/field/contenthistory.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
diff --git a/layouts/joomla/form/field/email.php b/layouts/joomla/form/field/email.php
index 35852973429cb..f306c7b484895 100644
--- a/layouts/joomla/form/field/email.php
+++ b/layouts/joomla/form/field/email.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\String\PunycodeHelper;
 
diff --git a/layouts/joomla/form/field/file.php b/layouts/joomla/form/field/file.php
index d613b2c6dc65b..f54f409c093f9 100644
--- a/layouts/joomla/form/field/file.php
+++ b/layouts/joomla/form/field/file.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
diff --git a/layouts/joomla/form/field/hidden.php b/layouts/joomla/form/field/hidden.php
index df80630813a23..ce2ee0b3d78cd 100644
--- a/layouts/joomla/form/field/hidden.php
+++ b/layouts/joomla/form/field/hidden.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 extract($displayData);
 
diff --git a/layouts/joomla/form/field/list-fancy-select.php b/layouts/joomla/form/field/list-fancy-select.php
index 7ce8f34352e4a..06c3277976573 100644
--- a/layouts/joomla/form/field/list-fancy-select.php
+++ b/layouts/joomla/form/field/list-fancy-select.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
diff --git a/layouts/joomla/form/field/list.php b/layouts/joomla/form/field/list.php
index 01917a7c16b4e..1e5792ca718dc 100644
--- a/layouts/joomla/form/field/list.php
+++ b/layouts/joomla/form/field/list.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\HTML\HTMLHelper;
 
diff --git a/layouts/joomla/form/field/media.php b/layouts/joomla/form/field/media.php
index 80fcc4664ca2a..85be7187b28bb 100644
--- a/layouts/joomla/form/field/media.php
+++ b/layouts/joomla/form/field/media.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
diff --git a/layouts/joomla/form/field/meter.php b/layouts/joomla/form/field/meter.php
index 539d3c60be8b0..1d0fb8cd7599e 100644
--- a/layouts/joomla/form/field/meter.php
+++ b/layouts/joomla/form/field/meter.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 extract($displayData);
 
diff --git a/layouts/joomla/form/field/moduleorder.php b/layouts/joomla/form/field/moduleorder.php
index b132d4197c14f..306725e9998b9 100644
--- a/layouts/joomla/form/field/moduleorder.php
+++ b/layouts/joomla/form/field/moduleorder.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 
diff --git a/layouts/joomla/form/field/number.php b/layouts/joomla/form/field/number.php
index 4ee6d819b26e3..55f1361a9d5cb 100644
--- a/layouts/joomla/form/field/number.php
+++ b/layouts/joomla/form/field/number.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 extract($displayData);
 
diff --git a/layouts/joomla/form/field/password.php b/layouts/joomla/form/field/password.php
index 54fae0233bc67..695027273eee9 100644
--- a/layouts/joomla/form/field/password.php
+++ b/layouts/joomla/form/field/password.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
diff --git a/layouts/joomla/form/field/radio/buttons.php b/layouts/joomla/form/field/radio/buttons.php
index 8909678a95b23..2df6ee454863a 100644
--- a/layouts/joomla/form/field/radio/buttons.php
+++ b/layouts/joomla/form/field/radio/buttons.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 extract($displayData, null);
 
diff --git a/layouts/joomla/form/field/radio/switcher.php b/layouts/joomla/form/field/radio/switcher.php
index 48cbe9ed0d2f4..a4ba13aa77cfd 100644
--- a/layouts/joomla/form/field/radio/switcher.php
+++ b/layouts/joomla/form/field/radio/switcher.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 
diff --git a/layouts/joomla/form/field/radiobasic.php b/layouts/joomla/form/field/radiobasic.php
index b02c053a67d1c..763abafda0fe2 100644
--- a/layouts/joomla/form/field/radiobasic.php
+++ b/layouts/joomla/form/field/radiobasic.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Language\Text;
 
diff --git a/layouts/joomla/form/field/range.php b/layouts/joomla/form/field/range.php
index 9f77958fc0755..3c1ed74dd9fd7 100644
--- a/layouts/joomla/form/field/range.php
+++ b/layouts/joomla/form/field/range.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 extract($displayData);
 
diff --git a/layouts/joomla/form/field/rules.php b/layouts/joomla/form/field/rules.php
index 72ff10f014c1a..91f83358f3065 100644
--- a/layouts/joomla/form/field/rules.php
+++ b/layouts/joomla/form/field/rules.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Access\Access;
 use Joomla\CMS\Factory;
diff --git a/layouts/joomla/form/field/tag.php b/layouts/joomla/form/field/tag.php
index 1e866e09840c2..6984bc1ad6da5 100644
--- a/layouts/joomla/form/field/tag.php
+++ b/layouts/joomla/form/field/tag.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
diff --git a/layouts/joomla/form/field/tel.php b/layouts/joomla/form/field/tel.php
index 11871a7ece764..7492cb7ac137a 100644
--- a/layouts/joomla/form/field/tel.php
+++ b/layouts/joomla/form/field/tel.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 extract($displayData);
 
diff --git a/layouts/joomla/form/field/text.php b/layouts/joomla/form/field/text.php
index 17eae9aa8631a..17a542fefcbc8 100644
--- a/layouts/joomla/form/field/text.php
+++ b/layouts/joomla/form/field/text.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Language\Text;
 
diff --git a/layouts/joomla/form/field/textarea.php b/layouts/joomla/form/field/textarea.php
index f16c466d32464..5e483bccae215 100644
--- a/layouts/joomla/form/field/textarea.php
+++ b/layouts/joomla/form/field/textarea.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
diff --git a/layouts/joomla/form/field/time.php b/layouts/joomla/form/field/time.php
index 56a99a20a513a..1c266598951a2 100644
--- a/layouts/joomla/form/field/time.php
+++ b/layouts/joomla/form/field/time.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 /**
  * @var  array $displayData Array with values.
diff --git a/layouts/joomla/form/field/url.php b/layouts/joomla/form/field/url.php
index baf0deeac1758..d298aa548848a 100644
--- a/layouts/joomla/form/field/url.php
+++ b/layouts/joomla/form/field/url.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\String\PunycodeHelper;
 
diff --git a/layouts/joomla/form/field/user.php b/layouts/joomla/form/field/user.php
index 1c52121913f90..b9dfb01863005 100644
--- a/layouts/joomla/form/field/user.php
+++ b/layouts/joomla/form/field/user.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
diff --git a/layouts/joomla/form/renderfield.php b/layouts/joomla/form/renderfield.php
index 720d02dce5739..d14700ce97060 100644
--- a/layouts/joomla/form/renderfield.php
+++ b/layouts/joomla/form/renderfield.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 
diff --git a/layouts/joomla/form/renderlabel.php b/layouts/joomla/form/renderlabel.php
index c1c87f25a6e14..69b00c795c97e 100644
--- a/layouts/joomla/form/renderlabel.php
+++ b/layouts/joomla/form/renderlabel.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 extract($displayData);
 
diff --git a/layouts/joomla/html/batch/access.php b/layouts/joomla/html/batch/access.php
index 9022689994304..039993d9ade5f 100644
--- a/layouts/joomla/html/batch/access.php
+++ b/layouts/joomla/html/batch/access.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
diff --git a/layouts/joomla/html/batch/adminlanguage.php b/layouts/joomla/html/batch/adminlanguage.php
index 35bf3bb1c00aa..5e74c3f7db5e7 100644
--- a/layouts/joomla/html/batch/adminlanguage.php
+++ b/layouts/joomla/html/batch/adminlanguage.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
diff --git a/layouts/joomla/html/batch/item.php b/layouts/joomla/html/batch/item.php
index 2cb8ddedc5245..29c1e61ebf146 100644
--- a/layouts/joomla/html/batch/item.php
+++ b/layouts/joomla/html/batch/item.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
diff --git a/layouts/joomla/html/batch/language.php b/layouts/joomla/html/batch/language.php
index 228fe0df28b91..d14abdabbf14d 100644
--- a/layouts/joomla/html/batch/language.php
+++ b/layouts/joomla/html/batch/language.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
diff --git a/layouts/joomla/html/batch/tag.php b/layouts/joomla/html/batch/tag.php
index 77b75e5320509..b2b15ffc2dea9 100644
--- a/layouts/joomla/html/batch/tag.php
+++ b/layouts/joomla/html/batch/tag.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
diff --git a/layouts/joomla/html/batch/user.php b/layouts/joomla/html/batch/user.php
index 7b9847109f609..ddc6897c0c811 100644
--- a/layouts/joomla/html/batch/user.php
+++ b/layouts/joomla/html/batch/user.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
diff --git a/layouts/joomla/html/batch/workflowstage.php b/layouts/joomla/html/batch/workflowstage.php
index 386691617f3f1..a4d0f795a8865 100644
--- a/layouts/joomla/html/batch/workflowstage.php
+++ b/layouts/joomla/html/batch/workflowstage.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
diff --git a/layouts/joomla/html/treeprefix.php b/layouts/joomla/html/treeprefix.php
index c68ef1594cf67..7aff1159e24be 100644
--- a/layouts/joomla/html/treeprefix.php
+++ b/layouts/joomla/html/treeprefix.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 /**
  * Layout variables
diff --git a/layouts/joomla/installer/changelog.php b/layouts/joomla/installer/changelog.php
index 3a0ddca65ca58..bf7aa41f0f8e2 100644
--- a/layouts/joomla/installer/changelog.php
+++ b/layouts/joomla/installer/changelog.php
@@ -9,7 +9,7 @@
 
 use Joomla\CMS\Language\Text;
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 array_walk(
 	$displayData,
diff --git a/layouts/joomla/links/groupclose.php b/layouts/joomla/links/groupclose.php
index f03eafeb1580e..e1f8b0e91f8f0 100644
--- a/layouts/joomla/links/groupclose.php
+++ b/layouts/joomla/links/groupclose.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 ?>
 </ul>
diff --git a/layouts/joomla/links/groupopen.php b/layouts/joomla/links/groupopen.php
index 20aa161ca7270..279b70288fa30 100644
--- a/layouts/joomla/links/groupopen.php
+++ b/layouts/joomla/links/groupopen.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Filter\OutputFilter;
 use Joomla\CMS\Language\Text;
diff --git a/layouts/joomla/links/groupsclose.php b/layouts/joomla/links/groupsclose.php
index 81a78b5c491ed..ec9263972c148 100644
--- a/layouts/joomla/links/groupsclose.php
+++ b/layouts/joomla/links/groupsclose.php
@@ -7,6 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
+
 ?>
 </div>
diff --git a/layouts/joomla/links/groupseparator.php b/layouts/joomla/links/groupseparator.php
index 64ecbceaf214a..bedc19d559368 100644
--- a/layouts/joomla/links/groupseparator.php
+++ b/layouts/joomla/links/groupseparator.php
@@ -7,6 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
+
 ?>
 <div class="j-links-separator"></div>
diff --git a/layouts/joomla/links/groupsopen.php b/layouts/joomla/links/groupsopen.php
index 66e5765de173d..cb280c210f658 100644
--- a/layouts/joomla/links/groupsopen.php
+++ b/layouts/joomla/links/groupsopen.php
@@ -7,6 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
+
 ?>
-<div class="j-links-groups">
\ No newline at end of file
+<div class="j-links-groups">
diff --git a/layouts/joomla/links/link.php b/layouts/joomla/links/link.php
index 78b66c0b7fb84..796a2b9bd3ea3 100644
--- a/layouts/joomla/links/link.php
+++ b/layouts/joomla/links/link.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Filter\OutputFilter;
 
diff --git a/layouts/joomla/modal/body.php b/layouts/joomla/modal/body.php
index 74b38a0b1b71b..b2db170a1a421 100644
--- a/layouts/joomla/modal/body.php
+++ b/layouts/joomla/modal/body.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 extract($displayData);
 
diff --git a/layouts/joomla/modal/footer.php b/layouts/joomla/modal/footer.php
index 098dae16129a3..e2074d578052c 100644
--- a/layouts/joomla/modal/footer.php
+++ b/layouts/joomla/modal/footer.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 extract($displayData);
 
diff --git a/layouts/joomla/modal/header.php b/layouts/joomla/modal/header.php
index 8529c26a2ef88..b3f3ef41e57d0 100644
--- a/layouts/joomla/modal/header.php
+++ b/layouts/joomla/modal/header.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Language\Text;
 
diff --git a/layouts/joomla/modal/iframe.php b/layouts/joomla/modal/iframe.php
index bc0363743e2c3..a7ac322e0134a 100644
--- a/layouts/joomla/modal/iframe.php
+++ b/layouts/joomla/modal/iframe.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\Utilities\ArrayHelper;
 
diff --git a/layouts/joomla/modal/main.php b/layouts/joomla/modal/main.php
index 8ea3a68be30f6..1e92304db2608 100644
--- a/layouts/joomla/modal/main.php
+++ b/layouts/joomla/modal/main.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\Utilities\ArrayHelper;
diff --git a/layouts/joomla/pagination/link.php b/layouts/joomla/pagination/link.php
index d9f246290eb6d..90f71da355e74 100644
--- a/layouts/joomla/pagination/link.php
+++ b/layouts/joomla/pagination/link.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
diff --git a/layouts/joomla/pagination/links.php b/layouts/joomla/pagination/links.php
index 8af8dc8d12973..b98ab6182d835 100644
--- a/layouts/joomla/pagination/links.php
+++ b/layouts/joomla/pagination/links.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
diff --git a/layouts/joomla/pagination/list.php b/layouts/joomla/pagination/list.php
index 7bb24ba00c649..350f22ed2a2cf 100644
--- a/layouts/joomla/pagination/list.php
+++ b/layouts/joomla/pagination/list.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Language\Text;
 
diff --git a/layouts/joomla/quickicons/icon.php b/layouts/joomla/quickicons/icon.php
index d13882a03198e..21a5441793a5a 100644
--- a/layouts/joomla/quickicons/icon.php
+++ b/layouts/joomla/quickicons/icon.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Language\Text;
 
diff --git a/layouts/joomla/searchtools/default.php b/layouts/joomla/searchtools/default.php
index 6fd011720175a..52d7a4b2c8550 100644
--- a/layouts/joomla/searchtools/default.php
+++ b/layouts/joomla/searchtools/default.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
diff --git a/layouts/joomla/searchtools/default/bar.php b/layouts/joomla/searchtools/default/bar.php
index 855adb75372f2..6137ffe182083 100644
--- a/layouts/joomla/searchtools/default/bar.php
+++ b/layouts/joomla/searchtools/default/bar.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Language\Text;
 use Joomla\Registry\Registry;
diff --git a/layouts/joomla/searchtools/default/filters.php b/layouts/joomla/searchtools/default/filters.php
index c41a26da95dc8..ec13b1f2e844b 100644
--- a/layouts/joomla/searchtools/default/filters.php
+++ b/layouts/joomla/searchtools/default/filters.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\FormHelper;
diff --git a/layouts/joomla/searchtools/default/list.php b/layouts/joomla/searchtools/default/list.php
index 087f0c385f144..e0d3323711ba9 100644
--- a/layouts/joomla/searchtools/default/list.php
+++ b/layouts/joomla/searchtools/default/list.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 $data = $displayData;
 
diff --git a/layouts/joomla/searchtools/default/noitems.php b/layouts/joomla/searchtools/default/noitems.php
index d48f1e6a402bb..a0b7755a9364e 100644
--- a/layouts/joomla/searchtools/default/noitems.php
+++ b/layouts/joomla/searchtools/default/noitems.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Language\Text;
 
diff --git a/layouts/joomla/searchtools/default/selector.php b/layouts/joomla/searchtools/default/selector.php
index f3cd42aaea993..adda53a39aff6 100644
--- a/layouts/joomla/searchtools/default/selector.php
+++ b/layouts/joomla/searchtools/default/selector.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 $data = $displayData;
 ?>
diff --git a/layouts/joomla/searchtools/grid/sort.php b/layouts/joomla/searchtools/grid/sort.php
index b1cddbd6766fb..12e62b199b204 100644
--- a/layouts/joomla/searchtools/grid/sort.php
+++ b/layouts/joomla/searchtools/grid/sort.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Language\Text;
 
diff --git a/layouts/joomla/sidebars/submenu.php b/layouts/joomla/sidebars/submenu.php
index 30b7443fef942..538479fddaf71 100644
--- a/layouts/joomla/sidebars/submenu.php
+++ b/layouts/joomla/sidebars/submenu.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
diff --git a/layouts/joomla/system/message.php b/layouts/joomla/system/message.php
index b7de5fb23d877..ad78d02fed9bb 100644
--- a/layouts/joomla/system/message.php
+++ b/layouts/joomla/system/message.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Factory;
diff --git a/layouts/joomla/tinymce/textarea.php b/layouts/joomla/tinymce/textarea.php
index 50d6522b939aa..262ef14cc1601 100644
--- a/layouts/joomla/tinymce/textarea.php
+++ b/layouts/joomla/tinymce/textarea.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 $data = $displayData;
 
diff --git a/layouts/joomla/tinymce/togglebutton.php b/layouts/joomla/tinymce/togglebutton.php
index ecef5c0d0ff6e..ef560c5284cee 100644
--- a/layouts/joomla/tinymce/togglebutton.php
+++ b/layouts/joomla/tinymce/togglebutton.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Language\Text;
 
diff --git a/layouts/joomla/toolbar/base.php b/layouts/joomla/toolbar/base.php
index 99d527415efb5..7b21127d837e1 100644
--- a/layouts/joomla/toolbar/base.php
+++ b/layouts/joomla/toolbar/base.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 /**
  * @var  string  $action
diff --git a/layouts/joomla/toolbar/basic.php b/layouts/joomla/toolbar/basic.php
index 15944a6e6cebf..4a8462a2b3356 100644
--- a/layouts/joomla/toolbar/basic.php
+++ b/layouts/joomla/toolbar/basic.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
diff --git a/layouts/joomla/toolbar/batch.php b/layouts/joomla/toolbar/batch.php
index e1671af844896..5f7f0c896af15 100644
--- a/layouts/joomla/toolbar/batch.php
+++ b/layouts/joomla/toolbar/batch.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
diff --git a/layouts/joomla/toolbar/containerclose.php b/layouts/joomla/toolbar/containerclose.php
index 8df11791be645..c5dc6b9c3fdf1 100644
--- a/layouts/joomla/toolbar/containerclose.php
+++ b/layouts/joomla/toolbar/containerclose.php
@@ -7,7 +7,8 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
+
 ?>
 </div>
 </nav>
diff --git a/layouts/joomla/toolbar/containeropen.php b/layouts/joomla/toolbar/containeropen.php
index 04adad9714536..eaa38308307ab 100644
--- a/layouts/joomla/toolbar/containeropen.php
+++ b/layouts/joomla/toolbar/containeropen.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
diff --git a/layouts/joomla/toolbar/dropdown.php b/layouts/joomla/toolbar/dropdown.php
index d05647a9134d9..644ca05cb04b7 100644
--- a/layouts/joomla/toolbar/dropdown.php
+++ b/layouts/joomla/toolbar/dropdown.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
diff --git a/layouts/joomla/toolbar/iconclass.php b/layouts/joomla/toolbar/iconclass.php
index 8ec6fb6fd5c6f..ea02983f9e483 100644
--- a/layouts/joomla/toolbar/iconclass.php
+++ b/layouts/joomla/toolbar/iconclass.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 // Convert icomoon to fa
 $icon = $displayData['icon'];
@@ -92,5 +92,4 @@
 {
 	$icon = 'list-ul';
 }
-
-?>fas fa-<?php echo $icon;
+?>fas fa-<?php echo $icon; ?>
diff --git a/layouts/joomla/toolbar/link.php b/layouts/joomla/toolbar/link.php
index 13ca609d16318..af1763ca22cca 100644
--- a/layouts/joomla/toolbar/link.php
+++ b/layouts/joomla/toolbar/link.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 /**
  * @var  int     $id
diff --git a/layouts/joomla/toolbar/modal.php b/layouts/joomla/toolbar/modal.php
index 9dc51895e6cc5..ab49079b87a76 100644
--- a/layouts/joomla/toolbar/modal.php
+++ b/layouts/joomla/toolbar/modal.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
diff --git a/layouts/joomla/toolbar/popup.php b/layouts/joomla/toolbar/popup.php
index 64324285b166e..faf9b652b1992 100644
--- a/layouts/joomla/toolbar/popup.php
+++ b/layouts/joomla/toolbar/popup.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\Utilities\ArrayHelper;
diff --git a/layouts/joomla/toolbar/separator.php b/layouts/joomla/toolbar/separator.php
index 298e5895c1080..a170763d028b7 100644
--- a/layouts/joomla/toolbar/separator.php
+++ b/layouts/joomla/toolbar/separator.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 /**
  * @var  bool    $is_child
diff --git a/layouts/joomla/toolbar/standard.php b/layouts/joomla/toolbar/standard.php
index b5c1052d18178..1c50efbfaad5e 100644
--- a/layouts/joomla/toolbar/standard.php
+++ b/layouts/joomla/toolbar/standard.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 
diff --git a/layouts/joomla/toolbar/title.php b/layouts/joomla/toolbar/title.php
index f8976ff4199c4..92ab75d3876c8 100644
--- a/layouts/joomla/toolbar/title.php
+++ b/layouts/joomla/toolbar/title.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 $icon = empty($displayData['icon']) ? 'dot-circle' : preg_replace('#\.[^ .]*$#', '', $displayData['icon']);
 
diff --git a/layouts/joomla/toolbar/versions.php b/layouts/joomla/toolbar/versions.php
index fe971722ac3e0..05cdf2e0473b5 100644
--- a/layouts/joomla/toolbar/versions.php
+++ b/layouts/joomla/toolbar/versions.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
diff --git a/layouts/libraries/cms/html/bootstrap/addtab.php b/layouts/libraries/cms/html/bootstrap/addtab.php
index b2f64b4da201b..96fae338629dd 100644
--- a/layouts/libraries/cms/html/bootstrap/addtab.php
+++ b/layouts/libraries/cms/html/bootstrap/addtab.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 $id       = empty($displayData['id']) ? '' : $displayData['id'];
 $active   = empty($displayData['active']) ? '' : $displayData['active'];
diff --git a/layouts/libraries/cms/html/bootstrap/endtab.php b/layouts/libraries/cms/html/bootstrap/endtab.php
index 304d93ca63931..1d9dfa00d9dcf 100644
--- a/layouts/libraries/cms/html/bootstrap/endtab.php
+++ b/layouts/libraries/cms/html/bootstrap/endtab.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 ?>
 
diff --git a/layouts/libraries/cms/html/bootstrap/endtabset.php b/layouts/libraries/cms/html/bootstrap/endtabset.php
index 304d93ca63931..1d9dfa00d9dcf 100644
--- a/layouts/libraries/cms/html/bootstrap/endtabset.php
+++ b/layouts/libraries/cms/html/bootstrap/endtabset.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 ?>
 
diff --git a/layouts/libraries/cms/html/bootstrap/starttabset.php b/layouts/libraries/cms/html/bootstrap/starttabset.php
index 7fa17b4e70d14..bd14c66bf69a4 100644
--- a/layouts/libraries/cms/html/bootstrap/starttabset.php
+++ b/layouts/libraries/cms/html/bootstrap/starttabset.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 $selector = empty($displayData['selector']) ? '' : $displayData['selector'];
 
diff --git a/layouts/plugins/system/privacyconsent/label.php b/layouts/plugins/system/privacyconsent/label.php
index 9eff2f9db4a67..e840b1f6217f9 100644
--- a/layouts/plugins/system/privacyconsent/label.php
+++ b/layouts/plugins/system/privacyconsent/label.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
diff --git a/layouts/plugins/system/privacyconsent/message.php b/layouts/plugins/system/privacyconsent/message.php
index 24dcb7756f888..570326fc489c1 100644
--- a/layouts/plugins/system/privacyconsent/message.php
+++ b/layouts/plugins/system/privacyconsent/message.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 extract($displayData);
 
diff --git a/layouts/plugins/system/webauthn/manage.php b/layouts/plugins/system/webauthn/manage.php
index de684fa1f475f..3183f8447877a 100644
--- a/layouts/plugins/system/webauthn/manage.php
+++ b/layouts/plugins/system/webauthn/manage.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
diff --git a/layouts/plugins/user/terms/label.php b/layouts/plugins/user/terms/label.php
index 5f1f42d96f261..ceb33d0e669bc 100644
--- a/layouts/plugins/user/terms/label.php
+++ b/layouts/plugins/user/terms/label.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
diff --git a/layouts/plugins/user/terms/message.php b/layouts/plugins/user/terms/message.php
index 60757d4bc4907..28cae72c857d9 100644
--- a/layouts/plugins/user/terms/message.php
+++ b/layouts/plugins/user/terms/message.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 extract($displayData);
 
diff --git a/libraries/src/Document/HtmlDocument.php b/libraries/src/Document/HtmlDocument.php
index f33f7004752a4..ac47cd4f29a66 100644
--- a/libraries/src/Document/HtmlDocument.php
+++ b/libraries/src/Document/HtmlDocument.php
@@ -318,11 +318,14 @@ public function mergeHeadData($data)
 
 		if (isset($data['style']))
 		{
-			foreach ($data['style'] as $type => $stdata)
+			foreach ($data['style'] as $type => $styles)
 			{
-				if (!isset($this->_style[strtolower($type)]) || !stristr($stdata, $this->_style[strtolower($type)]))
+				foreach ($styles as $hash => $style)
 				{
-					$this->addStyleDeclaration($stdata, $type);
+					if (!isset($this->_style[strtolower($type)][$hash]))
+					{
+						$this->addStyleDeclaration($style, $type);
+					}
 				}
 			}
 		}
@@ -333,11 +336,14 @@ public function mergeHeadData($data)
 
 		if (isset($data['script']))
 		{
-			foreach ($data['script'] as $type => $sdata)
+			foreach ($data['script'] as $type => $scripts)
 			{
-				if (!isset($this->_script[strtolower($type)]) || !stristr($sdata, $this->_script[strtolower($type)]))
+				foreach ($scripts as $hash => $script)
 				{
-					$this->addScriptDeclaration($sdata, $type);
+					if (!isset($this->_script[strtolower($type)][$hash]))
+					{
+						$this->addScriptDeclaration($script, $type);
+					}
 				}
 			}
 		}
diff --git a/libraries/src/Form/Field/FolderlistField.php b/libraries/src/Form/Field/FolderlistField.php
index 99325a6d35e7d..23fb5bf28ef81 100644
--- a/libraries/src/Form/Field/FolderlistField.php
+++ b/libraries/src/Form/Field/FolderlistField.php
@@ -185,7 +185,7 @@ protected function getOptions()
 	{
 		$options = array();
 
-		$path = ltrim($this->directory, '/');
+		$path = $this->directory;
 
 		if (!is_dir($path))
 		{
diff --git a/libraries/src/Form/Field/PredefinedlistField.php b/libraries/src/Form/Field/PredefinedlistField.php
index dd2e72a621e22..d73aaaadd9212 100644
--- a/libraries/src/Form/Field/PredefinedlistField.php
+++ b/libraries/src/Form/Field/PredefinedlistField.php
@@ -107,7 +107,9 @@ protected function getOptions()
 
 			foreach ($this->predefinedOptions as $value => $text)
 			{
-				if (empty($this->optionsFilter) || \in_array($value, $this->optionsFilter))
+				$val = (string) $value;
+
+				if (empty($this->optionsFilter) || in_array($val, $this->optionsFilter, true))
 				{
 					$text = $this->translate ? Text::_($text) : $text;
 
diff --git a/libraries/src/Form/Field/StatusField.php b/libraries/src/Form/Field/StatusField.php
index 5b8777c0b7fd0..b769e01468e64 100644
--- a/libraries/src/Form/Field/StatusField.php
+++ b/libraries/src/Form/Field/StatusField.php
@@ -32,10 +32,10 @@ class StatusField extends PredefinedlistField
 	 * @since  3.2
 	 */
 	protected $predefinedOptions = array(
-		'-2' =>	'JTRASHED',
-		'0'  => 'JUNPUBLISHED',
-		'1'  => 'JPUBLISHED',
-		'2'  => 'JARCHIVED',
-		'*'  => 'JALL',
+		-2  => 'JTRASHED',
+		0   => 'JUNPUBLISHED',
+		1   => 'JPUBLISHED',
+		2   => 'JARCHIVED',
+		'*' => 'JALL',
 	);
 }
diff --git a/libraries/src/Form/Field/TransitionField.php b/libraries/src/Form/Field/TransitionField.php
index f478e54af9de2..5e0687864b6b2 100644
--- a/libraries/src/Form/Field/TransitionField.php
+++ b/libraries/src/Form/Field/TransitionField.php
@@ -8,7 +8,7 @@
 
 namespace Joomla\CMS\Form\Field;
 
-\defined('JPATH_BASE') or die;
+\defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
diff --git a/libraries/src/HTML/Helpers/SortableList.php b/libraries/src/HTML/Helpers/SortableList.php
index e8362703e32f4..c6752bc5b57d2 100644
--- a/libraries/src/HTML/Helpers/SortableList.php
+++ b/libraries/src/HTML/Helpers/SortableList.php
@@ -16,6 +16,7 @@
  * HTML utility class for creating a sortable table list
  *
  * @since  3.0
+ * @deprecated  5.0  Sortable List will be deprecated in favour of a new dragula script in 4.0
  */
 abstract class SortableList
 {
@@ -32,6 +33,7 @@ abstract class SortableList
 	 * @return  void
 	 *
 	 * @since   3.0
+	 * @deprecated  5.0  In Joomla 4 call JHtml::_('dragablelist.dragable') and add a class of js-draggable to the tbody element of the table
 	 */
 	public static function sortable($tableId, $formId, $sortDir = 'asc', $saveOrderingUrl = null, $proceedSaveOrderButton = true, $nestedList = false)
 	{
diff --git a/libraries/src/Helper/ModuleHelper.php b/libraries/src/Helper/ModuleHelper.php
index 84b0cde173948..5e718a9b8625a 100644
--- a/libraries/src/Helper/ModuleHelper.php
+++ b/libraries/src/Helper/ModuleHelper.php
@@ -711,7 +711,7 @@ public static function &getModuleById($id)
 		for ($i = 0; $i < $total; $i++)
 		{
 			// Match the id of the module
-			if ($modules[$i]->id === $id)
+			if ((string) $modules[$i]->id === $id)
 			{
 				// Found it
 				return $modules[$i];
diff --git a/libraries/src/MVC/Controller/AdminController.php b/libraries/src/MVC/Controller/AdminController.php
index ffa9a3d57224e..9fca6fa55f248 100644
--- a/libraries/src/MVC/Controller/AdminController.php
+++ b/libraries/src/MVC/Controller/AdminController.php
@@ -362,9 +362,10 @@ public function checkin()
 		$this->checkToken();
 
 		$ids = $this->input->post->get('cid', array(), 'array');
+		$cid = ArrayHelper::toInteger($ids);
 
 		$model = $this->getModel();
-		$return = $model->checkin($ids);
+		$return = $model->checkin($cid);
 
 		if ($return === false)
 		{
@@ -381,7 +382,7 @@ public function checkin()
 		else
 		{
 			// Checkin succeeded.
-			$message = Text::plural($this->text_prefix . '_N_ITEMS_CHECKED_IN', \count($ids));
+			$message = Text::plural($this->text_prefix . '_N_ITEMS_CHECKED_IN', \count($cid));
 			$this->setRedirect(
 				Route::_(
 					'index.php?option=' . $this->option . '&view=' . $this->view_list . $this->getRedirectToListAppend(), false
diff --git a/libraries/src/MVC/Controller/FormController.php b/libraries/src/MVC/Controller/FormController.php
index 9d6a3ac1ab4b3..ce04125a1ef7f 100644
--- a/libraries/src/MVC/Controller/FormController.php
+++ b/libraries/src/MVC/Controller/FormController.php
@@ -736,6 +736,26 @@ public function save($key = null, $urlVar = null)
 				}
 			}
 
+			/**
+			 * We need the filtered value of calendar fields because the UTC normalision is
+			 * done in the filter and on output. This would apply the Timezone offset on
+			 * reload. We set the calendar values we save to the processed date.
+			 */
+			$filteredData = $form->filter($data);
+
+			foreach ($form->getFieldset() as $field)
+			{
+				if ($field->type === 'Calendar')
+				{
+					$fieldName = $field->fieldname;
+
+					if (isset($filteredData[$fieldName]))
+					{
+						$data[$fieldName] = $filteredData[$fieldName];
+					}
+				}
+			}
+
 			// Save the data in the session.
 			$app->setUserState($context . '.data', $data);
 
@@ -913,6 +933,29 @@ public function reload($key = null, $urlVar = null)
 			false
 		);
 
+		/** @var \Joomla\CMS\Form\Form $form */
+		$form = $model->getForm($data, false);
+
+		/**
+		 * We need the filtered value of calendar fields because the UTC normalision is
+		 * done in the filter and on output. This would apply the Timezone offset on
+		 * reload. We set the calendar values we save to the processed date.
+		 */
+		$filteredData = $form->filter($data);
+
+		foreach ($form->getFieldset() as $field)
+		{
+			if ($field->type === 'Calendar')
+			{
+				$fieldName = $field->fieldname;
+
+				if (isset($filteredData[$fieldName]))
+				{
+					$data[$fieldName] = $filteredData[$fieldName];
+				}
+			}
+		}
+
 		// Save the data in the session.
 		$app->setUserState($this->option . '.edit.' . $this->context . '.data', $data);
 
diff --git a/libraries/src/MVC/Model/AdminModel.php b/libraries/src/MVC/Model/AdminModel.php
index 983efd736101a..bbf08ab8b603b 100644
--- a/libraries/src/MVC/Model/AdminModel.php
+++ b/libraries/src/MVC/Model/AdminModel.php
@@ -1447,83 +1447,7 @@ public function save($data)
 
 		if ($app->input->get('task') == 'editAssociations')
 		{
-			$id = $data['id'];
-
-			// Deal with categories associations
-			if ($this->text_prefix === 'COM_CATEGORIES')
-			{
-				$extension       = $app->input->get('extension', 'com_content');
-				$this->typeAlias = $extension . '.category';
-				$component       = strtolower($this->text_prefix);
-				$view            = 'category';
-			}
-			else
-			{
-				$aliasArray = explode('.', $this->typeAlias);
-				$component  = $aliasArray[0];
-				$view       = $aliasArray[1];
-				$extension  = '';
-			}
-
-			// Menu item redirect needs admin client
-			$client = $component === 'com_menus' ? '&client_id=0' : '';
-
-			if ($id == 0)
-			{
-				$app->enqueueMessage(Text::_('JGLOBAL_ASSOCIATIONS_NEW_ITEM_WARNING'), 'error');
-				$app->redirect(
-					\JRoute::_('index.php?option=' . $component . '&view=' . $view . $client . '&layout=edit&id=' . $id . $extension, false)
-				);
-
-				return false;
-			}
-
-			if ($data['language'] === '*')
-			{
-				$app->enqueueMessage(Text::_('JGLOBAL_ASSOC_NOT_POSSIBLE'), 'notice');
-				$app->redirect(
-					\JRoute::_('index.php?option=' . $component . '&view=' . $view . $client . '&layout=edit&id=' . $id . $extension, false)
-				);
-
-				return false;
-			}
-
-			$languages = LanguageHelper::getContentLanguages(array(0, 1));
-			$target    = '';
-
-			/*
-			 * If the site contains only 2 languages and an association exists for the item
-			 * load directly the associated target item in the side by side view
-			 * otherwise select already the target language
-			 */
-			if (count($languages) === 2)
-			{
-				foreach ($languages as $language)
-				{
-					$lang_code[] = $language->lang_code;
-				}
-
-				$refLang    = array($data['language']);
-				$targetLang = array_diff($lang_code, $refLang);
-				$targetLang = implode(',', $targetLang);
-				$targetId   = $data['associations'][$targetLang];
-
-				if ($targetId)
-				{
-					$target = '&target=' . $targetLang . '%3A' . $targetId . '%3Aedit';
-				}
-				else
-				{
-					$target = '&target=' . $targetLang . '%3A0%3Aadd';
-				}
-			}
-
-			$app->redirect(
-				\JRoute::_(
-					'index.php?option=com_associations&view=association&layout=edit&itemtype=' . $this->typeAlias
-					. '&task=association.edit&id=' . $id . $target, false
-				)
-			);
+			return $this->redirectToAssociations($data);
 		}
 
 		return true;
@@ -1734,4 +1658,98 @@ public function editAssociations($data)
 		// Save the item
 		return $this->save($data);
 	}
+
+	/**
+	 * Method to load an item in com_associations.
+	 *
+	 * @param   array  $data  The form data.
+	 *
+	 * @return  boolean  True if successful, false otherwise.
+	 *
+	 * @throws \Exception
+	 * @since   3.9.17
+	 */
+	protected function redirectToAssociations($data)
+	{
+		$app = Factory::getApplication();
+		$id  = $data['id'];
+
+		// Deal with categories associations
+		if ($this->text_prefix === 'COM_CATEGORIES')
+		{
+			$extension       = $app->input->get('extension', 'com_content');
+			$this->typeAlias = $extension . '.category';
+			$component       = strtolower($this->text_prefix);
+			$view            = 'category';
+		}
+		else
+		{
+			$aliasArray = explode('.', $this->typeAlias);
+			$component  = $aliasArray[0];
+			$view       = $aliasArray[1];
+			$extension  = '';
+		}
+
+		// Menu item redirect needs admin client
+		$client = $component === 'com_menus' ? '&client_id=0' : '';
+
+		if ($id == 0)
+		{
+			$app->enqueueMessage(Text::_('JGLOBAL_ASSOCIATIONS_NEW_ITEM_WARNING'), 'error');
+			$app->redirect(
+				Route::_('index.php?option=' . $component . '&view=' . $view . $client . '&layout=edit&id=' . $id . $extension, false)
+			);
+
+			return false;
+		}
+
+		if ($data['language'] === '*')
+		{
+			$app->enqueueMessage(Text::_('JGLOBAL_ASSOC_NOT_POSSIBLE'), 'notice');
+			$app->redirect(
+				Route::_('index.php?option=' . $component . '&view=' . $view . $client . '&layout=edit&id=' . $id . $extension, false)
+			);
+
+			return false;
+		}
+
+		$languages = LanguageHelper::getContentLanguages(array(0, 1));
+		$target    = '';
+
+		/**
+		 * If the site contains only 2 languages and an association exists for the item
+		 * load directly the associated target item in the side by side view
+		 * otherwise select already the target language
+		 */
+		if (count($languages) === 2)
+		{
+			foreach ($languages as $language)
+			{
+				$lang_code[] = $language->lang_code;
+			}
+
+			$refLang    = array($data['language']);
+			$targetLang = array_diff($lang_code, $refLang);
+			$targetLang = implode(',', $targetLang);
+			$targetId   = $data['associations'][$targetLang];
+
+			if ($targetId)
+			{
+				$target = '&target=' . $targetLang . '%3A' . $targetId . '%3Aedit';
+			}
+			else
+			{
+				$target = '&target=' . $targetLang . '%3A0%3Aadd';
+			}
+		}
+
+		$app->redirect(
+			Route::_(
+				'index.php?option=com_associations&view=association&layout=edit&itemtype=' . $this->typeAlias
+				. '&task=association.edit&id=' . $id . $target, false
+			)
+		);
+
+		return true;
+	}
 }
diff --git a/libraries/src/Schema/ChangeItem/MysqlChangeItem.php b/libraries/src/Schema/ChangeItem/MysqlChangeItem.php
index 46c1f7e47db4c..2416de4e17fcc 100644
--- a/libraries/src/Schema/ChangeItem/MysqlChangeItem.php
+++ b/libraries/src/Schema/ChangeItem/MysqlChangeItem.php
@@ -235,8 +235,10 @@ protected function buildCheckQuery()
 
 	/**
 	 * Fix up integer. Fixes problem with MySQL integer descriptions.
-	 * If you change a column to "integer unsigned" it shows
-	 * as "int(10) unsigned" in the check query.
+	 * On MySQL 8 display length is not shown anymore.
+	 * This means we have to match e.g. both "int(10) unsigned" and
+	 * "int unsigned", or both "int(11)" and "int" and so on.
+	 * The same applies to tinyint.
 	 *
 	 * @param   string  $type1  the column type
 	 * @param   string  $type2  the column attributes
@@ -249,13 +251,28 @@ private function fixInteger($type1, $type2)
 	{
 		$result = $type1;
 
-		if (strtolower($type1) === 'integer' && strtolower(substr($type2, 0, 8)) === 'unsigned')
+		if (strtolower(substr($type2, 0, 8)) === 'unsigned')
 		{
-			$result = 'int(10) unsigned';
+			if (strtolower(substr($type1, 0, 7)) === 'tinyint')
+			{
+				$result = 'tinyint unsigned';
+			}
+			elseif (strtolower(substr($type1, 0, 3)) === 'int')
+			{
+				$result = 'int unsigned';
+			}
+			else
+			{
+				$result = $type1 . ' unsigned';
+			}
+		}
+		elseif (strtolower(substr($type1, 0, 7)) === 'tinyint')
+		{
+			$result = 'tinyint';
 		}
-		elseif (strtolower(substr($type2, 0, 8)) === 'unsigned')
+		elseif (strtolower(substr($type1, 0, 3)) === 'int')
 		{
-			$result = $type1 . ' unsigned';
+			$result = 'int';
 		}
 
 		return $result;
@@ -284,7 +301,9 @@ private function fixQuote($string)
 	/**
 	 * Make check query for column changes/modifications tolerant
 	 * for automatic type changes of text columns, e.g. from TEXT
-	 * to MEDIUMTEXT, after comnversion from utf8 to utf8mb4
+	 * to MEDIUMTEXT, after comnversion from utf8 to utf8mb4, and
+	 * fix integer (int or tinyint) columns without display length
+	 * for MySQL 8.
 	 *
 	 * @param   string  $type  The column type found in the update query
 	 *
@@ -296,7 +315,25 @@ private function fixUtf8mb4TypeChecks($type)
 	{
 		$uType = strtoupper(str_replace(';', '', $type));
 
-		if ($this->db instanceof UTF8MB4SupportInterface && $this->db->hasUTF8mb4Support())
+		if ($uType === 'TINYINT UNSIGNED')
+		{
+			$typeCheck = 'UPPER(LEFT(type, 7)) = ' . $this->db->quote('TINYINT')
+				. ' AND UPPER(RIGHT(type, 9)) = ' . $this->db->quote(' UNSIGNED');
+		}
+		elseif ($uType === 'TINYINT')
+		{
+			$typeCheck = 'UPPER(LEFT(type, 7)) = ' . $this->db->quote('TINYINT');
+		}
+		elseif ($uType === 'INT UNSIGNED')
+		{
+			$typeCheck = 'UPPER(LEFT(type, 3)) = ' . $this->db->quote('INT')
+				. ' AND UPPER(RIGHT(type, 9)) = ' . $this->db->quote(' UNSIGNED');
+		}
+		elseif ($uType === 'INT')
+		{
+			$typeCheck = 'UPPER(LEFT(type, 3)) = ' . $this->db->quote('INT');
+		}
+		elseif ($this->db instanceof UTF8MB4SupportInterface && $this->db->hasUTF8mb4Support())
 		{
 			if ($uType === 'TINYTEXT')
 			{
diff --git a/libraries/src/Schema/ChangeSet.php b/libraries/src/Schema/ChangeSet.php
index fb966de221411..de38036efce87 100644
--- a/libraries/src/Schema/ChangeSet.php
+++ b/libraries/src/Schema/ChangeSet.php
@@ -99,12 +99,12 @@ public function __construct($db, $folder = null)
 		// If on mysql, add a query at the end to check for utf8mb4 conversion status
 		if ($this->db->getServerType() === 'mysql')
 		{
-			// Let the update query be something harmless which should always succeed
+			// Let the update query do nothing when being executed
 			$tmpSchemaChangeItem = ChangeItem::getInstance(
 				$db,
 				'database.php',
 				'UPDATE ' . $this->db->quoteName('#__utf8_conversion')
-				. ' SET ' . $this->db->quoteName('converted') . ' = 0;'
+				. ' SET ' . $this->db->quoteName('converted') . ' = ' . $this->db->quoteName('converted') . ';'
 			);
 
 			// Set to not skipped
@@ -113,12 +113,12 @@ public function __construct($db, $folder = null)
 			// Set the check query
 			if ($this->db instanceof UTF8MB4SupportInterface && $this->db->hasUTF8mb4Support())
 			{
-				$converted = 2;
+				$converted = 4;
 				$tmpSchemaChangeItem->queryType = 'UTF8_CONVERSION_UTF8MB4';
 			}
 			else
 			{
-				$converted = 1;
+				$converted = 3;
 				$tmpSchemaChangeItem->queryType = 'UTF8_CONVERSION_UTF8';
 			}
 
diff --git a/libraries/src/Table/Usergroup.php b/libraries/src/Table/Usergroup.php
index f9f080f3ec9ab..26e4b6d24061f 100644
--- a/libraries/src/Table/Usergroup.php
+++ b/libraries/src/Table/Usergroup.php
@@ -86,6 +86,42 @@ public function check()
 			return false;
 		}
 
+		// We do not allow to move non public to root and public to non-root
+		if (!empty($this->id))
+		{
+			$table = self::getInstance('Usergroup', 'JTable', array('dbo' => $this->getDbo()));
+
+			$table->load($this->id);
+
+			if ((!$table->parent_id && $this->parent_id) || ($table->parent_id && !$this->parent_id))
+			{
+				$this->setError(\JText::_('JLIB_DATABASE_ERROR_USERGROUP_PARENT_ID_NOT_VALID'));
+
+				return false;
+			}
+		}
+		// New entry should always be greater 0
+		elseif (!$this->parent_id)
+		{
+			$this->setError(\JText::_('JLIB_DATABASE_ERROR_USERGROUP_PARENT_ID_NOT_VALID'));
+
+			return false;
+		}
+
+		// The new parent_id has to be a valid group
+		if ($this->parent_id)
+		{
+			$table = self::getInstance('Usergroup', 'JTable', array('dbo' => $this->getDbo()));
+			$table->load($this->parent_id);
+
+			if ($table->id != $this->parent_id)
+			{
+				$this->setError(\JText::_('JLIB_DATABASE_ERROR_USERGROUP_PARENT_ID_NOT_VALID'));
+
+				return false;
+			}
+		}
+
 		return true;
 	}
 
@@ -243,6 +279,9 @@ public function delete($oid = null)
 		$db->setQuery($query);
 		$db->execute();
 
+		// Rebuild the nested set tree.
+		$this->rebuild();
+
 		// Delete the usergroup in view levels
 		$replace = array();
 
diff --git a/modules/mod_articles_archive/mod_articles_archive.xml b/modules/mod_articles_archive/mod_articles_archive.xml
index 5befd6b7970b7..c5c429b221176 100644
--- a/modules/mod_articles_archive/mod_articles_archive.xml
+++ b/modules/mod_articles_archive/mod_articles_archive.xml
@@ -53,6 +53,7 @@
 					label="COM_MODULES_FIELD_CACHING_LABEL"
 					default="1"
 					filter="integer"
+					validate="options"
 					>
 					<option value="1">JGLOBAL_USE_GLOBAL</option>
 					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
diff --git a/modules/mod_articles_categories/mod_articles_categories.xml b/modules/mod_articles_categories/mod_articles_categories.xml
index b5e3703fee6e7..a00a506ee7e1a 100644
--- a/modules/mod_articles_categories/mod_articles_categories.xml
+++ b/modules/mod_articles_categories/mod_articles_categories.xml
@@ -80,6 +80,7 @@
 					description="MOD_ARTICLES_CATEGORIES_FIELD_COUNT_DESC"
 					default="0"
 					filter="integer"
+					validate="options"
 					>
 					<option value="0">JALL</option>
 					<option value="1">J1</option>
@@ -100,6 +101,7 @@
 					label="MOD_ARTICLES_CATEGORIES_FIELD_MAXLEVEL_LABEL"
 					default="0"
 					filter="integer"
+					validate="options"
 					>
 					<option value="0">JALL</option>
 					<option value="1">J1</option>
@@ -129,6 +131,7 @@
 					label="MOD_ARTICLES_CATEGORIES_TITLE_HEADING_LABEL"
 					default="4"
 					filter="integer"
+					validate="options"
 					>
 					<option value="1">JH1</option>
 					<option value="2">JH2</option>
@@ -150,6 +153,7 @@
 					label="COM_MODULES_FIELD_CACHING_LABEL"
 					default="1"
 					filter="integer"
+					validate="options"
 					>
 					<option value="1">JGLOBAL_USE_GLOBAL</option>
 					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
diff --git a/modules/mod_articles_category/mod_articles_category.xml b/modules/mod_articles_category/mod_articles_category.xml
index a20aa94935d1c..2961fb7299521 100644
--- a/modules/mod_articles_category/mod_articles_category.xml
+++ b/modules/mod_articles_category/mod_articles_category.xml
@@ -29,6 +29,7 @@
 					label="MOD_ARTICLES_CATEGORY_FIELD_MODE_LABEL"
 					description="MOD_ARTICLES_CATEGORY_FIELD_MODE_DESC"
 					default="normal"
+					validate="options"
 					>
 					<option value="normal">MOD_ARTICLES_CATEGORY_OPTION_NORMAL_VALUE</option>
 					<option value="dynamic">MOD_ARTICLES_CATEGORY_OPTION_DYNAMIC_VALUE</option>
@@ -551,6 +552,7 @@
 					label="COM_MODULES_FIELD_CACHING_LABEL"
 					default="1"
 					filter="integer"
+					validate="options"
 					>
 					<option value="1">JGLOBAL_USE_GLOBAL</option>
 					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
diff --git a/modules/mod_articles_latest/mod_articles_latest.xml b/modules/mod_articles_latest/mod_articles_latest.xml
index 539e1eec79180..c57e8178175af 100644
--- a/modules/mod_articles_latest/mod_articles_latest.xml
+++ b/modules/mod_articles_latest/mod_articles_latest.xml
@@ -47,6 +47,7 @@
 					label="MOD_LATEST_NEWS_FIELD_FEATURED_LABEL"
 					default=""
 					filter="integer"
+					validate="options"
 					>
 					<option value="">JSHOW</option>
 					<option value="0">JHIDE</option>
@@ -58,6 +59,7 @@
 					type="list"
 					label="MOD_LATEST_NEWS_FIELD_ORDERING_LABEL"
 					default="p_dsc"
+					validate="options"
 					>
 					<option value="c_dsc">MOD_LATEST_NEWS_VALUE_RECENT_ADDED</option>
 					<option value="m_dsc">MOD_LATEST_NEWS_VALUE_RECENT_MODIFIED</option>
@@ -71,6 +73,7 @@
 					type="list"
 					label="MOD_LATEST_NEWS_FIELD_USER_LABEL"
 					default="0"
+					validate="options"
 					>
 					<option value="0">MOD_LATEST_NEWS_VALUE_ANYONE</option>
 					<option value="by_me">MOD_LATEST_NEWS_VALUE_ADDED_BY_ME</option>
@@ -109,6 +112,7 @@
 					label="COM_MODULES_FIELD_CACHING_LABEL"
 					default="1"
 					filter="integer"
+					validate="options"
 					>
 					<option value="1">JGLOBAL_USE_GLOBAL</option>
 					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
diff --git a/modules/mod_articles_news/mod_articles_news.xml b/modules/mod_articles_news/mod_articles_news.xml
index 0ae7b09180ffb..3d8f2193dfac9 100644
--- a/modules/mod_articles_news/mod_articles_news.xml
+++ b/modules/mod_articles_news/mod_articles_news.xml
@@ -62,6 +62,7 @@
 					type="list"
 					label="MOD_ARTICLES_NEWS_FIELD_IMAGES_ARTICLE_LABEL"
 					default="none"
+					validate="options"
 					>
 					<option value="intro">MOD_ARTICLES_NEWS_OPTION_INTROIMAGE</option>
 					<option value="full">MOD_ARTICLES_NEWS_OPTION_FULLIMAGE</option>
@@ -88,6 +89,7 @@
 					filter="integer"
 					class="custom-select-color"
 					showon="item_title:1"
+					validate="options"
 					>
 					<option value="">JGLOBAL_USE_GLOBAL</option>
 					<option value="0">JNO</option>
@@ -100,6 +102,7 @@
 					label="MOD_ARTICLES_NEWS_TITLE_HEADING"
 					default="h4"
 					showon="item_title:1"
+					validate="options"
 					>
 					<option value="h1">JH1</option>
 					<option value="h2">JH2</option>
@@ -170,6 +173,7 @@
 					label="MOD_ARTICLES_NEWS_FIELD_FEATURED_LABEL"
 					default=""
 					filter="integer"
+					validate="options"
 					>
 					<option value="">JSHOW</option>
 					<option value="0">JHIDE</option>
@@ -210,6 +214,7 @@
 					default="1"
 					filter="integer"
 					showon="ordering:a.publish_up,a.created,a.modified,a.ordering,a.hits"
+					validate="options"
 					>
 					<option value="0">JGLOBAL_ORDER_ASCENDING</option>
 					<option value="1">JGLOBAL_ORDER_DESCENDING</option>
@@ -237,6 +242,7 @@
 					label="COM_MODULES_FIELD_CACHING_LABEL"
 					default="1"
 					filter="integer"
+					validate="options"
 					>
 					<option value="1">JGLOBAL_USE_GLOBAL</option>
 					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
diff --git a/modules/mod_articles_popular/mod_articles_popular.xml b/modules/mod_articles_popular/mod_articles_popular.xml
index f287a0c0860ee..b40f2436829de 100644
--- a/modules/mod_articles_popular/mod_articles_popular.xml
+++ b/modules/mod_articles_popular/mod_articles_popular.xml
@@ -137,6 +137,7 @@
 					label="COM_MODULES_FIELD_CACHING_LABEL"
 					default="1"
 					filter="integer"
+					validate="options"
 					>
 					<option value="1">JGLOBAL_USE_GLOBAL</option>
 					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
diff --git a/modules/mod_banners/mod_banners.xml b/modules/mod_banners/mod_banners.xml
index 29d922ac3ae58..eb89c1c52c6b2 100644
--- a/modules/mod_banners/mod_banners.xml
+++ b/modules/mod_banners/mod_banners.xml
@@ -33,6 +33,7 @@
 					label="MOD_BANNERS_FIELD_TARGET_LABEL"
 					default="1"
 					filter="integer"
+					validate="options"
 					>
 					<option value="0">JBROWSERTARGET_PARENT</option>
 					<option value="1">JBROWSERTARGET_NEW</option>
@@ -85,6 +86,7 @@
 					type="list"
 					label="MOD_BANNERS_FIELD_RANDOMISE_LABEL"
 					default="0"
+					validate="options"
 					>
 					<option value="0">MOD_BANNERS_VALUE_STICKYORDERING</option>
 					<option value="random">MOD_BANNERS_VALUE_STICKYRANDOMISE</option>
@@ -129,6 +131,7 @@
 					label="COM_MODULES_FIELD_CACHING_LABEL"
 					default="1"
 					filter="integer"
+					validate="options"
 					>
 					<option value="1">JGLOBAL_USE_GLOBAL</option>
 					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
diff --git a/modules/mod_breadcrumbs/mod_breadcrumbs.xml b/modules/mod_breadcrumbs/mod_breadcrumbs.xml
index 9e465a700bb89..4c042e99dfdab 100644
--- a/modules/mod_breadcrumbs/mod_breadcrumbs.xml
+++ b/modules/mod_breadcrumbs/mod_breadcrumbs.xml
@@ -88,6 +88,7 @@
 					label="COM_MODULES_FIELD_CACHING_LABEL"
 					default="0"
 					filter="integer"
+					validate="options"
 					>
 					<option value="1">JGLOBAL_USE_GLOBAL</option>
 					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
diff --git a/modules/mod_breadcrumbs/tmpl/default.php b/modules/mod_breadcrumbs/tmpl/default.php
index a0437c70946f1..62a9a58f4e8cf 100644
--- a/modules/mod_breadcrumbs/tmpl/default.php
+++ b/modules/mod_breadcrumbs/tmpl/default.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Language\Text;
 
 ?>
-<nav role="navigation" aria-label="<?php echo $module->name; ?>">
+<nav role="navigation" aria-label="<?php echo $module->title; ?>">
 	<ol itemscope itemtype="https://schema.org/BreadcrumbList" class="mod-breadcrumbs breadcrumb">
 		<?php if ($params->get('showHere', 1)) : ?>
 			<li class="mod-breadcrumbs__here float-left">
diff --git a/modules/mod_custom/mod_custom.xml b/modules/mod_custom/mod_custom.xml
index e4013999f7a6c..03e85eb0b2ea9 100644
--- a/modules/mod_custom/mod_custom.xml
+++ b/modules/mod_custom/mod_custom.xml
@@ -65,6 +65,7 @@
 					label="COM_MODULES_FIELD_CACHING_LABEL"
 					default="1"
 					filter="integer"
+					validate="options"
 					>
 					<option value="1">JGLOBAL_USE_GLOBAL</option>
 					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
diff --git a/modules/mod_feed/mod_feed.xml b/modules/mod_feed/mod_feed.xml
index 2d10fc5be8ace..261f62870616f 100644
--- a/modules/mod_feed/mod_feed.xml
+++ b/modules/mod_feed/mod_feed.xml
@@ -153,9 +153,9 @@
 					name="cache"
 					type="list"
 					label="COM_MODULES_FIELD_CACHING_LABEL"
-
 					default="1"
 					filter="integer"
+					validate="options"
 					>
 					<option value="1">JGLOBAL_USE_GLOBAL</option>
 					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
diff --git a/modules/mod_finder/mod_finder.xml b/modules/mod_finder/mod_finder.xml
index 7e4fbb836f414..94ed4741cbb74 100644
--- a/modules/mod_finder/mod_finder.xml
+++ b/modules/mod_finder/mod_finder.xml
@@ -48,6 +48,7 @@
 					label="MOD_FINDER_FIELDSET_BASIC_SHOW_ADVANCED_LABEL"
 					default="0"
 					filter="integer"
+					validate="options"
 					>
 					<option value="2">MOD_FINDER_FIELDSET_BASIC_SHOW_ADVANCED_OPTION_LINK</option>
 					<option value="1">JSHOW</option>
diff --git a/modules/mod_footer/mod_footer.xml b/modules/mod_footer/mod_footer.xml
index 9422973deae6b..8738f10df91df 100644
--- a/modules/mod_footer/mod_footer.xml
+++ b/modules/mod_footer/mod_footer.xml
@@ -42,6 +42,7 @@
 					label="COM_MODULES_FIELD_CACHING_LABEL"
 					default="1"
 					filter="integer"
+					validate="options"
 					>
 					<option value="1">JGLOBAL_USE_GLOBAL</option>
 					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
diff --git a/modules/mod_languages/mod_languages.xml b/modules/mod_languages/mod_languages.xml
index fae899e88960b..3ccafe400aab8 100644
--- a/modules/mod_languages/mod_languages.xml
+++ b/modules/mod_languages/mod_languages.xml
@@ -27,6 +27,7 @@
 				type="list"
 				label="JFIELD_LANGUAGE_LABEL"
 				description="JFIELD_MODULE_LANGUAGE_DESC"
+				validate="options"
 				>
 				<option value="*">JALL</option>
 			</field>
diff --git a/modules/mod_login/tmpl/default.php b/modules/mod_login/tmpl/default.php
index a1f573b4f9eca..6bca35d6f4737 100644
--- a/modules/mod_login/tmpl/default.php
+++ b/modules/mod_login/tmpl/default.php
@@ -77,7 +77,7 @@
 							</span>
 							<label for="modlgn-secretkey-<?php echo $module->id; ?>" class="sr-only"><?php echo Text::_('JGLOBAL_SECRETKEY'); ?></label>
 						</span>
-						<input id="modlgn-secretkey-<?php echo $module->id; ?>" autocomplete="off" type="text" name="secretkey" class="form-control" placeholder="<?php echo Text::_('JGLOBAL_SECRETKEY'); ?>">
+						<input id="modlgn-secretkey-<?php echo $module->id; ?>" autocomplete="one-time-code" type="text" name="secretkey" class="form-control" placeholder="<?php echo Text::_('JGLOBAL_SECRETKEY'); ?>">
 						<span class="input-group-append" title="<?php echo Text::_('JGLOBAL_SECRETKEY_HELP'); ?>">
 							<span class="input-group-text">
 								<span class="fas fa-question" aria-hidden="true"></span>
@@ -86,7 +86,7 @@
 					</div>
 				<?php else : ?>
 					<label for="modlgn-secretkey-<?php echo $module->id; ?>"><?php echo Text::_('JGLOBAL_SECRETKEY'); ?></label>
-					<input id="modlgn-secretkey-<?php echo $module->id; ?>" autocomplete="off" type="text" name="secretkey" class="form-control" placeholder="<?php echo Text::_('JGLOBAL_SECRETKEY'); ?>">
+					<input id="modlgn-secretkey-<?php echo $module->id; ?>" autocomplete="one-time-code" type="text" name="secretkey" class="form-control" placeholder="<?php echo Text::_('JGLOBAL_SECRETKEY'); ?>">
 					<span class="btn width-auto" title="<?php echo Text::_('JGLOBAL_SECRETKEY_HELP'); ?>">
 						<span class="fas fa-question" aria-hidden="true"></span>
 					</span>
diff --git a/modules/mod_menu/mod_menu.xml b/modules/mod_menu/mod_menu.xml
index 10cd9e0c0b831..33a835a7300a3 100644
--- a/modules/mod_menu/mod_menu.xml
+++ b/modules/mod_menu/mod_menu.xml
@@ -49,6 +49,7 @@
 					label="MOD_MENU_FIELD_STARTLEVEL_LABEL"
 					default="1"
 					filter="integer"
+					validate="options"
 					>
 					<option value="1">J1</option>
 					<option value="2">J2</option>
@@ -68,6 +69,7 @@
 					label="MOD_MENU_FIELD_ENDLEVEL_LABEL"
 					default="0"
 					filter="integer"
+					validate="options"
 					>
 					<option value="0">JALL</option>
 					<option value="1">J1</option>
@@ -135,6 +137,7 @@
 					label="COM_MODULES_FIELD_CACHING_LABEL"
 					default="1"
 					filter="integer"
+					validate="options"
 					>
 					<option value="1">JGLOBAL_USE_GLOBAL</option>
 					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
diff --git a/modules/mod_related_items/mod_related_items.xml b/modules/mod_related_items/mod_related_items.xml
index 2886379a9f58b..3920df17b886d 100644
--- a/modules/mod_related_items/mod_related_items.xml
+++ b/modules/mod_related_items/mod_related_items.xml
@@ -64,6 +64,7 @@
 					label="COM_MODULES_FIELD_CACHING_LABEL"
 					default="1"
 					filter="integer"
+					validate="options"
 					>
 					<option value="1">JGLOBAL_USE_GLOBAL</option>
 					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
diff --git a/modules/mod_stats/mod_stats.xml b/modules/mod_stats/mod_stats.xml
index ba5099eb34463..311c2558712d1 100644
--- a/modules/mod_stats/mod_stats.xml
+++ b/modules/mod_stats/mod_stats.xml
@@ -88,6 +88,7 @@
 					label="COM_MODULES_FIELD_CACHING_LABEL"
 					default="1"
 					filter="integer"
+					validate="options"
 					>
 					<option value="1">JGLOBAL_USE_GLOBAL</option>
 					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
diff --git a/modules/mod_syndicate/mod_syndicate.xml b/modules/mod_syndicate/mod_syndicate.xml
index 8fde97f6398c5..db4631bbed49e 100644
--- a/modules/mod_syndicate/mod_syndicate.xml
+++ b/modules/mod_syndicate/mod_syndicate.xml
@@ -49,6 +49,7 @@
 					type="list"
 					label="MOD_SYNDICATE_FIELD_FORMAT_LABEL"
 					default="rss"
+					validate="options"
 					>
 					<option value="rss">MOD_SYNDICATE_FIELD_VALUE_RSS</option>
 					<option value="atom">MOD_SYNDICATE_FIELD_VALUE_ATOM</option>
diff --git a/modules/mod_tags_popular/mod_tags_popular.xml b/modules/mod_tags_popular/mod_tags_popular.xml
index 304815f383148..79dd1ea03b2ea 100644
--- a/modules/mod_tags_popular/mod_tags_popular.xml
+++ b/modules/mod_tags_popular/mod_tags_popular.xml
@@ -77,6 +77,7 @@
 					label="JGLOBAL_ORDER_DIRECTION_LABEL"
 					default="1"
 					filter="integer"
+					validate="options"
 					>
 					<option value="0">JGLOBAL_ORDER_ASCENDING</option>
 					<option value="1">JGLOBAL_ORDER_DESCENDING</option>
@@ -150,6 +151,7 @@
 					label="COM_MODULES_FIELD_CACHING_LABEL"
 					default="1"
 					filter="integer"
+					validate="options"
 					>
 					<option value="1">JGLOBAL_USE_GLOBAL</option>
 					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
diff --git a/modules/mod_tags_similar/mod_tags_similar.xml b/modules/mod_tags_similar/mod_tags_similar.xml
index 10d98b0a840f3..dc784f63fd7c4 100644
--- a/modules/mod_tags_similar/mod_tags_similar.xml
+++ b/modules/mod_tags_similar/mod_tags_similar.xml
@@ -40,6 +40,7 @@
 					label="MOD_TAGS_SIMILAR_FIELD_MATCHTYPE_LABEL"
 					description="MOD_TAGS_SIMILAR_FIELD_MATCHTYPE_DESC"
 					default="any"
+					validate="options"
 					>
 					<option value="all">MOD_TAGS_SIMILAR_FIELD_ALL</option>
 					<option value="any">MOD_TAGS_SIMILAR_FIELD_ONE</option>
@@ -51,6 +52,7 @@
 					type="list"
 					label="MOD_TAGS_SIMILAR_FIELD_ORDERING_LABEL"
 					default="count"
+					validate="options"
 					>
 					<option value="count">MOD_TAGS_SIMILAR_FIELD_ORDERING_COUNT</option>
 					<option value="random">MOD_TAGS_SIMILAR_FIELD_ORDERING_RANDOM</option>
@@ -78,6 +80,7 @@
 					label="COM_MODULES_FIELD_CACHING_LABEL"
 					default="1"
 					filter="integer"
+					validate="options"
 					>
 					<option value="1">JGLOBAL_USE_GLOBAL</option>
 					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
diff --git a/modules/mod_users_latest/mod_users_latest.xml b/modules/mod_users_latest/mod_users_latest.xml
index 628ae2e6c0961..ea222e2d2366a 100644
--- a/modules/mod_users_latest/mod_users_latest.xml
+++ b/modules/mod_users_latest/mod_users_latest.xml
@@ -64,6 +64,7 @@
 					label="COM_MODULES_FIELD_CACHING_LABEL"
 					default="1"
 					filter="integer"
+					validate="options"
 					>
 					<option value="1">JGLOBAL_USE_GLOBAL</option>
 					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
diff --git a/modules/mod_whosonline/mod_whosonline.xml b/modules/mod_whosonline/mod_whosonline.xml
index 0bb8a7ca78a96..046ad51401e5c 100644
--- a/modules/mod_whosonline/mod_whosonline.xml
+++ b/modules/mod_whosonline/mod_whosonline.xml
@@ -29,6 +29,7 @@
 					label="MOD_WHOSONLINE_SHOWMODE_LABEL"
 					default="0"
 					filter="integer"
+					validate="options"
 					>
 					<option value="0">MOD_WHOSONLINE_FIELD_VALUE_NUMBER</option>
 					<option value="1">MOD_WHOSONLINE_FIELD_VALUE_NAMES</option>
@@ -69,6 +70,7 @@
 					label="COM_MODULES_FIELD_CACHING_LABEL"
 					default="0"
 					filter="integer"
+					validate="options"
 					>
 					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
 				</field>
diff --git a/modules/mod_wrapper/mod_wrapper.xml b/modules/mod_wrapper/mod_wrapper.xml
index 4374cce13ef2a..dda45422ed156 100644
--- a/modules/mod_wrapper/mod_wrapper.xml
+++ b/modules/mod_wrapper/mod_wrapper.xml
@@ -48,6 +48,7 @@
 					type="list"
 					label="MOD_WRAPPER_FIELD_SCROLL_LABEL"
 					default="auto"
+					validate="options"
 					>
 					<option value="auto">MOD_WRAPPER_FIELD_VALUE_AUTO</option>
 					<option value="no">JNO</option>
@@ -122,6 +123,7 @@
 					label="COM_MODULES_FIELD_CACHING_LABEL"
 					default="1"
 					filter="integer"
+					validate="options"
 					>
 					<option value="1">JGLOBAL_USE_GLOBAL</option>
 					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
diff --git a/package-lock.json b/package-lock.json
index 7d7c562c2c23e..92f2471194b2b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1720,9 +1720,9 @@
       }
     },
     "ansi-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
       "dev": true
     },
     "ansi-styles": {
@@ -3042,9 +3042,9 @@
       "dev": true
     },
     "camelcase": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
       "dev": true
     },
     "camelcase-keys": {
@@ -3200,49 +3200,40 @@
       "dev": true
     },
     "cliui": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
       "dev": true,
       "requires": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wrap-ansi": "^2.0.0"
+        "string-width": "^3.1.0",
+        "strip-ansi": "^5.2.0",
+        "wrap-ansi": "^5.1.0"
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
           "dev": true
         },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "dev": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
         "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
           "dev": true,
           "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
           }
         },
         "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "ansi-regex": "^4.1.0"
           }
         }
       }
@@ -3897,11 +3888,6 @@
       "integrity": "sha1-g4NCMMyfdMRX3lnuvRVD/uuDt+w=",
       "dev": true
     },
-    "css-vars-ponyfill": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/css-vars-ponyfill/-/css-vars-ponyfill-2.2.1.tgz",
-      "integrity": "sha512-bFdKEQbCtwoDl4/iPaqjGDMZRgnVn6k7c6XUlOrW+OzMIweWV6b5YbajR99dUiAsB1WpfbGGiiE9T1cnSh2pgA=="
-    },
     "css-what": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
@@ -5565,43 +5551,6 @@
         "string-width": "^1.0.1",
         "strip-ansi": "^3.0.1",
         "wide-align": "^1.1.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "dev": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "dev": true,
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        }
       }
     },
     "gaze": {
@@ -5625,9 +5574,9 @@
       "dev": true
     },
     "get-caller-file": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
       "dev": true
     },
     "get-stdin": {
@@ -5733,13 +5682,13 @@
       "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
     },
     "globule": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.0.tgz",
-      "integrity": "sha512-YlD4kdMqRCQHrhVdonet4TdRtv1/sZKepvoxNT4Nrhrp5HI8XFfc8kFlGlBn2myBo80aGp8Eft259mbcUJhgSg==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.1.tgz",
+      "integrity": "sha512-OVyWOHgw29yosRHCHo7NncwR1hW5ew0W/UrvtwvjefVJeQ26q4/8r8FmPsSF1hJ93IgWkyv16pCTz6WblMzm/g==",
       "dev": true,
       "requires": {
         "glob": "~7.1.1",
-        "lodash": "~4.17.10",
+        "lodash": "~4.17.12",
         "minimatch": "~3.0.2"
       }
     },
@@ -5969,14 +5918,6 @@
       "dev": true,
       "requires": {
         "ansi-regex": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        }
       }
     },
     "has-binary2": {
@@ -6323,9 +6264,9 @@
       "dev": true
     },
     "in-publish": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",
-      "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz",
+      "integrity": "sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==",
       "dev": true
     },
     "indent-string": {
@@ -6530,12 +6471,6 @@
         "loose-envify": "^1.0.0"
       }
     },
-    "invert-kv": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
-      "dev": true
-    },
     "is-absolute-url": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
@@ -7108,9 +7043,9 @@
       "integrity": "sha512-u/MtE1ST2pCr3rCyouJG2xMiw/k3OzLNeRKprjKTeHUezCGr0DyEgeXFdqFLmQfxfR5EsVu+mGo/sCcYdiYcIQ=="
     },
     "js-base64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
-      "integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.2.tgz",
+      "integrity": "sha512-Vg8czh0Q7sFBSUMWWArX/miJeBWYBPpdU/3M/DKSaekLMqrqVPaedp+5mZhie/r0lgrcaYBfwXatEew6gwgiQQ==",
       "dev": true
     },
     "js-tokens": {
@@ -7358,15 +7293,6 @@
         "stream-splicer": "^2.0.0"
       }
     },
-    "lcid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-      "dev": true,
-      "requires": {
-        "invert-kv": "^1.0.0"
-      }
-    },
     "leven": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
@@ -8260,9 +8186,9 @@
       "dev": true
     },
     "node-sass": {
-      "version": "4.13.1",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.13.1.tgz",
-      "integrity": "sha512-TTWFx+ZhyDx1Biiez2nB0L3YrCZ/8oHagaDalbuBSlqXgUPsdkUSzJsVxeDO9LtPB49+Fh3WQl3slABo6AotNw==",
+      "version": "4.14.1",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz",
+      "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==",
       "dev": true,
       "requires": {
         "async-foreach": "^0.1.3",
@@ -8279,17 +8205,11 @@
         "node-gyp": "^3.8.0",
         "npmlog": "^4.0.0",
         "request": "^2.88.0",
-        "sass-graph": "^2.2.4",
+        "sass-graph": "2.2.5",
         "stdout-stream": "^1.4.0",
         "true-case-path": "^1.0.2"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
         "ansi-styles": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
@@ -8319,15 +8239,6 @@
             "which": "^1.2.9"
           }
         },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
         "supports-color": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
@@ -8666,15 +8577,6 @@
       "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
       "dev": true
     },
-    "os-locale": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-      "dev": true,
-      "requires": {
-        "lcid": "^1.0.0"
-      }
-    },
     "os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
@@ -9934,9 +9836,9 @@
       "dev": true
     },
     "require-main-filename": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
       "dev": true
     },
     "requires-port": {
@@ -10103,15 +10005,15 @@
       "dev": true
     },
     "sass-graph": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
-      "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz",
+      "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==",
       "dev": true,
       "requires": {
         "glob": "^7.0.0",
         "lodash": "^4.0.0",
         "scss-tokenizer": "^0.2.3",
-        "yargs": "^7.0.0"
+        "yargs": "^13.3.2"
       }
     },
     "sass-loader": {
@@ -10922,13 +10824,25 @@
       "dev": true
     },
     "string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
       "dev": true,
       "requires": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
+        "code-point-at": "^1.0.0",
+        "is-fullwidth-code-point": "^1.0.0",
+        "strip-ansi": "^3.0.0"
+      },
+      "dependencies": {
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "dev": true,
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        }
       }
     },
     "string.prototype.trimleft": {
@@ -10961,12 +10875,12 @@
       }
     },
     "strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
       "dev": true,
       "requires": {
-        "ansi-regex": "^3.0.0"
+        "ansi-regex": "^2.0.0"
       }
     },
     "strip-bom": {
@@ -12918,9 +12832,9 @@
       }
     },
     "which-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
       "dev": true
     },
     "wide-align": {
@@ -12954,48 +12868,40 @@
       }
     },
     "wrap-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
       "dev": true,
       "requires": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1"
+        "ansi-styles": "^3.2.0",
+        "string-width": "^3.0.0",
+        "strip-ansi": "^5.0.0"
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
           "dev": true
         },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "dev": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
         "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
           "dev": true,
           "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
           }
         },
         "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "ansi-regex": "^4.1.0"
           }
         }
       }
@@ -13039,9 +12945,9 @@
       "dev": true
     },
     "y18n": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
       "dev": true
     },
     "yallist": {
@@ -13051,152 +12957,102 @@
       "dev": true
     },
     "yargs": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
-      "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
+      "version": "13.3.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+      "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
       "dev": true,
       "requires": {
-        "camelcase": "^3.0.0",
-        "cliui": "^3.2.0",
-        "decamelize": "^1.1.1",
-        "get-caller-file": "^1.0.1",
-        "os-locale": "^1.4.0",
-        "read-pkg-up": "^1.0.1",
+        "cliui": "^5.0.0",
+        "find-up": "^3.0.0",
+        "get-caller-file": "^2.0.1",
         "require-directory": "^2.1.1",
-        "require-main-filename": "^1.0.1",
+        "require-main-filename": "^2.0.0",
         "set-blocking": "^2.0.0",
-        "string-width": "^1.0.2",
-        "which-module": "^1.0.0",
-        "y18n": "^3.2.1",
-        "yargs-parser": "^5.0.0"
+        "string-width": "^3.0.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^13.1.2"
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
           "dev": true
         },
         "find-up": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-          "dev": true,
-          "requires": {
-            "path-exists": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "dev": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "load-json-file": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-          "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^2.2.0",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0",
-            "strip-bom": "^2.0.0"
-          }
-        },
-        "parse-json": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
           "dev": true,
           "requires": {
-            "error-ex": "^1.2.0"
+            "locate-path": "^3.0.0"
           }
         },
-        "path-exists": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
           "dev": true,
           "requires": {
-            "pinkie-promise": "^2.0.0"
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
           }
         },
-        "path-type": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-          "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
+            "p-try": "^2.0.0"
           }
         },
-        "read-pkg": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-          "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
           "dev": true,
           "requires": {
-            "load-json-file": "^1.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^1.0.0"
+            "p-limit": "^2.0.0"
           }
         },
-        "read-pkg-up": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-          "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-          "dev": true,
-          "requires": {
-            "find-up": "^1.0.0",
-            "read-pkg": "^1.0.0"
-          }
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
         },
         "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
           "dev": true,
           "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
           }
         },
         "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "strip-bom": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
           "dev": true,
           "requires": {
-            "is-utf8": "^0.2.0"
+            "ansi-regex": "^4.1.0"
           }
         }
       }
     },
     "yargs-parser": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
-      "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
+      "version": "13.1.2",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
       "dev": true,
       "requires": {
-        "camelcase": "^3.0.0"
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
       }
     },
     "yauzl": {
diff --git a/package.json b/package.json
index f3adb279802fb..300fe9ba8beed 100644
--- a/package.json
+++ b/package.json
@@ -95,7 +95,7 @@
     "karma-json-fixtures-preprocessor": "0.0.6",
     "karma-verbose-reporter": "^0.0.6",
     "mini-css-extract-plugin": "^0.9.0",
-    "node-sass": "^4.13.1",
+    "node-sass": "^4.14.1",
     "path": "^0.12.7",
     "postcss": "^7.0.27",
     "recursive-readdir": "^2.2.2",
diff --git a/plugins/editors/codemirror/codemirror.xml b/plugins/editors/codemirror/codemirror.xml
index acf1407e02922..9b570691869bf 100644
--- a/plugins/editors/codemirror/codemirror.xml
+++ b/plugins/editors/codemirror/codemirror.xml
@@ -5,7 +5,7 @@
 	<creationDate>28 March 2011</creationDate>
 	<author>Marijn Haverbeke</author>
 	<authorEmail>marijnh@gmail.com</authorEmail>
-	<authorUrl>http://codemirror.net/</authorUrl>
+	<authorUrl>https://codemirror.net/</authorUrl>
 	<copyright>Copyright (C) 2014 - 2017 by Marijn Haverbeke &lt;marijnh@gmail.com&gt; and others</copyright>
 	<license>MIT license: http://codemirror.net/LICENSE</license>
 	<description>PLG_CODEMIRROR_XML_DESCRIPTION</description>
diff --git a/plugins/fields/imagelist/tmpl/imagelist.php b/plugins/fields/imagelist/tmpl/imagelist.php
index c6b3dc4b9d7c8..de45f7bdc00aa 100644
--- a/plugins/fields/imagelist/tmpl/imagelist.php
+++ b/plugins/fields/imagelist/tmpl/imagelist.php
@@ -33,7 +33,7 @@
 
 	if ($fieldParams->get('directory', '/') !== '/')
 	{
-		$buffer .= sprintf('<img src="images/%s/%s"%s>',
+		$buffer .= sprintf('<img loading="lazy" src="images/%s/%s"%s>',
 			$fieldParams->get('directory'),
 			htmlentities($path, ENT_COMPAT, 'UTF-8', true),
 			$class
@@ -41,7 +41,7 @@
 	}
 	else
 	{
-		$buffer .= sprintf('<img src="images/%s"%s>',
+		$buffer .= sprintf('<img loading="lazy" src="images/%s"%s>',
 			htmlentities($path, ENT_COMPAT, 'UTF-8', true),
 			$class
 		);
diff --git a/plugins/fields/media/tmpl/media.php b/plugins/fields/media/tmpl/media.php
index 1707e09909506..ad7b2c9ab855c 100644
--- a/plugins/fields/media/tmpl/media.php
+++ b/plugins/fields/media/tmpl/media.php
@@ -30,7 +30,7 @@
 		continue;
 	}
 
-	$buffer .= sprintf('<img src="%s"%s>',
+	$buffer .= sprintf('<img loading="lazy" src="%s"%s>',
 		htmlentities($path, ENT_COMPAT, 'UTF-8', true),
 		$class
 	);
diff --git a/plugins/system/stats/layouts/field/data.php b/plugins/system/stats/layouts/field/data.php
index 3d9cc025f6135..e057925e237b8 100644
--- a/plugins/system/stats/layouts/field/data.php
+++ b/plugins/system/stats/layouts/field/data.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
diff --git a/plugins/system/stats/layouts/field/uniqueid.php b/plugins/system/stats/layouts/field/uniqueid.php
index 2ad4ce2fa0f73..328c068377f2e 100644
--- a/plugins/system/stats/layouts/field/uniqueid.php
+++ b/plugins/system/stats/layouts/field/uniqueid.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Language\Text;
 
diff --git a/plugins/system/stats/layouts/message.php b/plugins/system/stats/layouts/message.php
index dca6dd3ff921c..17bbee4e15ea3 100644
--- a/plugins/system/stats/layouts/message.php
+++ b/plugins/system/stats/layouts/message.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Language\Text;
 
diff --git a/plugins/system/stats/layouts/stats.php b/plugins/system/stats/layouts/stats.php
index 3c9de9f3ea59e..4312e67a85bd3 100644
--- a/plugins/system/stats/layouts/stats.php
+++ b/plugins/system/stats/layouts/stats.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('JPATH_BASE') or die;
+defined('_JEXEC') or die;
 
 use Joomla\CMS\Language\Text;
 
diff --git a/plugins/system/stats/src/Field/AbstractStatsField.php b/plugins/system/stats/src/Field/AbstractStatsField.php
index 7cb8b51b40dfb..6fce0b81786fa 100644
--- a/plugins/system/stats/src/Field/AbstractStatsField.php
+++ b/plugins/system/stats/src/Field/AbstractStatsField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Plugin\System\Stats\Field;
 
-\defined('JPATH_BASE') or die;
+\defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\FormField;
diff --git a/plugins/system/stats/src/Field/DataField.php b/plugins/system/stats/src/Field/DataField.php
index 84bea1a76fd4a..2d0bd8164f497 100644
--- a/plugins/system/stats/src/Field/DataField.php
+++ b/plugins/system/stats/src/Field/DataField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Plugin\System\Stats\Field;
 
-\defined('JPATH_BASE') or die;
+\defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\PluginHelper;
diff --git a/plugins/system/stats/src/Field/UniqueidField.php b/plugins/system/stats/src/Field/UniqueidField.php
index 6dd2d3110a783..5c1c5575eaafb 100644
--- a/plugins/system/stats/src/Field/UniqueidField.php
+++ b/plugins/system/stats/src/Field/UniqueidField.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\Plugin\System\Stats\Field;
 
-\defined('JPATH_BASE') or die;
+\defined('_JEXEC') or die;
 
 /**
  * Unique ID Field class for the Stats Plugin.
diff --git a/templates/cassiopeia/offline.php b/templates/cassiopeia/offline.php
index c96710a50a4f8..96b0d359f6ccf 100644
--- a/templates/cassiopeia/offline.php
+++ b/templates/cassiopeia/offline.php
@@ -97,7 +97,7 @@
 
 						<?php if (count($twofactormethods) > 1) : ?>
 						<label for="secretkey"><?php echo Text::_('JGLOBAL_SECRETKEY'); ?></label>
-						<input name="secretkey" class="form-control" id="secretkey" type="text">
+						<input name="secretkey" autocomplete="one-time-code" class="form-control" id="secretkey" type="text">
 						<?php endif; ?>
 
 						<input type="submit" name="Submit" class="btn btn-primary" value="<?php echo Text::_('JLOGIN'); ?>">
diff --git a/templates/system/offline.php b/templates/system/offline.php
index 47a5c406fd138..5e5b77e601328 100644
--- a/templates/system/offline.php
+++ b/templates/system/offline.php
@@ -71,7 +71,7 @@
 		<?php if (count($twofactormethods) > 1) : ?>
 			<p id="form-login-secretkey">
 				<label for="secretkey"><?php echo Text::_('JGLOBAL_SECRETKEY'); ?></label>
-				<input type="text" name="secretkey" class="inputbox" alt="<?php echo Text::_('JGLOBAL_SECRETKEY'); ?>" id="secretkey" />
+				<input type="text" name="secretkey" autocomplete="one-time-code" class="inputbox" alt="<?php echo Text::_('JGLOBAL_SECRETKEY'); ?>" id="secretkey" />
 			</p>
 		<?php endif; ?>
 		<p id="submit-button">