diff --git a/themes/blog/main.html.php b/themes/blog/main.html.php
index f9edef3..1355d8b 100644
--- a/themes/blog/main.html.php
+++ b/themes/blog/main.html.php
@@ -61,7 +61,7 @@
                     <p class="meta">
                         <span class="date" itemprop="datePublished"><?php echo format_date($p->date) ?></span> - Posted in 
                         <span itemprop="articleSection"><?php echo $p->category;?></span> by 
-                        <span itemprop="author"><a href="<?php echo $p->authorUrl;?>"><?php echo $p->author;?></a></span>
+                        <span class="author" itemprop="author"><a href="<?php echo $p->authorUrl;?>"><?php echo $p->authorName;?></a></span>
                         <?php if (disqus_count()) { ?> 
                             with <span><i class="fa fa-comments"></i> <a href="<?php echo $p->url ?>#disqus_thread"> comments</a></span>
                         <?php } elseif (facebook()) { ?> 
diff --git a/themes/blog/post.html.php b/themes/blog/post.html.php
index efa4751..829ac4e 100644
--- a/themes/blog/post.html.php
+++ b/themes/blog/post.html.php
@@ -36,7 +36,7 @@
                     <p class="meta">
                         <span class="date" itemprop="datePublished"><?php echo format_date($p->date) ?></span> - Posted in 
                         <span itemprop="articleSection"><?php echo $p->category;?></span> by 
-                        <span itemprop="author"><a href="<?php echo $p->authorUrl;?>"><?php echo $p->author;?></a></span>
+                        <span itemprop="author"><a href="<?php echo $p->authorUrl;?>"><?php echo $p->authorName;?></a></span>
                     </p>
                 </div>
                 <div class="desc text-left" itemprop="articleBody">                                   
diff --git a/themes/blog/profile.html.php b/themes/blog/profile.html.php
index f788749..049d5a4 100644
--- a/themes/blog/profile.html.php
+++ b/themes/blog/profile.html.php
@@ -13,17 +13,8 @@
                 <h3>Posts by this author</h3>
                 <?php if (!empty($posts)) { ?>
                     <ul class="post-list">
-                        <?php $i = 0; $len = count($posts); ?>
                         <?php foreach ($posts as $p): ?>
-                            <?php if ($i == 0) {
-                                $class = 'item first';
-                            } elseif ($i == $len - 1) {
-                                $class = 'item last';
-                            } else {
-                                $class = 'item';
-                            }
-                            $i++; ?>
-                            <li class="<?php echo $class; ?>">
+                            <li class="item">
                                 <span><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></span> on
                                 <span><?php echo format_date($p->date) ?></span> - Posted in <span><?php echo $p->category ?></span>
                             </li>
diff --git a/themes/clean/css/style.css b/themes/clean/css/style.css
index f9ceb3f..f4f2026 100644
--- a/themes/clean/css/style.css
+++ b/themes/clean/css/style.css
@@ -745,15 +745,15 @@ aside .copyright p {
 }
 
 .share a.twitter {
-    background: url(../../default/img/share-twitter.png) left top no-repeat;
+    background: url(../../readable/img/share-twitter.png) left top no-repeat;
 }
 
 .share a.facebook {
-    background: url(../../default/img/share-facebook.png) left top no-repeat;
+    background: url(../../readable/img/share-facebook.png) left top no-repeat;
 }
 
 .share a.googleplus {
-    background: url(../../default/img/share-googleplus.png) left top no-repeat;
+    background: url(../../readable/img/share-googleplus.png) left top no-repeat;
 }
 
 .share a:hover {
diff --git a/themes/clean/main.html.php b/themes/clean/main.html.php
index 4ef9a6f..92dd948 100644
--- a/themes/clean/main.html.php
+++ b/themes/clean/main.html.php
@@ -32,7 +32,7 @@
             <div class="date">
                 <span itemprop="datePublished"><?php echo format_date($p->date) ?></span> - Posted in
                 <span itemprop="articleSection"><?php echo $p->category ?></span> by
-                <span itemprop="author"><a href="<?php echo $p->authorUrl ?>"><?php echo $p->author ?></a></span>
+                <span itemprop="author"><a href="<?php echo $p->authorUrl ?>"><?php echo $p->authorName; ?></a></span>
                 <?php if (disqus_count()) { ?> - 
                     <span><a href="<?php echo $p->url ?>#disqus_thread">Comments</a></span>
                 <?php } elseif (facebook()) { ?> -
diff --git a/themes/clean/post.html.php b/themes/clean/post.html.php
index 02cb777..8064d42 100644
--- a/themes/clean/post.html.php
+++ b/themes/clean/post.html.php
@@ -15,7 +15,7 @@
             <span itemprop="datePublished"><a href="<?php echo $p->archive ?>" title="Show all posts made on this month"><?php echo format_date($p->date) ?></a></span>
             - Posted in
             <span itemprop="articleSection"><?php echo $p->category ?></span> by
-            <span itemprop="author"><a href="<?php echo $p->authorUrl ?>"><?php echo $p->author ?></a></span> -
+            <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 (!empty($p->image)) { ?>
diff --git a/themes/clean/profile.html.php b/themes/clean/profile.html.php
index 2f635f6..6d4a9c2 100644
--- a/themes/clean/profile.html.php
+++ b/themes/clean/profile.html.php
@@ -11,17 +11,8 @@
 <h2 class="post-index">Posts by this author</h2>
 <?php if (!empty($posts)) { ?>
     <ul class="post-list">
-        <?php $i = 0; $len = count($posts); ?>
         <?php foreach ($posts as $p): ?>
-            <?php if ($i == 0) {
-                $class = 'item first';
-            } elseif ($i == $len - 1) {
-                $class = 'item last';
-            } else {
-                $class = 'item';
-            }
-            $i++; ?>
-            <li class="<?php echo $class; ?>">
+            <li class="item">
                 <span><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></span> on
                 <span><?php echo format_date($p->date) ?></span> - Posted in <span><?php echo $p->tag ?></span>
             </li>
diff --git a/themes/logs/css/style.css b/themes/logs/css/style.css
index 40d5354..ef28d56 100644
--- a/themes/logs/css/style.css
+++ b/themes/logs/css/style.css
@@ -553,15 +553,15 @@ ul li, ol li {
 }
 
 .share a.twitter {
-    background: url(../../default/img/share-twitter.png) left top no-repeat;
+    background: url(../../readable/img/share-twitter.png) left top no-repeat;
 }
 
 .share a.facebook {
-    background: url(../../default/img/share-facebook.png) left top no-repeat;
+    background: url(../../readable/img/share-facebook.png) left top no-repeat;
 }
 
 .share a.googleplus {
-    background: url(../../default/img/share-googleplus.png) left top no-repeat;
+    background: url(../../readable/img/share-googleplus.png) left top no-repeat;
 }
 
 .share a:hover {
diff --git a/themes/logs/main.html.php b/themes/logs/main.html.php
index c69c9e2..cd8645c 100644
--- a/themes/logs/main.html.php
+++ b/themes/logs/main.html.php
@@ -12,17 +12,8 @@
         </div>
     <?php endif; ?>
 <?php endif; ?>
-<?php $i = 0; $len = count($posts); ?>
 <?php foreach ($posts as $p): ?>
-    <?php if ($i == 0) {
-        $class = 'post first';
-    } elseif ($i == $len - 1) {
-        $class = 'post last';
-    } else {
-        $class = 'post';
-    }
-    $i++; ?>
-    <div class="<?php echo $class ?>" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
+    <div class="post" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
         <div class="main">
             <?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>
@@ -32,7 +23,7 @@
             <div class="date">
                 <span itemprop="datePublished"><?php echo format_date($p->date) ?></span> - Posted in
                 <span itemprop="articleSection"><?php echo $p->category ?></span> by
-                <span itemprop="author"><a href="<?php echo $p->authorUrl ?>"><?php echo $p->author ?></a></span>
+                <span itemprop="author"><a href="<?php echo $p->authorUrl ?>"><?php echo $p->authorName; ?></a></span>
                 <?php if (disqus_count()) { ?> - 
                     <span><a href="<?php echo $p->url ?>#disqus_thread">Comments</a></span>
                 <?php } elseif (facebook()) { ?> - 
diff --git a/themes/logs/post.html.php b/themes/logs/post.html.php
index 2f58815..e651293 100644
--- a/themes/logs/post.html.php
+++ b/themes/logs/post.html.php
@@ -15,7 +15,7 @@
             <span itemprop="datePublished"><a href="<?php echo $p->archive ?>" title="Show all posts made on this month"><?php echo format_date($p->date) ?></a></span>
             - Posted in
             <span itemprop="articleSection"><?php echo $p->category ?></span> by
-            <span itemprop="author"><a href="<?php echo $p->authorUrl ?>"><?php echo $p->author ?></a></span> -
+            <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 (!empty($p->image)) { ?>
diff --git a/themes/logs/profile.html.php b/themes/logs/profile.html.php
index a2f2566..dce1a27 100644
--- a/themes/logs/profile.html.php
+++ b/themes/logs/profile.html.php
@@ -11,17 +11,8 @@
 <h2 class="post-index">Posts by this author</h2>
 <?php if (!empty($posts)) { ?>
     <ul class="post-list">
-        <?php $i = 0; $len = count($posts); ?>
         <?php foreach ($posts as $p): ?>
-            <?php if ($i == 0) {
-                $class = 'item first';
-            } elseif ($i == $len - 1) {
-                $class = 'item last';
-            } else {
-                $class = 'item';
-            }
-            $i++; ?>
-            <li class="<?php echo $class; ?>">
+            <li class="item">
                 <span><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></span> on
                 <span><?php echo format_date($p->date) ?></span> - Posted in <span><?php echo $p->tag ?></span>
             </li>
diff --git a/themes/readable/main.html.php b/themes/readable/main.html.php
index 998c2bc..5e4cca8 100644
--- a/themes/readable/main.html.php
+++ b/themes/readable/main.html.php
@@ -12,17 +12,8 @@
         </div>
     <?php endif; ?>
 <?php endif; ?>
-<?php $i = 0; $len = count($posts); ?>
 <?php foreach ($posts as $p): ?>
-    <?php if ($i == 0) {
-        $class = 'post first';
-    } elseif ($i == $len - 1) {
-        $class = 'post last';
-    } else {
-        $class = 'post';
-    }
-    $i++; ?>
-    <div class="<?php echo $class ?>" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
+    <div class="post" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
         <div class="main">
             <?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>
@@ -32,7 +23,7 @@
             <div class="date">
                 <span itemprop="datePublished"><?php echo format_date($p->date) ?></span> - Posted in
                 <span itemprop="articleSection"><?php echo $p->category ?></span> by
-                <span itemprop="author"><a href="<?php echo $p->authorUrl ?>"><?php echo $p->author ?></a></span>
+                <span itemprop="author"><a href="<?php echo $p->authorUrl ?>"><?php echo $p->authorName; ?></a></span>
                 <?php if (disqus_count()) { ?> - 
                     <span><a href="<?php echo $p->url ?>#disqus_thread">Comments</a></span>
                 <?php } elseif (facebook()) { ?> -
diff --git a/themes/readable/post.html.php b/themes/readable/post.html.php
index 97ced3d..a0d6bbf 100644
--- a/themes/readable/post.html.php
+++ b/themes/readable/post.html.php
@@ -15,7 +15,7 @@
             <span itemprop="datePublished"><a href="<?php echo $p->archive ?>" title="Show all posts made on this month"><?php echo format_date($p->date) ?></a></span>
             - Posted in
             <span itemprop="articleSection"><?php echo $p->category ?></span> by
-            <span itemprop="author"><a href="<?php echo $p->authorUrl ?>"><?php echo $p->author ?></a></span> -
+            <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 (!empty($p->image)) { ?>
diff --git a/themes/readable/profile.html.php b/themes/readable/profile.html.php
index 93ed853..7c2b461 100644
--- a/themes/readable/profile.html.php
+++ b/themes/readable/profile.html.php
@@ -11,17 +11,8 @@
 <h2 class="post-index">Posts by this author</h2>
 <?php if (!empty($posts)) { ?>
     <ul class="post-list">
-        <?php $i = 0; $len = count($posts); ?>
         <?php foreach ($posts as $p): ?>
-            <?php if ($i == 0) {
-                $class = 'item first';
-            } elseif ($i == $len - 1) {
-                $class = 'item last';
-            } else {
-                $class = 'item';
-            }
-            $i++; ?>
-            <li class="<?php echo $class; ?>">
+            <li class="item">
                 <span><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></span> on
                 <span><?php echo format_date($p->date) ?></span> - Posted in <span><?php echo $p->tag ?></span>
             </li>
diff --git a/themes/twentyfifteen/main.html.php b/themes/twentyfifteen/main.html.php
index 60209a6..9900adb 100644
--- a/themes/twentyfifteen/main.html.php
+++ b/themes/twentyfifteen/main.html.php
@@ -55,7 +55,7 @@
         </span>
         <span class="byline">
             <span class="author vcard">
-                <a href="<?php echo $p->authorUrl; ?>"><?php echo $p->author; ?></a>
+                <a href="<?php echo $p->authorUrl; ?>"><?php echo $p->authorName; ?></a>
             </span>
         </span>
         <span class="cat-links">
diff --git a/themes/twentyfifteen/post.html.php b/themes/twentyfifteen/post.html.php
index 4084d2e..8c2843a 100644
--- a/themes/twentyfifteen/post.html.php
+++ b/themes/twentyfifteen/post.html.php
@@ -53,7 +53,7 @@
         </span>
         <span class="byline">
             <span class="author vcard">
-                <a href="<?php echo $p->authorUrl; ?>"><?php echo $p->author; ?></a>
+                <a href="<?php echo $p->authorUrl; ?>"><?php echo $p->authorName; ?></a>
             </span>
         </span>
         <span class="cat-links">
diff --git a/themes/twentyfifteen/profile.html.php b/themes/twentyfifteen/profile.html.php
index ae4d2b9..f1bb73a 100644
--- a/themes/twentyfifteen/profile.html.php
+++ b/themes/twentyfifteen/profile.html.php
@@ -8,17 +8,8 @@
         <h2 class="post-index">Posts by this author</h2>
         <?php if (!empty($posts)) { ?>
             <ul class="post-list">
-                <?php $i = 0; $len = count($posts); ?>
                 <?php foreach ($posts as $p): ?>
-                    <?php if ($i == 0) {
-                        $class = 'item first';
-                    } elseif ($i == $len - 1) {
-                        $class = 'item last';
-                    } else {
-                        $class = 'item';
-                    }
-                    $i++; ?>
-                    <li class="<?php echo $class; ?>">
+                    <li class="item">
                         <span><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></span> on
                         <span><?php echo format_date($p->date) ?></span> - <?php echo i18n('Posted_in');?> <span><?php echo $p->tag ?></span>
                     </li>
diff --git a/themes/twentysixteen/main.html.php b/themes/twentysixteen/main.html.php
index 17d386e..7f6d39a 100644
--- a/themes/twentysixteen/main.html.php
+++ b/themes/twentysixteen/main.html.php
@@ -50,7 +50,7 @@
     </div><!-- .entry-content -->
 
     <footer class="entry-footer">
-        <span class="byline"><span class="author vcard"><a href="<?php echo $p->authorUrl;?>"><img alt="<?php echo $p->author;?>" src="<?php echo site_url();?>themes/twentysixteen/img/avatar.png" class="avatar avatar-49 grav-hashed grav-hijack" height="49" width="49"></a><span class="screen-reader-text">Author </span> <a class="url fn n" href="<?php echo $p->authorUrl;?>"><?php echo $p->author;?></a></span></span>
+        <span class="byline"><span class="author vcard"><a href="<?php echo $p->authorUrl;?>"><img alt="<?php echo $p->authorName;?>" src="<?php echo site_url();?>themes/twentysixteen/img/avatar.png" class="avatar avatar-49 grav-hashed grav-hijack" height="49" width="49"></a><span class="screen-reader-text">Author </span> <a class="url fn n" href="<?php echo $p->authorUrl;?>"><?php echo $p->author;?></a></span></span>
         <span class="posted-on"><span class="screen-reader-text"><?php echo i18n('Posted_on');?> </span><a href="<?php echo $p->url;?>" rel="bookmark"><time class="entry-date published"><?php echo format_date($p->date) ?></time></a></span>
         <span class="cat-links"><span class="screen-reader-text"><?php echo i18n('Category');?> </span><?php echo $p->category;?></span>
         <span class="tags-links"><span class="screen-reader-text">Tags </span><?php echo $p->tag;?></span>
diff --git a/themes/twentysixteen/profile.html.php b/themes/twentysixteen/profile.html.php
index f84cdd4..9cfe4fd 100644
--- a/themes/twentysixteen/profile.html.php
+++ b/themes/twentysixteen/profile.html.php
@@ -8,17 +8,8 @@
         <h2 class="post-index">Posts by this author</h2>
         <?php if (!empty($posts)) { ?>
             <ul class="post-list">
-                <?php $i = 0; $len = count($posts); ?>
                 <?php foreach ($posts as $p): ?>
-                    <?php if ($i == 0) {
-                        $class = 'item first';
-                    } elseif ($i == $len - 1) {
-                        $class = 'item last';
-                    } else {
-                        $class = 'item';
-                    }
-                    $i++; ?>
-                    <li class="<?php echo $class; ?>">
+                    <li class="item">
                         <span><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></span> on
                         <span><?php echo format_date($p->date) ?></span> - Posted in <span class="tags-links"><?php echo $p->tag ?></span>
                     </li>