diff --git a/modules/mod_articles_archive/tmpl/default.php b/modules/mod_articles_archive/tmpl/default.php
index a533e59366630..fad4079e24955 100644
--- a/modules/mod_articles_archive/tmpl/default.php
+++ b/modules/mod_articles_archive/tmpl/default.php
@@ -8,15 +8,16 @@
  */
 
 defined('_JEXEC') or die;
+
 ?>
 <?php if (!empty($list)) : ?>
 	<ul class="archive-module<?php echo $moduleclass_sfx; ?>">
-	<?php foreach ($list as $item) : ?>
-	<li>
-		<a href="<?php echo $item->link; ?>">
-			<?php echo $item->text; ?>
-		</a>
-	</li>
-	<?php endforeach; ?>
-</ul>
+		<?php foreach ($list as $item) : ?>
+			<li>
+				<a href="<?php echo $item->link; ?>">
+					<?php echo $item->text; ?>
+				</a>
+			</li>
+		<?php endforeach; ?>
+	</ul>
 <?php endif; ?>
diff --git a/modules/mod_articles_categories/tmpl/default.php b/modules/mod_articles_categories/tmpl/default.php
index b5ce9907833df..c62101b194b29 100644
--- a/modules/mod_articles_categories/tmpl/default.php
+++ b/modules/mod_articles_categories/tmpl/default.php
@@ -8,7 +8,8 @@
  */
 
 defined('_JEXEC') or die;
+
 ?>
 <ul class="categories-module<?php echo $moduleclass_sfx; ?>">
-<?php require JModuleHelper::getLayoutPath('mod_articles_categories', $params->get('layout', 'default') . '_items'); ?>
+	<?php require JModuleHelper::getLayoutPath('mod_articles_categories', $params->get('layout', 'default') . '_items'); ?>
 </ul>
diff --git a/modules/mod_articles_categories/tmpl/default_items.php b/modules/mod_articles_categories/tmpl/default_items.php
index fbae85902ef57..4561c452b6625 100644
--- a/modules/mod_articles_categories/tmpl/default_items.php
+++ b/modules/mod_articles_categories/tmpl/default_items.php
@@ -9,29 +9,30 @@
 
 defined('_JEXEC') or die;
 
-foreach ($list as $item) : ?>
-	<li <?php if ($_SERVER['REQUEST_URI'] === JRoute::_(ContentHelperRoute::getCategoryRoute($item->id))) echo ' class="active"'; ?>> <?php $levelup = $item->level - $startLevel - 1; ?>
+?>
+<?php foreach ($list as $item) : ?>
+	<li<?php if ($_SERVER['REQUEST_URI'] === JRoute::_(ContentHelperRoute::getCategoryRoute($item->id))) echo ' class="active"'; ?>>
+		<?php $levelup = $item->level - $startLevel - 1; ?>
 		<h<?php echo $params->get('item_heading') + $levelup; ?>>
-		<a href="<?php echo JRoute::_(ContentHelperRoute::getCategoryRoute($item->id)); ?>">
-		<?php echo $item->title; ?>
-			<?php if ($params->get('numitems')) : ?>
-				(<?php echo $item->numitems; ?>)
-			<?php endif; ?>
-		</a>
-   		</h<?php echo $params->get('item_heading') + $levelup; ?>>
-
+			<a href="<?php echo JRoute::_(ContentHelperRoute::getCategoryRoute($item->id)); ?>">
+				<?php echo $item->title; ?>
+				<?php if ($params->get('numitems')) : ?>
+					(<?php echo $item->numitems; ?>)
+				<?php endif; ?>
+			</a>
+		</h<?php echo $params->get('item_heading') + $levelup; ?>>
 		<?php if ($params->get('show_description', 0)) : ?>
 			<?php echo JHtml::_('content.prepare', $item->description, $item->getParams(), 'mod_articles_categories.content'); ?>
 		<?php endif; ?>
 		<?php if ($params->get('show_children', 0) && (($params->get('maxlevel', 0) == 0)
 			|| ($params->get('maxlevel') >= ($item->level - $startLevel)))
 			&& count($item->getChildren())) : ?>
