diff --git a/administrator/components/com_admin/tmpl/help/default.php b/administrator/components/com_admin/tmpl/help/default.php
index acdfc81117c56..20b033590a0b1 100644
--- a/administrator/components/com_admin/tmpl/help/default.php
+++ b/administrator/components/com_admin/tmpl/help/default.php
@@ -30,13 +30,13 @@
 			</button>
 			<div class="sidebar-nav" id="help-index">
 				<ul class="nav flex-column">
-					<li><?php echo HTMLHelper::_('link', Help::createUrl('JHELP_START_HERE'), Text::_('COM_ADMIN_START_HERE'), ['target' => 'helpFrame']); ?></li>
-					<li><?php echo HTMLHelper::_('link', 'https://www.gnu.org/licenses/gpl-2.0.html', Text::_('COM_ADMIN_LICENSE'), ['target' => 'helpFrame']); ?></li>
-					<li><?php echo HTMLHelper::_('link', Help::createUrl('JHELP_GLOSSARY'), Text::_('COM_ADMIN_GLOSSARY'), ['target' => 'helpFrame']); ?></li>
+					<li class="item"><?php echo HTMLHelper::_('link', Help::createUrl('JHELP_START_HERE'), Text::_('COM_ADMIN_START_HERE'), ['target' => 'helpFrame']); ?></li>
+					<li class="item"><?php echo HTMLHelper::_('link', 'https://www.gnu.org/licenses/gpl-2.0.html', Text::_('COM_ADMIN_LICENSE'), ['target' => 'helpFrame']); ?></li>
+					<li class="item"><?php echo HTMLHelper::_('link', Help::createUrl('JHELP_GLOSSARY'), Text::_('COM_ADMIN_GLOSSARY'), ['target' => 'helpFrame']); ?></li>
 					<li class="divider"></li>
 					<li class="nav-header"><?php echo Text::_('COM_ADMIN_ALPHABETICAL_INDEX'); ?></li>
 					<?php foreach ($this->toc as $k => $v) : ?>
-						<li>
+						<li class="item">
 							<?php $url = Help::createUrl('JHELP_' . strtoupper($k)); ?>
 							<?php echo HTMLHelper::_('link', $url, $v, ['target' => 'helpFrame']); ?>
 						</li>
diff --git a/administrator/components/com_associations/src/Field/Modal/AssociationField.php b/administrator/components/com_associations/src/Field/Modal/AssociationField.php
index c63f4601e32b2..b008ad334be61 100644
--- a/administrator/components/com_associations/src/Field/Modal/AssociationField.php
+++ b/administrator/components/com_associations/src/Field/Modal/AssociationField.php
@@ -98,7 +98,7 @@ protected function getInput()
 				'bodyHeight'  => 70,
 				'modalWidth'  => 80,
 				'footer'      => '<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">'
-						. Text::_("JLIB_HTML_BEHAVIOR_CLOSE") . '</button>',
+						. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>',
 			)
 		);
 
diff --git a/administrator/components/com_finder/src/Controller/DisplayController.php b/administrator/components/com_finder/src/Controller/DisplayController.php
index 2584d2a6c1794..aaa94590f34a9 100644
--- a/administrator/components/com_finder/src/Controller/DisplayController.php
+++ b/administrator/components/com_finder/src/Controller/DisplayController.php
@@ -11,9 +11,12 @@
 
 \defined('_JEXEC') or die;
 
+use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
+use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Router\Route;
+use Joomla\Component\Finder\Administrator\Helper\FinderHelper;
 
 /**
  * Base controller class for Finder.
@@ -46,6 +49,23 @@ public function display($cachable = false, $urlparams = array())
 		$layout = $this->input->get('layout', 'index', 'word');
 		$filterId = $this->input->get('filter_id', null, 'int');
 
+		if ($view === 'index')
+		{
+			$pluginEnabled    = PluginHelper::isEnabled('content', 'finder');
+
+			if (!$pluginEnabled)
+			{
+				$finderPluginId   = FinderHelper::getFinderPluginId();
+				$link = HTMLHelper::_(
+					'link',
+					'#plugin' . $finderPluginId . 'Modal',
+					Text::_('COM_FINDER_CONTENT_PLUGIN'),
+					'class="alert-link" data-bs-toggle="modal" id="title-' . $finderPluginId . '"'
+				);
+				$this->app->enqueueMessage(Text::sprintf('COM_FINDER_INDEX_PLUGIN_CONTENT_NOT_ENABLED_LINK', $link), 'warning');
+			}
+		}
+
 		// Check for edit form.
 		if ($view === 'filter' && $layout === 'edit' && !$this->checkEditId('com_finder.edit.filter', $filterId))
 		{
diff --git a/administrator/components/com_finder/src/View/Index/HtmlView.php b/administrator/components/com_finder/src/View/Index/HtmlView.php
index 465764db0a0c4..285a2069d1ecf 100644
--- a/administrator/components/com_finder/src/View/Index/HtmlView.php
+++ b/administrator/components/com_finder/src/View/Index/HtmlView.php
@@ -11,13 +11,12 @@
 
 \defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Router\Route;
+use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\Component\Finder\Administrator\Helper\FinderHelper;
@@ -57,6 +56,14 @@ class HtmlView extends BaseHtmlView
 	 */
 	protected $pluginState;
 
