diff --git a/components/com_newsfeeds/views/categories/tmpl/default.php b/components/com_newsfeeds/views/categories/tmpl/default.php
index e1f7edb4d1bc4..0f6c60003c28a 100644
--- a/components/com_newsfeeds/views/categories/tmpl/default.php
+++ b/components/com_newsfeeds/views/categories/tmpl/default.php
@@ -22,10 +22,9 @@
 		});
 	});
 });");
+
 ?>
 <div class="categories-list<?php echo $this->pageclass_sfx; ?>">
-	<?php
-		echo JLayoutHelper::render('joomla.content.categories_default', $this);
-		echo $this->loadTemplate('items');
-	?>
+	<?php echo JLayoutHelper::render('joomla.content.categories_default', $this); ?>
+	<?php echo $this->loadTemplate('items'); ?>
 </div>
diff --git a/components/com_newsfeeds/views/categories/tmpl/default_items.php b/components/com_newsfeeds/views/categories/tmpl/default_items.php
index a4ca6cd46d97e..7166c1449ecfd 100644
--- a/components/com_newsfeeds/views/categories/tmpl/default_items.php
+++ b/components/com_newsfeeds/views/categories/tmpl/default_items.php
@@ -11,23 +11,21 @@
 
 JHtml::_('bootstrap.tooltip');
 
-$class = ' class="first"';
-if ($this->maxLevelcat != 0 && count($this->items[$this->parent->id]) > 0) :
 ?>
+<?php $class = ' class="first"'; ?>
+<?php if ($this->maxLevelcat != 0 && count($this->items[$this->parent->id]) > 0) : ?>
 	<?php foreach ($this->items[$this->parent->id] as $id => $item) : ?>
-		<?php
-		if ($this->params->get('show_empty_categories_cat') || $item->numitems || count($item->getChildren())) :
-			if (!isset($this->items[$this->parent->id][$id + 1]))
-			{
-				$class = ' class="last"';
-			}
-			?>
-			<div <?php echo $class; ?> >
-			<?php $class = ''; ?>
+		<?php if ($this->params->get('show_empty_categories_cat') || $item->numitems || count($item->getChildren())) : ?>
+			<?php if (!isset($this->items[$this->parent->id][$id + 1])) : ?>
+				<?php $class = ' class="last"'; ?>
+			<?php endif; ?>
+			<div<?php echo $class; ?>>
+				<?php $class = ''; ?>
 				<h3 class="page-header item-title">
-				<a href="<?php echo JRoute::_(NewsfeedsHelperRoute::getCategoryRoute($item->id, $item->language)); ?>">
-					<?php echo $this->escape($item->title); ?></a>
-					<?php if ($this->params->get('show_cat_items_cat') == 1) :?>
+					<a href="<?php echo JRoute::_(NewsfeedsHelperRoute::getCategoryRoute($item->id, $item->language)); ?>">
+						<?php echo $this->escape($item->title); ?>
+					</a>
+					<?php if ($this->params->get('show_cat_items_cat') == 1) : ?>
 						<span class="badge badge-info tip hasTooltip" title="<?php echo JHtml::_('tooltipText', 'COM_NEWSFEEDS_NUM_ITEMS'); ?>">
 							<?php echo JText::_('COM_NEWSFEEDS_NUM_ITEMS'); ?>&nbsp;
 							<?php echo $item->numitems; ?>
@@ -35,7 +33,9 @@
 					<?php endif; ?>
 					<?php if (count($item->getChildren()) > 0 && $this->maxLevelcat > 1) : ?>
 						<a id="category-btn-<?php echo $item->id; ?>" href="#category-<?php echo $item->id; ?>"
-							data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right"><span class="icon-plus"></span></a>
+							data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right">
+							<span class="icon-plus"></span>
+						</a>
 					<?php endif; ?>
 				</h3>
 				<?php if ($this->params->get('show_subcat_desc_cat') == 1) : ?>
