diff --git a/system/htmly.php b/system/htmly.php
index 8da26c8..0a1ece5 100644
--- a/system/htmly.php
+++ b/system/htmly.php
@@ -67,17 +67,7 @@ get('/index', function () {
             'p' => $front,
             'static' => $front,
             'type' => 'is_frontpage',
-            'is_front' => true,
-            'is_blog' => '',
-            'is_category' => '',
-            'is_search' => '',
-            'is_archive' => '',
-            'is_type' => '',
-            'is_tag' => '',
-            'is_profile' => '',
-            'is_post' => '',
-            'is_page' => '',
-            'is_subpage' => '',
+            'is_front' => true
         ), $layout);
         
         
@@ -116,17 +106,7 @@ get('/index', function () {
                 'breadcrumb' => '',
                 'bodyclass' => 'no-posts',
                 'type' => 'is_frontpage',
-                'is_front' => true,
-                'is_blog' => '',
-                'is_category' => '',
-                'is_search' => '',
-                'is_archive' => '',
-                'is_type' => '',
-                'is_tag' => '',
-                'is_profile' => '',
-                'is_post' => '',
-                'is_page' => '',
-                'is_subpage' => '',
+                'is_front' => true
             ), $layout);
 
             die;
@@ -142,17 +122,7 @@ get('/index', function () {
             'breadcrumb' => '',
             'pagination' => has_pagination($total, $perpage, $page),
             'type' => 'is_frontpage',
-            'is_front' => true,
-            'is_blog' => '',
-            'is_category' => '',
-            'is_search' => '',
-            'is_archive' => '',
-            'is_type' => '',
-            'is_tag' => '',
-            'is_profile' => '',
-            'is_post' => '',
-            'is_page' => '',
-            'is_subpage' => '',
+            'is_front' => true
         ), $layout);
     
     }
@@ -284,17 +254,7 @@ get('/author/:name', function ($name) {
             'bodyclass' => 'in-profile author-' . $name,
             'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; ' . i18n('Profile_for') . ' ' . $author->name,
             'pagination' => has_pagination($total, $perpage, $page),
-            'is_front' => '',
-            'is_blog' => '',
-            'is_category' => '',
-            'is_search' => '',
-            'is_archive' => '',
-            'is_type' => '',
-            'is_tag' => '',
-            'is_profile' => true,
-            'is_post' => '',
-            'is_page' => '',
-            'is_subpage' => '',
+            'is_profile' => true
         ), $layout);
         die;
     }
@@ -312,17 +272,7 @@ get('/author/:name', function ($name) {
         'bodyclass' => 'in-profile author-' . $name,
         'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; ' . i18n('Profile_for') . ' ' . $author->name,
         'pagination' => has_pagination($total, $perpage, $page),
-        'is_front' => '',
-        'is_blog' => '',
-        'is_category' => '',
-        'is_search' => '',
-        'is_archive' => '',
-        'is_type' => '',
-        'is_tag' => '',
-        'is_profile' => true,
-        'is_post' => '',
-        'is_page' => '',
-        'is_subpage' => '',
+        'is_profile' => true
     ), $layout);
 });
 
@@ -1934,17 +1884,7 @@ get('/category/:category', function ($category) {
         'bodyclass' => 'in-category category-' . strtolower($category),
         'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; ' . $desc->title,
         'pagination' => has_pagination($total, $perpage, $page),
-        'is_front' => '',
-        'is_blog' => '',
-        'is_category' => true,
-        'is_search' => '',
-        'is_archive' => '',
-        'is_type' => '',
-        'is_tag' => '',
-        'is_profile' => '',
-        'is_post' => '',
-        'is_page' => '',
-        'is_subpage' => '',
+        'is_category' => true
     ), $layout);
 });
 
@@ -2160,17 +2100,7 @@ get('/type/:type', function ($type) {
         'bodyclass' => 'in-type type-' . strtolower($type),
         'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; ' . ucfirst($type),
         'pagination' => has_pagination($total, $perpage, $page),
-        'is_front' => '',
-        'is_blog' => '',
-        'is_category' => '',
-        'is_search' => '',
-        'is_archive' => '',
-        'is_type' => true,
-        'is_tag' => '',
-        'is_profile' => '',
-        'is_post' => '',
-        'is_page' => '',
-        'is_subpage' => '',
+        'is_type' => true
     ), $layout);
 });
 
@@ -2253,17 +2183,7 @@ get('/tag/:tag', function ($tag) {
         'bodyclass' => 'in-tag tag-' . strtolower($tag),
         'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; ' . i18n('Posts_tagged') . ' ' . tag_i18n($tag),
         'pagination' => has_pagination($total, $perpage, $page),
-        'is_front' => '',
-        'is_blog' => '',
-        'is_category' => '',
-        'is_search' => '',
-        'is_archive' => '',
-        'is_type' => '',
-        'is_tag' => true,
-        'is_profile' => '',
-        'is_post' => '',
-        'is_page' => '',
-        'is_subpage' => '',
+        'is_tag' => true
     ), $layout);
 });
 
@@ -2356,17 +2276,7 @@ get('/archive/:req', function ($req) {
         'bodyclass' => 'in-archive archive-' . strtolower($req),
         'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; ' . i18n('Archive_for') . ' ' . $timestamp,
         'pagination' => has_pagination($total, $perpage, $page),
-        'is_front' => '',
-        'is_blog' => '',
-        'is_category' => '',
-        'is_search' => '',
-        'is_archive' => true,
-        'is_type' => '',
-        'is_tag' => '',
-        'is_profile' => '',
-        'is_post' => '',
-        'is_page' => '',
-        'is_subpage' => '',
+        'is_archive' => true
     ), $layout);
 });
 
@@ -2463,17 +2373,7 @@ get('/search/:keyword', function ($keyword) {
         'bodyclass' => 'in-search search-' . strtolower($keyword),
         'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; ' . i18n('Search_results_for') . ' ' . $keyword,
         'pagination' => has_pagination($total, $perpage, $page),
-        'is_front' => '',
-        'is_blog' => '',
-        'is_category' => '',
-        'is_search' => true,
-        'is_archive' => '',
-        'is_type' => '',
-        'is_tag' => '',
-        'is_profile' => '',
-        'is_post' => '',
-        'is_page' => '',
-        'is_subpage' => '',
+        'is_search' => true
     ), $layout);
 });
 
@@ -2639,17 +2539,7 @@ get('/post/:name', function ($name) {
         'prev' => has_prev($prev),
         'next' => has_next($next),
         'type' => $var,
-        'is_front' => '',
-        'is_blog' => '',
-        'is_category' => '',
-        'is_search' => '',
-        'is_archive' => '',
-        'is_type' => '',
-        'is_tag' => '',
-        'is_profile' => '',
-        'is_post' => true,
-        'is_page' => '',
-        'is_subpage' => '',
+        'is_post' => true
     ), $layout);
 
 });
@@ -3075,17 +2965,7 @@ get('/:static', function ($static) {
             'bodyclass' => 'in-blog',
             'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; Blog',
             'pagination' => has_pagination($total, $perpage, $page),
-            'is_front' => '',
-            'is_blog' => true,
-            'is_category' => '',
-            'is_search' => '',
-            'is_archive' => '',
-            'is_type' => '',
-            'is_tag' => '',
-            'is_profile' => '',
-            'is_post' => '',
-            'is_page' => '',
-            'is_subpage' => '',
+            'is_blog' => true
         ), $layout);
     } elseif ($static === 'front') {
 
@@ -3157,17 +3037,7 @@ get('/:static', function ($static) {
             'type' => 'staticPage',
             'prev' => static_prev($prev),
             'next' => static_next($next),
-            'is_front' => '',
-            'is_blog' => '',
-            'is_category' => '',
-            'is_search' => '',
-            'is_archive' => '',
-            'is_type' => '',
-            'is_tag' => '',
-            'is_profile' => '',
-            'is_post' => '',
-            'is_page' => true,
-            'is_subpage' => '',
+            'is_page' => true
         ), $layout);
     }
 });
@@ -3464,17 +3334,7 @@ get('/:static/:sub', function ($static, $sub) {
         'prev' => static_prev($prev),
         'next' => static_next($next),
         'type' => 'subPage',
-        'is_front' => '',
-        'is_blog' => '',
-        'is_category' => '',
-        'is_search' => '',
-        'is_archive' => '',
-        'is_type' => '',
-        'is_tag' => '',
-        'is_profile' => '',
-        'is_post' => '',
-        'is_page' => '',
-        'is_subpage' => true,
+        'is_subpage' => true
     ), $layout);
 });
 
@@ -3745,17 +3605,7 @@ get('/:year/:month/:name', function ($year, $month, $name) {
         'prev' => has_prev($prev),
         'next' => has_next($next),
         'type' => $var,
-        'is_front' => '',
-        'is_blog' => '',
-        'is_category' => '',
-        'is_search' => '',
-        'is_archive' => '',
-        'is_type' => '',
-        'is_tag' => '',
-        'is_profile' => '',
-        'is_post' => true,
-        'is_page' => '',
-        'is_subpage' => '',
+        'is_post' => true
     ), $layout);
 
 });
diff --git a/themes/blog/main.html.php b/themes/blog/main.html.php
index 7ea3c7b..ffefce6 100644
--- a/themes/blog/main.html.php
+++ b/themes/blog/main.html.php
@@ -1,48 +1,59 @@
 <?php if (!defined('HTMLY')) die('HTMLy'); ?>