+	/**
+	 * The id of the content - finder plugin in mysql
+	 *
+	 * @var    integer
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $finderPluginId = 0;
+
 	/**
 	 * The model state
 	 *
@@ -138,17 +145,10 @@ public function display($tpl = null)
 			throw new GenericDataException(implode("\n", $errors), 500);
 		}
 
-		if (!$this->pluginState['plg_content_finder']->enabled)
+		// Check that the content - finder plugin is enabled
+		if (!PluginHelper::isEnabled('content', 'finder'))
 		{
-			if (Factory::getUser()->authorise('core.manage', 'com_plugin'))
-			{
-				$link = Route::_('index.php?option=com_plugins&task=plugin.edit&extension_id=' . FinderHelper::getFinderPluginId());
-				Factory::getApplication()->enqueueMessage(Text::sprintf('COM_FINDER_INDEX_PLUGIN_CONTENT_NOT_ENABLED_LINK', $link), 'warning');
-			}
-			else
-			{
-				Factory::getApplication()->enqueueMessage(Text::_('COM_FINDER_INDEX_PLUGIN_CONTENT_NOT_ENABLED'), 'warning');
-			}
+			$this->finderPluginId = FinderHelper::getFinderPluginId();
 		}
 
 		// Configure the toolbar.
diff --git a/administrator/components/com_finder/tmpl/index/default.php b/administrator/components/com_finder/tmpl/index/default.php
index 1f285706585a1..a55d36ad43795 100644
--- a/administrator/components/com_finder/tmpl/index/default.php
+++ b/administrator/components/com_finder/tmpl/index/default.php
@@ -36,6 +36,31 @@
 		<div class="col-md-12">
 			<div id="j-main-container" class="j-main-container">
 				<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+				<?php if ($this->finderPluginId) : ?>
+					<?php $link = Route::_('index.php?option=com_plugins&client_id=0&task=plugin.edit&extension_id=' . $this->finderPluginId . '&tmpl=component&layout=modal'); ?>
+					<?php echo HTMLHelper::_(
+						'bootstrap.renderModal',
+						'plugin' . $this->finderPluginId . 'Modal',
+						array(
+							'url'         => $link,
+							'title'       => Text::_('COM_FINDER_EDIT_PLUGIN_SETTINGS'),
+							'height'      => '400px',
+							'width'       => '800px',
+							'bodyHeight'  => '70',
+							'modalWidth'  => '80',
+							'closeButton' => false,
+							'backdrop'    => 'static',
+							'keyboard'    => false,
+							'footer'      => '<button type="button" class="btn btn-secondary" data-bs-dismiss="modal"'
+								. ' onclick="Joomla.iframeButtonClick({iframeSelector: \'#plugin' . $this->finderPluginId . 'Modal\', buttonSelector: \'#closeBtn\'})">'
+								. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>'
+								. '<button type="button" class="btn btn-primary" data-bs-dismiss="modal" onclick="Joomla.iframeButtonClick({iframeSelector: \'#plugin' . $this->finderPluginId . 'Modal\', buttonSelector: \'#saveBtn\'})">'
+								. Text::_("JSAVE") . '</button>'
+								. '<button type="button" class="btn btn-success" onclick="Joomla.iframeButtonClick({iframeSelector: \'#plugin' . $this->finderPluginId . 'Modal\', buttonSelector: \'#applyBtn\'}); return false;">'
+								. Text::_("JAPPLY") . '</button>'
+						)
+					); ?>
+				<?php endif; ?>
 				<?php if (empty($this->items)) : ?>
 					<div class="alert alert-info">
 						<span class="icon-info-circle" aria-hidden="true"></span><span class="visually-hidden"><?php echo Text::_('INFO'); ?></span>
diff --git a/administrator/components/com_joomlaupdate/restore.php b/administrator/components/com_joomlaupdate/restore.php
index a3b73de0dffc1..4aa1e7d133600 100644
--- a/administrator/components/com_joomlaupdate/restore.php
+++ b/administrator/components/com_joomlaupdate/restore.php
@@ -60,7 +60,7 @@
 }
 
 // fnmatch not available on non-POSIX systems
-// Thanks to soywiz@php.net for this usefull alternative function [http://gr2.php.net/fnmatch]
+// Thanks to soywiz@php.net for this useful alternative function [http://gr2.php.net/fnmatch]
 if (!function_exists('fnmatch'))
 {
 	function fnmatch($pattern, $string)
@@ -3111,7 +3111,7 @@ class AKText extends AKAbstractObject
 		'BTN_SITEFE'                      => 'Visit your site\'s frontend',
 		'BTN_SITEBE'                      => 'Visit your site\'s backend',
 		'WARNINGS'                        => 'Extraction Warnings',
-		'ERROR_OCCURED'                   => 'An error occurred',
+		'ERROR_OCCURRED'                  => 'An error occurred',
 		'STEALTH_MODE'                    => 'Stealth mode',
 		'STEALTH_URL'                     => 'HTML file to show to web visitors',
 		'ERR_NOT_A_JPS_FILE'              => 'The file is not a JPA archive',
@@ -5292,7 +5292,7 @@ public function __toString()
 		switch ($task)
 		{
 			case 'ping':
-				// ping task - realy does nothing!
+				// ping task - really does nothing!
 				$timer = AKFactory::getTimer();
 				$timer->enforce_min_exec_time();
 				break;
diff --git a/administrator/components/com_redirect/tmpl/links/default.php b/administrator/components/com_redirect/tmpl/links/default.php
index 82e1a06265237..95c65fba1dcb6 100644
--- a/administrator/components/com_redirect/tmpl/links/default.php
+++ b/administrator/components/com_redirect/tmpl/links/default.php
@@ -44,9 +44,9 @@
 						. ' onclick="Joomla.iframeButtonClick({iframeSelector: \'#plugin' . $this->redirectPluginId . 'Modal\', buttonSelector: \'#closeBtn\'})">'
 						. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>'
 						. '<button type="button" class="btn btn-primary" data-bs-dismiss="modal" onclick="Joomla.iframeButtonClick({iframeSelector: \'#plugin' . $this->redirectPluginId . 'Modal\', buttonSelector: \'#saveBtn\'})">'
-						. Text::_("JSAVE") . '</button>'
+						. Text::_('JSAVE') . '</button>'
 						. '<button type="button" class="btn btn-success" onclick="Joomla.iframeButtonClick({iframeSelector: \'#plugin' . $this->redirectPluginId . 'Modal\', buttonSelector: \'#applyBtn\'}); return false;">'
-						. Text::_("JAPPLY") . '</button>'
+						. Text::_('JAPPLY') . '</button>'
 				)
 			); ?>
 		<?php endif; ?>
diff --git a/administrator/components/com_redirect/tmpl/links/emptystate.php b/administrator/components/com_redirect/tmpl/links/emptystate.php
index 17581fa4f2479..705387dd82823 100644
--- a/administrator/components/com_redirect/tmpl/links/emptystate.php
+++ b/administrator/components/com_redirect/tmpl/links/emptystate.php
@@ -62,9 +62,9 @@
 				. ' onclick="Joomla.iframeButtonClick({iframeSelector: \'#plugin' . $this->redirectPluginId . 'Modal\', buttonSelector: \'#closeBtn\'})">'
 				. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>'
 				. '<button type="button" class="btn btn-primary" data-bs-dismiss="modal" onclick="Joomla.iframeButtonClick({iframeSelector: \'#plugin' . $this->redirectPluginId . 'Modal\', buttonSelector: \'#saveBtn\'})">'
-				. Text::_("JSAVE") . '</button>'
+				. Text::_('JSAVE') . '</button>'
 				. '<button type="button" class="btn btn-success" onclick="Joomla.iframeButtonClick({iframeSelector: \'#plugin' . $this->redirectPluginId . 'Modal\', buttonSelector: \'#applyBtn\'}); return false;">'
-				. Text::_("JAPPLY") . '</button>'
+				. Text::_('JAPPLY') . '</button>'
 		)
 	); ?>
 <?php endif; ?>
diff --git a/administrator/language/en-GB/com_finder.ini b/administrator/language/en-GB/com_finder.ini
index 3a40a017ab0cd..ceb5f3dd30f50 100644
--- a/administrator/language/en-GB/com_finder.ini
+++ b/administrator/language/en-GB/com_finder.ini
@@ -53,8 +53,10 @@ COM_FINDER_CONFIG_TUPLECOUNT_LABEL="Search for Phrases"
 COM_FINDER_CONFIG_TUPLECOUNT_PHRASE_DISABLED="Disabled (Improved performance)"
 COM_FINDER_CONFIG_TUPLECOUNT_PHRASE_ENABLED="Enabled (Improved search results)"
 COM_FINDER_CONFIGURATION="Smart Search: Options"
+COM_FINDER_CONTENT_PLUGIN="Smart Search Content Plugin"
 COM_FINDER_CREATE_FILTER="Create a filter."
 COM_FINDER_EDIT_FILTER="Edit Filter"
+COM_FINDER_EDIT_PLUGIN_SETTINGS="Edit Plugin Settings"
 COM_FINDER_EMPTYSTATE_BUTTON_ADD="Start the indexer"
 COM_FINDER_EMPTYSTATE_CONTENT="No content has been indexed or you have deleted all your maps. Please visit the Smart Search Index page to reindex your content."
 COM_FINDER_EMPTYSTATE_SEARCHES_CONTENT="There are no phrases used for site searching to view yet."
@@ -132,7 +134,7 @@ COM_FINDER_INDEX_HEADING_LINK_URL_DESC="Raw URL descending"
 COM_FINDER_INDEX_NO_CONTENT="No content matches your search criteria."
 COM_FINDER_INDEX_NO_DATA="No content has been indexed."
 COM_FINDER_INDEX_PLUGIN_CONTENT_NOT_ENABLED="The Smart Search Content Plugin is disabled. Changes to content will not update the Smart Search index until the Plugin is enabled."
-COM_FINDER_INDEX_PLUGIN_CONTENT_NOT_ENABLED_LINK="The <a href=\"%s\">Smart Search Content Plugin</a> is disabled. Changes to content will not update the Smart Search index if you do not enable this plugin."
+COM_FINDER_INDEX_PLUGIN_CONTENT_NOT_ENABLED_LINK="The %s is disabled. Changes to content will not update the Smart Search index if you do not enable this plugin."
 COM_FINDER_INDEX_PURGE_FAILED="Failed to delete selected items."
 COM_FINDER_INDEX_PURGE_SUCCESS="All items have been deleted."
 COM_FINDER_INDEX_SEARCH_DESC="Search in title, URL and last updated date."
diff --git a/api/components/com_contenthistory/src/Controller/HistoryController.php b/api/components/com_contenthistory/src/Controller/HistoryController.php
index 92ee9838159b2..34802e9f6061a 100644
--- a/api/components/com_contenthistory/src/Controller/HistoryController.php
+++ b/api/components/com_contenthistory/src/Controller/HistoryController.php
@@ -50,7 +50,7 @@ public function displayList()
 	{
 		$this->modelState->set('type_alias', $this->getTypeAliasFromInput());
 		$this->modelState->set('type_id', $this->getTypeIdFromInput());
-		$this->modelState->set('item_id', $this->getItemIdFromInput());
+		$this->modelState->set('item_id', $this->getTypeAliasFromInput() . '.' . $this->getItemIdFromInput());
 		$this->modelState->set('list.ordering', 'h.save_date');
 		$this->modelState->set('list.direction', 'DESC');
 
diff --git a/build/media_source/com_joomlaupdate/js/default.es6.js b/build/media_source/com_joomlaupdate/js/default.es6.js
index 3fc32a7a3628c..aba626b867aff 100644
--- a/build/media_source/com_joomlaupdate/js/default.es6.js
+++ b/build/media_source/com_joomlaupdate/js/default.es6.js
@@ -364,7 +364,7 @@ Joomla = window.Joomla || {};
           PreUpdateChecker.showorangewarning = true;
           break;
         default:
-          // An error occured -> show unknown error note
+          // An error occurred -> show unknown error note
           html = Joomla.JText._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_WARNING_UNKNOWN');
       }
     }
@@ -375,7 +375,7 @@ Joomla = window.Joomla || {};
     // Process Current Version Extension Compatibility
     html = '';
     if (extensionData.serverError) {
-      // An error occured -> show unknown error note
+      // An error occurred -> show unknown error note
       html = Joomla.JText._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_SERVER_ERROR');
     } else {
       // Switch the compatibility state
@@ -395,7 +395,7 @@ Joomla = window.Joomla || {};
           html = Joomla.JText._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_NO_COMPATIBILITY_INFORMATION');
           break;
         default:
-          // An error occured -> show unknown error note
+          // An error occurred -> show unknown error note
           html = Joomla.JText._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_WARNING_UNKNOWN');
       }
     }
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 f837fa29df728..5425541225e13 100644
--- a/build/media_source/mod_menu/js/admin-menu.es6.js
+++ b/build/media_source/mod_menu/js/admin-menu.es6.js
@@ -74,7 +74,7 @@ if (sidebar && !sidebar.getAttribute('data-hidden')) {
 
   // Set active class
   allLinks.forEach((link) => {
-    if (currentUrl === link.href) {
+    if (currentUrl.indexOf(link.href) === 0) {
       link.setAttribute('aria-current', 'page');
       link.classList.add('mm-active');
 
diff --git a/components/com_content/tmpl/article/default_links.php b/components/com_content/tmpl/article/default_links.php
index 4f4be3855703a..51e25ed33cca2 100644
--- a/components/com_content/tmpl/article/default_links.php
+++ b/components/com_content/tmpl/article/default_links.php
@@ -74,7 +74,7 @@
 									'modalWidth'  => '500',
 									'bodyHeight'  => '500',
 									'footer' => '<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" aria-hidden="true">'
-										. \Joomla\CMS\Language\Text::_("JLIB_HTML_BEHAVIOR_CLOSE") . '</button>'
+										. \Joomla\CMS\Language\Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>'
 								)
 							);
 							break;
diff --git a/layouts/joomla/editors/buttons/modal.php b/layouts/joomla/editors/buttons/modal.php
index 099590bf606d3..e288d0a818fe6 100644
--- a/layouts/joomla/editors/buttons/modal.php
+++ b/layouts/joomla/editors/buttons/modal.php
@@ -58,6 +58,6 @@
 		'bodyHeight'  => array_key_exists('bodyHeight', $options) ? $options['bodyHeight'] : '70',
 		'modalWidth'  => array_key_exists('modalWidth', $options) ? $options['modalWidth'] : '80',
 		'footer' => $confirm . '<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">'
-			. Text::_("JLIB_HTML_BEHAVIOR_CLOSE") . '</button>'
+			. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>'
 	)
 );
diff --git a/layouts/joomla/form/field/contenthistory.php b/layouts/joomla/form/field/contenthistory.php
index 19d97183f43d5..89b43ac2085a8 100644
--- a/layouts/joomla/form/field/contenthistory.php
+++ b/layouts/joomla/form/field/contenthistory.php
@@ -61,7 +61,7 @@
 		'modalWidth'  => '80',
 		'bodyHeight'  => '60',
 		'footer' => '<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" aria-hidden="true">'
-			. Text::_("JLIB_HTML_BEHAVIOR_CLOSE") . '</button>'
+			. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>'
 	)
 );
 
diff --git a/layouts/joomla/form/field/media.php b/layouts/joomla/form/field/media.php
index f31fc3431deab..372701e987f1b 100644
--- a/layouts/joomla/form/field/media.php
+++ b/layouts/joomla/form/field/media.php
@@ -163,8 +163,8 @@
 	<div class="input-group">
 		<input type="text" name="<?php echo $name; ?>" id="<?php echo $id; ?>" value="<?php echo htmlspecialchars($value, ENT_COMPAT, 'UTF-8'); ?>" readonly="readonly"<?php echo $attr; ?>>
 		<?php if ($disabled != true) : ?>
-			<button type="button" class="btn btn-success button-select"><?php echo Text::_("JLIB_FORM_BUTTON_SELECT"); ?></button>
-			<button type="button" class="btn btn-danger button-clear"><span class="icon-times" aria-hidden="true"></span><span class="visually-hidden"><?php echo Text::_("JLIB_FORM_BUTTON_CLEAR"); ?></span></button>
+			<button type="button" class="btn btn-success button-select"><?php echo Text::_('JLIB_FORM_BUTTON_SELECT'); ?></button>
+			<button type="button" class="btn btn-danger button-clear"><span class="icon-times" aria-hidden="true"></span><span class="visually-hidden"><?php echo Text::_('JLIB_FORM_BUTTON_CLEAR'); ?></span></button>
 		<?php endif; ?>
 	</div>
 </joomla-field-media>
diff --git a/layouts/plugins/system/privacyconsent/label.php b/layouts/plugins/system/privacyconsent/label.php
index 29496f9c3fa59..03b174c09f23c 100644
--- a/layouts/plugins/system/privacyconsent/label.php
+++ b/layouts/plugins/system/privacyconsent/label.php
@@ -104,7 +104,7 @@
 			'modalWidth'  => '800',
 			'bodyHeight'  => '500',
 			'footer' => '<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" aria-hidden="true">'
-				. Text::_("JLIB_HTML_BEHAVIOR_CLOSE") . '</button>',
+				. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>',
 		]
 	);
 }
diff --git a/layouts/plugins/user/terms/label.php b/layouts/plugins/user/terms/label.php
index 2267373b7e9ac..504884ab8ac23 100644
--- a/layouts/plugins/user/terms/label.php
+++ b/layouts/plugins/user/terms/label.php
@@ -103,7 +103,7 @@
 			'modalWidth'  => '800',
 			'bodyHeight'  => '500',
 			'footer' => '<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" aria-hidden="true">'
-				. Text::_("JLIB_HTML_BEHAVIOR_CLOSE") . '</button>',
+				. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>',
 		]
 	);
 }
diff --git a/libraries/src/Form/Field/ModulepositionField.php b/libraries/src/Form/Field/ModulepositionField.php
index 5813e6441d277..f3b072249a749 100644
--- a/libraries/src/Form/Field/ModulepositionField.php
+++ b/libraries/src/Form/Field/ModulepositionField.php
@@ -169,7 +169,7 @@ protected function getInput()
 				'modalWidth'  => '800',
 				'bodyHeight'  => '450',
 				'footer' => '<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" aria-hidden="true">'
-					. Text::_("JLIB_HTML_BEHAVIOR_CLOSE") . '</button>'
+					. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>'
 			)
 		);
 		$html[] = '</div>';
diff --git a/modules/mod_menu/tmpl/collapse-default.php b/modules/mod_menu/tmpl/collapse-default.php
index 4c81542fd4e89..716dd2d28c249 100644
--- a/modules/mod_menu/tmpl/collapse-default.php
+++ b/modules/mod_menu/tmpl/collapse-default.php
@@ -16,10 +16,10 @@
 ?>
 
 <nav class="navbar navbar-expand-md">
-	<button class="navbar-toggler navbar-toggler-right" type="button" data-bs-toggle="collapse" data-bs-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="<?php echo Text::_('MOD_MENU_TOGGLE'); ?>">
+	<button class="navbar-toggler navbar-toggler-right" type="button" data-bs-toggle="collapse" data-bs-target="#navbar<?php echo $module->id; ?>" aria-controls="navbar<?php echo $module->id; ?>" aria-expanded="false" aria-label="<?php echo Text::_('MOD_MENU_TOGGLE'); ?>">
 		<span class="icon-menu" aria-hidden="true"></span>
 	</button>
-	<div class="collapse navbar-collapse" id="navbar">
+	<div class="collapse navbar-collapse" id="navbar<?php echo $module->id; ?>">
 		<?php require __DIR__ . '/default.php'; ?>
 	</div>
 </nav>
diff --git a/plugins/sampledata/blog/blog.php b/plugins/sampledata/blog/blog.php
index fb05e2af0ccba..31ea7f86859ec 100644
--- a/plugins/sampledata/blog/blog.php
+++ b/plugins/sampledata/blog/blog.php
@@ -67,13 +67,13 @@ class PlgSampledataBlog extends CMSPlugin
 	/**
 	 * Get an overview of the proposed sampledata.
 	 *
-	 * @return  boolean  True on success.
+	 * @return  stdClass|void  Will be converted into the JSON response to the module.
 	 *
 	 * @since  3.8.0
 	 */
 	public function onSampledataGetOverview()
 	{
-		if (!Factory::getUser()->authorise('core.create', 'com_content'))
+		if (!$this->app->getIdentity()->authorise('core.create', 'com_content'))
 		{
 			return;
 		}
@@ -91,7 +91,7 @@ public function onSampledataGetOverview()
 	/**
 	 * First step to enter the sampledata. Content.
 	 *
-	 * @return  array or void  Will be converted into the JSON response to the module.
+	 * @return  array|void  Will be converted into the JSON response to the module.
 	 *
 	 * @since  3.8.0
 	 */
@@ -113,14 +113,15 @@ public function onAjaxSampledataApplyStep1()
 
 		// Get some metadata.
 		$access = (int) $this->app->get('access', 1);
-		$user   = Factory::getUser();
+		$user   = $this->app->getIdentity();
 
 		// Detect language to be used.
-		$language   = Multilanguage::isEnabled() ? Factory::getLanguage()->getTag() : '*';
+		$language   = Multilanguage::isEnabled() ? $this->app->getLanguage()->getTag() : '*';
 		$langSuffix = ($language !== '*') ? ' (' . $language . ')' : '';
 
 		/** @var \Joomla\Component\Tags\Administrator\Model\TagModel $model */
-		$modelTag = $this->app->bootComponent('com_tags')->getMVCFactory()->createModel('Tag', 'Administrator', ['ignore_request' => true]);
+		$modelTag = $this->app->bootComponent('com_tags')->getMVCFactory()
+			->createModel('Tag', 'Administrator', ['ignore_request' => true]);
 
 		$tagIds = array();
 
@@ -146,7 +147,7 @@ public function onAjaxSampledataApplyStep1()
 			{
 				if (!$modelTag->save($tag))
 				{
-					Factory::getLanguage()->load('com_tags');
+					$this->app->getLanguage()->load('com_tags');
 					throw new Exception(Text::_($modelTag->getError()));
 				}
 			}
@@ -162,7 +163,7 @@ public function onAjaxSampledataApplyStep1()
 			$tagIds[] = $modelTag->getItem()->id;
 		}
 
