diff --git a/cache/installedVersion.json b/cache/installedVersion.json
index dc254d9..0fdd7d6 100644
--- a/cache/installedVersion.json
+++ b/cache/installedVersion.json
@@ -1,4 +1,4 @@
 {
   "id": 782014,
-  "tag_name": "v2.6.6"
+  "tag_name": "v2.6.7"
 }
diff --git a/system/admin/admin.php b/system/admin/admin.php
index 409a5bc..ebc888a 100644
--- a/system/admin/admin.php
+++ b/system/admin/admin.php
@@ -181,7 +181,7 @@ function edit_content($title, $tag, $url, $content, $oldfile, $destination = nul
     if ($media !== null) {
         $post_media = "\n<!--" . $type . " " . $post_media. " " . $type . "-->";
     } else {
-        $post_image = "";
+        $post_media = "";
     }    
     $post_content = "<!--t " . $post_title . " t-->" . $post_description . $tagmd . $post_media . "\n\n" . $content;
 
diff --git a/themes/blog/main.html.php b/themes/blog/main.html.php
index b15a0b3..573f3ef 100644
--- a/themes/blog/main.html.php
+++ b/themes/blog/main.html.php
@@ -51,13 +51,12 @@
                         <blockquote class="quote"><i class="fa fa-quote-left"></i> <?php echo $p->quote ?> <i class="fa fa-quote-right"></i></blockquote>
                     </div>
                 <?php } ?>
-                <?php if (!empty($p->link)) { ?>
-                    <div class="featured featured-link">
-                        <a target="_blank" href="<?php echo $p->link ?>"><i class="fa fa-external-link"></i> <?php echo $p->link ?></a>
-                    </div>
-                <?php } ?>
                 <div class="info text-left">
-                    <h2 class="title" itemprop="headline"><a href="<?php echo $p->url;?>"><?php echo $p->title;?></a></h2>
+                    <?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>
+                    <?php } ?>
                     <p class="meta">
                         <span class="date" itemprop="datePublished"><?php echo date('d F Y', $p->date) ?></span> - Posted in 
                         <span itemprop="articleSection"><?php echo $p->category;?></span> by 
diff --git a/themes/blog/post.html.php b/themes/blog/post.html.php
index 2c654ce..91c1a29 100644
--- a/themes/blog/post.html.php
+++ b/themes/blog/post.html.php
@@ -26,13 +26,12 @@
                         <blockquote class="quote"><i class="fa fa-quote-left"></i> <?php echo $p->quote ?> <i class="fa fa-quote-right"></i></blockquote>
                     </div>
                 <?php } ?>
-                <?php if (!empty($p->link)) { ?>
-                    <div class="featured featured-link">
-                        <a target="_blank" href="<?php echo $p->link ?>"><i class="fa fa-external-link"></i> <?php echo $p->link ?></a>
-                    </div>
-                <?php } ?>
                 <div class="info text-left">
-                    <h1 class="title" itemprop="headline"><?php echo $p->title;?></h1>
+                    <?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>
+					<?php } ?>
                     <p class="meta">
                         <span class="date" itemprop="datePublished"><?php echo date('d F Y', $p->date) ?></span> - Posted in 
                         <span itemprop="articleSection"><?php echo $p->category;?></span> by 
@@ -50,9 +49,9 @@
                         <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> comments</span></a>
                     <?php } ?>
                     <span class="share pull-right">
