diff --git a/administrator/includes/toolbar.php b/administrator/includes/toolbar.php
index 9b27e2a4b35da..a3817414be577 100644
--- a/administrator/includes/toolbar.php
+++ b/administrator/includes/toolbar.php
@@ -646,8 +646,8 @@ public static function versions($typeAlias, $itemId, $height = 800, $width = 500
 	public static function modal($targetModalId, $icon, $alt)
 	{
 		$title = JText::_($alt);
-		$dhtml = "<button data-toggle='modal' data-target='#" . $targetModalId . "' class='btn btn-small'>
-			<span class='" . $icon . "' title='" . $title . "'></span> " . $title . "</button>";
+		$dhtml = '<button data-toggle="modal" data-target="#' . $targetModalId . '" class="btn btn-small">
+			<span class="' . $icon . '" title="' . $title . '"></span> ' . $title . '</button>';
 
 		$bar = JToolbar::getInstance('toolbar');
 		$bar->appendButton('Custom', $dhtml, $alt);
diff --git a/administrator/modules/mod_feed/tmpl/default.php b/administrator/modules/mod_feed/tmpl/default.php
index d44cdcf419333..8cb87558db60c 100644
--- a/administrator/modules/mod_feed/tmpl/default.php
+++ b/administrator/modules/mod_feed/tmpl/default.php
@@ -17,35 +17,35 @@
 {
 	$lang      = JFactory::getLanguage();
 	$myrtl     = $params->get('rssrtl');
-	$direction = " ";
+	$direction = ' ';
 
 	if ($lang->isRtl() && $myrtl == 0)
 	{
-		$direction = " redirect-rtl";
+		$direction = ' redirect-rtl';
 	}
 
 	// Feed description
 	elseif ($lang->isRtl() && $myrtl == 1)
 	{
-		$direction = " redirect-ltr";
+		$direction = ' redirect-ltr';
 	}
 
 	elseif ($lang->isRtl() && $myrtl == 2)
 	{
-		$direction = " redirect-rtl";
+		$direction = ' redirect-rtl';
 	}
 
 	elseif ($myrtl == 0)
 	{
-		$direction = " redirect-ltr";
+		$direction = ' redirect-ltr';
 	}
 	elseif ($myrtl == 1)
 	{
-		$direction = " redirect-ltr";
+		$direction = ' redirect-ltr';
 	}
 	elseif ($myrtl == 2)
 	{
-		$direction = " redirect-rtl";
+		$direction = ' redirect-rtl';
 	}
 
 	if ($feed != false) :
diff --git a/administrator/modules/mod_latest/helper.php b/administrator/modules/mod_latest/helper.php
index 9dc0a0172b821..c0e25ac26e046 100644
--- a/administrator/modules/mod_latest/helper.php
+++ b/administrator/modules/mod_latest/helper.php
@@ -134,6 +134,6 @@ public static function getTitle($params)
 			$title = '';
 		}
 
-		return JText::plural('MOD_LATEST_TITLE' . $type . ($catid ? "_CATEGORY" : '') . ($who != '0' ? "_$who" : ''), (int) $params->get('count'), $title);
+		return JText::plural('MOD_LATEST_TITLE' . $type . ($catid ? '_CATEGORY' : '') . ($who != '0' ? "_$who" : ''), (int) $params->get('count'), $title);
 	}
 }
diff --git a/administrator/modules/mod_login/helper.php b/administrator/modules/mod_login/helper.php
index 8191d4922087a..80f818bfe8288 100644
--- a/administrator/modules/mod_login/helper.php
+++ b/administrator/modules/mod_login/helper.php
@@ -34,7 +34,7 @@ public static function getLanguageList()
 			$languages,
 			function ($a, $b)
 			{
-				return strcmp($a["value"], $b["value"]);
+				return strcmp($a['value'], $b['value']);
 			}
 		);
 