-		if (!ComponentHelper::isEnabled('com_content') || !Factory::getUser()->authorise('core.create', 'com_content'))
+		if (!ComponentHelper::isEnabled('com_content') || !$this->app->getIdentity()->authorise('core.create', 'com_content'))
 		{
 			$response            = array();
 			$response['success'] = true;
@@ -173,7 +174,7 @@ public function onAjaxSampledataApplyStep1()
 
 		if (ComponentHelper::isEnabled('com_fields') && $user->authorise('core.create', 'com_fields'))
 		{
-			Factory::getLanguage()->load('com_fields');
+			$this->app->getLanguage()->load('com_fields');
 
 			$mvcFactory = $this->app->bootComponent('com_fields')->getMVCFactory();
 
@@ -283,7 +284,7 @@ public function onAjaxSampledataApplyStep1()
 			}
 		}
 
-		if (ComponentHelper::isEnabled('com_workflow') && Factory::getUser()->authorise('core.create', 'com_workflow'))
+		if (ComponentHelper::isEnabled('com_workflow') && $this->app->getIdentity()->authorise('core.create', 'com_workflow'))
 		{
 			$this->app->bootComponent('com_workflow');
 
@@ -531,7 +532,7 @@ public function onAjaxSampledataApplyStep1()
 			{
 				if (!$categoryModel->save($category))
 				{
-					Factory::getLanguage()->load('com_categories');
+					$this->app->getLanguage()->load('com_categories');
 					throw new Exception($categoryModel->getError());
 				}
 			}
@@ -779,12 +780,11 @@ public function onAjaxSampledataApplyStep1()
 			}
 
 			// Add a value to the custom field if a value is given