@@ -45,17 +45,14 @@
 						</div>
 					<?php endif; ?>
 				<?php endif; ?>
-
 				<?php if (count($item->getChildren()) > 0 && $this->maxLevelcat > 1) : ?>
 					<div class="collapse fade" id="category-<?php echo $item->id; ?>">
-					<?php
-					$this->items[$item->id] = $item->getChildren();
-					$this->parent = $item;
-					$this->maxLevelcat--;
-					echo $this->loadTemplate('items');
-					$this->parent = $item->getParent();
-					$this->maxLevelcat++;
-					?>
+						<?php $this->items[$item->id] = $item->getChildren(); ?>
+						<?php $this->parent = $item; ?>
+						<?php $this->maxLevelcat--; ?>
+						<?php echo $this->loadTemplate('items'); ?>
+						<?php $this->parent = $item->getParent(); ?>
+						<?php $this->maxLevelcat++; ?>
 					</div>
 				<?php endif; ?>
 			</div>
diff --git a/components/com_newsfeeds/views/category/tmpl/default.php b/components/com_newsfeeds/views/category/tmpl/default.php
index 4e55395218831..cfbce91ba219c 100644
--- a/components/com_newsfeeds/views/category/tmpl/default.php
+++ b/components/com_newsfeeds/views/category/tmpl/default.php
@@ -14,6 +14,7 @@
 JHtml::_('formbehavior.chosen', 'select');
 
 $pageClass = $this->params->get('pageclass_sfx');
+
 ?>
 <div class="newsfeed-category<?php echo $this->pageclass_sfx; ?>">
 	<?php if ($this->params->get('show_page_heading')) : ?>
@@ -26,16 +27,14 @@
 			<?php echo JHtml::_('content.prepare', $this->category->title, '', 'com_newsfeeds.category.title'); ?>
 		</h2>
 	<?php endif; ?>
-
 	<?php if ($this->params->get('show_tags', 1) && !empty($this->category->tags->itemTags)) : ?>
 		<?php $this->category->tagLayout = new JLayoutFile('joomla.content.tags'); ?>
 		<?php echo $this->category->tagLayout->render($this->category->tags->itemTags); ?>
 	<?php endif; ?>
-
 	<?php if ($this->params->get('show_description', 1) || $this->params->def('show_description_image', 1)) : ?>
 		<div class="category-desc">
 			<?php if ($this->params->get('show_description_image') && $this->category->getParams()->get('image')) : ?>
-				<img src="<?php echo $this->category->getParams()->get('image'); ?>"/>
+				<img src="<?php echo $this->category->getParams()->get('image'); ?>" />
 			<?php endif; ?>
 			<?php if ($this->params->get('show_description') && $this->category->description) : ?>
 				<?php echo JHtml::_('content.prepare', $this->category->description, '', 'com_newsfeeds.category'); ?>
@@ -43,12 +42,12 @@
 			<div class="clr"></div>
 		</div>
 	<?php endif; ?>
-
 	<?php echo $this->loadTemplate('items'); ?>
-
 	<?php if ($this->maxLevel != 0 && !empty($this->children[$this->category->id])) : ?>
 		<div class="cat-children">
-			<h3><?php echo JText::_('JGLOBAL_SUBCATEGORIES'); ?></h3>
+			<h3>
+				<?php echo JText::_('JGLOBAL_SUBCATEGORIES'); ?>
+			</h3>
 			<?php echo $this->loadTemplate('children'); ?>
 		</div>
 	<?php endif; ?>
diff --git a/components/com_newsfeeds/views/category/tmpl/default_children.php b/components/com_newsfeeds/views/category/tmpl/default_children.php
index 686a3233d6032..f8bec6ef57fcf 100644
--- a/components/com_newsfeeds/views/category/tmpl/default_children.php
+++ b/components/com_newsfeeds/views/category/tmpl/default_children.php
@@ -9,49 +9,49 @@
 
 defined('_JEXEC') or die;
 
