diff --git a/_src/_includes/entry_meta.html b/_src/_includes/entry_meta.html
index 45eb620f..6637f22e 100644
--- a/_src/_includes/entry_meta.html
+++ b/_src/_includes/entry_meta.html
@@ -1,12 +1,14 @@
 <footer class="entry-meta">
+	<p class="byline author vcard source-org"><span class="by">by</span> <a class="fn" rel="author" href="/about/">{{ page.author }}</a></p>
+
+     <time class="pubdate" datetime="{{ page.date | date_to_xmlschema }}" pubdate{% if updated %} data-updated="true"{% endif %}>{{ page.date | timeago }}</time>
+
+    {% if page.updated %}
+      <time class="updated" datetime="{{ page.updated | date_to_xmlschema }}">Updated {{ page.updated | timeago }}</time>
+    {% endif %}
+    
     <p class="categories">
         {{ page.categories | category_links }}
     </p>
-	<p class="byline author vcard source-org"><span class="by">by</span> <a class="fn" rel="author" href="/about/">{{ page.author }}</a></p>
-	<div class="time">
-	    <p title="{{ page.date | date_to_xmlschema }}">{{ page.date | timeago }}</p>
-	    {% if page.moddate %}
-	    <p class="modtime" title="{{ page.date | date_to_xmlschema }}">updated: {{ page.moddate | timeago }}</p>
-	    {% endif %}
-	</div>
+    
 </footer>
\ No newline at end of file
diff --git a/_src/_posts/2008-06-19-ubuntu-as-mac-file-server-and-time-machine-volume.markdown b/_src/_posts/2008-06-19-ubuntu-as-mac-file-server-and-time-machine-volume.markdown
index b03e5d1f..74ec861d 100644
--- a/_src/_posts/2008-06-19-ubuntu-as-mac-file-server-and-time-machine-volume.markdown
+++ b/_src/_posts/2008-06-19-ubuntu-as-mac-file-server-and-time-machine-volume.markdown
@@ -6,7 +6,7 @@ title: 'HowTo: Make Ubuntu A Perfect Mac File Server And Time Machine Volume [Up
 author: Matthias Kretschmann
 
 date: 2008-06-19 03:08:11+00:00
-moddate: 2009-01-19 03:08:11+00:00
+updated: 2009-01-19 03:08:11+00:00
 
 wordpress_id: 75
 categories:
diff --git a/_src/_posts/2011-12-15-badged.markdown b/_src/_posts/2011-12-15-badged.markdown
index ecaa27ea..f9688ba1 100644
--- a/_src/_posts/2011-12-15-badged.markdown
+++ b/_src/_posts/2011-12-15-badged.markdown
@@ -4,7 +4,7 @@ layout: post
 title: Badged - iOS Style Notification Badges for WordPress
 image: Badged-Teaser-kremalicious@2x.png
 author: Matthias Kretschmann
-moddate: 2013-11-10 07:56:46+00:00
+updated: 2013-11-10 07:56:46+00:00
 sticky: true
 
 date: 2011-12-15 07:56:46+00:00
diff --git a/_src/_posts/2013-11-20-why-we-are-allowed-to-hate-silicon-valley.markdown b/_src/_posts/2013-11-20-why-we-are-allowed-to-hate-silicon-valley.markdown
index bee1053d..7b57f1ec 100644
--- a/_src/_posts/2013-11-20-why-we-are-allowed-to-hate-silicon-valley.markdown
+++ b/_src/_posts/2013-11-20-why-we-are-allowed-to-hate-silicon-valley.markdown
@@ -11,4 +11,4 @@ categories:
 
 Don't fully agree with Evgeny Morozov's culture pessimism but he makes some good points in this article:
 
-> This bubbling discontent is reassuring. It might even help bury some of the myths spun by Silicon Valley. Wouldn’t it be nice if one day, told that Google’s mission is to “organize the world’s information and make it universally accessible and useful,” we would finally read between the lines and discover its true meaning: “to monetize all of the world’s information and make it universally inaccessible and profitable”? With this act of subversive interpretation, we might eventually hit upon the greatest emancipatory insight of all: Letting Google organize all of the world’s information makes as much sense as letting Halliburton organize all of the world’s oil.
\ No newline at end of file
+> It might even help bury some of the myths spun by Silicon Valley. Wouldn’t it be nice if one day, told that Google’s mission is to “organize the world’s information and make it universally accessible and useful,” we would finally read between the lines and discover its true meaning: “to monetize all of the world’s information and make it universally inaccessible and profitable”? With this act of subversive interpretation, we might eventually hit upon the greatest emancipatory insight of all: Letting Google organize all of the world’s information makes as much sense as letting Halliburton organize all of the world’s oil.
\ No newline at end of file
diff --git a/_src/assets/less/content.less b/_src/assets/less/content.less
index 366e53aa..d1751432 100644
--- a/_src/assets/less/content.less
+++ b/_src/assets/less/content.less
@@ -23,7 +23,7 @@
     }
     
     .page-single  & {
-        padding-bottom: @line-height-computed
+        padding-bottom: @line-height-computed*2
     }
 }
 
@@ -171,17 +171,16 @@
     .clearfix;
     margin-top: @line-height-computed*2;
     font-size: @font-size-small;
-    line-height: 1.4em;
 }
 
 .byline,
-.time,
+time,
 .categories {
     text-align: center;
 }
 
 .byline,
-.time {
+time {
 	font-style: italic;
 	color: @text-color-light;
 }
@@ -192,13 +191,13 @@
     .by { display: block }
 }
 
-.time,
-.modtime {
+time {
+    display: block;
     color: @text-color-dimmed
 }
 
 .categories {
-    
+    margin-top: @line-height-computed;
 }
 
 
diff --git a/_src/feed.xml b/_src/feed.xml
index 105e3a7e..61656262 100644
--- a/_src/feed.xml
+++ b/_src/feed.xml
@@ -25,8 +25,8 @@ layout: nil
 		    
             <published>{{ post.date | date_to_xmlschema }}</published>
             
-            {% if post.moddate %}
-                <updated>{{ post.moddate | date_to_xmlschema }}</updated>
+            {% if post.updated %}
+                <updated>{{ post.updated | date_to_xmlschema }}</updated>
             {% endif %}
             
     		<id>{{ site.url }}/{{ post.url }}</id>
diff --git a/_src/robots.txt b/_src/robots.txt
index f026ea93..167fa612 100644
--- a/_src/robots.txt
+++ b/_src/robots.txt
@@ -2,4 +2,4 @@ User-agent: *
 Disallow: /search/
 Disallow: /page/
 
-Sitemap: http://kremalicious.com/sitemap.xml
\ No newline at end of file
+Sitemap: {{ site.url }}/sitemap.xml
\ No newline at end of file
diff --git a/_src/search.json b/_src/search.json
index e86255dc..a9bacc14 100644
--- a/_src/search.json
+++ b/_src/search.json
@@ -5,6 +5,7 @@
         {
           "title"     : "{{ post.title | escape | titlecase }}",
           "category"  : "{{ post.categories }}",
+          "tag"       : "{{ post.tags }}",
           "url"       : "{{ post.url }}",
           "date"      : "{{ post.date }}",
           "content"   : "{{ post.content | strip_html | strip_newlines | escape }}"