-			if (ComponentHelper::isEnabled('com_fields') && Factory::getUser()->authorise('core.create', 'com_fields'))
+			if (ComponentHelper::isEnabled('com_fields') && $this->app->getIdentity()->authorise('core.create', 'com_fields'))
 			{
 				if (!empty($article['authorValue']))
 				{
 					// Store a field value
-					$query = $this->db->getQuery(true);
 
 					$valueAuthor = (object) [
 						'item_id'  => $articleModel->getItem()->id,
@@ -800,9 +800,9 @@ public function onAjaxSampledataApplyStep1()
 		$this->app->setUserState('sampledata.blog.articles', $ids);
 		$this->app->setUserState('sampledata.blog.articles.catIds', $catIds);
 
-		$response          = new stdClass;
-		$response->success = true;
-		$response->message = Text::_('PLG_SAMPLEDATA_BLOG_STEP1_SUCCESS');
+		$response            = [];
+		$response['success'] = true;
+		$response['message'] = Text::_('PLG_SAMPLEDATA_BLOG_STEP1_SUCCESS');
 
 		return $response;
 	}
@@ -810,7 +810,7 @@ public function onAjaxSampledataApplyStep1()
 	/**
 	 * Second step to enter the sampledata. Menus.
 	 *
-	 * @return  array or void  Will be converted into the JSON response to the module.
+	 * @return  array|void  Will be converted into the JSON response to the module.
 	 *
 	 * @since  3.8.0
 	 */
@@ -821,7 +821,7 @@ public function onAjaxSampledataApplyStep2()
 			return;
 		}
 
-		if (!ComponentHelper::isEnabled('com_menus') || !Factory::getUser()->authorise('core.create', 'com_menus'))
+		if (!ComponentHelper::isEnabled('com_menus') || !$this->app->getIdentity()->authorise('core.create', 'com_menus'))
 		{
 			$response            = array();
 			$response['success'] = true;
@@ -831,7 +831,7 @@ public function onAjaxSampledataApplyStep2()
 		}
 
 		// Detect language to be used.
-		$language   = Multilanguage::isEnabled() ? Factory::getLanguage()->getTag() : '*';
+		$language   = Multilanguage::isEnabled() ? $this->app->getLanguage()->getTag() : '*';
 		$langSuffix = ($language !== '*') ? ' (' . $language . ')' : '';
 
 		// Create the menu types.
@@ -858,7 +858,7 @@ public function onAjaxSampledataApplyStep2()
 
 				if (!$menuTable->check())
 				{
-					Factory::getLanguage()->load('com_menu');
+					$this->app->getLanguage()->load('com_menu');
 					throw new Exception($menuTable->getError());
 				}
 
@@ -1378,25 +1378,20 @@ public function onAjaxSampledataApplyStep2()
 	/**
 	 * Third step to enter the sampledata. Modules.
 	 *
-	 * @return  array or void  Will be converted into the JSON response to the module.
+	 * @return  array|void  Will be converted into the JSON response to the module.
 	 *
 	 * @since  3.8.0
 	 */
 	public function onAjaxSampledataApplyStep3()
 	{
-		$app = Factory::getApplication();
-
-		// Get previously entered categories ids
-		$catIds = $this->app->getUserState('sampledata.blog.articles.catIds');
-
 		if (!Session::checkToken('get') || $this->app->input->get('type') != $this->_name)
 		{
 			return;
 		}
 
-		Factory::getLanguage()->load('com_modules');
+		$this->app->getLanguage()->load('com_modules');
 
-		if (!ComponentHelper::isEnabled('com_modules') || !Factory::getUser()->authorise('core.create', 'com_modules'))
+		if (!ComponentHelper::isEnabled('com_modules') || !$this->app->getIdentity()->authorise('core.create', 'com_modules'))
 		{
 			$response            = array();
 			$response['success'] = true;
@@ -1406,7 +1401,7 @@ public function onAjaxSampledataApplyStep3()
 		}
 
 		// Detect language to be used.
-		$language   = Multilanguage::isEnabled() ? Factory::getLanguage()->getTag() : '*';
+		$language   = Multilanguage::isEnabled() ? $this->app->getLanguage()->getTag() : '*';
 		$langSuffix = ($language !== '*') ? ' (' . $language . ')' : '';
 
 		// Add Include Paths.
@@ -1421,6 +1416,7 @@ public function onAjaxSampledataApplyStep3()
 		// Get previously entered Data from UserStates
 		$menuTypes = $this->app->getUserState('sampledata.blog.menutypes');
 
+		// Get previously entered categories ids
 		$catIds = $this->app->getUserState('sampledata.blog.articles.catIds');
 
 		// Link to article "typography" in banner module
@@ -1735,7 +1731,7 @@ public function onAjaxSampledataApplyStep3()
 
 		if (!isset($home))
 		{
-			$home = $app->getMenu('site')->getDefault()->id;
+			$home = $this->app->getMenu('site')->getDefault()->id;
 		}
 
 		foreach ($modules as $module)
@@ -1835,7 +1831,7 @@ public function onAjaxSampledataApplyStep3()
 	/**
 	 * Final step to show completion of sampledata.
 	 *
-	 * @return  array or void  Will be converted into the JSON response to the module.
+	 * @return  array|void  Will be converted into the JSON response to the module.
 	 *
 	 * @since  4.0.0
 	 */
@@ -1868,11 +1864,10 @@ private function addMenuItems(array $menuItems, $level)
 	{
 		$itemIds = array();
 		$access  = (int) $this->app->get('access', 1);
-		$user    = Factory::getUser();
-		$app     = Factory::getApplication();
+		$user    = $this->app->getIdentity();
 
 		// Detect language to be used.
-		$language   = Multilanguage::isEnabled() ? Factory::getLanguage()->getTag() : '*';
+		$language   = Multilanguage::isEnabled() ? $this->app->getLanguage()->getTag() : '*';
 		$langSuffix = ($language !== '*') ? ' (' . $language . ')' : '';
 
 		foreach ($menuItems as $menuItem)
@@ -1888,9 +1883,9 @@ private function addMenuItems(array $menuItems, $level)
 			// Set unicodeslugs if alias is empty
 			if (trim(str_replace('-', '', $menuItem['alias']) == ''))
 			{
-				$unicode = $app->set('unicodeslugs', 1);
+				$unicode = $this->app->set('unicodeslugs', 1);
 				$menuItem['alias'] = ApplicationHelper::stringURLSafe($menuItem['title']);
-				$app->set('unicodeslugs', $unicode);
+				$this->app->set('unicodeslugs', $unicode);
 			}
 
 			// Append language suffix to title.
diff --git a/plugins/sampledata/multilang/multilang.php b/plugins/sampledata/multilang/multilang.php
index 0ef220994cbe5..9aa01dde53e6a 100644
--- a/plugins/sampledata/multilang/multilang.php
+++ b/plugins/sampledata/multilang/multilang.php
@@ -58,15 +58,6 @@ class PlgSampledataMultilang extends CMSPlugin
 	 */
 	protected $autoloadLanguage = true;
 
-	/**
-	 * Holds the menuitem model
-	 *
-	 * @var     MenusModelItem
-	 *
-	 * @since   4.0.0
-	 */
-	private $menuItemModel;
-
 	/**
 	 * @var     string language path
 	 *
@@ -75,7 +66,7 @@ class PlgSampledataMultilang extends CMSPlugin
 	protected $path = null;
 
 	/**
-	 * @var    Admin Id, author of all generated content.
+	 * @var    integer Id, author of all generated content.
 	 *
 	 * @since   4.0.0
 	 */
@@ -84,13 +75,13 @@ class PlgSampledataMultilang extends CMSPlugin
 	/**
 	 * Get an overview of the proposed sampledata.
 	 *
-	 * @return  boolean  True on success.
+	 * @return  stdClass|void  Will be converted into the JSON response to the module.
 	 *
 	 * @since   4.0.0
 	 */
 	public function onSampledataGetOverview()
 	{
-		if (!Factory::getUser()->authorise('core.create', 'com_content'))
+		if (!$this->app->getIdentity()->authorise('core.create', 'com_content'))
 		{
 			return;
 		}
@@ -135,7 +126,7 @@ public function onAjaxSampledataApplyStep1()
 			$response            = array();
 			$response['success'] = false;
 
-			$lang = Factory::getLanguage()->getTag();
+			$lang = $this->app->getLanguage();
 			$lang->load('plg_system_languagefilter', JPATH_ADMINISTRATOR);
 			$message = $lang->_('PLG_SYSTEM_LANGUAGEFILTER');
 
@@ -144,9 +135,9 @@ public function onAjaxSampledataApplyStep1()
 			return $response;
 		}
 
-		$response          = new stdClass;
-		$response->success = true;
-		$response->message = Text::_('PLG_SAMPLEDATA_MULTILANG_STEP1_SUCCESS');
+		$response            = [];
+		$response['success'] = true;
+		$response['message'] = Text::_('PLG_SAMPLEDATA_MULTILANG_STEP1_SUCCESS');
 
 		return $response;
 	}
@@ -165,7 +156,7 @@ public function onAjaxSampledataApplyStep2()
 			return;
 		}
 
-		if (!ComponentHelper::isEnabled('com_modules') || !Factory::getUser()->authorise('core.create', 'com_modules'))
+		if (!ComponentHelper::isEnabled('com_modules') || !$this->app->getIdentity()->authorise('core.create', 'com_modules'))
 		{
 			$response            = array();
 			$response['success'] = true;
@@ -179,7 +170,7 @@ public function onAjaxSampledataApplyStep2()
 			$response            = array();
 			$response['success'] = false;
 
-			$lang = Factory::getLanguage()->getTag();
+			$lang = $this->app->getLanguage();
 			$lang->load('mod_languages', JPATH_SITE);
 			$message = $lang->_('MOD_LANGUAGES');
 
@@ -188,9 +179,9 @@ public function onAjaxSampledataApplyStep2()
 			return $response;
 		}
 
-		$response          = new stdClass;
-		$response->success = true;
-		$response->message = Text::_('PLG_SAMPLEDATA_MULTILANG_STEP2_SUCCESS');
+		$response            = [];
+		$response['success'] = true;
+		$response['message'] = Text::_('PLG_SAMPLEDATA_MULTILANG_STEP2_SUCCESS');
 
 		return $response;
 	}