-$class = ' class="first"';
-if ($this->maxLevel != 0 && count($this->children[$this->category->id]) > 0) :
 ?>
-<ul>
-<?php foreach ($this->children[$this->category->id] as $id => $child) : ?>
-	<?php
-	if ($this->params->get('show_empty_categories') || $child->numitems || count($child->getChildren())) :
-	if (!isset($this->children[$this->category->id][$id + 1]))
-	{
-		$class = ' class="last"';
-	}
-	?>
-	<li<?php echo $class; ?>>
-		<?php $class = ''; ?>
-			<span class="item-title"><a href="<?php echo JRoute::_(NewsfeedsHelperRoute::getCategoryRoute($child->id)); ?>">
-				<?php echo $this->escape($child->title); ?></a>
-			</span>
-
-			<?php if ($this->params->get('show_subcat_desc') == 1) : ?>
-			<?php if ($child->description) : ?>
-				<div class="category-desc">
-					<?php echo JHtml::_('content.prepare', $child->description, '', 'com_newsfeeds.category'); ?>
-				</div>
+<?php $class = ' class="first"'; ?>
+<?php if ($this->maxLevel != 0 && count($this->children[$this->category->id]) > 0) : ?>
+	<ul>
+		<?php foreach ($this->children[$this->category->id] as $id => $child) : ?>
+			<?php if ($this->params->get('show_empty_categories') || $child->numitems || count($child->getChildren())) : ?>
+				<?php if (!isset($this->children[$this->category->id][$id + 1])) : ?>
+					<?php $class = ' class="last"'; ?>
+				<?php endif; ?>
+				<li<?php echo $class; ?>>
+					<?php $class = ''; ?>
+					<span class="item-title">
+						<a href="<?php echo JRoute::_(NewsfeedsHelperRoute::getCategoryRoute($child->id)); ?>">
+							<?php echo $this->escape($child->title); ?>
+						</a>
+					</span>
+					<?php if ($this->params->get('show_subcat_desc') == 1) : ?>
+						<?php if ($child->description) : ?>
+							<div class="category-desc">
+								<?php echo JHtml::_('content.prepare', $child->description, '', 'com_newsfeeds.category'); ?>
+							</div>
+						<?php endif; ?>
+					<?php endif; ?>
+					<?php if ($this->params->get('show_cat_items') == 1) : ?>
+						<dl class="newsfeed-count">
+							<dt>
+								<?php echo JText::_('COM_NEWSFEEDS_CAT_NUM'); ?>
+							</dt>
+							<dd>
+								<?php echo $child->numitems; ?>
+							</dd>
+						</dl>
+					<?php endif; ?>
+					<?php if (count($child->getChildren()) > 0) : ?>
+						<?php $this->children[$child->id] = $child->getChildren(); ?>
+						<?php $this->category = $child; ?>
+						<?php $this->maxLevel--; ?>
+						<?php echo $this->loadTemplate('children'); ?>
+						<?php $this->category = $child->getParent(); ?>
+						<?php $this->maxLevel++; ?>
+					<?php endif; ?>
+				</li>
 			<?php endif; ?>
-            <?php endif; ?>
-
-            <?php if ($this->params->get('show_cat_items') == 1) : ?>
-			<dl class="newsfeed-count"><dt>
-				<?php echo JText::_('COM_NEWSFEEDS_CAT_NUM'); ?></dt>
-				<dd><?php echo $child->numitems; ?></dd>
-			</dl>
-		<?php endif; ?>
-
-			<?php if (count($child->getChildren()) > 0) :
-				$this->children[$child->id] = $child->getChildren();
-				$this->category = $child;
-				$this->maxLevel--;
-				echo $this->loadTemplate('children');
-				$this->category = $child->getParent();
-				$this->maxLevel++;
-			endif; ?>
-		</li>
-	<?php endif; ?>
-	<?php endforeach; ?>
+		<?php endforeach; ?>
 	</ul>
 <?php endif;