-                        <a target="_blank" class="first" href="https://www.facebook.com/sharer.php?u=<?php echo $p->url ?>&t=<?php echo $p->title ?>"><i class="fa fa-facebook"></i></a> 
-                        <a target="_blank" href="https://twitter.com/share?url=<?php echo $p->url ?>&text=<?php echo $p->title ?>"><i class="fa fa-twitter"></i></a> 
-                        <a target="_blank" class="last" href="https://plus.google.com/share?url=<?php echo $p->url ?>"><i class="fa fa-google-plus"></i></a> 
+                        <a target="    " class="first" href="https://www.facebook.com/sharer.php?u=<?php echo $p->url ?>&t=<?php echo $p->title ?>"><i class="fa fa-facebook"></i></a> 
+                        <a target="    " href="https://twitter.com/share?url=<?php echo $p->url ?>&text=<?php echo $p->title ?>"><i class="fa fa-twitter"></i></a> 
+                        <a target="    " class="last" href="https://plus.google.com/share?url=<?php echo $p->url ?>"><i class="fa fa-google-plus"></i></a> 
                     </span>
                 <div style="clear:both;"></div>
                 </div>
diff --git a/themes/blog/profile.html.php b/themes/blog/profile.html.php
index fe6d355..c9d988f 100644
--- a/themes/blog/profile.html.php
+++ b/themes/blog/profile.html.php
@@ -35,6 +35,8 @@
         </div><!--//content--> 
     </div><!--//section-inner-->
 </section><!--//section-->
+<?php if (!empty($posts)) { ?>
 <?php if (!empty($pagination['prev']) || !empty($pagination['next'])): ?>
 	<div class="pagination"><?php echo $pagination['html'];?></div>
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
+<?php } ?>
\ No newline at end of file
diff --git a/themes/clean/main.html.php b/themes/clean/main.html.php
index c4a95da..a81790c 100644
--- a/themes/clean/main.html.php
+++ b/themes/clean/main.html.php
@@ -23,7 +23,11 @@
     $i++; ?>
     <div class="<?php echo $class ?>" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
         <div class="main">
-            <h2 class="title-index" itemprop="name"><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></h2>
+            <?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>
+            <?php } ?>
             <div class="date">
                 <span itemprop="datePublished"><?php echo date('d F Y', $p->date) ?></span> - Posted in
                 <span itemprop="articleSection"><?php echo $p->category ?></span> by
@@ -54,11 +58,6 @@
                     <blockquote><?php echo $p->quote ?></blockquote>
                 </div>
             <?php } ?>
-            <?php if (!empty($p->link)) { ?>
-                <div class="featured-link">
-                    <a href="<?php echo $p->link ?>"><?php echo $p->link ?></a>
-                </div>
-            <?php } ?>
             <div class="teaser-body" itemprop="articleBody">
                 <?php echo get_thumbnail($p->body) ?>
                 <p><?php echo get_teaser($p->body) ?>
diff --git a/themes/clean/post.html.php b/themes/clean/post.html.php
index 3f0050f..fd5966a 100644
--- a/themes/clean/post.html.php
+++ b/themes/clean/post.html.php
@@ -5,7 +5,11 @@
 <div class="post" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
     <div class="main">
         <a name="more"></a>
+        <?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>
+        <?php } ?>
         <div class="date">
             <span itemprop="datePublished"><a href="<?php echo $p->archive ?>" title="Show all posts made on this month"><?php echo date('d F Y', $p->date) ?></a></span>
             - Posted in
@@ -33,11 +37,6 @@
                 <blockquote><?php echo $p->quote ?></blockquote>
             </div>
         <?php } ?>
-        <?php if (!empty($p->link)) { ?>
-            <div class="featured-link">
-                <a href="<?php echo $p->link ?>"><?php echo $p->link ?></a>
-            </div>
-        <?php } ?>
         <div class="post-body" itemprop="articleBody">
             <?php echo $p->body; ?>
         </div>
diff --git a/themes/default/main.html.php b/themes/default/main.html.php
index 1a7fe22..3d4f9b8 100644
--- a/themes/default/main.html.php
+++ b/themes/default/main.html.php
@@ -23,7 +23,11 @@
     $i++; ?>
     <div class="<?php echo $class ?>" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
         <div class="main">
-            <h2 class="title-index" itemprop="name"><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></h2>
+            <?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>
+            <?php } ?>
             <div class="date">
                 <span itemprop="datePublished"><?php echo date('d F Y', $p->date) ?></span> - Posted in
                 <span itemprop="articleSection"><?php echo $p->category ?></span> by