-			<?php echo '<ul>'; ?>
-			<?php $temp = $list; ?>
-			<?php $list = $item->getChildren(); ?>
-			<?php require JModuleHelper::getLayoutPath('mod_articles_categories', $params->get('layout', 'default') . '_items'); ?>
-			<?php $list = $temp; ?>
-			<?php echo '</ul>'; ?>
+			<ul>
+				<?php $temp = $list; ?>
+				<?php $list = $item->getChildren(); ?>
+				<?php require JModuleHelper::getLayoutPath('mod_articles_categories', $params->get('layout', 'default') . '_items'); ?>
+				<?php $list = $temp; ?>
+			</ul>
 		<?php endif; ?>
 	</li>
 <?php endforeach; ?>
diff --git a/modules/mod_articles_category/tmpl/default.php b/modules/mod_articles_category/tmpl/default.php
index 27909e734de41..0a3b28b70bd6d 100644
--- a/modules/mod_articles_category/tmpl/default.php
+++ b/modules/mod_articles_category/tmpl/default.php
@@ -13,111 +13,105 @@
 <ul class="category-module<?php echo $moduleclass_sfx; ?>">
 	<?php if ($grouped) : ?>
 		<?php foreach ($list as $group_name => $group) : ?>
-		<li>
-			<div class="mod-articles-category-group"><?php echo $group_name; ?></div>
-			<ul>
-				<?php foreach ($group as $item) : ?>
-					<li>
-						<?php if ($params->get('link_titles') == 1) : ?>
-							<a class="mod-articles-category-title <?php echo $item->active; ?>" href="<?php echo $item->link; ?>">
-								<?php echo $item->title; ?>
-							</a>
-						<?php else : ?>
-							<?php echo $item->title; ?>
-						<?php endif; ?>
-
-						<?php if ($item->displayHits) : ?>
-							<span class="mod-articles-category-hits">
-								(<?php echo $item->displayHits; ?>)
-							</span>
-						<?php endif; ?>
-
-						<?php if ($params->get('show_author')) : ?>
-							<span class="mod-articles-category-writtenby">
-								<?php echo $item->displayAuthorName; ?>
-							</span>
-						<?php endif; ?>
-
-						<?php if ($item->displayCategoryTitle) : ?>
-							<span class="mod-articles-category-category">
-								(<?php echo $item->displayCategoryTitle; ?>)
-							</span>
-						<?php endif; ?>
-
-						<?php if ($item->displayDate) : ?>
-							<span class="mod-articles-category-date"><?php echo $item->displayDate; ?></span>
-						<?php endif; ?>
-
-						<?php if ($params->get('show_introtext')) : ?>
-							<p class="mod-articles-category-introtext">
-								<?php echo $item->displayIntrotext; ?>
-							</p>
-						<?php endif; ?>
-
-						<?php if ($params->get('show_readmore')) : ?>
-							<p class="mod-articles-category-readmore">
+			<li>
+				<div class="mod-articles-category-group">
+					<?php echo $group_name; ?>
+				</div>
+				<ul>
+					<?php foreach ($group as $item) : ?>
+						<li>
+							<?php if ($params->get('link_titles') == 1) : ?>
 								<a class="mod-articles-category-title <?php echo $item->active; ?>" href="<?php echo $item->link; ?>">