diff --git a/administrator/modules/mod_menu/menu.php b/administrator/modules/mod_menu/menu.php
index 0f4ce184550d1..a69056d1512bc 100644
--- a/administrator/modules/mod_menu/menu.php
+++ b/administrator/modules/mod_menu/menu.php
@@ -119,7 +119,7 @@ public function renderMenu($id = 'menu', $class = '')
 		// Recurse through children if they exist
 		while ($this->_current->hasChildren())
 		{
-			echo "<ul " . $id . " " . $class . ">\n";
+			echo '<ul ' . $id . ' ' . $class . ">\n";
 
 			foreach ($this->_current->getChildren() as $child)
 			{
@@ -177,7 +177,7 @@ public function renderLevel($depth)
 		}
 
 		// Print the item
-		echo "<li" . $class . ">";
+		echo '<li' . $class . '>';
 
 		// Print a link if it exists
 		$linkClass = array();
@@ -214,20 +214,20 @@ public function renderLevel($depth)
 
 		if ($this->_current->link != null && $this->_current->target != null)
 		{
-			echo "<a" . $linkClass . " " . $dataToggle . " href=\"" . $this->_current->link . "\" target=\"" . $this->_current->target . "\" >"
-				. $this->_current->title . $dropdownCaret . "</a>";
+			echo '<a' . $linkClass . ' ' . $dataToggle . ' href="' . $this->_current->link . '" target="' . $this->_current->target . '">'
+				. $this->_current->title . $dropdownCaret . '</a>';
 		}
 		elseif ($this->_current->link != null && $this->_current->target == null)
 		{
-			echo "<a" . $linkClass . " " . $dataToggle . " href=\"" . $this->_current->link . "\">" . $this->_current->title . $dropdownCaret . "</a>";
+			echo '<a' . $linkClass . ' ' . $dataToggle . ' href="' . $this->_current->link . '">' . $this->_current->title . $dropdownCaret . '</a>';
 		}
 		elseif ($this->_current->title != null)
 		{
-			echo "<a" . $linkClass . " " . $dataToggle . ">" . $this->_current->title . $dropdownCaret . "</a>";
+			echo '<a' . $linkClass . ' ' . $dataToggle . '>' . $this->_current->title . $dropdownCaret . '</a>';
 		}
 		else
 		{
-			echo "<span></span>";
+			echo '<span></span>';
 		}
 
 		// Recurse through children if they exist
diff --git a/administrator/modules/mod_popular/helper.php b/administrator/modules/mod_popular/helper.php
index 8591798606892..1eac75a1f3202 100644
--- a/administrator/modules/mod_popular/helper.php
+++ b/administrator/modules/mod_popular/helper.php
@@ -122,6 +122,6 @@ public static function getTitle($params)
 			$title = '';
 		}
 
-		return JText::plural('MOD_POPULAR_TITLE' . ($catid ? "_CATEGORY" : '') . ($who != '0' ? "_$who" : ''), (int) $params->get('count'), $title);
+		return JText::plural('MOD_POPULAR_TITLE' . ($catid ? '_CATEGORY' : '') . ($who != '0' ? "_$who" : ''), (int) $params->get('count'), $title);
 	}
 }
diff --git a/administrator/templates/hathor/cpanel.php b/administrator/templates/hathor/cpanel.php
index 152f6b2c8b3d4..1b6e026e433ce 100644
--- a/administrator/templates/hathor/cpanel.php
+++ b/administrator/templates/hathor/cpanel.php
@@ -89,7 +89,7 @@
 	<div id="header">
 		<!-- Site Title and Skip to Content -->
 		<div class="title-ua">
-			<h1 class="title"><?php echo $this->params->get('showSiteName') ? $app->get('sitename') . " " . JText::_('JADMINISTRATION') : JText::_('JADMINISTRATION'); ?></h1>
+			<h1 class="title"><?php echo $this->params->get('showSiteName') ? $app->get('sitename') . ' ' . JText::_('JADMINISTRATION') : JText::_('JADMINISTRATION'); ?></h1>
 			<div id="skiplinkholder"><p><a id="skiplink" href="#skiptarget"><?php echo JText::_('TPL_HATHOR_SKIP_TO_MAIN_CONTENT'); ?></a></p></div>
       	</div>
 	</div><!-- end header -->
diff --git a/administrator/templates/hathor/html/com_banners/tracks/default.php b/administrator/templates/hathor/html/com_banners/tracks/default.php
index 4fd208b58f02e..961e1c2871fbd 100644
--- a/administrator/templates/hathor/html/com_banners/tracks/default.php
+++ b/administrator/templates/hathor/html/com_banners/tracks/default.php
@@ -131,10 +131,10 @@
 				'height'      => '300px',
 				'footer'      => '<a class="btn" data-dismiss="modal" type="button"'
 						. ' onclick="jQuery(\'#downloadModal iframe\').contents().find(\'#closeBtn\').click();">'