diff --git a/components/com_newsfeeds/views/category/tmpl/default_items.php b/components/com_newsfeeds/views/category/tmpl/default_items.php
index 0dba52c6db763..e6a7cde7daca8 100644
--- a/components/com_newsfeeds/views/category/tmpl/default_items.php
+++ b/components/com_newsfeeds/views/category/tmpl/default_items.php
@@ -14,36 +14,39 @@
 $listDirn  = $this->escape($this->state->get('list.direction'));
 
 ?>
-
 <?php if (empty($this->items)) : ?>
 	<p><?php echo JText::_('COM_NEWSFEEDS_NO_ARTICLES'); ?></p>
 <?php else : ?>
-
-<form action="<?php echo htmlspecialchars(JUri::getInstance()->toString(), ENT_COMPAT, 'UTF-8'); ?>" method="post" name="adminForm" id="adminForm">
-	<?php if ($this->params->get('filter_field') !== 'hide' || $this->params->get('show_pagination_limit')) : ?>
-	<fieldset class="filters btn-toolbar">
-		<?php if ($this->params->get('filter_field') !== 'hide' && $this->params->get('filter_field') == '1') : ?>
-			<div class="btn-group">
-				<label class="filter-search-lbl element-invisible" for="filter-search"><span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span><?php echo JText::_('COM_NEWSFEEDS_FILTER_LABEL') . '&#160;'; ?></label>
-				<input type="text" name="filter-search" id="filter-search" value="<?php echo $this->escape($this->state->get('list.filter')); ?>" class="inputbox" onchange="document.adminForm.submit();" title="<?php echo JText::_('COM_NEWSFEEDS_FILTER_SEARCH_DESC'); ?>" placeholder="<?php echo JText::_('COM_NEWSFEEDS_FILTER_SEARCH_DESC'); ?>" />
-			</div>
-		<?php endif; ?>
-		<?php if ($this->params->get('show_pagination_limit')) : ?>
-			<div class="btn-group pull-right">
-				<label for="limit" class="element-invisible">
-					<?php echo JText::_('JGLOBAL_DISPLAY_NUM'); ?>
-				</label>
-				<?php echo $this->pagination->getLimitBox(); ?>
-			</div>
+	<form action="<?php echo htmlspecialchars(JUri::getInstance()->toString(), ENT_COMPAT, 'UTF-8'); ?>" method="post" name="adminForm" id="adminForm">
+		<?php if ($this->params->get('filter_field') !== 'hide' || $this->params->get('show_pagination_limit')) : ?>
+			<fieldset class="filters btn-toolbar">
+				<?php if ($this->params->get('filter_field') !== 'hide' && $this->params->get('filter_field') == '1') : ?>
+					<div class="btn-group">
+						<label class="filter-search-lbl element-invisible" for="filter-search">
+							<span class="label label-warning">
+								<?php echo JText::_('JUNPUBLISHED'); ?>
+							</span>
+							<?php echo JText::_('COM_NEWSFEEDS_FILTER_LABEL') . '&#160;'; ?>
+						</label>
+						<input type="text" name="filter-search" id="filter-search" value="<?php echo $this->escape($this->state->get('list.filter')); ?>" class="inputbox" onchange="document.adminForm.submit();" title="<?php echo JText::_('COM_NEWSFEEDS_FILTER_SEARCH_DESC'); ?>" placeholder="<?php echo JText::_('COM_NEWSFEEDS_FILTER_SEARCH_DESC'); ?>" />
+					</div>
+				<?php endif; ?>
+				<?php if ($this->params->get('show_pagination_limit')) : ?>
+					<div class="btn-group pull-right">
+						<label for="limit" class="element-invisible">
+							<?php echo JText::_('JGLOBAL_DISPLAY_NUM'); ?>
+						</label>
+						<?php echo $this->pagination->getLimitBox(); ?>
+					</div>
+				<?php endif; ?>
+			</fieldset>
 		<?php endif; ?>