-									<?php if ($item->params->get('access-view') == false) : ?>
-										<?php echo JText::_('MOD_ARTICLES_CATEGORY_REGISTER_TO_READ_MORE'); ?>
-									<?php elseif ($readmore = $item->alternative_readmore) : ?>
-										<?php echo $readmore; ?>
-										<?php echo JHtml::_('string.truncate', $item->title, $params->get('readmore_limit')); ?>
+									<?php echo $item->title; ?>
+								</a>
+							<?php else : ?>
+								<?php echo $item->title; ?>
+							<?php endif; ?>
+							<?php if ($item->displayHits) : ?>
+								<span class="mod-articles-category-hits">
+									(<?php echo $item->displayHits; ?>)
+								</span>
+							<?php endif; ?>
+							<?php if ($params->get('show_author')) : ?>
+								<span class="mod-articles-category-writtenby">
+									<?php echo $item->displayAuthorName; ?>
+								</span>
+							<?php endif; ?>
+							<?php if ($item->displayCategoryTitle) : ?>
+								<span class="mod-articles-category-category">
+									(<?php echo $item->displayCategoryTitle; ?>)
+								</span>
+							<?php endif; ?>
+							<?php if ($item->displayDate) : ?>
+								<span class="mod-articles-category-date">
+									<?php echo $item->displayDate; ?>
+								</span>
+							<?php endif; ?>
+							<?php if ($params->get('show_introtext')) : ?>
+								<p class="mod-articles-category-introtext">
+									<?php echo $item->displayIntrotext; ?>
+								</p>
+							<?php endif; ?>
+							<?php if ($params->get('show_readmore')) : ?>
+								<p class="mod-articles-category-readmore">
+									<a class="mod-articles-category-title <?php echo $item->active; ?>" href="<?php echo $item->link; ?>">
+										<?php if ($item->params->get('access-view') == false) : ?>
+											<?php echo JText::_('MOD_ARTICLES_CATEGORY_REGISTER_TO_READ_MORE'); ?>
+										<?php elseif ($readmore = $item->alternative_readmore) : ?>
+											<?php echo $readmore; ?>
+											<?php echo JHtml::_('string.truncate', $item->title, $params->get('readmore_limit')); ?>
 											<?php if ($params->get('show_readmore_title', 0) != 0) : ?>
 												<?php echo JHtml::_('string.truncate', $this->item->title, $params->get('readmore_limit')); ?>
 											<?php endif; ?>
-									<?php elseif ($params->get('show_readmore_title', 0) == 0) : ?>
-										<?php echo JText::sprintf('MOD_ARTICLES_CATEGORY_READ_MORE_TITLE'); ?>
-									<?php else : ?>
-										<?php echo JText::_('MOD_ARTICLES_CATEGORY_READ_MORE'); ?>
-										<?php echo JHtml::_('string.truncate', $item->title, $params->get('readmore_limit')); ?>
-									<?php endif; ?>
-								</a>
-							</p>
-						<?php endif; ?>
-					</li>
-				<?php endforeach; ?>
-			</ul>
-		</li>
+										<?php elseif ($params->get('show_readmore_title', 0) == 0) : ?>
+											<?php echo JText::sprintf('MOD_ARTICLES_CATEGORY_READ_MORE_TITLE'); ?>
+										<?php else : ?>
+											<?php echo JText::_('MOD_ARTICLES_CATEGORY_READ_MORE'); ?>
+											<?php echo JHtml::_('string.truncate', $item->title, $params->get('readmore_limit')); ?>
+										<?php endif; ?>
+									</a>
+								</p>
+							<?php endif; ?>
+						</li>
+					<?php endforeach; ?>
+				</ul>
+			</li>
 		<?php endforeach; ?>
 	<?php else : ?>
 		<?php foreach ($list as $item) : ?>
 			<li>
 				<?php if ($params->get('link_titles') == 1) : ?>
-					<a class="mod-articles-category-title <?php echo $item->active; ?>" href="<?php echo $item->link; ?>"><?php echo $item->title; ?></a>
+					<a class="mod-articles-category-title <?php echo $item->active; ?>" href="<?php echo $item->link; ?>">
+						<?php echo $item->title; ?>
+					</a>
 				<?php else : ?>
 					<?php echo $item->title; ?>
 				<?php endif; ?>
-
 				<?php if ($item->displayHits) : ?>
 					<span class="mod-articles-category-hits">
 						(<?php echo $item->displayHits; ?>)
 					</span>
 				<?php endif; ?>
-
 				<?php if ($params->get('show_author')) : ?>
 					<span class="mod-articles-category-writtenby">
 						<?php echo $item->displayAuthorName; ?>
 					</span>
 				<?php endif; ?>
-
 				<?php if ($item->displayCategoryTitle) : ?>
 					<span class="mod-articles-category-category">
 						(<?php echo $item->displayCategoryTitle; ?>)
 					</span>
 				<?php endif; ?>
-
 				<?php if ($item->displayDate) : ?>
 					<span class="mod-articles-category-date">
 						<?php echo $item->displayDate; ?>
 					</span>
 				<?php endif; ?>
-
 				<?php if ($params->get('show_introtext')) : ?>
 					<p class="mod-articles-category-introtext">
 						<?php echo $item->displayIntrotext; ?>
 					</p>
 				<?php endif; ?>
-
 				<?php if ($params->get('show_readmore')) : ?>
 					<p class="mod-articles-category-readmore">
 						<a class="mod-articles-category-title <?php echo $item->active; ?>" href="<?php echo $item->link; ?>">
