diff --git a/themes/blog/css/styles.css b/themes/blog/css/styles.css
index 6e2b8a3..d0314e1 100644
--- a/themes/blog/css/styles.css
+++ b/themes/blog/css/styles.css
@@ -622,4 +622,10 @@ ul.month {
 .pagination {
   margin-top:0;
   margin-bottom:15px;
+}
+
+.feed-link {
+  display:inline;
+  margin:0 0 0 10px;
+  float:right;	
 }
\ No newline at end of file
diff --git a/themes/blog/main.html.php b/themes/blog/main.html.php
index ffefce6..618dbe5 100644
--- a/themes/blog/main.html.php
+++ b/themes/blog/main.html.php
@@ -2,21 +2,20 @@
 <?php if (!empty($breadcrumb)): ?>
     <div class="breadcrumb"><?php echo $breadcrumb ?></div>
 <?php endif; ?>
-<?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>
+<?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>
+                <span class="social-navigation feed-link"><a href="<?php echo $category->url;?>/feed"><i class="fa fa-rss"></i></a></span>
+                <div class="text-left">                                   
+                    <?php echo $category->body; ?>
+                </div><!--//desc-->
+                </div><!--//item-->                       
+            </div><!--//content-->  
         </div>
-    <?php endif; ?>
+    </div>
 <?php endif; ?>
 <?php $i = 0; $len = count($posts); ?>
 <?php foreach ($posts as $p): ?>
@@ -67,7 +66,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">                                    
diff --git a/themes/blog/static.html.php b/themes/blog/static.html.php
index 95afb61..059affb 100644
--- a/themes/blog/static.html.php
+++ b/themes/blog/static.html.php
@@ -11,6 +11,16 @@
                 <div class="desc text-left" itemprop="articleBody">
                     <?php echo $p->body; ?>
                 </div><!--//desc-->
+                <div style="margin-top:30px;position:relative;">
+                    <hr>
+                    <?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 $p->title;?></a></span>
+                    <?php endif; ?>
+                    <?php if (!empty($prev)): ?>
+                        <span class="older pull-right"><a href="<?php echo($prev['url']); ?>" rel="prev"><?php echo $p->title;?> <i class="fa fa-long-arrow-right"></i></a></span>
+                    <?php endif; ?>
+                    <div style="clear:both;"></div>
+                </div>
             </div><!--//item-->
         </div><!--//content-->
     </div><!--//section-inner-->
diff --git a/themes/clean/main.html.php b/themes/clean/main.html.php
index 030e780..009fb3c 100644
--- a/themes/clean/main.html.php
+++ b/themes/clean/main.html.php
@@ -2,15 +2,13 @@
 <?php if (!empty($breadcrumb)): ?>
     <div class="breadcrumb"><?php echo $breadcrumb ?></div>
 <?php endif; ?>
-<?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>
+<?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>
-    <?php endif; ?>
+    </div>
 <?php endif; ?>
 <?php $i = 0; $len = count($posts); ?>
 <?php foreach ($posts as $p): ?>
@@ -38,7 +36,7 @@
                 <?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 (!empty($p->image)) { ?>
                 <div class="featured-image">
diff --git a/themes/clean/static.html.php b/themes/clean/static.html.php
index 969ced9..1472ae6 100644
--- a/themes/clean/static.html.php
+++ b/themes/clean/static.html.php
@@ -10,4 +10,12 @@
             <?php echo $p->body; ?>
         </div>
     </div>
+    <div class="postnav">
+        <?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 (!empty($prev)): ?>
+            <span><a href="<?php echo($prev['url']); ?>" class="pagination-arrow older" rel="prev"><?php echo($prev['title']); ?></a></span>
+        <?php endif; ?>
+    </div>
 </div>
\ No newline at end of file
diff --git a/themes/logs/css/style.css b/themes/logs/css/style.css
index ef28d56..937c94e 100644
--- a/themes/logs/css/style.css
+++ b/themes/logs/css/style.css
@@ -484,7 +484,7 @@ ul li, ol li {
     margin-bottom: 1.5em;
 }
 
-.in-post .post {
+.in-post .post, .in-page .post, .in-subpage .post {
     border: none;
 }
 
diff --git a/themes/logs/main.html.php b/themes/logs/main.html.php
index 8e0fea5..284fa76 100644
--- a/themes/logs/main.html.php
+++ b/themes/logs/main.html.php
@@ -2,15 +2,13 @@
 <?php if (!empty($breadcrumb)): ?>
     <div class="breadcrumb"><?php echo $breadcrumb ?></div>
 <?php endif; ?>
-<?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>
+<?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>
-    <?php endif; ?>
+    </div>
 <?php endif; ?>
 <?php foreach ($posts as $p): ?>
     <div class="post" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
@@ -29,7 +27,7 @@
                 <?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 (!empty($p->image)) { ?>
                 <div class="featured-image">
diff --git a/themes/logs/static.html.php b/themes/logs/static.html.php
index f82075d..a4e4e48 100644
--- a/themes/logs/static.html.php
+++ b/themes/logs/static.html.php
@@ -11,4 +11,13 @@
             <?php echo $p->body; ?>
         </div>
     </div>
+	<div class="border"></div>
+    <div class="postnav">
+        <?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 (!empty($prev)): ?>
+            <span class="older"><a href="<?php echo($prev['url']); ?>" rel="prev"><?php echo($prev['title']); ?></a> &raquo;</span>
+        <?php endif; ?>
+    </div>
 </div>
\ No newline at end of file
diff --git a/themes/readable/main.html.php b/themes/readable/main.html.php
index 4950bb3..168c638 100644
--- a/themes/readable/main.html.php
+++ b/themes/readable/main.html.php
@@ -2,15 +2,13 @@
 <?php if (!empty($breadcrumb)): ?>
     <div class="breadcrumb"><?php echo $breadcrumb ?></div>
 <?php endif; ?>
-<?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>
+<?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>
-    <?php endif; ?>
+    </div>
 <?php endif; ?>
 <?php foreach ($posts as $p): ?>
     <div class="post" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
@@ -29,7 +27,7 @@
                 <?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 (!empty($p->image)) { ?>
                 <div class="featured-image">
diff --git a/themes/readable/static.html.php b/themes/readable/static.html.php
index 969ced9..1472ae6 100644
--- a/themes/readable/static.html.php
+++ b/themes/readable/static.html.php
@@ -10,4 +10,12 @@
             <?php echo $p->body; ?>
         </div>
     </div>
+    <div class="postnav">
+        <?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 (!empty($prev)): ?>
+            <span><a href="<?php echo($prev['url']); ?>" class="pagination-arrow older" rel="prev"><?php echo($prev['title']); ?></a></span>
+        <?php endif; ?>
+    </div>
 </div>
\ No newline at end of file
diff --git a/themes/twentyfifteen/README.md b/themes/twentyfifteen/README.md
index 7e2272c..fac491d 100644
--- a/themes/twentyfifteen/README.md
+++ b/themes/twentyfifteen/README.md
@@ -3,8 +3,7 @@ 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`
+ -  Activate it from HTMLy panel.
 
 ## License
 
diff --git a/themes/twentyfifteen/css/style.css b/themes/twentyfifteen/css/style.css
index a98104b..0f1f7a4 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/rss"]:before {
+.social-navigation a[href*="/feed"]:before {
 	content: "\f413";
 }
 
@@ -6129,4 +6129,14 @@ ul.month {
 	.main-navigation {
 		margin: 0 auto 9.0909%;
 	}
+}
+
+.feed-link {
+	display:inline;
+	margin:0 0 0 10px;
+	float:right;	
+}
+
+.feed-link a {
+	height:100%;
 }
\ No newline at end of file
diff --git a/themes/twentyfifteen/css/style_v2.css b/themes/twentyfifteen/css/style_v2.css
index 16aa9f4..322a3a5 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/rss"]:before {
+.social-navigation a[href*="/feed"]:before {
 	content: "\f413";
 }
 
@@ -6136,4 +6136,14 @@ ul.month {
 
 .comments-area a.more-link:hover {
 	border-bottom: none;
+}
+
+.feed-link {
+	display:inline;
+	margin:0 0 0 10px;
+	float:right;	
+}
+
+.feed-link a {
+	height:100%;
 }
\ No newline at end of file
diff --git a/themes/twentyfifteen/layout.html.php b/themes/twentyfifteen/layout.html.php
index cb96800..82dcda6 100644
--- a/themes/twentyfifteen/layout.html.php
+++ b/themes/twentyfifteen/layout.html.php
@@ -61,6 +61,11 @@
                                     </a>
                                 </li>
 								<?php endif;?>
+                                <li class="menu-item">
+                                    <a href="<?php echo site_url();?>feed/rss">
+                                    <span class="screen-reader-text">RSS</span>
+                                    </a>
+                                </li>
                             </ul>
                         </div>
                     </nav>
diff --git a/themes/twentyfifteen/main.html.php b/themes/twentyfifteen/main.html.php
index 6f5a68a..8da2ee6 100644
--- a/themes/twentyfifteen/main.html.php
+++ b/themes/twentyfifteen/main.html.php
@@ -1,18 +1,34 @@
 <?php if (!defined('HTMLY')) die('HTMLy'); ?>
 <?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>
+    <header class="page-header">
+		<span class="social-navigation feed-link"><a 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 endif;?>
 <?php if (isset($is_tag)):?>
-    <header class="page-header"><h1 class="page-title"><?php echo i18n('Tags');?>: <?php echo $tag->title;?></h1></header>
+    <header class="page-header">
+		<span class="social-navigation feed-link"><a 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 endif;?>
 <?php if (isset($is_archive)):?>
-    <header class="page-header"><h1 class="page-title"><?php echo i18n('Archives');?>: <?php echo $archive->title;?></h1></header>
+    <header class="page-header">
+		<span class="social-navigation feed-link"><a 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 endif;?>
 <?php if (isset($is_search)):?>
-    <header class="page-header"><h1 class="page-title"><?php echo i18n('Search');?>: <?php echo $search->title;?></h1></header>
+    <header class="page-header">
+		<span class="social-navigation feed-link"><a 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 endif;?>
 <?php if (isset($is_type)):?>
-    <header class="page-header"><h1 class="page-title">Type: <?php echo ucfirst($type->title);?></h1></header>
+    <header class="page-header">
+		<span class="social-navigation feed-link"><a 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 endif;?>
 <?php foreach ($posts as $p): ?>
 <article class="post type-post hentry <?php if (!empty($p->image) || !empty ($p->audio) || !empty ($p->video)):?>has-post-thumbnail<?php endif;?>">
diff --git a/themes/twentyfifteen/profile.html.php b/themes/twentyfifteen/profile.html.php
index 05db32b..a7c2b89 100644
--- a/themes/twentyfifteen/profile.html.php
+++ b/themes/twentyfifteen/profile.html.php
@@ -1,10 +1,11 @@
 <?php if (!defined('HTMLY')) die('HTMLy'); ?>
 <article class="page type-page hentry">
     <header class="entry-header">
-        <h1 class="entry-title"><?php echo $name ?></h1>
+        <h1 class="entry-title"><?php echo $author->name ?></h1>
+		<span class="social-navigation feed-link"><a href="<?php echo $author->url;?>/feed"><span class="screen-reader-text">RSS</span></a></span>
     </header>
     <div class="entry-content">
-        <?php echo $about ?>
+        <?php echo $author->about ?>
         <h2 class="post-index"><?php echo i18n('Post_by_author');?></h2>
         <?php if (!empty($posts)) { ?>
             <ul class="post-list">
diff --git a/themes/twentyfifteen/static.html.php b/themes/twentyfifteen/static.html.php
index eb2b713..f3e3d7b 100644
--- a/themes/twentyfifteen/static.html.php
+++ b/themes/twentyfifteen/static.html.php
@@ -7,4 +7,15 @@
     <div class="entry-content">
         <?php echo $p->body; ?>
     </div>
-</article>
\ No newline at end of file
+</article>
+<nav role="navigation" class="navigation post-navigation">
+    <h2 class="screen-reader-text">Post navigation</h2>
+    <div class="nav-links">
+        <?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 (!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>
+</nav>
\ No newline at end of file
diff --git a/themes/twentysixteen/README.md b/themes/twentysixteen/README.md
index de5affe..5a4ddd5 100644
--- a/themes/twentysixteen/README.md
+++ b/themes/twentysixteen/README.md
@@ -3,8 +3,7 @@ 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`
+ -  Activate it from HTMLy panel.
 
 ## License
 
diff --git a/themes/twentysixteen/css/style.css b/themes/twentysixteen/css/style.css
index 2681f07..15a6d33 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";
 }
 
@@ -4059,4 +4059,10 @@ ul.month {
 
 .nav li.active .dropdown-toggle, .nav .dropdown-menu li.active a {
 	font-weight: 700;
+}
+
+.feed-link {
+	display:inline;
+	margin:0 0 0 10px;
+	float:right;	
 }
\ No newline at end of file
diff --git a/themes/twentysixteen/layout.html.php b/themes/twentysixteen/layout.html.php
index fe98667..2a03bcf 100644
--- a/themes/twentysixteen/layout.html.php
+++ b/themes/twentysixteen/layout.html.php
@@ -125,6 +125,7 @@
                     <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 f22cf41..772aefb 100644
--- a/themes/twentysixteen/main.html.php
+++ b/themes/twentysixteen/main.html.php
@@ -1,18 +1,34 @@
 <?php if (!defined('HTMLY')) die('HTMLy'); ?>
 <?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>
+    <header class="page-header">
+		<h1 class="page-title"><?php echo i18n('Category');?>: <?php echo $category->title;?></h1>
+		<span class="social-navigation feed-link"><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 endif;?>
 <?php if (isset($is_tag)):?>
-    <header class="page-header"><h1 class="page-title">Tag: <?php echo $tag->title;?></h1></header>
+    <header class="page-header">
+		<h1 class="page-title"><?php echo i18n('Tag');?>: <?php echo $tag->title;?></h1>
+		<span class="social-navigation feed-link"><a href="<?php echo $tag->url;?>/feed"><span class="screen-reader-text">RSS</span></a></span>
+	</header>
 <?php endif;?>
 <?php if (isset($is_archive)):?>
-    <header class="page-header"><h1 class="page-title"><?php echo i18n('Archives');?>: <?php echo $archive->title;?></h1></header>
+    <header class="page-header">
+		<h1 class="page-title"><?php echo i18n('Archives');?>: <?php echo $archive->title;?></h1>
+		<span class="social-navigation feed-link"><a href="<?php echo $archive->url;?>/feed"><span class="screen-reader-text">RSS</span></a></span>
+	</header>
 <?php endif;?>
 <?php if (isset($is_search)):?>
-    <header class="page-header"><h1 class="page-title"><?php echo i18n('Search');?>: <?php echo $search->title;?></h1></header>
+    <header class="page-header">
+		<h1 class="page-title"><?php echo i18n('Search');?>: <?php echo $search->title;?></h1>
+		<span class="social-navigation feed-link"><a href="<?php echo $search->url;?>/feed"><span class="screen-reader-text">RSS</span></a></span>
+	</header>
 <?php endif;?>
 <?php if (isset($is_type)):?>
-    <header class="page-header"><h1 class="page-title">Type: <?php echo ucfirst($type->title);?></h1></header>
+    <header class="page-header">
+		<h1 class="page-title">Type: <?php echo ucfirst($type->title);?></h1>
+		<span class="social-navigation feed-link"><a href="<?php echo $type->url;?>/feed"><span class="screen-reader-text">RSS</span></a></span>
+	</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">
diff --git a/themes/twentysixteen/profile.html.php b/themes/twentysixteen/profile.html.php
index 352c2f5..a056fad 100644
--- a/themes/twentysixteen/profile.html.php
+++ b/themes/twentysixteen/profile.html.php
@@ -1,10 +1,11 @@
 <?php if (!defined('HTMLY')) die('HTMLy'); ?>
 <article class="page type-page hentry">
     <header class="entry-header">
-        <h1 class="entry-title"><?php echo $name ?></h1>
+        <h1 class="entry-title"><?php echo $author->name ?></h1>
+		<span class="social-navigation feed-link"><a href="<?php echo $author->url;?>/feed"><span class="screen-reader-text">RSS</span></a></span>
     </header>
     <div class="entry-content">
-        <?php echo $about ?>
+        <?php echo $author->about ?>
         <h2 class="post-index"><?php echo i18n('Post_by_author');?></h2>
         <?php if (!empty($posts)) { ?>
             <ul class="post-list">
diff --git a/themes/twentysixteen/static.html.php b/themes/twentysixteen/static.html.php
index 9677faa..8deec9f 100644
--- a/themes/twentysixteen/static.html.php
+++ b/themes/twentysixteen/static.html.php
@@ -16,4 +16,16 @@
         </div>
     </div><!-- .entry-content -->
     
-</article><!-- #post-## -->
\ No newline at end of file
+</article><!-- #post-## -->
+
+<nav role="navigation" class="navigation post-navigation">
+    <h2 class="screen-reader-text">Post navigation</h2>
+    <div class="nav-links">
+        <?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 (!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>
+</nav>
\ No newline at end of file