-<?php if ($breadcrumb): ?>
+<?php if (!empty($breadcrumb)): ?>
     <div class="breadcrumb"><?php echo $breadcrumb ?></div>
 <?php endif; ?>
-<?php if ($is_category): ?>
-    <div class="section">
-        <div class="section-inner">
-            <div class="content">
-                <div class="item">
-                <h2 class="title"><?php echo $category->title;?></h2>
-                <div class="text-left">                                   
-                    <?php echo $category->body; ?>
-                </div><!--//desc-->
-                </div><!--//item-->                       
-            </div><!--//content-->  
+<?php if (config('category.info') === 'true'):?>
+    <?php if (!empty($category)): ?>
+        <div class="section">
+            <div class="section-inner">
+                <div class="content">
+                    <div class="item">
+                    <h2 class="title"><?php echo $category->title;?></h2>
+                    <div class="text-left">                                   
+                        <?php echo $category->body; ?>
+                    </div><!--//desc-->
+                    </div><!--//item-->                       
+                </div><!--//content-->  
+            </div>
         </div>
-    </div>
+    <?php endif; ?>
 <?php endif; ?>
+<?php $i = 0; $len = count($posts); ?>
 <?php foreach ($posts as $p): ?>
-<section class="post section" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
+    <?php if ($i == 0) {
+        $class = 'post first';
+    } elseif ($i == $len - 1) {
+        $class = 'post last';
+    } else {
+        $class = 'post';
+    }
+    $i++; ?>
+<section class="post section <?php echo $class ?>" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
     <div class="section-inner">
         <div class="content">
             <div class="item">