diff --git a/modules/mod_articles_latest/tmpl/default.php b/modules/mod_articles_latest/tmpl/default.php
index ed834b96b1db2..b6e8bfb2a3221 100644
--- a/modules/mod_articles_latest/tmpl/default.php
+++ b/modules/mod_articles_latest/tmpl/default.php
@@ -8,15 +8,16 @@
  */
 
 defined('_JEXEC') or die;
+
 ?>
 <ul class="latestnews<?php echo $moduleclass_sfx; ?>">
-<?php foreach ($list as $item) : ?>
-	<li itemscope itemtype="https://schema.org/Article">
-		<a href="<?php echo $item->link; ?>" itemprop="url">
-			<span itemprop="name">
-				<?php echo $item->title; ?>
-			</span>
-		</a>
-	</li>
-<?php endforeach; ?>
+	<?php foreach ($list as $item) : ?>
+		<li itemscope itemtype="https://schema.org/Article">
+			<a href="<?php echo $item->link; ?>" itemprop="url">
+				<span itemprop="name">
+					<?php echo $item->title; ?>
+				</span>
+			</a>
+		</li>
+	<?php endforeach; ?>
 </ul>
diff --git a/modules/mod_articles_news/tmpl/_item.php b/modules/mod_articles_news/tmpl/_item.php
index c5101cfddbe55..8701e8020976c 100644
--- a/modules/mod_articles_news/tmpl/_item.php
+++ b/modules/mod_articles_news/tmpl/_item.php
@@ -10,9 +10,9 @@
 defined('_JEXEC') or die;
 
 $item_heading = $params->get('item_heading', 'h4');
+
 ?>
 <?php if ($params->get('item_title')) : ?>
-
 	<<?php echo $item_heading; ?> class="newsflash-title<?php echo $params->get('moduleclass_sfx'); ?>">
 	<?php if ($item->link !== '' && $params->get('link_titles')) : ?>
 		<a href="<?php echo $item->link; ?>">
@@ -22,21 +22,17 @@
 		<?php echo $item->title; ?>
 	<?php endif; ?>
 	</<?php echo $item_heading; ?>>
-
 <?php endif; ?>
-
 <?php if (!$params->get('intro_only')) : ?>
 	<?php echo $item->afterDisplayTitle; ?>
 <?php endif; ?>
-
 <?php echo $item->beforeDisplayContent; ?>
-
 <?php if ($params->get('show_introtext', '1')) : ?>
 	<?php echo $item->introtext; ?>
 <?php endif; ?>
-
 <?php echo $item->afterDisplayContent; ?>
-
 <?php if (isset($item->link) && $item->readmore != 0 && $params->get('readmore')) : ?>
-	<?php echo '<a class="readmore" href="' . $item->link . '">' . $item->linkText . '</a>'; ?>
+	<a class="readmore" href="<?php echo $item->link; ?>">
+		<?php echo $item->linkText; ?>
+	</a>
 <?php endif; ?>
diff --git a/modules/mod_articles_news/tmpl/default.php b/modules/mod_articles_news/tmpl/default.php
index 5cb29b093b965..0d4173ff4b0c4 100644
--- a/modules/mod_articles_news/tmpl/default.php
+++ b/modules/mod_articles_news/tmpl/default.php
@@ -8,6 +8,7 @@
  */
 
 defined('_JEXEC') or die;
+
 ?>
 <div class="newsflash<?php echo $moduleclass_sfx; ?>">
 	<?php foreach ($list as $item) : ?>
diff --git a/modules/mod_articles_news/tmpl/horizontal.php b/modules/mod_articles_news/tmpl/horizontal.php
index 475f75b3e9c82..86cf4014eeb08 100644
--- a/modules/mod_articles_news/tmpl/horizontal.php
+++ b/modules/mod_articles_news/tmpl/horizontal.php
@@ -8,13 +8,13 @@
  */
 
 defined('_JEXEC') or die;
+
 ?>
 <ul class="newsflash-horiz<?php echo $params->get('moduleclass_sfx'); ?>">
 	<?php for ($i = 0, $n = count($list); $i < $n; $i ++) : ?>
 		<?php $item = $list[$i]; ?>
 		<li>
 			<?php require JModuleHelper::getLayoutPath('mod_articles_news', '_item'); ?>