@@ -227,9 +218,9 @@ public function onAjaxSampledataApplyStep3()
 			return $response;
 		}
 
-		$response          = new stdClass;
-		$response->success = true;
-		$response->message = Text::_('PLG_SAMPLEDATA_MULTILANG_STEP3_SUCCESS');
+		$response            = [];
+		$response['success'] = true;
+		$response['message'] = Text::_('PLG_SAMPLEDATA_MULTILANG_STEP3_SUCCESS');
 
 		return $response;
 	}
@@ -248,7 +239,7 @@ public function onAjaxSampledataApplyStep4()
 			return;
 		}
 
-		if (!ComponentHelper::isEnabled('com_menus') || !Factory::getUser()->authorise('core.create', 'com_menus'))
+		if (!ComponentHelper::isEnabled('com_menus') || !$this->app->getIdentity()->authorise('core.create', 'com_menus'))
 		{
 			$response            = array();
 			$response['success'] = true;
@@ -291,9 +282,9 @@ public function onAjaxSampledataApplyStep4()
 			return $response;
 		}
 
-		$response          = new stdClass;
-		$response->success = true;
-		$response->message = Text::_('PLG_SAMPLEDATA_MULTILANG_STEP4_SUCCESS');
+		$response            = [];
+		$response['success'] = true;
+		$response['message'] = Text::_('PLG_SAMPLEDATA_MULTILANG_STEP4_SUCCESS');
 
 		return $response;
 	}