-	</fieldset>
-	<?php endif; ?>
 		<ul class="category list-striped list-condensed">
 			<?php foreach ($this->items as $i => $item) : ?>
 				<?php if ($this->items[$i]->published == 0) : ?>
 					<li class="system-unpublished cat-list-row<?php echo $i % 2; ?>">
 				<?php else : ?>
-					<li class="cat-list-row<?php echo $i % 2; ?>" >
+					<li class="cat-list-row<?php echo $i % 2; ?>">
 				<?php endif; ?>
 				<?php if ($this->params->get('show_articles')) : ?>
 					<span class="list-hits badge badge-info pull-right">
@@ -53,27 +56,31 @@
 				<span class="list pull-left">
 					<div class="list-title">
 						<a href="<?php echo JRoute::_(NewsFeedsHelperRoute::getNewsfeedRoute($item->slug, $item->catid)); ?>">
-							<?php echo $item->name; ?></a>
+							<?php echo $item->name; ?>
+						</a>
 					</div>
 				</span>
 				<?php if ($this->items[$i]->published == 0) : ?>
-					<span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
+					<span class="label label-warning">
+						<?php echo JText::_('JUNPUBLISHED'); ?>
+					</span>
 				<?php endif; ?>
 				<br />
 				<?php if ($this->params->get('show_link')) : ?>
 					<?php $link = JStringPunycode::urlToUTF8($item->link); ?>
 					<span class="list pull-left">
-							<a href="<?php echo $item->link; ?>"><?php echo $link; ?></a>
+						<a href="<?php echo $item->link; ?>">
+							<?php echo $link; ?>
+						</a>
 					</span>
 					<br />
 				<?php endif; ?>
 				</li>
 			<?php endforeach; ?>
 		</ul>
-
 		<?php // Add pagination links ?>
 		<?php if (!empty($this->items)) : ?>
-			<?php if (($this->params->def('show_pagination', 2) == 1  || ($this->params->get('show_pagination') == 2)) && ($this->pagination->pagesTotal > 1)) : ?>
+			<?php if (($this->params->def('show_pagination', 2) == 1 || ($this->params->get('show_pagination') == 2)) && ($this->pagination->pagesTotal > 1)) : ?>
 				<div class="pagination">
 					<?php if ($this->params->def('show_pagination_results', 1)) : ?>
 						<p class="counter pull-right">
diff --git a/components/com_newsfeeds/views/newsfeed/tmpl/default.php b/components/com_newsfeeds/views/newsfeed/tmpl/default.php
index 9487bf58543ea..e5497efbe1657 100644
--- a/components/com_newsfeeds/views/newsfeed/tmpl/default.php
+++ b/components/com_newsfeeds/views/newsfeed/tmpl/default.php
@@ -9,137 +9,114 @@
 
 defined('_JEXEC') or die;
 