-
 			<?php if ($n > 1 && (($i < $n - 1) || $params->get('showLastSeparator'))) : ?>
 				<span class="article-separator">&#160;</span>
 			<?php endif; ?>
diff --git a/modules/mod_articles_news/tmpl/vertical.php b/modules/mod_articles_news/tmpl/vertical.php
index 1ec2600a7bf88..840cad44c8d96 100644
--- a/modules/mod_articles_news/tmpl/vertical.php
+++ b/modules/mod_articles_news/tmpl/vertical.php
@@ -8,13 +8,13 @@
  */
 
 defined('_JEXEC') or die;
+
 ?>
 <ul class="newsflash-vert<?php echo $params->get('moduleclass_sfx'); ?>">
 	<?php for ($i = 0, $n = count($list); $i < $n; $i ++) : ?>
 		<?php $item = $list[$i]; ?>
 		<li class="newsflash-item">
 			<?php require JModuleHelper::getLayoutPath('mod_articles_news', '_item'); ?>
-
 			<?php if ($n > 1 && (($i < $n - 1) || $params->get('showLastSeparator'))) : ?>
 				<span class="article-separator">&#160;</span>
 			<?php endif; ?>
diff --git a/modules/mod_articles_popular/tmpl/default.php b/modules/mod_articles_popular/tmpl/default.php
index 8ba8075b98346..2ca9b289844cb 100644
--- a/modules/mod_articles_popular/tmpl/default.php
+++ b/modules/mod_articles_popular/tmpl/default.php
@@ -8,15 +8,16 @@
  */
 
 defined('_JEXEC') or die;
+
 ?>
 <ul class="mostread<?php echo $moduleclass_sfx; ?>">
-<?php foreach ($list as $item) : ?>
-	<li itemscope itemtype="https://schema.org/Article">
-		<a href="<?php echo $item->link; ?>" itemprop="url">
-			<span itemprop="name">
-				<?php echo $item->title; ?>
-			</span>
-		</a>
-	</li>
-<?php endforeach; ?>
+	<?php foreach ($list as $item) : ?>
+		<li itemscope itemtype="https://schema.org/Article">
+			<a href="<?php echo $item->link; ?>" itemprop="url">
+				<span itemprop="name">
+					<?php echo $item->title; ?>
+				</span>
+			</a>
+		</li>
+	<?php endforeach; ?>
 </ul>
diff --git a/modules/mod_banners/tmpl/default.php b/modules/mod_banners/tmpl/default.php
index a87cc1b856e00..4d40d3815df89 100644
--- a/modules/mod_banners/tmpl/default.php
+++ b/modules/mod_banners/tmpl/default.php
@@ -10,105 +10,104 @@
 defined('_JEXEC') or die;
 
 JLoader::register('BannerHelper', JPATH_ROOT . '/components/com_banners/helpers/banner.php');
+
 ?>
 <div class="bannergroup<?php echo $moduleclass_sfx; ?>">