-                <?php if ($p->image) { ?>
+                <?php if (!empty($p->image)) { ?>
                     <div class="featured featured-image">
                         <a href="<?php echo $p->url ?>"><img  itemprop="image" src="<?php echo $p->image; ?>" alt="<?php echo $p->title ?>"/></a>
                     </div>
                 <?php } ?>
-                <?php if ($p->video) { ?>
+                <?php if (!empty($p->video)) { ?>
                     <div class="featured featured-video embed-responsive embed-responsive-16by9">
                         <iframe class="embed-responsive-item" src="https://www.youtube.com/embed/<?php echo get_video_id($p->video); ?>" frameborder="0" allowfullscreen></iframe>
                     </div>
                 <?php } ?>
-                <?php if ($p->audio) { ?>
+                <?php if (!empty($p->audio)) { ?>
                     <div class="featured featured-audio embed-responsive embed-responsive-16by9">
                         <iframe class="embed-responsive-item" scrolling="no" frameborder="no" src="https://w.soundcloud.com/player/?url=<?php echo $p->audio;?>&amp;auto_play=false&amp;visual=true"></iframe>
                     </div>
                 <?php } ?>
-                <?php if ($p->quote) { ?>
+                <?php if (!empty($p->quote)) { ?>
                     <div class="featured featured-quote">
                         <blockquote class="quote"><i class="fa fa-quote-left"></i> <?php echo $p->quote ?> <i class="fa fa-quote-right"></i></blockquote>
                     </div>
                 <?php } ?>
                 <div class="info text-left">
-                    <?php if ($p->link) { ?>
+                    <?php if (!empty($p->link)) { ?>
                         <h2 class="title" itemprop="headline"><a target="_blank" href="<?php echo $p->link ?>"><?php echo $p->title;?> <i class="fa fa-external-link"></i></a></h2>
                     <?php } else {?>
                         <h2 class="title" itemprop="headline"><a href="<?php echo $p->url;?>"><?php echo $p->title;?></a></h2>
@@ -56,7 +67,7 @@
                         <?php } elseif (facebook()) { ?> 
                             - <i class="fa fa-comments"></i> <a href="<?php echo $p->url ?>#comments"><span><fb:comments-count href=<?php echo $p->url ?>></fb:comments-count> <?php echo i18n("Comments");?></span></a>
                         <?php } ?>
-                        <?php if (login()) { echo ' - <span><a href="'. $p->url .'/edit?destination=post">Edit</a></span>'; } ?>
+						<?php if (login()) { echo ' - <span><a href="'. $p->url .'/edit?destination=post">Edit</a></span>'; } ?>
                     </p>
                 </div>
                 <div class="desc text-left" itemprop="articleBody">                                    
@@ -77,7 +88,7 @@
     </div><!--//section-inner-->                 
 </section><!--//section-->
 <?php endforeach; ?>
-<?php if ($pagination['prev'] || $pagination['next']): ?>
+<?php if (!empty($pagination['prev']) || !empty($pagination['next'])): ?>
     <div class="pagination"><?php echo $pagination['html'];?></div>
 <?php endif; ?>
 <?php if (disqus_count()): ?>
diff --git a/themes/blog/post.html.php b/themes/blog/post.html.php
index c4e9567..e24d3c1 100644
--- a/themes/blog/post.html.php
+++ b/themes/blog/post.html.php
@@ -1,5 +1,5 @@
 <?php if (!defined('HTMLY')) die('HTMLy'); ?>
-<?php if ($breadcrumb): ?>
+<?php if (!empty($breadcrumb)): ?>
     <div class="breadcrumb"><?php echo $breadcrumb ?></div>
 <?php endif; ?>
 <section class="inpost post section" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
@@ -7,28 +7,28 @@
         <div class="content">    
             <?php if (login()) { echo tab($p); } ?>   
             <div class="item">
-                <?php if ($p->image) { ?>
+                <?php if (!empty($p->image)) { ?>
                     <div class="featured featured-image">
                         <a href="<?php echo $p->url ?>"><img itemprop="image" src="<?php echo $p->image; ?>" alt="<?php echo $p->title ?>"/></a>
                     </div>
                 <?php } ?>
-                <?php if ($p->video) { ?>
+                <?php if (!empty($p->video)) { ?>
                     <div class="featured featured-video embed-responsive embed-responsive-16by9">
                         <iframe class="embed-responsive-item" src="https://www.youtube.com/embed/<?php echo get_video_id($p->video); ?>" frameborder="0" allowfullscreen></iframe>
                     </div>
                 <?php } ?>
-                <?php if ($p->audio) { ?>
+                <?php if (!empty($p->audio)) { ?>
                     <div class="featured featured-audio embed-responsive embed-responsive-16by9">
                         <iframe class="embed-responsive-item" scrolling="no" frameborder="no" src="https://w.soundcloud.com/player/?url=<?php echo $p->audio;?>&amp;auto_play=false&amp;visual=true"></iframe>
                     </div>
                 <?php } ?>
-                <?php if ($p->quote) { ?>
+                <?php if (!empty($p->quote)) { ?>
                     <div class="featured featured-quote">
                         <blockquote class="quote"><i class="fa fa-quote-left"></i> <?php echo $p->quote ?> <i class="fa fa-quote-right"></i></blockquote>
                     </div>
                 <?php } ?>
                 <div class="info text-left">
-                    <?php if ($p->link) { ?>
+                    <?php if (!empty($p->link)) { ?>
                         <h1 class="title" itemprop="headline"><a target="_blank" href="<?php echo $p->link ?>"><?php echo $p->title;?> <i class="fa fa-external-link"></i></a></h1>
 					<?php } else { ?>
 						<h1 class="title" itemprop="headline"><?php echo $p->title;?></h1>
@@ -57,10 +57,10 @@
                 </div>
                 <div style="margin-top:30px;position:relative;">
                     <hr>
-                    <?php if ($next): ?>
+                    <?php if (!empty($next)): ?>
                         <span class="newer"><a href="<?php echo($next['url']); ?>" rel="next"><i class="fa fa-long-arrow-left"></i> <?php echo i18n("Next");?></a></span>
                     <?php endif; ?>
-                    <?php if ($prev): ?>
+                    <?php if (!empty($prev)): ?>
                         <span class="older pull-right"><a href="<?php echo($prev['url']); ?>" rel="prev"><?php echo i18n("Prev");?> <i class="fa fa-long-arrow-right"></i></a></span>
                     <?php endif; ?>
                     <div style="clear:both;"></div>
diff --git a/themes/blog/profile.html.php b/themes/blog/profile.html.php
index e684b95..d05b574 100644
--- a/themes/blog/profile.html.php
+++ b/themes/blog/profile.html.php
@@ -1,5 +1,5 @@
 <?php if (!defined('HTMLY')) die('HTMLy'); ?>
-<?php if ($breadcrumb): ?>
+<?php if (!empty($breadcrumb)): ?>
     <div class="breadcrumb"><?php echo $breadcrumb ?></div>
 <?php endif; ?>
 <section class="inprofile post section">
@@ -11,7 +11,7 @@
                     <?php echo $about; ?>
                 </div><!--//desc-->
                 <h3><?php echo i18n("Post_by_author");?></h3>
-                <?php if ($posts) { ?>
+                <?php if (!empty($posts)) { ?>
                     <ul class="post-list">
                         <?php foreach ($posts as $p): ?>
                             <li class="item">
@@ -27,8 +27,8 @@
         </div><!--//content--> 
     </div><!--//section-inner-->
 </section><!--//section-->
-<?php if ($posts) { ?>
-<?php if ($pagination['prev'] || $pagination['next']): ?>
+<?php if (!empty($posts)) { ?>
+<?php if (!empty($pagination['prev']) || !empty($pagination['next'])): ?>
 	<div class="pagination"><?php echo $pagination['html'];?></div>
 <?php endif; ?>
 <?php } ?>
\ No newline at end of file
diff --git a/themes/blog/static.html.php b/themes/blog/static.html.php
index 27fe66f..95afb61 100644
--- a/themes/blog/static.html.php
+++ b/themes/blog/static.html.php
@@ -1,5 +1,5 @@
 <?php if (!defined('HTMLY')) die('HTMLy'); ?>
-<?php if ($breadcrumb): ?>
+<?php if (!empty($breadcrumb)): ?>
     <div class="breadcrumb"><?php echo $breadcrumb ?></div>
 <?php endif; ?>
 <section class="inpage post section" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
diff --git a/themes/clean/main.html.php b/themes/clean/main.html.php
index cbd9eae..030e780 100644
--- a/themes/clean/main.html.php
+++ b/themes/clean/main.html.php
@@ -1,14 +1,16 @@
 <?php if (!defined('HTMLY')) die('HTMLy'); ?>
-<?php if ($breadcrumb): ?>
+<?php if (!empty($breadcrumb)): ?>
     <div class="breadcrumb"><?php echo $breadcrumb ?></div>
 <?php endif; ?>
-<?php if ($is_category): ?>
-    <div class="category">
-        <h2 class="category-title"><?php echo $category->title;?></h2>
-        <div class="category-content">                                   
-            <?php echo $category->body; ?>
+<?php if (config('category.info') === 'true'):?>
+    <?php if (!empty($category)): ?>
+        <div class="category">
+            <h2 class="category-title"><?php echo $category->title;?></h2>
+            <div class="category-content">                                   
+                <?php echo $category->body; ?>
+            </div>
         </div>
-    </div>
+    <?php endif; ?>
 <?php endif; ?>
 <?php $i = 0; $len = count($posts); ?>
 <?php foreach ($posts as $p): ?>
@@ -22,7 +24,7 @@
     $i++; ?>
     <div class="<?php echo $class ?>" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
         <div class="main">
-            <?php if ($p->link) { ?>
+            <?php if (!empty($p->link)) { ?>
                 <h2 class="title-index" itemprop="name"><a href="<?php echo $p->link ?>"><?php echo $p->title ?> &rarr;</a></h2>
             <?php } else { ?>
                 <h2 class="title-index" itemprop="name"><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></h2>
@@ -36,24 +38,24 @@
                 <?php } elseif (facebook()) { ?> -
                     <a href="<?php echo $p->url ?>#comments"><span><fb:comments-count href=<?php echo $p->url ?>></fb:comments-count> <?php echo i18n("Comments");?></span></a>
                 <?php } ?>
-                <?php if (login()) { echo ' - <span><a href="'. $p->url .'/edit?destination=post">Edit</a></span>'; } ?>
+				<?php if (login()) { echo ' - <span><a href="'. $p->url .'/edit?destination=post">Edit</a></span>'; } ?>
             </div>
-            <?php if ($p->image) { ?>
+            <?php if (!empty($p->image)) { ?>
                 <div class="featured-image">
                     <a href="<?php echo $p->url ?>"><img src="<?php echo $p->image; ?>" alt="<?php echo $p->title ?>"/></a>
                 </div>
             <?php } ?>
-            <?php if ($p->video) { ?>
+            <?php if (!empty($p->video)) { ?>
                 <div class="featured-video">
                     <iframe src="https://www.youtube.com/embed/<?php echo get_video_id($p->video); ?>" width="560" height="315" frameborder="0" allowfullscreen></iframe>
                 </div>
             <?php } ?>
-            <?php if ($p->audio) { ?>
+            <?php if (!empty($p->audio)) { ?>
                 <div class="featured-audio">
                     <iframe width="560" height="315" scrolling="no" frameborder="no" src="https://w.soundcloud.com/player/?url=<?php echo $p->audio;?>&amp;auto_play=false&amp;visual=true"></iframe>
                 </div>
             <?php } ?>
-            <?php if ($p->quote) { ?>
+            <?php if (!empty($p->quote)) { ?>
                 <div class="featured-quote">
                     <blockquote><?php echo $p->quote ?></blockquote>
                 </div>
@@ -66,13 +68,13 @@
         </div>
     </div>
 <?php endforeach; ?>
-<?php if ($pagination['prev'] || $pagination['next']): ?>
+<?php if (!empty($pagination['prev']) || !empty($pagination['next'])): ?>
     <div class="pager">
-        <?php if ($pagination['prev']): ?>
+        <?php if (!empty($pagination['prev'])): ?>
             <span><a href="?page=<?php echo $page - 1 ?>" class="pagination-arrow newer" rel="prev"><?php echo i18n('Newer'); ?></a></span>
         <?php endif; ?>
          <span class="page-number"><?php echo $pagination['pagenum']; ?></span>
-        <?php if ($pagination['next']): ?>
+        <?php if (!empty($pagination['next'])): ?>
             <span><a href="?page=<?php echo $page + 1 ?>" class="pagination-arrow older" rel="next"><?php echo i18n('Older'); ?></a></span>
         <?php endif; ?>
     </div>
diff --git a/themes/clean/post.html.php b/themes/clean/post.html.php
index 80f97c7..7d2721f 100644
--- a/themes/clean/post.html.php
+++ b/themes/clean/post.html.php
@@ -1,12 +1,12 @@
 <?php if (!defined('HTMLY')) die('HTMLy'); ?>
-<?php if ($breadcrumb): ?>
+<?php if (!empty($breadcrumb)): ?>
     <div class="breadcrumb" xmlns:v="http://rdf.data-vocabulary.org/#"><?php echo $breadcrumb ?></div>
 <?php endif; ?>
 <?php if (login()) { echo tab($p); } ?>
 <div class="post" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
     <div class="main">
         <a name="more"></a>
-        <?php if ($p->link) { ?>
+        <?php if (!empty($p->link)) { ?>
         <h1 class="title-post" itemprop="name"><a target="_blank" href="<?php echo $p->link ?>"><?php echo $p->title ?> &rarr;</a></h1>
         <?php } else { ?>
         <h1 class="title-post" itemprop="name"><?php echo $p->title ?></h1>
@@ -18,22 +18,22 @@
             <span itemprop="author"><a href="<?php echo $p->authorUrl ?>"><?php echo $p->authorName; ?></a></span> -
             <span><a href="<?php echo $p->url ?>" rel="permalink">Permalink</a></span>
         </div>
-        <?php if ($p->image) { ?>
+        <?php if (!empty($p->image)) { ?>
             <div class="featured-image">
                 <a href="<?php echo $p->url ?>"><img src="<?php echo $p->image; ?>" alt="<?php echo $p->title ?>"/></a>
             </div>
         <?php } ?>
-        <?php if ($p->video) { ?>
+        <?php if (!empty($p->video)) { ?>
             <div class="featured-video">
                 <iframe src="https://www.youtube.com/embed/<?php echo get_video_id($p->video); ?>" width="560" height="315" frameborder="0" allowfullscreen></iframe>
             </div>
         <?php } ?>
-        <?php if ($p->audio) { ?>
+        <?php if (!empty($p->audio)) { ?>
             <div class="featured-audio">
                 <iframe width="560" height="315" scrolling="no" frameborder="no" src="https://w.soundcloud.com/player/?url=<?php echo $p->audio;?>&amp;auto_play=false&amp;visual=true"></iframe>
             </div>
         <?php } ?>
-        <?php if ($p->quote) { ?>
+        <?php if (!empty($p->quote)) { ?>
             <div class="featured-quote">
                 <blockquote><?php echo $p->quote ?></blockquote>
             </div>
@@ -70,10 +70,10 @@
         <?php endif; ?>
     </div>
     <div class="postnav">
-        <?php if ($next): ?>
+        <?php if (!empty($next)): ?>
             <span><a href="<?php echo($next['url']); ?>" class="pagination-arrow newer" rel="next"><?php echo($next['title']); ?></a></span>
         <?php endif; ?>
-        <?php if ($prev): ?>
+        <?php if (!empty($prev)): ?>
             <span><a href="<?php echo($prev['url']); ?>" class="pagination-arrow older" rel="prev"><?php echo($prev['title']); ?></a></span>
         <?php endif; ?>
     </div>
diff --git a/themes/clean/profile.html.php b/themes/clean/profile.html.php
index 591a58f..63c0238 100644
--- a/themes/clean/profile.html.php
+++ b/themes/clean/profile.html.php
@@ -1,5 +1,5 @@
 <?php if (!defined('HTMLY')) die('HTMLy'); ?>
-<?php if ($breadcrumb): ?>
+<?php if (!empty($breadcrumb)): ?>
     <div class="breadcrumb"><?php echo $breadcrumb ?></div>
 <?php endif; ?>
 <div class="profile-wrapper" itemprop="accountablePerson" itemscope="itemscope">
@@ -9,7 +9,7 @@
     </div>
 </div>
 <h2 class="post-index"><?php echo i18n("Post_by_author");?></h2>
-<?php if ($posts) { ?>
+<?php if (!empty($posts)) { ?>
     <ul class="post-list">
         <?php foreach ($posts as $p): ?>
             <li class="item">
@@ -18,13 +18,13 @@
             </li>
         <?php endforeach; ?>
     </ul>
-    <?php if ($pagination['prev'] || $pagination['next']): ?>
+    <?php if (!empty($pagination['prev']) || !empty($pagination['next'])): ?>
         <div class="pager">
-            <?php if ($pagination['prev']): ?>
+            <?php if (!empty($pagination['prev'])): ?>
                 <span><a href="?page=<?php echo $page - 1 ?>" class="pagination-arrow newer" rel="prev">Newer</a></span>
             <?php endif; ?>
              <span class="page-number"><?php echo $pagination['pagenum']; ?></span>
-            <?php if ($pagination['next']): ?>
+            <?php if (!empty($pagination['next'])): ?>
                 <span><a href="?page=<?php echo $page + 1 ?>" class="pagination-arrow older" rel="next">Older</a></span>
             <?php endif; ?>
         </div>
diff --git a/themes/logs/main.html.php b/themes/logs/main.html.php
index f51aed9..8e0fea5 100644
--- a/themes/logs/main.html.php
+++ b/themes/logs/main.html.php
@@ -1,19 +1,21 @@
 <?php if (!defined('HTMLY')) die('HTMLy'); ?>
-<?php if ($breadcrumb): ?>
+<?php if (!empty($breadcrumb)): ?>
     <div class="breadcrumb"><?php echo $breadcrumb ?></div>
 <?php endif; ?>
-<?php if ($is_category): ?>
-    <div class="category">
-        <h2 class="category-title"><?php echo $category->title;?></h2>
-        <div class="category-content">                                   
-            <?php echo $category->body; ?>
+<?php if (config('category.info') === 'true'):?>
+    <?php if (!empty($category)): ?>
+        <div class="category">
+            <h2 class="category-title"><?php echo $category->title;?></h2>
+            <div class="category-content">                                   
+                <?php echo $category->body; ?>
+            </div>
         </div>
-    </div>
+    <?php endif; ?>
 <?php endif; ?>
 <?php foreach ($posts as $p): ?>
     <div class="post" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
         <div class="main">
-            <?php if ($p->link) { ?>
+            <?php if (!empty($p->link)) { ?>
                 <h2 class="title-index" itemprop="name"><a target="_blank" href="<?php echo $p->link ?>"><?php echo $p->title ?> &rarr;</a></h2>
             <?php } else { ?>
                 <h2 class="title-index" itemprop="name"><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></h2>
@@ -27,24 +29,24 @@
                 <?php } elseif (facebook()) { ?> - 
                     <a href="<?php echo $p->url ?>#comments"><span><fb:comments-count href=<?php echo $p->url ?>></fb:comments-count> <?php echo i18n('Comments');?></span></a>
                 <?php } ?>
-                <?php if (login()) { echo ' - <span><a href="'. $p->url .'/edit?destination=post">Edit</a></span>'; } ?>
+				<?php if (login()) { echo ' - <span><a href="'. $p->url .'/edit?destination=post">Edit</a></span>'; } ?>
             </div>
-            <?php if ($p->image) { ?>
+            <?php if (!empty($p->image)) { ?>
                 <div class="featured-image">
                     <a href="<?php echo $p->url ?>"><img src="<?php echo $p->image; ?>" alt="<?php echo $p->title ?>"/></a>
                 </div>
             <?php } ?>
-            <?php if ($p->video) { ?>
+            <?php if (!empty($p->video)) { ?>
                 <div class="featured-video">
                     <iframe src="https://www.youtube.com/embed/<?php echo get_video_id($p->video); ?>" width="560" height="315" frameborder="0" allowfullscreen></iframe>
                 </div>
             <?php } ?>
-            <?php if ($p->audio) { ?>
+            <?php if (!empty($p->audio)) { ?>
                 <div class="featured-audio">
                     <iframe width="560" height="315" scrolling="no" frameborder="no" src="https://w.soundcloud.com/player/?url=<?php echo $p->audio;?>&amp;auto_play=false&amp;visual=true"></iframe>
                 </div>
             <?php } ?>
-            <?php if ($p->quote) { ?>
+            <?php if (!empty($p->quote)) { ?>
                 <div class="featured-quote">
                     <blockquote><?php echo $p->quote ?></blockquote>
                 </div>
@@ -57,13 +59,13 @@
         </div>
     </div>
 <?php endforeach; ?>
-<?php if ($pagination['prev'] || $pagination['next']): ?>
+<?php if (!empty($pagination['prev']) || !empty($pagination['next'])): ?>
     <div class="pager">
-        <?php if ($pagination['prev']): ?>
+        <?php if (!empty($pagination['prev'])): ?>
             <span class="newer" ><a href="?page=<?php echo $page - 1 ?>" rel="prev">&laquo; <?php echo i18n('Newer');?></a></span>
         <?php endif; ?>
         <span class="page-number"><?php echo $pagination['pagenum'];?></span>
-        <?php if ($pagination['next']): ?>
+        <?php if (!empty($pagination['next'])): ?>
             <span class="older"><a href="?page=<?php echo $page + 1 ?>" rel="next"><?php echo i18n('Older');?>  &raquo;</a></span>
         <?php endif; ?>
     </div>
diff --git a/themes/logs/post.html.php b/themes/logs/post.html.php
index ce4cb1a..8271fac 100644
--- a/themes/logs/post.html.php
+++ b/themes/logs/post.html.php
@@ -1,12 +1,12 @@
 <?php if (!defined('HTMLY')) die('HTMLy'); ?>
-<?php if ($breadcrumb): ?>
+<?php if (!empty($breadcrumb)): ?>
     <div class="breadcrumb" xmlns:v="http://rdf.data-vocabulary.org/#"><?php echo $breadcrumb ?></div>
 <?php endif; ?>
 <?php if (login()) { echo tab($p); } ?>
 <div class="post" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
     <div class="main">
         <a name="more"></a>
-            <?php if ($p->link) { ?>
+            <?php if (!empty($p->link)) { ?>
                 <h1 class="title-post" itemprop="name"><a target="_blank" href="<?php echo $p->link ?>"><?php echo $p->title ?> &rarr;</a></h1>
             <?php } else { ?>
                 <h1 class="title-post" itemprop="name"><?php echo $p->title ?></h1>
@@ -18,22 +18,22 @@
             <span itemprop="author"><a href="<?php echo $p->authorUrl ?>"><?php echo $p->authorName; ?></a></span> -
             <span><a href="<?php echo $p->url ?>" rel="permalink">Permalink</a></span>
         </div>
-        <?php if ($p->image) { ?>
+        <?php if (!empty($p->image)) { ?>
             <div class="featured-image">
                 <a href="<?php echo $p->url ?>"><img src="<?php echo $p->image; ?>" alt="<?php echo $p->title ?>"/></a>
             </div>
         <?php } ?>
-        <?php if ($p->video) { ?>
+        <?php if (!empty($p->video)) { ?>
             <div class="featured-video">
                 <iframe src="https://www.youtube.com/embed/<?php echo get_video_id($p->video); ?>" width="560" height="315" frameborder="0" allowfullscreen></iframe>
             </div>
         <?php } ?>
-        <?php if ($p->audio) { ?>
+        <?php if (!empty($p->audio)) { ?>
             <div class="featured-audio">
                 <iframe width="560" height="315" scrolling="no" frameborder="no" src="https://w.soundcloud.com/player/?url=<?php echo $p->audio;?>&amp;auto_play=false&amp;visual=true"></iframe>
             </div>
         <?php } ?>
-        <?php if ($p->quote) { ?>
+        <?php if (!empty($p->quote)) { ?>
             <div class="featured-quote">
                 <blockquote><?php echo $p->quote ?></blockquote>
             </div>
@@ -70,10 +70,10 @@
         <?php endif; ?>
     </div>
     <div class="postnav">
-        <?php if ($next): ?>
+        <?php if (!empty($next)): ?>
             <span class="newer">&laquo; <a href="<?php echo($next['url']); ?>" rel="next"><?php echo($next['title']); ?></a></span>
         <?php endif; ?>
-        <?php if ($prev): ?>
+        <?php if (!empty($prev)): ?>
             <span class="older"><a href="<?php echo($prev['url']); ?>" rel="prev"><?php echo($prev['title']); ?></a> &raquo;</span>
         <?php endif; ?>
     </div>
diff --git a/themes/logs/profile.html.php b/themes/logs/profile.html.php
index 5a6124b..30310e5 100644
--- a/themes/logs/profile.html.php
+++ b/themes/logs/profile.html.php
@@ -1,5 +1,5 @@
 <?php if (!defined('HTMLY')) die('HTMLy'); ?>
-<?php if ($breadcrumb): ?>
+<?php if (!empty($breadcrumb)): ?>
     <div class="breadcrumb"><?php echo $breadcrumb ?></div>
 <?php endif; ?>
 <div class="profile-wrapper" itemprop="accountablePerson" itemscope="itemscope">
@@ -9,7 +9,7 @@
     </div>
 </div>
 <h2 class="post-index"><?php echo i18n('Post_by_author');?></h2>
-<?php if ($posts) { ?>
+<?php if (!empty($posts)) { ?>
     <ul class="post-list">
         <?php foreach ($posts as $p): ?>
             <li class="item">
@@ -18,13 +18,13 @@
             </li>
         <?php endforeach; ?>
     </ul>
-    <?php if ($pagination['prev'] || $pagination['next']): ?>
+    <?php if (!empty($pagination['prev']) || !empty($pagination['next'])): ?>
         <div class="pager">
-            <?php if ($pagination['prev']): ?>
+            <?php if (!empty($pagination['prev'])): ?>
                 <span class="newer" ><a href="?page=<?php echo $page - 1 ?>" rel="prev">&laquo; <?php echo i18n('Newer');?></a></span>
             <?php endif; ?>
             <span class="page-number"><?php echo $pagination['pagenum'];?></span>
-            <?php if ($pagination['next']): ?>
+            <?php if (!empty($pagination['next'])): ?>
                 <span class="older"><a href="?page=<?php echo $page + 1 ?>" rel="next"><?php echo i18n('Older');?>  &raquo;</a></span>
             <?php endif; ?>
         </div>
diff --git a/themes/readable/main.html.php b/themes/readable/main.html.php
index 0ca72b7..4950bb3 100644
--- a/themes/readable/main.html.php
+++ b/themes/readable/main.html.php
@@ -1,19 +1,21 @@
 <?php if (!defined('HTMLY')) die('HTMLy'); ?>
-<?php if ($breadcrumb): ?>
+<?php if (!empty($breadcrumb)): ?>
     <div class="breadcrumb"><?php echo $breadcrumb ?></div>
 <?php endif; ?>
-<?php if ($is_category): ?>
-    <div class="category">
-        <h2 class="category-title"><?php echo $category->title;?></h2>
-        <div class="category-content">                                   
-            <?php echo $category->body; ?>
+<?php if (config('category.info') === 'true'):?>
+    <?php if (!empty($category)): ?>
+        <div class="category">
+            <h2 class="category-title"><?php echo $category->title;?></h2>
+            <div class="category-content">                                   
+                <?php echo $category->body; ?>
+            </div>
         </div>
-    </div>
+    <?php endif; ?>
 <?php endif; ?>
 <?php foreach ($posts as $p): ?>
     <div class="post" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
         <div class="main">
-            <?php if ($p->link) { ?>
+            <?php if (!empty($p->link)) { ?>
                 <h2 class="title-index" itemprop="name"><a target="_blank" href="<?php echo $p->link ?>"><?php echo $p->title ?> &rarr;</a></h2>
             <?php } else { ?>
                 <h2 class="title-index" itemprop="name"><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></h2>
@@ -27,24 +29,24 @@
                 <?php } elseif (facebook()) { ?> -
                     <a href="<?php echo $p->url ?>#comments"><span><fb:comments-count href=<?php echo $p->url ?>></fb:comments-count> <?php echo i18n('Comments');?></span></a>
                 <?php } ?>
-                <?php if (login()) { echo ' - <span><a href="'. $p->url .'/edit?destination=post">Edit</a></span>'; } ?>
+				<?php if (login()) { echo ' - <span><a href="'. $p->url .'/edit?destination=post">Edit</a></span>'; } ?>
             </div>
-            <?php if ($p->image) { ?>
+            <?php if (!empty($p->image)) { ?>
                 <div class="featured-image">
                     <a href="<?php echo $p->url ?>"><img src="<?php echo $p->image; ?>" alt="<?php echo $p->title ?>"/></a>
                 </div>
             <?php } ?>
-            <?php if ($p->video) { ?>
+            <?php if (!empty($p->video)) { ?>
                 <div class="featured-video">
                     <iframe src="https://www.youtube.com/embed/<?php echo get_video_id($p->video); ?>" width="560" height="315" frameborder="0" allowfullscreen></iframe>
                 </div>
             <?php } ?>
-            <?php if ($p->audio) { ?>
+            <?php if (!empty($p->audio)) { ?>
                 <div class="featured-audio">
                     <iframe width="560" height="315" scrolling="no" frameborder="no" src="https://w.soundcloud.com/player/?url=<?php echo $p->audio;?>&amp;auto_play=false&amp;visual=true"></iframe>
                 </div>
             <?php } ?>
-            <?php if ($p->quote) { ?>
+            <?php if (!empty($p->quote)) { ?>
                 <div class="featured-quote">
                     <blockquote><?php echo $p->quote ?></blockquote>
                 </div>
@@ -57,12 +59,12 @@
         </div>
     </div>
 <?php endforeach; ?>
-<?php if ($pagination['prev'] || $pagination['next']): ?>
+<?php if (!empty($pagination['prev']) || !empty($pagination['next'])): ?>
     <div class="pager">
-        <?php if ($pagination['prev']): ?>
+        <?php if (!empty($pagination['prev'])): ?>
             <span><a href="?page=<?php echo $page - 1 ?>" class="pagination-arrow newer" rel="prev"><?php echo i18n('Newer');?></a></span>
         <?php endif; ?>
-        <?php if ($pagination['next']): ?>
+        <?php if (!empty($pagination['next'])): ?>
             <span><a href="?page=<?php echo $page + 1 ?>" class="pagination-arrow older" rel="next"><?php echo i18n('Older');?></a></span>
         <?php endif; ?>
     </div>
diff --git a/themes/readable/post.html.php b/themes/readable/post.html.php
index db520d4..7a90be6 100644
--- a/themes/readable/post.html.php
+++ b/themes/readable/post.html.php
@@ -1,12 +1,12 @@
 <?php if (!defined('HTMLY')) die('HTMLy'); ?>
-<?php if ($breadcrumb): ?>
+<?php if (!empty($breadcrumb)): ?>
     <div class="breadcrumb" xmlns:v="http://rdf.data-vocabulary.org/#"><?php echo $breadcrumb ?></div>
 <?php endif; ?>
 <?php if (login()) { echo tab($p); } ?>
 <div class="post" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
     <div class="main">
         <a name="more"></a>
-        <?php if ($p->link) { ?>
+        <?php if (!empty($p->link)) { ?>
             <h1 class="title-post" itemprop="name"><a target="_blank" href="<?php echo $p->link ?>"><?php echo $p->title ?> &rarr;</a></h1>
         <?php } else { ?>
             <h1 class="title-post" itemprop="name"><?php echo $p->title ?></h1>
@@ -18,22 +18,22 @@
             <span itemprop="author"><a href="<?php echo $p->authorUrl ?>"><?php echo $p->authorName; ?></a></span> -
             <span><a href="<?php echo $p->url ?>" rel="permalink">Permalink</a></span>
         </div>
-        <?php if ($p->image) { ?>
+        <?php if (!empty($p->image)) { ?>
             <div class="featured-image">
                 <a href="<?php echo $p->url ?>"><img src="<?php echo $p->image; ?>" alt="<?php echo $p->title ?>"/></a>
             </div>
         <?php } ?>
-        <?php if ($p->video) { ?>
+        <?php if (!empty($p->video)) { ?>
             <div class="featured-video">
                 <iframe src="https://www.youtube.com/embed/<?php echo get_video_id($p->video); ?>" width="560" height="315" frameborder="0" allowfullscreen></iframe>
             </div>
         <?php } ?>
-        <?php if ($p->audio) { ?>
+        <?php if (!empty($p->audio)) { ?>
             <div class="featured-audio">
                 <iframe width="560" height="315" scrolling="no" frameborder="no" src="https://w.soundcloud.com/player/?url=<?php echo $p->audio;?>&amp;auto_play=false&amp;visual=true"></iframe>
             </div>
         <?php } ?>
-        <?php if ($p->quote) { ?>
+        <?php if (!empty($p->quote)) { ?>
             <div class="featured-quote">
                 <blockquote><?php echo $p->quote ?></blockquote>
             </div>
@@ -68,10 +68,10 @@
         <?php endif; ?>
     </div>
     <div class="postnav">
-        <?php if ($next): ?>
+        <?php if (!empty($next)): ?>
             <span><a href="<?php echo($next['url']); ?>" class="pagination-arrow newer" rel="next"><?php echo($next['title']); ?></a></span>
         <?php endif; ?>
-        <?php if ($prev): ?>
+        <?php if (!empty($prev)): ?>
             <span><a href="<?php echo($prev['url']); ?>" class="pagination-arrow older" rel="prev"><?php echo($prev['title']); ?></a></span>
         <?php endif; ?>
     </div>
diff --git a/themes/readable/profile.html.php b/themes/readable/profile.html.php
index 136900c..8bbf5bd 100644
--- a/themes/readable/profile.html.php
+++ b/themes/readable/profile.html.php
@@ -1,5 +1,5 @@
 <?php if (!defined('HTMLY')) die('HTMLy'); ?>
-<?php if ($breadcrumb): ?>
+<?php if (!empty($breadcrumb)): ?>
     <div class="breadcrumb"><?php echo $breadcrumb ?></div>
 <?php endif; ?>
 <div class="profile-wrapper" itemprop="accountablePerson" itemscope="itemscope">
@@ -9,7 +9,7 @@
     </div>
 </div>
 <h2 class="post-index"><?php echo i18n('Post_by_author');?></h2>
-<?php if ($posts) { ?>
+<?php if (!empty($posts)) { ?>
     <ul class="post-list">
         <?php foreach ($posts as $p): ?>
             <li class="item">
@@ -18,12 +18,12 @@
             </li>
         <?php endforeach; ?>
     </ul>
-    <?php if ($pagination['prev'] || $pagination['next']): ?>
+    <?php if (!empty($pagination['prev']) || !empty($pagination['next'])): ?>
         <div class="pager">
-            <?php if ($pagination['prev']): ?>
+            <?php if (!empty($pagination['prev'])): ?>
                 <span><a href="?page=<?php echo $page - 1 ?>" class="pagination-arrow newer" rel="prev"><?php echo i18n('Newer');?></a></span>
             <?php endif; ?>
-            <?php if ($pagination['next']): ?>
+            <?php if (!empty($pagination['next'])): ?>
                 <span><a href="?page=<?php echo $page + 1 ?>" class="pagination-arrow older" rel="next"><?php echo i18n('Older');?></a></span>
             <?php endif; ?>
         </div>
diff --git a/themes/readable/static.html.php b/themes/readable/static.html.php
index 480c9fc..969ced9 100644
--- a/themes/readable/static.html.php
+++ b/themes/readable/static.html.php
@@ -1,5 +1,5 @@
 <?php if (!defined('HTMLY')) die('HTMLy'); ?>
-<?php if ($breadcrumb): ?>
+<?php if (!empty($breadcrumb)): ?>
     <div class="breadcrumb" xmlns:v="http://rdf.data-vocabulary.org/#"><?php echo $breadcrumb ?></div>
 <?php endif; ?>
 <?php if (login()) { echo tab($p); } ?>
diff --git a/themes/twentyfifteen/README.md b/themes/twentyfifteen/README.md
index d2d4e24..7e2272c 100644
--- a/themes/twentyfifteen/README.md
+++ b/themes/twentyfifteen/README.md
@@ -1,6 +1,11 @@
 # HTMLy Theme Twenty Fifteen
 WordPress Twenty Fifteen ported to HTMLy.
 
+## Installations 
+ -  Upload and extract the zip file into themes directory.
+ -  Rename the extracted folder to `twentyfifteen`.
+ -  Change the `views.root` using `http://www.example.com/admin/config` to `themes/twentyfifteen`
+
 ## License
 
 See the LICENSE.txt
diff --git a/themes/twentyfifteen/css/style.css b/themes/twentyfifteen/css/style.css
index 7aca5d4..a98104b 100644
--- a/themes/twentyfifteen/css/style.css
+++ b/themes/twentyfifteen/css/style.css
@@ -880,7 +880,7 @@ a:focus {
 	content: "\f516";
 }
 
-.social-navigation a[href*="/feed"]:before {
+.social-navigation a[href$="/feed/rss"]:before {
 	content: "\f413";
 }
 
diff --git a/themes/twentyfifteen/css/style_v2.css b/themes/twentyfifteen/css/style_v2.css
index bba4372..16aa9f4 100644
--- a/themes/twentyfifteen/css/style_v2.css
+++ b/themes/twentyfifteen/css/style_v2.css
@@ -881,7 +881,7 @@ a:focus {
 	content: "\f516";
 }
 
-.social-navigation a[href*="/feed"]:before {
+.social-navigation a[href$="/feed/rss"]:before {
 	content: "\f413";
 }
 
diff --git a/themes/twentyfifteen/layout.html.php b/themes/twentyfifteen/layout.html.php
index c876824..cb96800 100644
--- a/themes/twentyfifteen/layout.html.php
+++ b/themes/twentyfifteen/layout.html.php
@@ -47,11 +47,6 @@
                     <nav id="social-navigation" class="social-navigation" role="navigation">
                         <div class="menu-social-links-container">
                             <ul id="menu-social-links" class="menu">
-                                <li class="menu-item">
-                                    <a href="<?php echo site_url();?>feed/rss">
-                                    <span class="screen-reader-text">RSS</span>
-                                    </a>
-                                </li>
 							    <?php if(!empty(config('social.twitter'))):?>
                                 <li class="menu-item">
                                     <a href="<?php echo config('social.twitter');?>">
diff --git a/themes/twentyfifteen/main.html.php b/themes/twentyfifteen/main.html.php
index 8dbe902..6f5a68a 100644
--- a/themes/twentyfifteen/main.html.php
+++ b/themes/twentyfifteen/main.html.php
@@ -1,42 +1,42 @@
 <?php if (!defined('HTMLY')) die('HTMLy'); ?>
-<?php if ($is_category):?>
-    <header class="page-header"><span class="social-navigation" style="margin:0 auto;float:right;"><a style="height:100%" href="<?php echo $category->url;?>/feed"><span class="screen-reader-text">RSS</span></a></span><h1 class="page-title"><?php echo i18n('Category');?>: <?php echo $category->title;?></h1><div class="taxonomy-description"><?php echo $category->body;?></div></header>
+<?php if (isset($is_category)):?>
+    <header class="page-header"><h1 class="page-title"><?php echo i18n('Category');?>: <?php echo $category->title;?></h1><div class="taxonomy-description"><?php echo $category->body;?></div></header>
 <?php endif;?>
-<?php if ($is_tag):?>
-    <header class="page-header"><span class="social-navigation" style="margin:0 auto;float:right;"><a style="height:100%" href="<?php echo $tag->url;?>/feed"><span class="screen-reader-text">RSS</span></a></span><h1 class="page-title"><?php echo i18n('Tags');?>: <?php echo $tag->title;?></h1></header>
+<?php if (isset($is_tag)):?>
+    <header class="page-header"><h1 class="page-title"><?php echo i18n('Tags');?>: <?php echo $tag->title;?></h1></header>
 <?php endif;?>
-<?php if ($is_archive):?>
-    <header class="page-header"><span class="social-navigation" style="margin:0 auto;float:right;"><a style="height:100%" href="<?php echo $archive->url;?>/feed"><span class="screen-reader-text">RSS</span></a></span><h1 class="page-title"><?php echo i18n('Archives');?>: <?php echo $archive->title;?></h1></header>
+<?php if (isset($is_archive)):?>
+    <header class="page-header"><h1 class="page-title"><?php echo i18n('Archives');?>: <?php echo $archive->title;?></h1></header>
 <?php endif;?>
-<?php if ($is_search):?>
-    <header class="page-header"><span class="social-navigation" style="margin:0 auto;float:right;"><a style="height:100%" href="<?php echo $search->url;?>/feed"><span class="screen-reader-text">RSS</span></a></span><h1 class="page-title"><?php echo i18n('Search');?>: <?php echo $search->title;?></h1></header>
+<?php if (isset($is_search)):?>
+    <header class="page-header"><h1 class="page-title"><?php echo i18n('Search');?>: <?php echo $search->title;?></h1></header>
 <?php endif;?>
-<?php if ($is_type):?>
-    <header class="page-header"><span class="social-navigation" style="margin:0 auto;float:right;"><a style="height:100%" href="<?php echo $type->url;?>/feed"><span class="screen-reader-text">RSS</span></a></span><h1 class="page-title">Type: <?php echo ucfirst($type->title);?></h1></header>
+<?php if (isset($is_type)):?>
+    <header class="page-header"><h1 class="page-title">Type: <?php echo ucfirst($type->title);?></h1></header>
 <?php endif;?>
 <?php foreach ($posts as $p): ?>
-<article class="post type-post hentry <?php if ($p->image || $p->audio || $p->video):?>has-post-thumbnail<?php endif;?>">
-    <?php if ($p->image):?>
+<article class="post type-post hentry <?php if (!empty($p->image) || !empty ($p->audio) || !empty ($p->video)):?>has-post-thumbnail<?php endif;?>">
+    <?php if (!empty($p->image)):?>
     <div class="post-thumbnail">
         <img style="width:100%;" title="<?php echo $p->title; ?>" alt="<?php echo $p->title; ?>" class="attachment-post-thumbnail wp-post-image" src="<?php echo $p->image; ?>">
     </div>
     <?php endif; ?>
-    <?php if ($p->audio):?>
+    <?php if (!empty($p->audio)):?>
     <div class="post-thumbnail">
         <iframe width="100%" height="200px" class="embed-responsive-item" scrolling="no" frameborder="no" src="https://w.soundcloud.com/player/?url=<?php echo $p->audio;?>&amp;auto_play=false&amp;visual=true"></iframe>
     </div>
     <?php endif; ?>
-    <?php if ($p->video):?>
+    <?php if (!empty($p->video)):?>
     <div class="post-thumbnail">
         <iframe width="100%" height="315px" class="embed-responsive-item" src="https://www.youtube.com/embed/<?php echo get_video_id($p->video); ?>" frameborder="0" allowfullscreen></iframe>
     </div>
     <?php endif; ?>
-    <?php if ($p->quote):?>
+    <?php if (!empty($p->quote)):?>
     <div class="post-blockquote">
         <blockquote class="quote"><?php echo $p->quote ?></blockquote>
     </div>
     <?php endif; ?>
-    <?php if ($p->link) { ?>
+    <?php if (!empty($p->link)) { ?>
     <header class="entry-header">
         <div class="post-link"><h2 class="entry-title"><a target="_blank" href="<?php echo $p->url; ?>"><?php echo $p->title; ?></a></h2></div>
     </header>
@@ -73,14 +73,14 @@
     </footer>
 </article>
 <?php endforeach; ?>
-<?php if ($pagination['prev'] || $pagination['next']): ?>
+<?php if (!empty($pagination['prev']) || !empty($pagination['next'])): ?>
 <div class="navigation pagination">
     <div class="nav-links">
-        <?php if ($pagination['prev']): ?>
+        <?php if (!empty($pagination['prev'])): ?>
             <a class="prev page-numbers" href="?page=<?php echo $page - 1 ?>">«</a>
         <?php endif; ?>
         <span class="page-numbers"><?php echo $pagination['pagenum'];?></span>
-        <?php if ($pagination['next']): ?>
+        <?php if (!empty($pagination['next'])): ?>
             <a class="next page-numbers" href="?page=<?php echo $page + 1 ?>">»</a>
         <?php endif; ?>
     </div>
diff --git a/themes/twentyfifteen/post.html.php b/themes/twentyfifteen/post.html.php
index cbb4f8f..37f9c02 100644
--- a/themes/twentyfifteen/post.html.php
+++ b/themes/twentyfifteen/post.html.php
@@ -1,21 +1,21 @@
 <?php if (!defined('HTMLY')) die('HTMLy'); ?>
-<article class="post type-post hentry <?php if ($p->image || $p->audio || $p->video):?>has-post-thumbnail<?php endif;?>">
-    <?php if ($p->image):?>
+<article class="post type-post hentry <?php if (!empty($p->image) || !empty ($p->audio) || !empty ($p->video)):?>has-post-thumbnail<?php endif;?>">
+    <?php if (!empty($p->image)):?>
     <div class="post-thumbnail">
         <img style="width:100%;" title="<?php echo $p->title; ?>" alt="<?php echo $p->title; ?>" class="attachment-post-thumbnail wp-post-image" src="<?php echo $p->image; ?>">
     </div>
     <?php endif; ?>
-    <?php if ($p->audio):?>
+    <?php if (!empty($p->audio)):?>
     <div class="post-thumbnail">
         <iframe width="100%" height="200px" class="embed-responsive-item" scrolling="no" frameborder="no" src="https://w.soundcloud.com/player/?url=<?php echo $p->audio;?>&amp;auto_play=false&amp;visual=true"></iframe>
     </div>
     <?php endif; ?>
-    <?php if ($p->video):?>
+    <?php if (!empty($p->video)):?>
     <div class="post-thumbnail">
         <iframe width="100%" height="315px" class="embed-responsive-item" src="https://www.youtube.com/embed/<?php echo get_video_id($p->video); ?>" frameborder="0" allowfullscreen></iframe>
     </div>
     <?php endif; ?>
-    <?php if ($p->quote):?>
+    <?php if (!empty($p->quote)):?>
     <div class="post-blockquote">
         <blockquote class="quote"><?php echo $p->quote ?></blockquote>
     </div>
@@ -88,10 +88,10 @@
 <nav role="navigation" class="navigation post-navigation">
     <h2 class="screen-reader-text">Post navigation</h2>
     <div class="nav-links">
-        <?php if ($prev): ?>
+        <?php if (!empty($prev)): ?>
             <div class="nav-previous"><a style="background-image: url(<?php echo($prev['image']); ?>);<?php if (!empty($prev['image'])):?>color:#fff;<?php endif;?>" rel="prev" href="<?php echo($prev['url']); ?>"><span style="<?php if (!empty($prev['image'])):?>color:#fff;<?php endif;?>" aria-hidden="true" class="meta-nav"><?php echo i18n('Prev');?></span> <span class="screen-reader-text">Previous post:</span> <span class="post-title"><?php echo($prev['title']); ?></span></a></div>
         <?php endif; ?>
-        <?php if ($next): ?>
+        <?php if (!empty($next)): ?>
             <div class="nav-next"><a style="background-image: url(<?php echo($next['image']); ?>);<?php if (!empty($next['image'])):?>color:#fff;<?php endif;?>" rel="next" href="<?php echo($next['url']); ?>"><span style="<?php if (!empty($next['image'])):?>color:#fff;<?php endif;?>" aria-hidden="true" class="meta-nav"><?php echo i18n('Next');?></span> <span class="screen-reader-text">Next post:</span> <span class="post-title"><?php echo($next['title']); ?></span></a></div>
         <?php endif; ?>
     </div>
diff --git a/themes/twentyfifteen/profile.html.php b/themes/twentyfifteen/profile.html.php
index 4bc9559..05db32b 100644
--- a/themes/twentyfifteen/profile.html.php
+++ b/themes/twentyfifteen/profile.html.php
@@ -1,12 +1,12 @@
 <?php if (!defined('HTMLY')) die('HTMLy'); ?>
 <article class="page type-page hentry">
     <header class="entry-header">
-        <h1 class="entry-title"><?php echo $author->name ?></h1><span class="social-navigation" style="margin:0 auto;float:right;"><a style="height:100%" href="<?php echo $author->url;?>/feed"><span class="screen-reader-text">RSS</span></a></span>
+        <h1 class="entry-title"><?php echo $name ?></h1>
     </header>
     <div class="entry-content">
-        <?php echo $author->about ?>
+        <?php echo $about ?>
         <h2 class="post-index"><?php echo i18n('Post_by_author');?></h2>
-        <?php if ($posts) { ?>
+        <?php if (!empty($posts)) { ?>
             <ul class="post-list">
                 <?php foreach ($posts as $p): ?>
                     <li class="item">
@@ -20,15 +20,15 @@
         } ?>
     </div>
 </article>
-<?php if ($posts) { ?>
-<?php if ($pagination['prev'] || $pagination['next']): ?>
+<?php if (!empty($posts)) { ?>
+<?php if (!empty($pagination['prev']) || !empty($pagination['next'])): ?>
 <div class="navigation pagination">
     <div class="nav-links">
-        <?php if ($pagination['prev']): ?>
+        <?php if (!empty($pagination['prev'])): ?>
             <a class="prev page-numbers" href="?page=<?php echo $page - 1 ?>">«</a>
         <?php endif; ?>
         <span class="page-numbers"><?php echo $pagination['pagenum'];?></span>
-        <?php if ($pagination['next']): ?>
+        <?php if (!empty($pagination['next'])): ?>
             <a class="next page-numbers" href="?page=<?php echo $page + 1 ?>">»</a>
         <?php endif; ?>
     </div>
diff --git a/themes/twentysixteen/README.md b/themes/twentysixteen/README.md
index 4d7beae..de5affe 100644
--- a/themes/twentysixteen/README.md
+++ b/themes/twentysixteen/README.md
@@ -1,6 +1,11 @@
 # HTMLy Theme Twenty Sixteen
 WordPress Twenty Sixteen ported to HTMLy.
 
+## Installations 
+ -  Upload and extract the zip file into themes directory.
+ -  Rename the extracted folder to `twentysixteen`.
+ -  Change the `views.root` using `http://www.example.com/admin/config` to `themes/twentysixteen`
+
 ## License
 
 See the LICENSE.txt
diff --git a/themes/twentysixteen/css/style.css b/themes/twentysixteen/css/style.css
index b4a3523..2681f07 100644
--- a/themes/twentysixteen/css/style.css
+++ b/themes/twentysixteen/css/style.css
@@ -1023,7 +1023,7 @@ a:active {
 	content: "\f516";
 }
 
-.social-navigation a[href*="/feed"]:before {
+.social-navigation a[href$="/feed/"]:before {
 	content: "\f413";
 }
 
diff --git a/themes/twentysixteen/layout.html.php b/themes/twentysixteen/layout.html.php
index 2a03bcf..fe98667 100644
--- a/themes/twentysixteen/layout.html.php
+++ b/themes/twentysixteen/layout.html.php
@@ -125,7 +125,6 @@
                     <ul class="social-links-menu" id="menu-social-links">
                         <?php if(!empty(config('social.twitter'))):?><li><a href="<?php echo config('social.twitter');?>"><span class="screen-reader-text">Twitter</span></a></li><?php endif;?>
                         <?php if(!empty(config('social.facebook'))):?><li><a href="<?php echo config('social.facebook');?>"><span class="screen-reader-text">Facebook</span></a></li><?php endif;?>
-                        <li><a href="<?php echo site_url();?>feed/rss"><span class="screen-reader-text">RSS</span></a></li>
                     </ul>
                     </div>                
                 </nav>
diff --git a/themes/twentysixteen/main.html.php b/themes/twentysixteen/main.html.php
index 2c932e7..f22cf41 100644
--- a/themes/twentysixteen/main.html.php
+++ b/themes/twentysixteen/main.html.php
@@ -1,31 +1,31 @@
 <?php if (!defined('HTMLY')) die('HTMLy'); ?>
-<?php if ($is_category):?>
-    <header class="page-header"><h1 class="page-title"><?php echo i18n('Category');?>: <?php echo $category->title;?> </h1><span class="social-navigation" style="display:inline;margin:0 auto;float:right;"><a href="<?php echo $category->url;?>/feed"><span class="screen-reader-text">RSS</span></a></span><div class="taxonomy-description"><?php echo $category->body;?> </div> </header>
+<?php if (isset($is_category)):?>
+    <header class="page-header"><h1 class="page-title"><?php echo i18n('Category');?>: <?php echo $category->title;?></h1><div class="taxonomy-description"><?php echo $category->body;?></div></header>
 <?php endif;?>
-<?php if ($is_tag):?>
-    <header class="page-header"><h1 class="page-title"><?php echo i18n('Tags');?>: <?php echo $tag->title;?></h1><span class="social-navigation" style="float:right;"><a href="<?php echo $tag->url;?>/feed"><span class="screen-reader-text">RSS</span></a></span></header>
+<?php if (isset($is_tag)):?>
+    <header class="page-header"><h1 class="page-title">Tag: <?php echo $tag->title;?></h1></header>
 <?php endif;?>
-<?php if ($is_archive):?>
-    <header class="page-header"><h1 class="page-title"><?php echo i18n('Archives');?>: <?php echo $archive->title;?></h1><span class="social-navigation" style="float:right;"><a href="<?php echo $archive->url;?>/feed"><span class="screen-reader-text">RSS</span></a></span></header>
+<?php if (isset($is_archive)):?>
+    <header class="page-header"><h1 class="page-title"><?php echo i18n('Archives');?>: <?php echo $archive->title;?></h1></header>
 <?php endif;?>
-<?php if ($is_search):?>
-    <header class="page-header"><h1 class="page-title"><?php echo i18n('Search');?>: <?php echo $search->title;?></h1><span class="social-navigation" style="float:right;"><a href="<?php echo $search->url;?>/feed"><span class="screen-reader-text">RSS</span></a></span></header>
+<?php if (isset($is_search)):?>
+    <header class="page-header"><h1 class="page-title"><?php echo i18n('Search');?>: <?php echo $search->title;?></h1></header>
 <?php endif;?>
-<?php if ($is_type):?>
-    <header class="page-header"><h1 class="page-title">Type: <?php echo ucfirst($type->title);?></h1><span class="social-navigation" style="float:right;"><a href="<?php echo $type->url;?>/feed"><span class="screen-reader-text">RSS</span></a></span></header>
+<?php if (isset($is_type)):?>
+    <header class="page-header"><h1 class="page-title">Type: <?php echo ucfirst($type->title);?></h1></header>
 <?php endif;?>
 <?php foreach ($posts as $p):?>
 <article class="post <?php if ($p->type == 'post') {echo 'format-standard';} else { echo 'format-' . $p->type;} ?> hentry single">
 
     <header class="entry-header">
-        <?php if ($p->link) {?>
+        <?php if (!empty($p->link)) {?>
             <div class="post-link"><h2 class="entry-title"><a target="_blank" href="<?php echo $p->link;?>"><?php echo $p->title;?></a></h2></div>
         <?php } else { ?>
             <h2 class="entry-title"><a href="<?php echo $p->url;?>"><?php echo $p->title;?></a></h2>
         <?php } ?>
     </header><!-- .entry-header -->
 
-    <?php if ($p->image):?>
+    <?php if (!empty($p->image)):?>
     <a class="post-thumbnail" href="<?php echo $p->url;?>"><img alt="<?php echo $p->title;?>" src="<?php echo $p->image;?>" width="100%"/></a>
     <?php endif;?>
         
@@ -33,13 +33,13 @@
         <div class="content">
             <div class="clearfix text-formatted field field--name-body">
                 <div class="content">
-                    <?php if ($p->quote):?>
+                    <?php if (!empty($p->quote)):?>
                         <blockquote><?php echo $p->quote;?></blockquote>
                     <?php endif;?>
-                    <?php if ($p->video):?>
+                    <?php if (!empty($p->video)):?>
                         <span class="embed-youtube"><iframe width="100%" height="315px" class="embed-responsive-item" src="https://www.youtube.com/embed/<?php echo get_video_id($p->video); ?>" frameborder="0" allowfullscreen></iframe></span>
                     <?php endif; ?>
-                    <?php if ($p->audio):?>
+                    <?php if (!empty($p->audio)):?>
                         <span class="embed-soundcloud"><iframe width="100%" height="200px" class="embed-responsive-item" scrolling="no" frameborder="no" src="https://w.soundcloud.com/player/?url=<?php echo $p->audio;?>&amp;auto_play=false&amp;visual=true"></iframe></span>
                     <?php endif; ?>
                     <?php echo get_teaser($p->body, $p->url);?>
@@ -64,14 +64,14 @@
 </article><!-- #post-## -->
 <?php endforeach;?>
 
-<?php if ($pagination['prev'] || $pagination['next']): ?>
+<?php if (!empty($pagination['prev']) || !empty($pagination['next'])): ?>
 <div class="navigation pagination">
     <div class="nav-links">
-        <?php if ($pagination['prev']): ?>
+        <?php if (!empty($pagination['prev'])): ?>
             <a class="prev page-numbers" href="?page=<?php echo $page - 1 ?>">«</a>
         <?php endif; ?>
         <span class="page-numbers"><?php echo $pagination['pagenum'];?></span>
-        <?php if ($pagination['next']): ?>
+        <?php if (!empty($pagination['next'])): ?>
             <a class="next page-numbers" href="?page=<?php echo $page + 1 ?>">»</a>
         <?php endif; ?>
     </div>
diff --git a/themes/twentysixteen/post.html.php b/themes/twentysixteen/post.html.php
index 889da04..5a60bc8 100644
--- a/themes/twentysixteen/post.html.php
+++ b/themes/twentysixteen/post.html.php
@@ -3,14 +3,14 @@
 
     <header class="entry-header">
         <?php if (login()) { echo tab($p); } ?>
-        <?php if ($p->link) {?>
+        <?php if (!empty($p->link)) {?>
             <div class="post-link"><h1 class="entry-title"><a target="_blank" href="<?php echo $p->link;?>"><?php echo $p->title;?></a></h1></div>
         <?php } else { ?>
             <h1 class="entry-title"><?php echo $p->title;?></h1>
         <?php } ?>
     </header><!-- .entry-header -->
 
-    <?php if ($p->image):?>
+    <?php if (!empty($p->image)):?>
         <a class="post-thumbnail" href="<?php echo $p->url;?>"><img alt="<?php echo $p->title;?>" src="<?php echo $p->image;?>" width="100%"/></a>
     <?php endif;?>
 
@@ -18,13 +18,13 @@
         <div class="content">
             <div class="clearfix text-formatted field field--name-body">
                 <div class="content">
-                    <?php if ($p->quote):?>
+                    <?php if (!empty($p->quote)):?>
                         <blockquote><?php echo $p->quote;?></blockquote>
                     <?php endif;?>
-                    <?php if ($p->video):?>
+                    <?php if (!empty($p->video)):?>
                         <span class="embed-youtube"><iframe width="100%" height="315px" class="embed-responsive-item" src="https://www.youtube.com/embed/<?php echo get_video_id($p->video); ?>" frameborder="0" allowfullscreen></iframe></span>
                     <?php endif; ?>
-                    <?php if ($p->audio):?>
+                    <?php if (!empty($p->audio)):?>
                         <span class="embed-soundcloud"><iframe width="100%" height="200px" class="embed-responsive-item" scrolling="no" frameborder="no" src="https://w.soundcloud.com/player/?url=<?php echo $p->audio;?>&amp;auto_play=false&amp;visual=true"></iframe></span>
                     <?php endif; ?>
                     <?php echo $p->body;?>
@@ -98,10 +98,10 @@
 <nav role="navigation" class="navigation post-navigation">
     <h2 class="screen-reader-text">Post navigation</h2>
     <div class="nav-links">
-        <?php if ($prev): ?>
+        <?php if (!empty($prev)): ?>
             <div class="nav-previous"><a rel="prev" href="<?php echo($prev['url']); ?>"><span aria-hidden="true" class="meta-nav"><?php echo i18n('Prev');?></span> <span class="screen-reader-text">Previous post:</span> <span class="post-title"><?php echo($prev['title']); ?></span></a></div>
         <?php endif;?>
-        <?php if ($next): ?>
+        <?php if (!empty($next)): ?>
             <div class="nav-next"><a rel="next" href="<?php echo($next['url']); ?>"><span aria-hidden="true" class="meta-nav"><?php echo i18n('Next');?></span> <span class="screen-reader-text">Next post:</span> <span class="post-title"><?php echo($next['title']); ?></span></a></div>
         <?php endif;?>
     </div>
diff --git a/themes/twentysixteen/profile.html.php b/themes/twentysixteen/profile.html.php
index 11cc472..352c2f5 100644
--- a/themes/twentysixteen/profile.html.php
+++ b/themes/twentysixteen/profile.html.php
@@ -1,12 +1,12 @@
 <?php if (!defined('HTMLY')) die('HTMLy'); ?>
 <article class="page type-page hentry">
     <header class="entry-header">
-        <h1 class="entry-title"><?php echo $author->name ?></h1><span class="social-navigation" style="float:right;"><a href="<?php echo $author->url;?>/feed"><span class="screen-reader-text">RSS</span></a></span>
+        <h1 class="entry-title"><?php echo $name ?></h1>
     </header>
     <div class="entry-content">
-        <?php echo $author->about ?>
+        <?php echo $about ?>
         <h2 class="post-index"><?php echo i18n('Post_by_author');?></h2>
-        <?php if ($posts) { ?>
+        <?php if (!empty($posts)) { ?>
             <ul class="post-list">
                 <?php foreach ($posts as $p): ?>
                     <li class="item">
@@ -20,15 +20,15 @@
         } ?>
     </div>
 </article>
-<?php if ($posts) { ?>
-<?php if ($pagination['prev'] || $pagination['next']): ?>
+<?php if (!empty($posts)) { ?>
+<?php if (!empty($pagination['prev']) || !empty($pagination['next'])): ?>
 <div class="navigation pagination">
     <div class="nav-links">
-        <?php if ($pagination['prev']): ?>
+        <?php if (!empty($pagination['prev'])): ?>
             <a class="prev page-numbers" href="?page=<?php echo $page - 1 ?>">«</a>
         <?php endif; ?>
         <span class="page-numbers"><?php echo $pagination['pagenum'];?></span>
-        <?php if ($pagination['next']): ?>
+        <?php if (!empty($pagination['next'])): ?>
             <a class="next page-numbers" href="?page=<?php echo $page + 1 ?>">»</a>
         <?php endif; ?>
     </div>