-						. JText::_("COM_BANNERS_CANCEL") . '</a>'
+						. JText::_('COM_BANNERS_CANCEL') . '</a>'
 						. '<button class="btn btn-success" type="button"'
 						. ' onclick="jQuery(\'#downloadModal iframe\').contents().find(\'#exportBtn\').click();">'
-						. JText::_("COM_BANNERS_TRACKS_EXPORT") . '</button>',
+						. JText::_('COM_BANNERS_TRACKS_EXPORT') . '</button>',
 			)
 		); ?>
 
diff --git a/administrator/templates/hathor/html/com_finder/maps/default.php b/administrator/templates/hathor/html/com_finder/maps/default.php
index 94355167de024..602fbf06bb787 100644
--- a/administrator/templates/hathor/html/com_finder/maps/default.php
+++ b/administrator/templates/hathor/html/com_finder/maps/default.php
@@ -120,7 +120,7 @@
 				</td>
 				<td class="center btns">
 				<?php if ((int) $item->num_children === 0) : ?>
-					<span class="badge <?php if ($item->num_nodes > 0) echo "badge-info"; ?>"><?php echo $item->num_nodes; ?></span>
+					<span class="badge <?php if ($item->num_nodes > 0) echo 'badge-info'; ?>"><?php echo $item->num_nodes; ?></span>
 				<?php else : ?>
 					&nbsp;
 				<?php endif; ?>
diff --git a/administrator/templates/hathor/html/com_menus/menus/default.php b/administrator/templates/hathor/html/com_menus/menus/default.php
index 1fd85bb9753f6..53ef61b9dbeea 100644
--- a/administrator/templates/hathor/html/com_menus/menus/default.php
+++ b/administrator/templates/hathor/html/com_menus/menus/default.php
@@ -23,7 +23,7 @@
 $modMenuId = (int) $this->get('ModMenuId');
 
 $script = array();
-$script[] = "jQuery(document).ready(function() {";
+$script[] = 'jQuery(document).ready(function() {';
 
 foreach ($this->items as $item) :
 	if ($user->authorise('core.edit', 'com_menus')) :
@@ -39,7 +39,7 @@
 $script[] = '			window.parent.location.reload();';
 $script[] = '		},1000);';
 $script[] = '	});';
-$script[] = "});";
+$script[] = '});';
 
 JFactory::getDocument()->addScriptDeclaration(implode("\n", $script));
 ?>
@@ -162,10 +162,10 @@
 										'height' => '300px',
 										'width' => '800px',
 										'footer' => '<a class="btn" type="button" data-dismiss="modal" aria-hidden="true">'
-											. JText::_("JLIB_HTML_BEHAVIOR_CLOSE") . '</a>'
+											. JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>'
 											. '<button class="btn btn-success" data-dismiss="modal" aria-hidden="true" onclick="jQuery(\'#module'
 											. $module->id . 'Modal iframe\').contents().find(\'#saveBtn\').click();">'
-											. JText::_("JSAVE") . '</button>'
+											. JText::_('JSAVE') . '</button>'
 									)
 								); ?>
 						<?php endif; ?>
@@ -182,7 +182,7 @@
 								'height' => '500px',
 								'width' => '800px',
 								'footer' => '<a class="btn" type="button" data-dismiss="modal" aria-hidden="true">'
-									. JText::_("JLIB_HTML_BEHAVIOR_CLOSE") . '</a>'
+									. JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>'
 								)
 						); ?>
 					<?php endif; ?>
diff --git a/administrator/templates/hathor/html/com_postinstall/messages/default.php b/administrator/templates/hathor/html/com_postinstall/messages/default.php
index 75ed564ea3b7f..b5d93f1ac71ad 100644
--- a/administrator/templates/hathor/html/com_postinstall/messages/default.php
+++ b/administrator/templates/hathor/html/com_postinstall/messages/default.php
@@ -12,15 +12,17 @@
 $renderer       = JFactory::getDocument()->loadRenderer('module');
 $options        = array('style' => 'raw');
 $mod            = JModuleHelper::getModule('mod_feed');