-<?php if ($headerText) : ?>
-	<?php echo $headerText; ?>
-<?php endif; ?>
-
-<?php foreach ($list as $item) : ?>
-	<div class="banneritem">
-		<?php $link = JRoute::_('index.php?option=com_banners&task=click&id=' . $item->id); ?>
-		<?php if ($item->type == 1) : ?>
-			<?php // Text based banners ?>
-			<?php echo str_replace(array('{CLICKURL}', '{NAME}'), array($link, $item->name), $item->custombannercode); ?>
-		<?php else : ?>
-			<?php $imageurl = $item->params->get('imageurl'); ?>
-			<?php $width = $item->params->get('width'); ?>
-			<?php $height = $item->params->get('height'); ?>
-			<?php if (BannerHelper::isImage($imageurl)) : ?>
-				<?php // Image based banner ?>
-				<?php $baseurl = strpos($imageurl, 'http') === 0 ? '' : JUri::base(); ?>
-				<?php $alt = $item->params->get('alt'); ?>
-				<?php $alt = $alt ?: $item->name; ?>
-				<?php $alt = $alt ?: JText::_('MOD_BANNERS_BANNER'); ?>
-				<?php if ($item->clickurl) : ?>
-					<?php // Wrap the banner in a link ?>
-					<?php $target = $params->get('target', 1); ?>
-					<?php if ($target == 1) : ?>
-						<?php // Open in a new window ?>
-						<a
-							href="<?php echo $link; ?>" target="_blank" rel="noopener noreferrer"
-							title="<?php echo htmlspecialchars($item->name, ENT_QUOTES, 'UTF-8'); ?>">
-							<img
-								src="<?php echo $baseurl . $imageurl; ?>"
-								alt="<?php echo $alt;?>"
-								<?php if (!empty($width)) echo ' width="' . $width . '"';?>
-								<?php if (!empty($height)) echo ' height="' . $height . '"';?>
-							/>
-						</a>
-					<?php elseif ($target == 2) : ?>
-						<?php // Open in a popup window ?>
-						<a
-							href="<?php echo $link; ?>" onclick="window.open(this.href, '',
-								'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=780,height=550');
-								return false"
-							title="<?php echo htmlspecialchars($item->name, ENT_QUOTES, 'UTF-8'); ?>">
-							<img
-								src="<?php echo $baseurl . $imageurl; ?>"
-								alt="<?php echo $alt;?>"
-								<?php if (!empty($width)) echo ' width="' . $width . '"';?>
-								<?php if (!empty($height)) echo ' height="' . $height . '"';?>
-							/>
-						</a>
+	<?php if ($headerText) : ?>
+		<?php echo $headerText; ?>
+	<?php endif; ?>
+	<?php foreach ($list as $item) : ?>
+		<div class="banneritem">
+			<?php $link = JRoute::_('index.php?option=com_banners&task=click&id=' . $item->id); ?>
+			<?php if ($item->type == 1) : ?>
+				<?php // Text based banners ?>
+				<?php echo str_replace(array('{CLICKURL}', '{NAME}'), array($link, $item->name), $item->custombannercode); ?>
+			<?php else : ?>
+				<?php $imageurl = $item->params->get('imageurl'); ?>
+				<?php $width = $item->params->get('width'); ?>
+				<?php $height = $item->params->get('height'); ?>
+				<?php if (BannerHelper::isImage($imageurl)) : ?>
+					<?php // Image based banner ?>
+					<?php $baseurl = strpos($imageurl, 'http') === 0 ? '' : JUri::base(); ?>
+					<?php $alt = $item->params->get('alt'); ?>
+					<?php $alt = $alt ?: $item->name; ?>
+					<?php $alt = $alt ?: JText::_('MOD_BANNERS_BANNER'); ?>
+					<?php if ($item->clickurl) : ?>
+						<?php // Wrap the banner in a link ?>
+						<?php $target = $params->get('target', 1); ?>
+						<?php if ($target == 1) : ?>
+							<?php // Open in a new window ?>
+							<a
+								href="<?php echo $link; ?>" target="_blank" rel="noopener noreferrer"
+								title="<?php echo htmlspecialchars($item->name, ENT_QUOTES, 'UTF-8'); ?>">
+								<img
+									src="<?php echo $baseurl . $imageurl; ?>"
+									alt="<?php echo $alt; ?>"
+									<?php if (!empty($width)) echo ' width="' . $width . '"'; ?>
+									<?php if (!empty($height)) echo ' height="' . $height . '"'; ?>
+								/>
+							</a>
+						<?php elseif ($target == 2) : ?>
+							<?php // Open in a popup window ?>
+							<a
+								href="<?php echo $link; ?>" onclick="window.open(this.href, '',
+									'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=780,height=550');
+									return false"
+								title="<?php echo htmlspecialchars($item->name, ENT_QUOTES, 'UTF-8'); ?>">
+								<img
+									src="<?php echo $baseurl . $imageurl; ?>"
+									alt="<?php echo $alt; ?>"
+									<?php if (!empty($width)) echo ' width="' . $width . '"'; ?>
+									<?php if (!empty($height)) echo ' height="' . $height . '"'; ?>
+								/>
+							</a>
+						<?php else : ?>
+							<?php // Open in parent window ?>
+							<a
+								href="<?php echo $link; ?>"
+								title="<?php echo htmlspecialchars($item->name, ENT_QUOTES, 'UTF-8'); ?>">
+								<img
+									src="<?php echo $baseurl . $imageurl; ?>"
+									alt="<?php echo $alt; ?>"
+									<?php if (!empty($width)) echo ' width="' . $width . '"'; ?>
+									<?php if (!empty($height)) echo ' height="' . $height . '"'; ?>
+								/>
+							</a>
+						<?php endif; ?>
 					<?php else : ?>