-if (!empty($this->msg))
-{
-	echo $this->msg;
-}
-else
-{
-	$lang      = JFactory::getLanguage();
-	$myrtl     = $this->newsfeed->rtl;
-	$direction = ' ';
-
-	$isRtl = $lang->isRtl();
-
-		if ($isRtl && $myrtl == 0)
-		{
-			$direction = ' redirect-rtl';
-		}
-		elseif ($isRtl && $myrtl == 1)
-		{
-			$direction = ' redirect-ltr';
-		}
-		elseif ($isRtl && $myrtl == 2)
-		{
-			$direction = ' redirect-rtl';
-		}
-		elseif ($myrtl == 0)
-		{
-			$direction = ' redirect-ltr';
-		}
-		elseif ($myrtl == 1)
-		{
-			$direction = ' redirect-ltr';
-		}
-		elseif ($myrtl == 2)
-		{
-			$direction = ' redirect-rtl';
-		}
-		$images = json_decode($this->item->images);
-	?>
-	<div class="newsfeed<?php echo $this->pageclass_sfx; ?><?php echo $direction; ?>">
-	<?php if ($this->params->get('display_num')) : ?>
-	<h1 class="<?php echo $direction; ?>">
-		<?php echo $this->escape($this->params->get('page_heading')); ?>
-	</h1>
+?>
+<?php if (!empty($this->msg)) : ?>
+	<?php echo $this->msg; ?>
+<?php else : ?>
+	<?php $lang      = JFactory::getLanguage(); ?>
+	<?php $myrtl     = $this->newsfeed->rtl; ?>
+	<?php $direction = ' '; ?>
+	<?php $isRtl     = $lang->isRtl(); ?>
+	<?php if ($isRtl && $myrtl == 0) : ?>
+		<?php $direction = ' redirect-rtl'; ?>
+	<?php elseif ($isRtl && $myrtl == 1) : ?>
+		<?php $direction = ' redirect-ltr'; ?>
+	<?php elseif ($isRtl && $myrtl == 2) : ?>
+		<?php $direction = ' redirect-rtl'; ?>
+	<?php elseif ($myrtl == 0) : ?>
+		<?php $direction = ' redirect-ltr'; ?>
+	<?php elseif ($myrtl == 1) : ?>
+		<?php $direction = ' redirect-ltr'; ?>
+	<?php elseif ($myrtl == 2) : ?>
+		<?php $direction = ' redirect-rtl'; ?>
 	<?php endif; ?>
-	<h2 class="<?php echo $direction; ?>">
-		<?php if ($this->item->published == 0) : ?>
-			<span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
+	<?php $images = json_decode($this->item->images); ?>
+	<div class="newsfeed<?php echo $this->pageclass_sfx; ?><?php echo $direction; ?>">
+		<?php if ($this->params->get('display_num')) : ?>
+			<h1 class="<?php echo $direction; ?>">
+				<?php echo $this->escape($this->params->get('page_heading')); ?>
+			</h1>
 		<?php endif; ?>
-		<a href="<?php echo $this->item->link; ?>" target="_blank">
-		<?php echo str_replace('&apos;', "'", $this->item->name); ?></a>
-	</h2>
-
-	<?php if ($this->params->get('show_tags', 1)) : ?>
-		<?php $this->item->tagLayout = new JLayoutFile('joomla.content.tags'); ?>
-		<?php echo $this->item->tagLayout->render($this->item->tags->itemTags); ?>
-	<?php endif; ?>
-
-	<!-- Show Images from Component -->
-	<?php if (isset($images->image_first) and !empty($images->image_first)) : ?>
-	<?php $imgfloat = empty($images->float_first) ? $this->params->get('float_first') : $images->float_first; ?>
-	<div class="img-intro-<?php echo htmlspecialchars($imgfloat, ENT_COMPAT, 'UTF-8'); ?>"> <img
-		<?php if ($images->image_first_caption) :
-			echo 'class="caption"' . ' title="' . htmlspecialchars($images->image_first_caption, ENT_COMPAT, 'UTF-8') . '"';
-		endif; ?>
-		src="<?php echo htmlspecialchars($images->image_first, ENT_COMPAT, 'UTF-8'); ?>" alt="<?php echo htmlspecialchars($images->image_first_alt, ENT_COMPAT, 'UTF-8'); ?>"/> </div>
-	<?php endif; ?>
-
-	<?php if (isset($images->image_second) and !empty($images->image_second)) : ?>
-	<?php $imgfloat = empty($images->float_second) ? $this->params->get('float_second') : $images->float_second; ?>
-	<div class="pull-<?php echo htmlspecialchars($imgfloat, ENT_COMPAT, 'UTF-8'); ?> item-image"> <img
-	<?php if ($images->image_second_caption) :
-		echo 'class="caption"' . ' title="' . htmlspecialchars($images->image_second_caption) . '"';
-	endif; ?>
-	src="<?php echo htmlspecialchars($images->image_second, ENT_COMPAT, 'UTF-8'); ?>" alt="<?php echo htmlspecialchars($images->image_second_alt, ENT_COMPAT, 'UTF-8'); ?>"/> </div>
-	<?php endif; ?>
-	<!-- Show Description from Component -->
-	<?php echo $this->item->description; ?>
-	<!-- Show Feed's Description -->
-
-	<?php if ($this->params->get('show_feed_description')) : ?>
-		<div class="feed-description">
-			<?php echo str_replace('&apos;', "'", $this->rssDoc->description); ?>
-		</div>
-	<?php endif; ?>
-
-	<!-- Show Image -->
-	<?php if (isset($this->rssDoc->image, $this->rssDoc->imagetitle) && $this->params->get('show_feed_image')) : ?>
-	<div>
-			<img src="<?php echo $this->rssDoc->image; ?>" alt="<?php echo $this->rssDoc->image->decription; ?>" />
-</div>
-<?php endif; ?>
-
-	<!-- Show items -->
-	<?php if (!empty($this->rssDoc[0])) { ?>
-	<ol>
-	<?php for ($i = 0; $i < $this->item->numarticles; $i++)
-	{
-		if (empty($this->rssDoc[$i]))
-		{
-			break;
-		}
-		?>
-		<?php
-			$uri   = !empty($this->rssDoc[$i]->guid) || $this->rssDoc[$i]->guid !== null ? trim($this->rssDoc[$i]->guid) : trim($this->rssDoc[$i]->uri);
-			$uri   = strpos($uri, 'http') !== 0 ? $this->item->link : $uri;
-			$text  = !empty($this->rssDoc[$i]->content) || $this->rssDoc[$i]->content !== null ? trim($this->rssDoc[$i]->content) : trim($this->rssDoc[$i]->description);
-			$title = trim($this->rssDoc[$i]->title);
-		?>
-			<li>
-				<?php if (!empty($uri)) : ?>
-					<h3 class="feed-link">
-					<a href="<?php echo htmlspecialchars($uri); ?>" target="_blank">
-					<?php echo $title; ?></a></h3>
-				<?php else : ?>
-					<h3 class="feed-link"><?php echo $title; ?></h3>
+		<h2 class="<?php echo $direction; ?>">
+			<?php if ($this->item->published == 0) : ?>
+				<span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
+			<?php endif; ?>
+			<a href="<?php echo $this->item->link; ?>" target="_blank">
+				<?php echo str_replace('&apos;', "'", $this->item->name); ?>
+			</a>
+		</h2>
+		<?php if ($this->params->get('show_tags', 1)) : ?>
+			<?php $this->item->tagLayout = new JLayoutFile('joomla.content.tags'); ?>
+			<?php echo $this->item->tagLayout->render($this->item->tags->itemTags); ?>
+		<?php endif; ?>
+		<!-- Show Images from Component -->
+		<?php if (isset($images->image_first) && !empty($images->image_first)) : ?>
+			<?php $imgfloat = empty($images->float_first) ? $this->params->get('float_first') : $images->float_first; ?>
+			<div class="img-intro-<?php echo htmlspecialchars($imgfloat, ENT_COMPAT, 'UTF-8'); ?>">
+				<img
+				<?php if ($images->image_first_caption) : ?>
+					<?php echo 'class="caption"' . ' title="' . htmlspecialchars($images->image_first_caption, ENT_COMPAT, 'UTF-8') . '"'; ?>
 				<?php endif; ?>
-
-				<?php if ($this->params->get('show_item_description') && !empty($text)) : ?>
-					<div class="feed-item-description">
-					<?php if ($this->params->get('show_feed_image', 0) == 0)
-					{
-						$text = JFilterOutput::stripImages($text);
-					}
-					$text = JHtml::_('string.truncate', $text, $this->params->get('feed_character_count'));
-						echo str_replace('&apos;', "'", $text);
-					?>
-					</div>
+				src="<?php echo htmlspecialchars($images->image_first, ENT_COMPAT, 'UTF-8'); ?>" alt="<?php echo htmlspecialchars($images->image_first_alt, ENT_COMPAT, 'UTF-8'); ?>" />
+			</div>
+		<?php endif; ?>
+		<?php if (isset($images->image_second) && !empty($images->image_second)) : ?>
+			<?php $imgfloat = empty($images->float_second) ? $this->params->get('float_second') : $images->float_second; ?>
+			<div class="pull-<?php echo htmlspecialchars($imgfloat, ENT_COMPAT, 'UTF-8'); ?> item-image">
+				<img
+				<?php if ($images->image_second_caption) : ?>
+					<?php echo 'class="caption"' . ' title="' . htmlspecialchars($images->image_second_caption) . '"'; ?>
 				<?php endif; ?>
-				</li>
-			<?php } ?>
+				src="<?php echo htmlspecialchars($images->image_second, ENT_COMPAT, 'UTF-8'); ?>" alt="<?php echo htmlspecialchars($images->image_second_alt, ENT_COMPAT, 'UTF-8'); ?>" />
+			</div>
+		<?php endif; ?>
+		<!-- Show Description from Component -->
+		<?php echo $this->item->description; ?>
+		<!-- Show Feed's Description -->
+		<?php if ($this->params->get('show_feed_description')) : ?>
+			<div class="feed-description">
+				<?php echo str_replace('&apos;', "'", $this->rssDoc->description); ?>
+			</div>
+		<?php endif; ?>
+		<!-- Show Image -->
+		<?php if (isset($this->rssDoc->image, $this->rssDoc->imagetitle) && $this->params->get('show_feed_image')) : ?>
+			<div>
+				<img src="<?php echo $this->rssDoc->image; ?>" alt="<?php echo $this->rssDoc->image->decription; ?>" />
+			</div>
+		<?php endif; ?>
+		<!-- Show items -->
+		<?php if (!empty($this->rssDoc[0])) : ?>
+			<ol>
+				<?php for ($i = 0; $i < $this->item->numarticles; $i++) : ?>
+					<?php if (empty($this->rssDoc[$i])) : ?>
+						<?php break; ?>
+					<?php endif; ?>
+					<?php $uri   = !empty($this->rssDoc[$i]->guid) || $this->rssDoc[$i]->guid !== null ? trim($this->rssDoc[$i]->guid) : trim($this->rssDoc[$i]->uri); ?>
+					<?php $uri   = strpos($uri, 'http') !== 0 ? $this->item->link : $uri; ?>
+					<?php $text  = !empty($this->rssDoc[$i]->content) || $this->rssDoc[$i]->content !== null ? trim($this->rssDoc[$i]->content) : trim($this->rssDoc[$i]->description); ?>
+					<?php $title = trim($this->rssDoc[$i]->title); ?>
+					<li>
+						<?php if (!empty($uri)) : ?>
+							<h3 class="feed-link">
+								<a href="<?php echo htmlspecialchars($uri); ?>" target="_blank">
+									<?php echo $title; ?>
+								</a>
+							</h3>
+						<?php else : ?>
+							<h3 class="feed-link"><?php echo $title; ?></h3>
+						<?php endif; ?>
+						<?php if ($this->params->get('show_item_description') && !empty($text)) : ?>
+							<div class="feed-item-description">
+								<?php if ($this->params->get('show_feed_image', 0) == 0) : ?>
+									<?php $text = JFilterOutput::stripImages($text); ?>
+								<?php endif; ?>
+								<?php $text = JHtml::_('string.truncate', $text, $this->params->get('feed_character_count')); ?>
+								<?php echo str_replace('&apos;', "'", $text); ?>
+							</div>
+						<?php endif; ?>
+					</li>
+				<?php endfor; ?>
 			</ol>
-		<?php } ?>
+		<?php endif; ?>
 	</div>
-<?php } ?>
+<?php endif; ?>