-$param          = array("rssurl" => "https://www.joomla.org/announcements/release-news.feed?type=rss",
-						"rsstitle" => 0,
-						"rssdesc" => 0,
-						"rssimage" => 1,
-						"rssitems" => 5,
-						"rssitemdesc" => 1,
-						"word_count" => 200,
-						"cache" => 0,
-						"moduleclass_sfx" => ' list-striped');
+$param          = array(
+	'rssurl'          => 'https://www.joomla.org/announcements/release-news.feed?type=rss',
+	'rsstitle'        => 0,
+	'rssdesc'         => 0,
+	'rssimage'        => 1,
+	'rssitems'        => 5,
+	'rssitemdesc'     => 1,
+	'word_count'      => 200,
+	'cache'           => 0,
+	'moduleclass_sfx' => ' list-striped'
+);
 $params         = array('params' => json_encode($param));
 ?>
 
diff --git a/administrator/templates/hathor/html/com_templates/template/default.php b/administrator/templates/hathor/html/com_templates/template/default.php
index 490b4c2f9f4a9..1282d08e059d2 100644
--- a/administrator/templates/hathor/html/com_templates/template/default.php
+++ b/administrator/templates/hathor/html/com_templates/template/default.php
@@ -85,7 +85,7 @@ function clearCoords()
 			};
 		});");
 }