@@ -312,7 +303,7 @@ public function onAjaxSampledataApplyStep5()
 			return;
 		}
 
-		if (!ComponentHelper::isEnabled('com_modules') || !Factory::getUser()->authorise('core.create', 'com_modules'))
+		if (!ComponentHelper::isEnabled('com_modules') || !$this->app->getIdentity()->authorise('core.create', 'com_modules'))
 		{
 			$response            = array();
 			$response['success'] = true;
@@ -335,9 +326,9 @@ public function onAjaxSampledataApplyStep5()
 			}
 		}
 
-		$response          = new stdClass;
-		$response->success = true;
-		$response->message = Text::_('PLG_SAMPLEDATA_MULTILANG_STEP5_SUCCESS');
+		$response            = [];
+		$response['success'] = true;
+		$response['message'] = Text::_('PLG_SAMPLEDATA_MULTILANG_STEP5_SUCCESS');
 
 		return $response;
 	}
@@ -356,7 +347,7 @@ public function onAjaxSampledataApplyStep6()
 			return;
 		}
 
-		if (!ComponentHelper::isEnabled('com_content') || !Factory::getUser()->authorise('core.create', 'com_content'))
+		if (!ComponentHelper::isEnabled('com_content') || !$this->app->getIdentity()->authorise('core.create', 'com_content'))
 		{
 			$response            = array();
 			$response['success'] = true;
@@ -365,7 +356,7 @@ public function onAjaxSampledataApplyStep6()
 			return $response;
 		}
 