-						<?php // Open in parent window ?>
-						<a
-							href="<?php echo $link; ?>"
-							title="<?php echo htmlspecialchars($item->name, ENT_QUOTES, 'UTF-8'); ?>">
-							<img
-								src="<?php echo $baseurl . $imageurl; ?>"
-								alt="<?php echo $alt;?>"
-								<?php if (!empty($width)) echo ' width="' . $width . '"';?>
-								<?php if (!empty($height)) echo ' height="' . $height . '"';?>
-							/>
-						</a>
+						<?php // Just display the image if no link specified ?>
+						<img
+							src="<?php echo $baseurl . $imageurl; ?>"
+							alt="<?php echo $alt; ?>"
+							<?php if (!empty($width)) echo ' width="' . $width . '"'; ?>
+							<?php if (!empty($height)) echo ' height="' . $height . '"'; ?>
+						/>
 					<?php endif; ?>
-				<?php else : ?>
-					<?php // Just display the image if no link specified ?>
-					<img
-						src="<?php echo $baseurl . $imageurl; ?>"
-						alt="<?php echo $alt;?>"
-						<?php if (!empty($width)) echo ' width="' . $width . '"';?>
-						<?php if (!empty($height)) echo ' height="' . $height . '"';?>
-					/>
+				<?php elseif (BannerHelper::isFlash($imageurl)) : ?>
+					<object
+						classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
+						codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0"
+						<?php if (!empty($width)) echo ' width="' . $width . '"'; ?>
+						<?php if (!empty($height)) echo ' height="' . $height . '"'; ?>
+					>
+						<param name="movie" value="<?php echo $imageurl; ?>" />
+						<embed
+							src="<?php echo $imageurl; ?>"
+							loop="false"
+							pluginspage="http://www.macromedia.com/go/get/flashplayer"
+							type="application/x-shockwave-flash"
+							<?php if (!empty($width)) echo ' width="' . $width . '"'; ?>
+							<?php if (!empty($height)) echo ' height="' . $height . '"'; ?>
+						/>
+					</object>
 				<?php endif; ?>
-			<?php elseif (BannerHelper::isFlash($imageurl)) : ?>
-				<object
-					classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
-					codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0"
-					<?php if (!empty($width)) echo ' width="' . $width . '"';?>
-					<?php if (!empty($height)) echo ' height="' . $height . '"';?>
-				>
-					<param name="movie" value="<?php echo $imageurl; ?>" />
-					<embed
-						src="<?php echo $imageurl; ?>"
-						loop="false"
-						pluginspage="http://www.macromedia.com/go/get/flashplayer"
-						type="application/x-shockwave-flash"
-						<?php if (!empty($width)) echo ' width="' . $width . '"';?>
-						<?php if (!empty($height)) echo ' height="' . $height . '"';?>
-					/>
-				</object>
 			<?php endif; ?>
-		<?php endif; ?>
-		<div class="clr"></div>
-	</div>
-<?php endforeach; ?>
-
-<?php if ($footerText) : ?>
-	<div class="bannerfooter">
-		<?php echo $footerText; ?>
-	</div>
-<?php endif; ?>
+			<div class="clr"></div>
+		</div>
+	<?php endforeach; ?>
+	<?php if ($footerText) : ?>
+		<div class="bannerfooter">
+			<?php echo $footerText; ?>
+		</div>
+	<?php endif; ?>
 </div>
diff --git a/modules/mod_breadcrumbs/tmpl/default.php b/modules/mod_breadcrumbs/tmpl/default.php
index a2e9d5de126e8..488a90fc054ca 100644
--- a/modules/mod_breadcrumbs/tmpl/default.php
+++ b/modules/mod_breadcrumbs/tmpl/default.php
@@ -10,8 +10,8 @@
 defined('_JEXEC') or die;
 
 JHtml::_('bootstrap.tooltip');
-?>
 
+?>
 <ul itemscope itemtype="https://schema.org/BreadcrumbList" class="breadcrumb<?php echo $moduleclass_sfx; ?>">
 	<?php if ($params->get('showHere', 1)) : ?>
 		<li>
@@ -22,54 +22,50 @@
 			<span class="divider icon-location"></span>
 		</li>
 	<?php endif; ?>