@@ -54,11 +58,6 @@
                     <blockquote><?php echo $p->quote ?></blockquote>
                 </div>
             <?php } ?>
-            <?php if (!empty($p->link)) { ?>
-                <div class="featured-link">
-                    <a href="<?php echo $p->link ?>"><?php echo $p->link ?></a>
-                </div>
-            <?php } ?>
             <div class="teaser-body" itemprop="articleBody">
                 <?php echo get_thumbnail($p->body) ?>
                 <p><?php echo get_teaser($p->body) ?>
diff --git a/themes/default/post.html.php b/themes/default/post.html.php
index 95f3805..53dbaac 100644
--- a/themes/default/post.html.php
+++ b/themes/default/post.html.php
@@ -5,7 +5,11 @@
 <div class="post" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
     <div class="main">
         <a name="more"></a>
-        <h1 class="title-post" itemprop="name"><?php echo $p->title ?></h1>
+        <?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>
+        <?php } ?>
         <div class="date">
             <span itemprop="datePublished"><a href="<?php echo $p->archive ?>" title="Show all posts made on this month"><?php echo date('d F Y', $p->date) ?></a></span>
             - Posted in
@@ -33,11 +37,6 @@
                 <blockquote><?php echo $p->quote ?></blockquote>
             </div>
         <?php } ?>
-        <?php if (!empty($p->link)) { ?>
-            <div class="featured-link">
-                <a href="<?php echo $p->link ?>"><?php echo $p->link ?></a>
-            </div>
-        <?php } ?>
         <div class="post-body" itemprop="articleBody">
             <?php echo $p->body; ?>
         </div>
diff --git a/themes/logs/main.html.php b/themes/logs/main.html.php
index a562d7d..6b3efaa 100644
--- a/themes/logs/main.html.php
+++ b/themes/logs/main.html.php
@@ -23,7 +23,11 @@
     $i++; ?>
     <div class="<?php echo $class ?>" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
         <div class="main">
-            <h2 class="title-index" itemprop="name"><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></h2>
+            <?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>
+            <?php } ?>
             <div class="date">
                 <span itemprop="datePublished"><?php echo date('d F Y', $p->date) ?></span> - Posted in
                 <span itemprop="articleSection"><?php echo $p->category ?></span> by
@@ -54,11 +58,6 @@
                     <blockquote><?php echo $p->quote ?></blockquote>
                 </div>
             <?php } ?>
-            <?php if (!empty($p->link)) { ?>
-                <div class="featured-link">
-                    <a href="<?php echo $p->link ?>"><?php echo $p->link ?></a>
-                </div>
-            <?php } ?>
             <div class="teaser-body" itemprop="articleBody">
                 <?php echo get_thumbnail($p->body) ?>
                 <p><?php echo get_teaser($p->body) ?>
diff --git a/themes/logs/post.html.php b/themes/logs/post.html.php
index 1d4d276..30f2180 100644
--- a/themes/logs/post.html.php
+++ b/themes/logs/post.html.php
@@ -5,7 +5,11 @@
 <div class="post" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
     <div class="main">
         <a name="more"></a>
-        <h1 class="title-post" itemprop="name"><?php echo $p->title ?></h1>
+            <?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>
+            <?php } ?>
         <div class="date">
             <span itemprop="datePublished"><a href="<?php echo $p->archive ?>" title="Show all posts made on this month"><?php echo date('d F Y', $p->date) ?></a></span>
             - Posted in
@@ -33,11 +37,6 @@
                 <blockquote><?php echo $p->quote ?></blockquote>
             </div>
         <?php } ?>
-        <?php if (!empty($p->link)) { ?>
-            <div class="featured-link">
-                <a href="<?php echo $p->link ?>"><?php echo $p->link ?></a>
-            </div>
-        <?php } ?>
         <div class="post-body" itemprop="articleBody">
             <?php echo $p->body; ?>
         </div>