-		if (!ComponentHelper::isEnabled('com_categories') || !Factory::getUser()->authorise('core.create', 'com_content.category'))
+		if (!ComponentHelper::isEnabled('com_categories') || !$this->app->getIdentity()->authorise('core.create', 'com_content.category'))
 		{
 			$response            = array();
 			$response['success'] = true;
@@ -423,9 +414,9 @@ public function onAjaxSampledataApplyStep6()
 			return $response;
 		}
 
-		$response          = new stdClass;
-		$response->success = true;
-		$response->message = Text::_('PLG_SAMPLEDATA_MULTILANG_STEP6_SUCCESS');
+		$response            = [];
+		$response['success'] = true;
+		$response['message'] = Text::_('PLG_SAMPLEDATA_MULTILANG_STEP6_SUCCESS');
 
 		return $response;
 	}
@@ -462,9 +453,9 @@ public function onAjaxSampledataApplyStep7()
 			return $response;
 		}
 
-		$response          = new stdClass;
-		$response->success = true;
-		$response->message = Text::_('PLG_SAMPLEDATA_MULTILANG_STEP7_SUCCESS');
+		$response            = [];
+		$response['success'] = true;
+		$response['message'] = Text::_('PLG_SAMPLEDATA_MULTILANG_STEP7_SUCCESS');
 
 		return $response;
 	}
