diff --git a/system/htmly.php b/system/htmly.php
index b05fc90..0cf8895 100644
--- a/system/htmly.php
+++ b/system/htmly.php
@@ -280,6 +280,7 @@ get('/author/:name', function ($name) {
             'posts' => null,
             'about' => $author->about,
             'name' => $author->name,
+            'author' => $author,
             'type' => 'is_profile',
             'bodyclass' => 'in-profile author-' . $name,
             'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; ' . i18n('Profile_for') . ' ' . $author->name,
@@ -307,6 +308,7 @@ get('/author/:name', function ($name) {
         'posts' => $posts,
         'about' => $author->about,
         'name' => $author->name,
+        'author' => $author,
         'type' => 'is_profile',
         'bodyclass' => 'in-profile author-' . $name,
         'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; ' . i18n('Profile_for') . ' ' . $author->name,
diff --git a/themes/twentyfifteen/README.md b/themes/twentyfifteen/README.md
index 7e2272c..d2d4e24 100644
--- a/themes/twentyfifteen/README.md
+++ b/themes/twentyfifteen/README.md
@@ -1,11 +1,6 @@
 # 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 a98104b..7aca5d4 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";
 }
 
diff --git a/themes/twentyfifteen/css/style_v2.css b/themes/twentyfifteen/css/style_v2.css
index 16aa9f4..bba4372 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";
 }
 
diff --git a/themes/twentyfifteen/layout.html.php b/themes/twentyfifteen/layout.html.php
index cb96800..c876824 100644
--- a/themes/twentyfifteen/layout.html.php
+++ b/themes/twentyfifteen/layout.html.php
@@ -47,6 +47,11 @@
                     <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 c233294..8dbe902 100644
--- a/themes/twentyfifteen/main.html.php
+++ b/themes/twentyfifteen/main.html.php
@@ -1,18 +1,18 @@
 <?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><div class="taxonomy-description"><?php echo $category->body;?></div></header>
+    <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 endif;?>
 <?php if ($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" 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 endif;?>
 <?php if ($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" 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 endif;?>
 <?php if ($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" 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 endif;?>
 <?php if ($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" 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 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;?>">
diff --git a/themes/twentyfifteen/profile.html.php b/themes/twentyfifteen/profile.html.php
index 7328d76..4bc9559 100644
--- a/themes/twentyfifteen/profile.html.php
+++ b/themes/twentyfifteen/profile.html.php
@@ -1,10 +1,10 @@
 <?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" 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>
     </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 ($posts) { ?>
             <ul class="post-list">
diff --git a/themes/twentysixteen/README.md b/themes/twentysixteen/README.md
index de5affe..4d7beae 100644
--- a/themes/twentysixteen/README.md
+++ b/themes/twentysixteen/README.md
@@ -1,11 +1,6 @@
 # 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 2681f07..b4a3523 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 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 768031a..2c932e7 100644
--- a/themes/twentysixteen/main.html.php
+++ b/themes/twentysixteen/main.html.php
@@ -1,18 +1,18 @@
 <?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><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" 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 endif;?>
 <?php if ($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('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 endif;?>
 <?php if ($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" style="float:right;"><a href="<?php echo $archive->url;?>/feed"><span class="screen-reader-text">RSS</span></a></span></header>
 <?php endif;?>
 <?php if ($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" style="float:right;"><a href="<?php echo $search->url;?>/feed"><span class="screen-reader-text">RSS</span></a></span></header>
 <?php endif;?>
 <?php if ($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" style="float:right;"><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 84b2bf7..11cc472 100644
--- a/themes/twentysixteen/profile.html.php
+++ b/themes/twentysixteen/profile.html.php
@@ -1,10 +1,10 @@
 <?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" style="float:right;"><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 ($posts) { ?>
             <ul class="post-list">