diff --git a/layouts/joomla/html/batch/access.php b/layouts/joomla/html/batch/access.php
index 40df5ddfd59c8..f40fdacfcd570 100644
--- a/layouts/joomla/html/batch/access.php
+++ b/layouts/joomla/html/batch/access.php
@@ -9,21 +9,25 @@
 
 defined('JPATH_BASE') or die;
 
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+
 /**
  * Layout variables
  * ---------------------
- * None
+ *
+ * none
  */
 
 ?>
-<label id="batch-access-lbl" for="batch-access" class="modalTooltip" title="<?php echo JHtml::_('tooltipText', 'JLIB_HTML_BATCH_ACCESS_LABEL', 'JLIB_HTML_BATCH_ACCESS_LABEL_DESC'); ?>">
-	<?php echo JText::_('JLIB_HTML_BATCH_ACCESS_LABEL'); ?></label>
-	<?php echo JHtml::_(
+<label id="batch-access-lbl" for="batch-access" class="modalTooltip" title="<?php echo HTMLHelper::_('tooltipText', 'JLIB_HTML_BATCH_ACCESS_LABEL', 'JLIB_HTML_BATCH_ACCESS_LABEL_DESC'); ?>">
+	<?php echo Text::_('JLIB_HTML_BATCH_ACCESS_LABEL'); ?></label>
+	<?php echo HTMLHelper::_(
 		'access.assetgrouplist',
 		'batch[assetgroup_id]', '',
 		'class="custom-select"',
 		array(
-			'title' => JText::_('JLIB_HTML_BATCH_NOCHANGE'),
-			'id' => 'batch-access'
+			'title' => Text::_('JLIB_HTML_BATCH_NOCHANGE'),
+			'id'    => 'batch-access'
 		)
 	); ?>
diff --git a/layouts/joomla/html/batch/adminlanguage.php b/layouts/joomla/html/batch/adminlanguage.php
index ebb1221fe084c..ec06c794245d0 100644
--- a/layouts/joomla/html/batch/adminlanguage.php
+++ b/layouts/joomla/html/batch/adminlanguage.php
@@ -9,13 +9,17 @@
 
 defined('JPATH_BASE') or die;
 
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+
 /**
  * Layout variables
  * ---------------------
  * None
  */
 
-JFactory::getDocument()->addScriptDeclaration(
+Factory::getDocument()->addScriptDeclaration(
 	'
 		jQuery(document).ready(function($){
 			if ($("#batch-category-id").length){var batchSelector = $("#batch-category-id");}
@@ -35,10 +39,10 @@
 			'
 );
 ?>
-<label id="batch-language-lbl" for="batch-language-id" class="modalTooltip" title="<?php echo JHtml::_('tooltipText', 'JLIB_HTML_BATCH_LANGUAGE_LABEL', 'JLIB_HTML_BATCH_LANGUAGE_LABEL_DESC'); ?>">
-	<?php echo JText::_('JLIB_HTML_BATCH_LANGUAGE_LABEL'); ?>
+<label id="batch-language-lbl" for="batch-language-id" class="modalTooltip" title="<?php echo HTMLHelper::_('tooltipText', 'JLIB_HTML_BATCH_LANGUAGE_LABEL', 'JLIB_HTML_BATCH_LANGUAGE_LABEL_DESC'); ?>">
+	<?php echo Text::_('JLIB_HTML_BATCH_LANGUAGE_LABEL'); ?>
 </label>
 <select name="batch[language_id]" class="inputbox" id="batch-language-id">
-	<option value=""><?php echo JText::_('JLIB_HTML_BATCH_LANGUAGE_NOCHANGE'); ?></option>
-	<?php echo JHtml::_('select.options', JHtml::_('adminlanguage.existing', true, true), 'value', 'text'); ?>
+	<option value=""><?php echo Text::_('JLIB_HTML_BATCH_LANGUAGE_NOCHANGE'); ?></option>
+	<?php echo HTMLHelper::_('select.options', HTMLHelper::_('adminlanguage.existing', true, true), 'value', 'text'); ?>
 </select>
diff --git a/layouts/joomla/html/batch/item.php b/layouts/joomla/html/batch/item.php
index b08a0499d32f5..3d5b12b123217 100644
--- a/layouts/joomla/html/batch/item.php
+++ b/layouts/joomla/html/batch/item.php
@@ -9,6 +9,9 @@
 
 defined('JPATH_BASE') or die;
 
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+
 /**
  * Layout variables
  * ---------------------
@@ -20,18 +23,18 @@
 
 // Create the copy/move options.
 $options = array(
-	JHtml::_('select.option', 'c', JText::_('JLIB_HTML_BATCH_COPY')),
-	JHtml::_('select.option', 'm', JText::_('JLIB_HTML_BATCH_MOVE'))
+	HTMLHelper::_('select.option', 'c', Text::_('JLIB_HTML_BATCH_COPY')),
+	HTMLHelper::_('select.option', 'm', Text::_('JLIB_HTML_BATCH_MOVE'))
 );
 ?>
-<label id="batch-choose-action-lbl" for="batch-choose-action"><?php echo JText::_('JLIB_HTML_BATCH_MENU_LABEL'); ?></label>
+<label id="batch-choose-action-lbl" for="batch-choose-action"><?php echo Text::_('JLIB_HTML_BATCH_MENU_LABEL'); ?></label>
 <div id="batch-choose-action" class="control-group">
 	<select name="batch[category_id]" class="custom-select" id="batch-category-id">
-		<option value=""><?php echo JText::_('JLIB_HTML_BATCH_NO_CATEGORY'); ?></option>
-		<?php echo JHtml::_('select.options', JHtml::_('category.options', $extension)); ?>
+		<option value=""><?php echo Text::_('JLIB_HTML_BATCH_NO_CATEGORY'); ?></option>
+		<?php echo HTMLHelper::_('select.options', HTMLHelper::_('category.options', $extension)); ?>
 	</select>
 </div>
 <div id="batch-copy-move" class="control-group radio">
-	<?php echo JText::_('JLIB_HTML_BATCH_MOVE_QUESTION'); ?>
-	<?php echo JHtml::_('select.radiolist', $options, 'batch[move_copy]', '', 'value', 'text', 'm'); ?>
+	<?php echo Text::_('JLIB_HTML_BATCH_MOVE_QUESTION'); ?>
+	<?php echo HTMLHelper::_('select.radiolist', $options, 'batch[move_copy]', '', 'value', 'text', 'm'); ?>
 </div>
diff --git a/layouts/joomla/html/batch/language.php b/layouts/joomla/html/batch/language.php
index 2867288af1894..75c9ee4118597 100644
--- a/layouts/joomla/html/batch/language.php
+++ b/layouts/joomla/html/batch/language.php
@@ -9,13 +9,17 @@
 
 defined('JPATH_BASE') or die;
 
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+
 /**
  * Layout variables
  * ---------------------
  * None
  */
 
-JFactory::getDocument()->addScriptDeclaration(
+Factory::getDocument()->addScriptDeclaration(
 	'
 		jQuery(document).ready(function($){
 			if ($("#batch-category-id").length){var batchSelector = $("#batch-category-id");}
@@ -35,10 +39,10 @@
 			'
 );
 ?>
-<label id="batch-language-lbl" for="batch-language-id" class="modalTooltip" title="<?php echo JHtml::_('tooltipText', 'JLIB_HTML_BATCH_LANGUAGE_LABEL', 'JLIB_HTML_BATCH_LANGUAGE_LABEL_DESC'); ?>">
-	<?php echo JText::_('JLIB_HTML_BATCH_LANGUAGE_LABEL'); ?>
+<label id="batch-language-lbl" for="batch-language-id" class="modalTooltip" title="<?php echo HTMLHelper::_('tooltipText', 'JLIB_HTML_BATCH_LANGUAGE_LABEL', 'JLIB_HTML_BATCH_LANGUAGE_LABEL_DESC'); ?>">
+	<?php echo Text::_('JLIB_HTML_BATCH_LANGUAGE_LABEL'); ?>
 </label>
 <select name="batch[language_id]" class="custom-select" id="batch-language-id">
-	<option value=""><?php echo JText::_('JLIB_HTML_BATCH_LANGUAGE_NOCHANGE'); ?></option>
-	<?php echo JHtml::_('select.options', JHtml::_('contentlanguage.existing', true, true), 'value', 'text'); ?>
+	<option value=""><?php echo Text::_('JLIB_HTML_BATCH_LANGUAGE_NOCHANGE'); ?></option>
+	<?php echo HTMLHelper::_('select.options', HTMLHelper::_('contentlanguage.existing', true, true), 'value', 'text'); ?>
 </select>
diff --git a/layouts/joomla/html/batch/tag.php b/layouts/joomla/html/batch/tag.php
index 1cdfc167e7ab8..7dee24feee770 100644
--- a/layouts/joomla/html/batch/tag.php
+++ b/layouts/joomla/html/batch/tag.php
@@ -9,6 +9,9 @@
 
 defined('JPATH_BASE') or die;
 
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+
 /**
  * Layout variables
  * ---------------------
@@ -17,10 +20,10 @@
 
 ?>
 <label id="batch-tag-lbl" for="batch-tag-id" class="modalTooltip" title="<?php
-echo JHtml::_('tooltipText', 'JLIB_HTML_BATCH_TAG_LABEL', 'JLIB_HTML_BATCH_TAG_LABEL_DESC'); ?>">
-<?php echo JText::_('JLIB_HTML_BATCH_TAG_LABEL'); ?>
+echo HTMLHelper::_('tooltipText', 'JLIB_HTML_BATCH_TAG_LABEL', 'JLIB_HTML_BATCH_TAG_LABEL_DESC'); ?>">
+<?php echo Text::_('JLIB_HTML_BATCH_TAG_LABEL'); ?>
 </label>
 <select name="batch[tag]" class="custom-select" id="batch-tag-id">
-	<option value=""><?php echo JText::_('JLIB_HTML_BATCH_TAG_NOCHANGE'); ?></option>
-	<?php echo JHtml::_('select.options', JHtml::_('tag.tags', array('filter.published' => array(1))), 'value', 'text'); ?>
+	<option value=""><?php echo Text::_('JLIB_HTML_BATCH_TAG_NOCHANGE'); ?></option>
+	<?php echo HTMLHelper::_('select.options', HTMLHelper::_('tag.tags', array('filter.published' => array(1))), 'value', 'text'); ?>
 </select>
diff --git a/layouts/joomla/html/batch/user.php b/layouts/joomla/html/batch/user.php
index c7fa17cff5f85..0b002b500a462 100644
--- a/layouts/joomla/html/batch/user.php
+++ b/layouts/joomla/html/batch/user.php
@@ -9,6 +9,9 @@
 
 defined('JPATH_BASE') or die;
 
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+
 /**
  * Layout variables
  * ---------------------
@@ -22,15 +25,15 @@
 
 if ($noUser)
 {
-	$optionNo = '<option value="0">' . JText::_('JLIB_HTML_BATCH_USER_NOUSER') . '</option>';
+	$optionNo = '<option value="0">' . Text::_('JLIB_HTML_BATCH_USER_NOUSER') . '</option>';
 }
 ?>
 <label id="batch-user-lbl" for="batch-user" class="modalTooltip" title="<?php
-echo JHtml::_('tooltipText', 'JLIB_HTML_BATCH_USER_LABEL', 'JLIB_HTML_BATCH_USER_LABEL_DESC'); ?>">
-	<?php echo JText::_('JLIB_HTML_BATCH_USER_LABEL'); ?>
+echo HTMLHelper::_('tooltipText', 'JLIB_HTML_BATCH_USER_LABEL', 'JLIB_HTML_BATCH_USER_LABEL_DESC'); ?>">
+	<?php echo Text::_('JLIB_HTML_BATCH_USER_LABEL'); ?>
 </label>
 <select name="batch[user_id]" class="custom-select" id="batch-user-id">
-	<option value=""><?php echo JText::_('JLIB_HTML_BATCH_USER_NOCHANGE'); ?></option>
+	<option value=""><?php echo Text::_('JLIB_HTML_BATCH_USER_NOCHANGE'); ?></option>
 	<?php echo $optionNo; ?>
-	<?php echo JHtml::_('select.options', JHtml::_('user.userlist'), 'value', 'text'); ?>
+	<?php echo HTMLHelper::_('select.options', HTMLHelper::_('user.userlist'), 'value', 'text'); ?>
 </select>
diff --git a/layouts/joomla/sidebars/submenu.php b/layouts/joomla/sidebars/submenu.php
index a2f908ba8f586..bcf8f388872ec 100644
--- a/layouts/joomla/sidebars/submenu.php
+++ b/layouts/joomla/sidebars/submenu.php
@@ -9,18 +9,19 @@
 
 defined('JPATH_BASE') or die;
 
-JHtml::_('jquery.framework');
-JHtmlBehavior::core();
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
 
-JFactory::getDocument()->addScriptDeclaration('
-	jQuery(document).ready(function($)
-	{
-		if (window.toggleSidebar)
-		{
+HTMLHelper::_('jquery.framework');
+HTMLHelper::_('behavior.core');
+
+Factory::getDocument()->addScriptDeclaration('
+	jQuery(document).ready(function($) {
+		if (window.toggleSidebar) {
 			toggleSidebar(true);
 		}
-		else
-		{
+		else {
 			$("#j-toggle-sidebar-header").css("display", "none");
 			$("#j-toggle-button-wrapper").css("display", "none");
 		}
@@ -43,7 +44,7 @@
 					<a class="nolink"><?php echo $item[0]; ?></a>
 				<?php else :
 					if ($item[1] !== '') : ?>
-						<a href="<?php echo JFilterOutput::ampReplace($item[1]); ?>"><?php echo $item[0]; ?></a>
+						<a href="<?php echo OutputFilter::ampReplace($item[1]); ?>"><?php echo $item[0]; ?></a>
 					<?php else : ?>
 						<?php echo $item[0]; ?>
 					<?php endif;
@@ -57,7 +58,7 @@
 			<?php endif; ?>
 			<?php if ($displayData->displayFilters) : ?>
 			<div class="filter-select hidden-sm-down">
-				<h4 class="page-header"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></h4>
+				<h4 class="page-header"><?php echo Text::_('JSEARCH_FILTER_LABEL'); ?></h4>
 				<?php foreach ($displayData->filters as $filter) : ?>
 					<label for="<?php echo $filter['name']; ?>" class="sr-only"><?php echo $filter['label']; ?></label>
 					<select name="<?php echo $filter['name']; ?>" id="<?php echo $filter['name']; ?>" class="custom-select" onchange="this.form.submit()">
diff --git a/layouts/joomla/system/message.php b/layouts/joomla/system/message.php
index 3ca64d960f4b1..c8aa720f2e9f4 100644
--- a/layouts/joomla/system/message.php
+++ b/layouts/joomla/system/message.php
@@ -9,17 +9,20 @@
 
 defined('JPATH_BASE') or die;
 
+use Joomla\CMS\Application\CMSApplication;
+use Joomla\CMS\Language\Text;
+
 $msgList = $displayData['msgList'];
 
 $alert = [
-	JApplicationCms::MSG_EMERGENCY => 'danger',
-	JApplicationCms::MSG_ALERT     => 'danger',
-	JApplicationCms::MSG_CRITICAL  => 'danger',
-	JApplicationCms::MSG_ERROR     => 'danger',
-	JApplicationCms::MSG_WARNING   => 'warning',
-	JApplicationCms::MSG_NOTICE    => 'info',
-	JApplicationCms::MSG_INFO      => 'info',
-	JApplicationCms::MSG_DEBUG     => 'info',
+	CMSApplication::MSG_EMERGENCY => 'danger',
+	CMSApplication::MSG_ALERT     => 'danger',
+	CMSApplication::MSG_CRITICAL  => 'danger',
+	CMSApplication::MSG_ERROR     => 'danger',
+	CMSApplication::MSG_WARNING   => 'warning',
+	CMSApplication::MSG_NOTICE    => 'info',
+	CMSApplication::MSG_INFO      => 'info',
+	CMSApplication::MSG_DEBUG     => 'info',
 ];
 
 ?>
@@ -29,7 +32,7 @@
 			<?php foreach ($msgList as $type => $msgs) : ?>
 				<joomla-alert level="<?php echo $alert[$type] ?? $type; ?>" dismiss="true">
 					<?php if (!empty($msgs)) : ?>
-						<h4><?php echo JText::_($type); ?></h4>
+						<h4><?php echo Text::_($type); ?></h4>
 						<div>
 							<?php foreach ($msgs as $msg) : ?>
 								<div><?php echo $msg; ?></div>
@@ -40,4 +43,4 @@
 			<?php endforeach; ?>
 		<?php endif; ?>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/layouts/joomla/tinymce/buttons.php b/layouts/joomla/tinymce/buttons.php
deleted file mode 100644
index e35abcd168da0..0000000000000
--- a/layouts/joomla/tinymce/buttons.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * @package     Joomla.Site
- * @subpackage  Layout
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-defined('JPATH_BASE') or die;
-
-JLog::add('The layout joomla.tinymce.buttons is deprecated, use joomla.editors.buttons instead.', JLog::WARNING, 'deprecated');
-echo JLayoutHelper::render('joomla.editors.buttons', $displayData);
diff --git a/layouts/joomla/tinymce/buttons/button.php b/layouts/joomla/tinymce/buttons/button.php
deleted file mode 100644
index 9f697d72aab25..0000000000000
--- a/layouts/joomla/tinymce/buttons/button.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * @package     Joomla.Site
- * @subpackage  Layout
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-defined('JPATH_BASE') or die;
-
-JLog::add('The layout joomla.tinymce.buttons.button is deprecated, use joomla.editors.buttons.button instead.', JLog::WARNING, 'deprecated');
-echo JLayoutHelper::render('joomla.editors.buttons.button', $displayData);
diff --git a/layouts/joomla/tinymce/togglebutton.php b/layouts/joomla/tinymce/togglebutton.php
index 9a1b2eca0830c..59e266a9bcc4c 100644
--- a/layouts/joomla/tinymce/togglebutton.php
+++ b/layouts/joomla/tinymce/togglebutton.php
@@ -9,6 +9,8 @@
 
 defined('JPATH_BASE') or die;
 
+use Joomla\CMS\Language\Text;
+
 $name = $displayData;
 
 ?>
@@ -16,9 +18,10 @@
 	<div class="btn-group">
 		<a class="btn btn-secondary" href="#"
 			onclick="tinyMCE.execCommand('mceToggleEditor', false, '<?php echo $name; ?>');return false;"
-			title="<?php echo JText::_('PLG_TINY_BUTTON_TOGGLE_EDITOR'); ?>"
+			title="<?php echo Text::_('PLG_TINY_BUTTON_TOGGLE_EDITOR'); ?>"
 		>
-			<span class="icon-eye" aria-hidden="true"></span> <?php echo JText::_('PLG_TINY_BUTTON_TOGGLE_EDITOR'); ?>
+			<span class="icon-eye" aria-hidden="true"></span>
+			<?php echo Text::_('PLG_TINY_BUTTON_TOGGLE_EDITOR'); ?>
 		</a>
 	</div>
 </div>
\ No newline at end of file