diff --git a/administrator/components/com_templates/Extension/TemplatesComponent.php b/administrator/components/com_templates/Extension/TemplatesComponent.php
new file mode 100644
index 0000000000000..3095e34d0bf30
--- /dev/null
+++ b/administrator/components/com_templates/Extension/TemplatesComponent.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Component\Templates\Administrator\Extension;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Extension\BootableExtensionInterface;
+use Joomla\CMS\Extension\MVCComponent;
+use Joomla\CMS\HTML\HTMLRegistryAwareTrait;
+use Joomla\Component\Templates\Administrator\Service\HTML\Templates;
+use Psr\Container\ContainerInterface;
+
+/**
+ * Component class for com_templates
+ *
+ * @since  4.0.0
+ */
+class TemplatesComponent extends MVCComponent implements BootableExtensionInterface
+{
+	use HTMLRegistryAwareTrait;
+
+	/**
+	 * Booting the extension. This is the function to set up the environment of the extension like
+	 * registering new class loaders, etc.
+	 *
+	 * If required, some initial set up can be done from services of the container, eg.
+	 * registering HTML services.
+	 *
+	 * @param   ContainerInterface  $container  The container
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0.0
+	 */
+	public function boot(ContainerInterface $container)
+	{
+		$this->getRegistry()->register('templates', new Templates);
+	}
+}
diff --git a/administrator/components/com_templates/helpers/html/templates.php b/administrator/components/com_templates/Service/HTML/Templates.php
similarity index 59%
rename from administrator/components/com_templates/helpers/html/templates.php
rename to administrator/components/com_templates/Service/HTML/Templates.php
index f3db2c3c9a866..3f5bf0924418b 100644
--- a/administrator/components/com_templates/helpers/html/templates.php
+++ b/administrator/components/com_templates/Service/HTML/Templates.php
@@ -7,16 +7,21 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\Component\Templates\Administrator\Service\HTML;
+
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Application\ApplicationHelper;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Uri\Uri;
 
 /**
- * JHtml helper class.
+ * Html helper class.
  *
  * @since  1.6
  */