-JFactory::getDocument()->addStyleDeclaration("
+JFactory::getDocument()->addStyleDeclaration('
 	/* Styles for modals */
 	.selected{
 		background: #08c;
@@ -112,7 +112,7 @@ function clearCoords()
 	.tree-holder{
 		overflow-x: auto;
 	}
-");
+');
 if ($this->type == 'font')
 {
 	JFactory::getDocument()->addStyleDeclaration(
diff --git a/administrator/templates/hathor/html/com_templates/template/default_tree.php b/administrator/templates/hathor/html/com_templates/template/default_tree.php
index 7cb55f94160b3..e67483f537df1 100644
--- a/administrator/templates/hathor/html/com_templates/template/default_tree.php
+++ b/administrator/templates/hathor/html/com_templates/template/default_tree.php
@@ -31,16 +31,16 @@
 
 				if ($count == count($keyArray))
 				{
-					$class = "folder show";
+					$class = 'folder show';
 				}
 				else
 				{
-					$class = "folder";
+					$class = 'folder';
 				}
 			}
 			else
 			{
-				$class = "folder";
+				$class = 'folder';
 			}
 
 			?>
diff --git a/administrator/templates/hathor/html/modules.php b/administrator/templates/hathor/html/modules.php
index 8724c9427a70f..3112e486e0138 100644
--- a/administrator/templates/hathor/html/modules.php
+++ b/administrator/templates/hathor/html/modules.php
@@ -38,7 +38,7 @@ function modChrome_xhtmlid($module, &$params, &$attribs)
 
 		</div>
 		<?php
-	} elseif ($attribs['id'] == "submenu-box")
+	} elseif ($attribs['id'] == 'submenu-box')
 	{
 		?>
 		<div id="no-submenu"></div>
diff --git a/administrator/templates/hathor/html/pagination.php b/administrator/templates/hathor/html/pagination.php
index e245d81adcbad..a8e630b2ac2a4 100644
--- a/administrator/templates/hathor/html/pagination.php
+++ b/administrator/templates/hathor/html/pagination.php
@@ -73,16 +73,16 @@ function pagination_list_footer($list)
 	$fixlimit = $list['limitfield'];
 	$fixlimit = preg_replace('/onchange="Joomla.submitform\(\);"/', '', $fixlimit);
 
-	$html = "<div class=\"containerpg\"><div class=\"pagination\">\n";
+	$html = '<div class="containerpg"><div class="pagination">';
 
-	$html .= "\n<div class=\"limit\"><label for=\"limit\">".JText::_('JGLOBAL_DISPLAY_NUM')." </label>";
-	$html .= "\n".$fixlimit;
-	$html .= "\n<button id=\"pagination-go\" type=\"button\" onclick=\"Joomla.submitform()\">" . JText::_('JSUBMIT') . "</button></div>";
+	$html .= '<div class="limit"><label for="limit">' . JText::_('JGLOBAL_DISPLAY_NUM') . ' </label>';
+	$html .= "\n" . $fixlimit;
+	$html .= "\n" . '<button id="pagination-go" type="button" onclick="Joomla.submitform()">' . JText::_('JSUBMIT') . '</button></div>';
 	$html .= "\n" . $list['pageslinks'];
-	$html .= "\n<div class=\"limit\">".$list['pagescounter']."</div>";
+	$html .= "\n" . '<div class="limit">' . $list['pagescounter'] . '</div>';
 
-	$html .= "\n<input type=\"hidden\" name=\"" . $list['prefix'] . "limitstart\" value=\"".$list['limitstart']."\" />";
-	$html .= "\n<div class=\"clr\"></div></div></div>";
+	$html .= "\n" . '<input type="hidden" name="' . $list['prefix'] . 'limitstart" value="' . $list['limitstart'] . '" />';
+	$html .= "\n" . '<div class="clr"></div></div></div>';
 
 	return $html;
 }
@@ -93,35 +93,35 @@ function pagination_list_render($list)
 
 	if ($list['start']['active'])
 	{
-		$html .= "<div class=\"button2-right\"><div class=\"start\">".$list['start']['data']."</div></div>";
+		$html .= '<div class="button2-right"><div class="start">'. $list['start']['data']. '</div></div>';
 	} else {
-		$html .= "<div class=\"button2-right off\"><div class=\"start\">".$list['start']['data']."</div></div>";
+		$html .= '<div class="button2-right off"><div class="start">'. $list['start']['data']. '</div></div>';
 	}
 	if ($list['previous']['active'])
 	{
-		$html .= "<div class=\"button2-right\"><div class=\"prev\">".$list['previous']['data']."</div></div>";
+		$html .= '<div class="button2-right"><div class="prev">'. $list['previous']['data']. '</div></div>';
 	} else {
-		$html .= "<div class=\"button2-right off\"><div class=\"prev\">".$list['previous']['data']."</div></div>";
+		$html .= '<div class="button2-right off"><div class="prev">'. $list['previous']['data']. '</div></div>';
 	}
 
-	$html .= "\n<div class=\"button2-left\"><div class=\"page\">";
+	$html .= '<div class="button2-left"><div class="page">';
 	foreach ($list['pages'] as $page)
 	{
 		$html .= $page['data'];
 	}
-	$html .= "\n</div></div>";
+	$html .= '</div></div>';
 
 	if ($list['next']['active'])
 	{
-		$html .= "<div class=\"button2-left\"><div class=\"next\">".$list['next']['data']."</div></div>";
+		$html .= '<div class="button2-left"><div class="next">'. $list['next']['data']. '</div></div>';
 	} else {
-		$html .= "<div class=\"button2-left off\"><div class=\"next\">".$list['next']['data']."</div></div>";
+		$html .= '<div class="button2-left off"><div class="next">'. $list['next']['data']. '</div></div>';
 	}
 	if ($list['end']['active'])
 	{
-		$html .= "<div class=\"button2-left\"><div class=\"end\">".$list['end']['data']."</div></div>";
+		$html .= '<div class="button2-left"><div class="end">'. $list['end']['data']. '</div></div>';
 	} else {
-		$html .= "<div class=\"button2-left off\"><div class=\"end\">".$list['end']['data']."</div></div>";
+		$html .= '<div class="button2-left off"><div class="end">'. $list['end']['data']. '</div></div>';
 	}
 
 	return $html;
@@ -131,11 +131,11 @@ function pagination_item_active(&$item)
 {
 	if ($item->base > 0)
 	{
-		return "<a href=\"#\" title=\"".$item->text."\" onclick=\"document.adminForm." . $item->prefix . "limitstart.value=".$item->base."; Joomla.submitform();return false;\">".$item->text."</a>";
+		return '<a href="#" title="'.$item->text.'" onclick="document.adminForm.' . $item->prefix . 'limitstart.value=' .$item->base.'; Joomla.submitform();return false;">'.$item->text. '</a>';
 	}
 	else
 	{
-		return "<a href=\"#\" title=\"".$item->text."\" onclick=\"document.adminForm." . $item->prefix . "limitstart.value=0; Joomla.submitform();return false;\">".$item->text."</a>";
+		return '<a href="#" title="'.$item->text.'" onclick="document.adminForm.' . $item->prefix . 'limitstart.value=0; Joomla.submitform();return false;">'.$item->text. '</a>';
 	}
 }
 
diff --git a/administrator/templates/hathor/index.php b/administrator/templates/hathor/index.php
index b9471fcb7d07e..cb235f717942d 100644
--- a/administrator/templates/hathor/index.php
+++ b/administrator/templates/hathor/index.php
@@ -105,7 +105,7 @@
 	<div id="header">
 		<!-- Site Title and Skip to Content -->
 		<div class="title-ua">
-			<h1 class="title"><?php echo $this->params->get('showSiteName') ? $app->get('sitename') . " " . JText::_('JADMINISTRATION') : JText::_('JADMINISTRATION'); ?></h1>
+			<h1 class="title"><?php echo $this->params->get('showSiteName') ? $app->get('sitename') . ' ' . JText::_('JADMINISTRATION') : JText::_('JADMINISTRATION'); ?></h1>
 			<div id="skiplinkholder"><p><a id="skiplink" href="#skiptarget"><?php echo JText::_('TPL_HATHOR_SKIP_TO_MAIN_CONTENT'); ?></a></p></div>
 		</div>
 	</div><!-- end header -->
@@ -132,7 +132,7 @@
 			<?php if (!$app->input->getInt('hidemainmenu')) : ?>
 				<h3 class="element-invisible"><?php echo JText::_('TPL_HATHOR_SUB_MENU'); ?></h3>
 				<jdoc:include type="modules" name="submenu" style="xhtmlid" id="submenu-box" />
-				<?php echo " " ?>
+				<?php echo ' ' ?>
 			<?php else : ?>
 				<div id="no-submenu"></div>
 			<?php endif; ?>
diff --git a/administrator/templates/hathor/login.php b/administrator/templates/hathor/login.php
index 7e398d6473e8d..925f67aa8706d 100644
--- a/administrator/templates/hathor/login.php
+++ b/administrator/templates/hathor/login.php
@@ -55,7 +55,7 @@
 if ($this->direction === 'rtl')
 {
 	JHtml::_('stylesheet', 'template_rtl.css', array('version' => 'auto', 'relative' => true));
-	JHtml::_('stylesheet', 'colour_' . $colour . '_rtl.css', array('version' => 'auto', 'relative' => true));;
+	JHtml::_('stylesheet', 'colour_' . $colour . '_rtl.css', array('version' => 'auto', 'relative' => true));
 }
 
 // Load additional CSS styles for bold Text
@@ -93,7 +93,7 @@
 	<div id="containerwrap">
 		<!-- Header Logo -->
 		<div id="header">
-			<h1 class="title"><?php echo $this->params->get('showSiteName') ? $app->get('sitename') . " " . JText::_('JADMINISTRATION') : JText::_('JADMINISTRATION'); ?></h1>
+			<h1 class="title"><?php echo $this->params->get('showSiteName') ? $app->get('sitename') . ' ' . JText::_('JADMINISTRATION') : JText::_('JADMINISTRATION'); ?></h1>
 		</div><!-- end header -->
 		<!-- Content Area -->
 		<div id="content">
diff --git a/administrator/templates/isis/error.php b/administrator/templates/isis/error.php
index 636378de65e08..32b178c50ea1c 100644
--- a/administrator/templates/isis/error.php
+++ b/administrator/templates/isis/error.php
@@ -122,7 +122,7 @@
 	<script src="<?php echo $this->baseurl; ?>/templates/<?php echo $this->template; ?>/js/template.js"></script>
 	<!--[if lt IE 9]><script src="<?php echo JUri::root(true); ?>/media/jui/js/html5.js"></script><![endif]-->
 </head>
-<body class="admin <?php echo $option . " view-" . $view . " layout-" . $layout . " task-" . $task . " ";?>" data-spy="scroll" data-target=".subhead" data-offset="87">
+<body class="admin <?php echo $option . ' view-' . $view . ' layout-' . $layout . ' task-' . $task;?>" data-spy="scroll" data-target=".subhead" data-offset="87">
 	<!-- Top Navigation -->
 	<nav class="navbar navbar-inverse navbar-fixed-top">
 		<div class="navbar-inner">
diff --git a/administrator/templates/isis/html/layouts/joomla/form/field/media.php b/administrator/templates/isis/html/layouts/joomla/form/field/media.php
index ad287a6bbb724..cb62e95ba3212 100644
--- a/administrator/templates/isis/html/layouts/joomla/form/field/media.php
+++ b/administrator/templates/isis/html/layouts/joomla/form/field/media.php
@@ -130,8 +130,8 @@
 		<?php endif; ?>
 		<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) : ?>
-			<a class="btn add-on button-select"><?php echo JText::_("JLIB_FORM_BUTTON_SELECT"); ?></a>
-			<a class="btn icon-remove hasTooltip add-on button-clear" title="<?php echo JText::_("JLIB_FORM_BUTTON_CLEAR"); ?>"></a>
+			<a class="btn add-on button-select"><?php echo JText::_('JLIB_FORM_BUTTON_SELECT'); ?></a>
+			<a class="btn icon-remove hasTooltip add-on button-clear" title="<?php echo JText::_('JLIB_FORM_BUTTON_CLEAR'); ?>"></a>
 		<?php endif; ?>
 	</div>
 	<?php if ($showPreview && !$showAsTooltip) : ?>
diff --git a/administrator/templates/isis/html/layouts/joomla/pagination/link.php b/administrator/templates/isis/html/layouts/joomla/pagination/link.php
index 00563c1eed62f..39d539d996248 100644
--- a/administrator/templates/isis/html/layouts/joomla/pagination/link.php
+++ b/administrator/templates/isis/html/layouts/joomla/pagination/link.php
@@ -29,23 +29,23 @@
 {
 	// Check for "Start" item
 	case JText::_('JLIB_HTML_START') :
-		$icon = "icon-backward icon-first";
+		$icon = 'icon-backward icon-first';
 		break;
 
 	// Check for "Prev" item
 	case JText::_('JPREV') :
 		$item->text = JText::_('JPREVIOUS');
-		$icon = "icon-step-backward icon-previous";
+		$icon = 'icon-step-backward icon-previous';
 		break;
 
 	// Check for "Next" item
 	case JText::_('JNEXT') :
-		$icon = "icon-step-forward icon-next";
+		$icon = 'icon-step-forward icon-next';
 		break;
 
 	// Check for "End" item
 	case JText::_('JLIB_HTML_END') :
-		$icon = "icon-forward icon-last";
+		$icon = 'icon-forward icon-last';
 		break;
 
 	default:
diff --git a/administrator/templates/isis/html/layouts/joomla/toolbar/versions.php b/administrator/templates/isis/html/layouts/joomla/toolbar/versions.php
index 8f081f8c528a7..67233bd098c92 100644
--- a/administrator/templates/isis/html/layouts/joomla/toolbar/versions.php
+++ b/administrator/templates/isis/html/layouts/joomla/toolbar/versions.php
@@ -33,7 +33,7 @@
 		'height' => '300px',
 		'width'  => '800px',
 		'footer' => '<a class="btn" type="button" data-dismiss="modal" aria-hidden="true">'
-			. JText::_("JTOOLBAR_CLOSE") . '</a>'
+			. JText::_('JTOOLBAR_CLOSE') . '</a>'
 	)
 );
 ?>