-
-	<?php
-	// Get rid of duplicated entries on trail including home page when using multilanguage
-	for ($i = 0; $i < $count; $i++)
-	{
-		if ($i === 1 && !empty($list[$i]->link) && !empty($list[$i - 1]->link) && $list[$i]->link === $list[$i - 1]->link)
-		{
-			unset($list[$i]);
-		}
-	}
-
-	// Find last and penultimate items in breadcrumbs list
-	end($list);
-	$last_item_key   = key($list);
-	prev($list);
-	$penult_item_key = key($list);
-
-	// Make a link if not the last item in the breadcrumbs
-	$show_last = $params->get('showLast', 1);
-
-	// Generate the trail
-	foreach ($list as $key => $item) :
-		if ($key !== $last_item_key) :
-			// Render all but last item - along with separator ?>
+	<?php // Get rid of duplicated entries on trail including home page when using multilanguage ?>
+	<?php for ($i = 0; $i < $count; $i++) : ?>
+		<?php if ($i === 1 && !empty($list[$i]->link) && !empty($list[$i - 1]->link) && $list[$i]->link === $list[$i - 1]->link) : ?>
+			<?php unset($list[$i]); ?>
+		<?php endif; ?>
+	<?php endfor; ?>
+	<?php // Find last and penultimate items in breadcrumbs list ?>
+	<?php end($list); ?>
+	<?php $last_item_key = key($list); ?>
+	<?php prev($list); ?>
+	<?php $penult_item_key = key($list); ?>
+	<?php // Make a link if not the last item in the breadcrumbs ?>
+	<?php $show_last = $params->get('showLast', 1); ?>
+	<?php // Generate the trail ?>
+	<?php foreach ($list as $key => $item) : ?>
+		<?php if ($key !== $last_item_key) : ?>
+			<?php // Render all but last item - along with separator ?>
 			<li itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem">
 				<?php if (!empty($item->link)) : ?>
-					<a itemprop="item" href="<?php echo $item->link; ?>" class="pathway"><span itemprop="name"><?php echo $item->name; ?></span></a>
+					<a itemprop="item" href="<?php echo $item->link; ?>" class="pathway">
+						<span itemprop="name">
+							<?php echo $item->name; ?>
+						</span>
+					</a>
 				<?php else : ?>
 					<span itemprop="name">
 						<?php echo $item->name; ?>
 					</span>
 				<?php endif; ?>
-
 				<?php if (($key !== $penult_item_key) || $show_last) : ?>
 					<span class="divider">
 						<?php echo $separator; ?>
 					</span>
 				<?php endif; ?>
-				<meta itemprop="position" content="<?php echo $key + 1; ?>">
+				<meta itemprop="position" content="<?php echo $key + 1; ?>" />
 			</li>
-		<?php elseif ($show_last) :
-			// Render last item if reqd. ?>
+		<?php elseif ($show_last) : ?>
+			<?php // Render last item if reqd. ?>
 			<li itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem" class="active">
 				<span itemprop="name">
 					<?php echo $item->name; ?>
 				</span>
-				<meta itemprop="position" content="<?php echo $key + 1; ?>">
+				<meta itemprop="position" content="<?php echo $key + 1; ?>" />
 			</li>
-		<?php endif;
-	endforeach; ?>
+		<?php endif; ?>
+	<?php endforeach; ?>
 </ul>
diff --git a/modules/mod_custom/tmpl/default.php b/modules/mod_custom/tmpl/default.php
index 560cbec95a64c..1770fdf419b25 100644
--- a/modules/mod_custom/tmpl/default.php
+++ b/modules/mod_custom/tmpl/default.php
@@ -8,9 +8,8 @@
  */
 
 defined('_JEXEC') or die;
-?>
-
 
-<div class="custom<?php echo $moduleclass_sfx; ?>" <?php if ($params->get('backgroundimage')) : ?> style="background-image:url(<?php echo $params->get('backgroundimage'); ?>)"<?php endif; ?> >
+?>
+<div class="custom<?php echo $moduleclass_sfx; ?>" <?php if ($params->get('backgroundimage')) : ?> style="background-image:url(<?php echo $params->get('backgroundimage'); ?>)"<?php endif; ?>>
 	<?php echo $module->content; ?>
 </div>