@@ -472,7 +463,7 @@ public function onAjaxSampledataApplyStep7()
 	/**
 	 * Final step to show completion of sampledata.
 	 *
-	 * @return  array or void  Will be converted into the JSON response to the module.
+	 * @return  array|void  Will be converted into the JSON response to the module.
 	 *
 	 * @since  4.0.0
 	 */
diff --git a/plugins/user/profile/src/Field/TosField.php b/plugins/user/profile/src/Field/TosField.php
index 1c2875b7f94ab..aa01a286ec0b0 100644
--- a/plugins/user/profile/src/Field/TosField.php
+++ b/plugins/user/profile/src/Field/TosField.php
@@ -134,7 +134,7 @@ protected function getLabel()
 					'modalWidth'  => '800',
 					'bodyHeight'  => '500',
 					'footer' => '<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" aria-hidden="true">'
-						. Text::_("JLIB_HTML_BEHAVIOR_CLOSE") . '</button>',
+						. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>',
 				]
 			);
 		}
diff --git a/templates/cassiopeia/html/mod_menu/collapse-metismenu.php b/templates/cassiopeia/html/mod_menu/collapse-metismenu.php
index 81847d0982f8b..d84baf07a0bd2 100644
--- a/templates/cassiopeia/html/mod_menu/collapse-metismenu.php
+++ b/templates/cassiopeia/html/mod_menu/collapse-metismenu.php
@@ -16,10 +16,10 @@
 ?>
 
 <nav class="navbar navbar-expand-md">
-	<button class="navbar-toggler navbar-toggler-right" type="button" data-bs-toggle="collapse" data-bs-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="<?php echo Text::_('MOD_MENU_TOGGLE'); ?>">
+	<button class="navbar-toggler navbar-toggler-right" type="button" data-bs-toggle="collapse" data-bs-target="#navbar<?php echo $module->id; ?>" aria-controls="navbar<?php echo $module->id; ?>" aria-expanded="false" aria-label="<?php echo Text::_('MOD_MENU_TOGGLE'); ?>">
 		<span class="icon-menu" aria-hidden="true"></span>
 	</button>
-	<div class="collapse navbar-collapse" id="navbar">
+	<div class="collapse navbar-collapse" id="navbar<?php echo $module->id; ?>">
 		<?php require __DIR__ . '/dropdown-metismenu.php'; ?>
 	</div>
 </nav>