diff --git a/administrator/templates/isis/html/mod_version/default.php b/administrator/templates/isis/html/mod_version/default.php
index bc6b425ce73f4..df17ae5914340 100644
--- a/administrator/templates/isis/html/mod_version/default.php
+++ b/administrator/templates/isis/html/mod_version/default.php
@@ -11,5 +11,5 @@
 ?>
 <?php if (!empty($version)) : ?>
 	<?php echo $version; ?>
-	<?php echo "&nbsp;&mdash;&nbsp;"; ?>
+	<?php echo '&nbsp;&mdash;&nbsp;'; ?>
 <?php endif; ?>
diff --git a/administrator/templates/isis/html/modules.php b/administrator/templates/isis/html/modules.php
index acc8b03a08c58..165c317cb5bee 100644
--- a/administrator/templates/isis/html/modules.php
+++ b/administrator/templates/isis/html/modules.php
@@ -30,7 +30,7 @@ function modChrome_title($module, &$params, &$attribs)
 {
 	if ($module->content)
 	{
-		echo "<div class=\"module-title\"><h6>" . $module->title . "</h6></div>";
+		echo '<div class="module-title"><h6>' . $module->title . '</h6></div>';
 		echo $module->content;
 	}
 }
diff --git a/administrator/templates/isis/index.php b/administrator/templates/isis/index.php
index 277152a19a08b..b9baf563291cd 100644
--- a/administrator/templates/isis/index.php
+++ b/administrator/templates/isis/index.php
@@ -122,7 +122,7 @@ function colorIsLight($color)
 // Template color
 if ($navbar_color)
 {
-	$this->addStyleDeclaration("
+	$this->addStyleDeclaration('
 	.navbar-inner,
 	.navbar-inverse .navbar-inner,
 	.dropdown-menu li > a:hover,
@@ -132,37 +132,37 @@ function colorIsLight($color)
 	.navbar-inverse .nav li.dropdown.active > .dropdown-toggle,
 	.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle,
 	#status.status-top {
-		background: " . $navbar_color . ";
-	}");
+		background: ' . $navbar_color . ';
+	}');
 }
 
 // Template header color
 if ($header_color)
 {
-	$this->addStyleDeclaration("
+	$this->addStyleDeclaration('
 	.header {
-		background: " . $header_color . ";
-	}");
+		background: ' . $header_color . ';
+	}');
 }
 
 // Sidebar background color
 if ($this->params->get('sidebarColor'))
 {
-	$this->addStyleDeclaration("
+	$this->addStyleDeclaration('
 	.nav-list > .active > a,
 	.nav-list > .active > a:hover {
-		background: " . $this->params->get('sidebarColor') . ";
-	}");
+		background: ' . $this->params->get('sidebarColor') . ';
+	}');
 }
 
 // Link color
 if ($this->params->get('linkColor'))
 {
-	$this->addStyleDeclaration("
+	$this->addStyleDeclaration('
 	a,
 	.j-toggle-sidebar-button {
-		color: " . $this->params->get('linkColor') . ";
-	}");
+		color: ' . $this->params->get('linkColor') . ';
+	}');
 }
 ?>
 <!DOCTYPE html>
diff --git a/administrator/templates/isis/login.php b/administrator/templates/isis/login.php
index 749399f212716..86d95bc130f8c 100644
--- a/administrator/templates/isis/login.php
+++ b/administrator/templates/isis/login.php
@@ -65,14 +65,14 @@ function colorIsLight($color)
 // Background color
 if ($background_color)
 {
-	$this->addStyleDeclaration("
+	$this->addStyleDeclaration('
 	.view-login {
-		background-color: " . $background_color . ";
-	}");
+		background-color: ' . $background_color . ';
+	}');
 }
 
 // Responsive Styles
-$this->addStyleDeclaration("
+$this->addStyleDeclaration('
 	@media (max-width: 480px) {
 		.view-login .container {
 			margin-top: -170px;
@@ -81,12 +81,12 @@ function colorIsLight($color)
 			font-size: 13px;
 			padding: 4px 10px 4px;
 		}
-	}");
+	}');
 
 // Check if debug is on
 if (JPluginHelper::isEnabled('system', 'debug') && ($app->get('debug_lang', 0) || $app->get('debug', 0)))
 {
-	$this->addStyleDeclaration("
+	$this->addStyleDeclaration('
 	.view-login .container {
 		position: static;
 		margin-top: 20px;
@@ -95,7 +95,7 @@ function colorIsLight($color)
 	}
 	.view-login .navbar-fixed-bottom {
 		display: none;
-	}");
+	}');
 }
 ?>
 <!DOCTYPE html>
@@ -105,7 +105,7 @@ function colorIsLight($color)
 	<meta http-equiv="X-UA-Compatible" content="IE=edge" />
 	<jdoc:include type="head" />
 </head>
-<body class="site <?php echo $option . " view-" . $view . " layout-" . $layout . " task-" . $task . " itemid-" . $itemid . " "; ?>">
+<body class="site <?php echo $option . ' view-' . $view . ' layout-' . $layout . ' task-' . $task . ' itemid-' . $itemid . ' '; ?>">
 	<!-- Container -->
 	<div class="container">
 		<div id="content">