-class JHtmlTemplates
+class Templates
 {
 	/**
 	 * Display the thumb for the template.
@@ -28,7 +33,7 @@ class JHtmlTemplates
 	 *
 	 * @since   1.6
 	 */
-	public static function thumb($template, $clientId = 0)
+	public function thumb($template, $clientId = 0)
 	{
 		$client = ApplicationHelper::getClientInfo($clientId);
 		$basePath = $client->path . '/templates/' . $template;
@@ -40,12 +45,12 @@ public static function thumb($template, $clientId = 0)
 		{
 			$clientPath = ($clientId == 0) ? '' : 'administrator/';
 			$thumb = $clientPath . 'templates/' . $template . '/template_thumbnail.png';
-			$html = JHtml::_('image', $thumb, JText::_('COM_TEMPLATES_PREVIEW'));
+			$html = HTMLHelper::_('image', $thumb, Text::_('COM_TEMPLATES_PREVIEW'));
 
 			if (file_exists($preview))
 			{
 				$html = '<a href="#' . $template . '-Modal" role="button" class="thumbnail float-left hasTooltip" data-toggle="modal" title="' .
-					JHtml::_('tooltipText', 'COM_TEMPLATES_CLICK_TO_ENLARGE') . '">' . $html . '</a>';
+					HTMLHelper::_('tooltipText', 'COM_TEMPLATES_CLICK_TO_ENLARGE') . '">' . $html . '</a>';
 			}
 		}
 
@@ -62,35 +67,32 @@ public static function thumb($template, $clientId = 0)
 	 *
 	 * @since   3.4
 	 */
-	public static function thumbModal($template, $clientId = 0)
+	public function thumbModal($template, $clientId = 0)
 	{
 		$client = ApplicationHelper::getClientInfo($clientId);
 		$basePath = $client->path . '/templates/' . $template;
-		$baseUrl = ($clientId == 0) ? JUri::root(true) : JUri::root(true) . '/administrator';
+		$baseUrl = ($clientId == 0) ? Uri::root(true) : Uri::root(true) . '/administrator';
 		$thumb = $basePath . '/template_thumbnail.png';
 		$preview = $basePath . '/template_preview.png';
 		$html = '';
 
-		if (file_exists($thumb))
+		if (file_exists($thumb) && file_exists($preview))
 		{
-			if (file_exists($preview))
-			{
-				$preview = $baseUrl . '/templates/' . $template . '/template_preview.png';
-				$footer = '<button type="button" class="btn btn-secondary" data-dismiss="modal" aria-hidden="true">'
-					. JText::_('JTOOLBAR_CLOSE') . '</button>';
+			$preview = $baseUrl . '/templates/' . $template . '/template_preview.png';
+			$footer = '<button type="button" class="btn btn-secondary" data-dismiss="modal" aria-hidden="true">'
+				. Text::_('JTOOLBAR_CLOSE') . '</button>';
 
-				$html .= JHtml::_(
-					'bootstrap.renderModal',
-					$template . '-Modal',
-					array(
-						'title'  => JText::_('COM_TEMPLATES_BUTTON_PREVIEW'),
-						'height' => '500px',
-						'width'  => '800px',
-						'footer' => $footer,
-					),
-					$body = '<div><img src="' . $preview . '" style="max-width:100%" alt="' . $template . '"></div>'
-				);
-			}
+			$html .= HTMLHelper::_(
+				'bootstrap.renderModal',
+				$template . '-Modal',
+				array(
+					'title'  => Text::_('COM_TEMPLATES_BUTTON_PREVIEW'),
+					'height' => '500px',
+					'width'  => '800px',
+					'footer' => $footer,
+				),
+				$body = '<div><img src="' . $preview . '" style="max-width:100%" alt="' . $template . '"></div>'
+			);
 		}
 
 		return $html;
diff --git a/administrator/components/com_templates/dispatcher.php b/administrator/components/com_templates/dispatcher.php
deleted file mode 100644
index 7623dc2676056..0000000000000
--- a/administrator/components/com_templates/dispatcher.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_templates
- *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-defined('_JEXEC') or die;
-
-\JLoader::register('TemplatesHelper', __DIR__ . '/helpers/templates.php');
-
-use Joomla\CMS\Dispatcher\Dispatcher;
-
-/**
- * Dispatcher class for com_templates
- *
- * @since  4.0.0
- */
-class TemplatesDispatcher extends Dispatcher
-{
-	/**
-	 * The extension namespace
-	 *
-	 * @var    string
-	 *
-	 * @since  4.0.0
-	 */
-	protected $namespace = 'Joomla\\Component\\Templates';
-}
diff --git a/administrator/components/com_templates/helpers/template.php b/administrator/components/com_templates/helpers/template.php
index c484036e436ee..685f31c45415f 100644
--- a/administrator/components/com_templates/helpers/template.php
+++ b/administrator/components/com_templates/helpers/template.php
@@ -12,7 +12,9 @@
 /**
  * Template Helper class.
  *
- * @since  3.2
+ * @since       3.2
+ *
+ * @deprecated  5.0 Use \Joomla\Component\Templates\Administrator\Helper\TemplateHelper instead
  */
 abstract class TemplateHelper extends \Joomla\Component\Templates\Administrator\Helper\TemplateHelper
 {
diff --git a/administrator/components/com_templates/helpers/templates.php b/administrator/components/com_templates/helpers/templates.php
index f9afa6bb57b47..45be20e5cf5e0 100644
--- a/administrator/components/com_templates/helpers/templates.php
+++ b/administrator/components/com_templates/helpers/templates.php
@@ -12,7 +12,9 @@
 /**
  * Templates component helper.
  *
- * @since  1.6
+ * @since       1.6
+ *
+ * @deprecated  5.0 Use \Joomla\Component\Templates\Administrator\Helper\TemplatesHelper instead
  */
 class TemplatesHelper extends \Joomla\Component\Templates\Administrator\Helper\TemplatesHelper
 {
diff --git a/administrator/components/com_templates/services/provider.php b/administrator/components/com_templates/services/provider.php
new file mode 100644
index 0000000000000..10513dcbf9963
--- /dev/null
+++ b/administrator/components/com_templates/services/provider.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Dispatcher\DispatcherFactoryInterface;
+use Joomla\CMS\Extension\ComponentInterface;
+use Joomla\CMS\Extension\MVCComponent;
+use Joomla\CMS\Extension\Service\Provider\DispatcherFactory;
+use Joomla\CMS\Extension\Service\Provider\MVCFactoryFactory;
+use Joomla\CMS\MVC\Factory\MVCFactoryFactoryInterface;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+
+/**
+ * The templates service provider.
+ *
+ * @since  4.0.0
+ */
+return new class implements ServiceProviderInterface
+{
+	/**
+	 * Registers the service provider with a DI container.
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0.0
+	 */
+	public function register(Container $container)
+	{
+		$container->registerServiceProvider(new MVCFactoryFactory('\\Joomla\\Component\\Templates'));
+		$container->registerServiceProvider(new DispatcherFactory('\\Joomla\\Component\\Templates'));
+
+		$container->set(
+			ComponentInterface::class,
+			function (Container $container)
+			{
+				$component = new MVCComponent($container->get(DispatcherFactoryInterface::class));
+
+				$component->setMvcFactoryFactory($container->get(MVCFactoryFactoryInterface::class));
+
+				return $component;
+			}
+		);
+	}
+};