diff --git a/tests/output/basic/drafts/a-draft-article.html b/tests/output/basic/drafts/a-draft-article.html
index 24c1c3bc..7da9c416 100644
--- a/tests/output/basic/drafts/a-draft-article.html
+++ b/tests/output/basic/drafts/a-draft-article.html
@@ -55,8 +55,8 @@
 
     <div class="entry-content">
       <footer class="post-info">
-        <abbr class="published" title="2012-07-26T22:04:43.481849">
-                Thu 26 July 2012
+        <abbr class="published" title="2012-09-17T15:02:39.591671">
+                Mon 17 September 2012
         </abbr>
 
         
diff --git a/tests/output/basic/feeds/all-fr.atom.xml b/tests/output/basic/feeds/all-fr.atom.xml
index 39220a4f..979e21ef 100644
--- a/tests/output/basic/feeds/all-fr.atom.xml
+++ b/tests/output/basic/feeds/all-fr.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-fr.atom.xml" rel="self"></link><id>/</id><updated>2012-07-26T22:04:43Z</updated><entry><title>Trop bien !</title><link href="/oh-yeah-fr.html" rel="alternate"></link><updated>2012-07-26T22:04:43Z</updated><author><name>Dummy Author</name></author><id>tag:,2012-07-26:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-fr.atom.xml" rel="self"></link><id>/</id><updated>2012-09-17T15:02:39Z</updated><entry><title>Trop bien !</title><link href="/oh-yeah-fr.html" rel="alternate"></link><updated>2012-09-17T15:02:39Z</updated><author><name>Dummy Author</name></author><id>tag:,2012-09-17:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
 </summary></entry><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/oh-yeah-fr.html b/tests/output/basic/oh-yeah-fr.html
index cfcb7f1a..335428ef 100644
--- a/tests/output/basic/oh-yeah-fr.html
+++ b/tests/output/basic/oh-yeah-fr.html
@@ -55,8 +55,8 @@
 
     <div class="entry-content">
       <footer class="post-info">
-        <abbr class="published" title="2012-07-26T22:04:43.481849">
-                Thu 26 July 2012
+        <abbr class="published" title="2012-09-17T15:02:39.591671">
+                Mon 17 September 2012
         </abbr>
 
         
diff --git a/tests/output/basic/tag/bar.html b/tests/output/basic/tag/bar.html
index f58ba6bd..77462fe6 100644
--- a/tests/output/basic/tag/bar.html
+++ b/tests/output/basic/tag/bar.html
@@ -51,7 +51,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -68,10 +68,10 @@
 
 Translations: 
     
-        <a href=".././second-article-fr.html">fr</a>
+        <a href=".././second-article.html">en</a>
     
 
-</footer><!-- /.post-info --><p>This is some article, in english</p>
+</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
 
                 </article>
                 
@@ -92,8 +92,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article-fr.html" rel="bookmark"
-                           title="Permalink to Deuxième article">Deuxième article</a></h1>
+                    <h1><a href=".././second-article.html" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -113,13 +113,13 @@ Translations:
 
 Translations: 
     
-        <a href=".././second-article.html">en</a>
+        <a href=".././second-article-fr.html">fr</a>
     
 
 </footer><!-- /.post-info -->
-                <p>Ceci est un article, en français.</p>
+                <p>This is some article, in english</p>
 
-                <a class="readmore" href=".././second-article-fr.html">read more</a>
+                <a class="readmore" href=".././second-article.html">read more</a>
                 
                 </div><!-- /.entry-content -->
             </article></li>
diff --git a/tests/output/basic/tag/baz.html b/tests/output/basic/tag/baz.html
index a5f9d9cc..4ebe1f1d 100644
--- a/tests/output/basic/tag/baz.html
+++ b/tests/output/basic/tag/baz.html
@@ -51,7 +51,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -68,10 +68,10 @@
 
 Translations: 
     
-        <a href=".././second-article-fr.html">fr</a>
+        <a href=".././second-article.html">en</a>
     
 
-</footer><!-- /.post-info --><p>This is some article, in english</p>
+</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
 
                 </article>
                 
@@ -92,8 +92,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article-fr.html" rel="bookmark"
-                           title="Permalink to Deuxième article">Deuxième article</a></h1>
+                    <h1><a href=".././second-article.html" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -113,13 +113,13 @@ Translations:
 
 Translations: 
     
-        <a href=".././second-article.html">en</a>
+        <a href=".././second-article-fr.html">fr</a>
     
 
 </footer><!-- /.post-info -->
-                <p>Ceci est un article, en français.</p>
+                <p>This is some article, in english</p>
 
-                <a class="readmore" href=".././second-article-fr.html">read more</a>
+                <a class="readmore" href=".././second-article.html">read more</a>
                 
                 </div><!-- /.entry-content -->
             </article></li>
diff --git a/tests/output/basic/tag/foo.html b/tests/output/basic/tag/foo.html
index 2756f57d..d1e2dbb8 100644
--- a/tests/output/basic/tag/foo.html
+++ b/tests/output/basic/tag/foo.html
@@ -51,7 +51,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -68,10 +68,10 @@
 
 Translations: 
     
-        <a href=".././second-article-fr.html">fr</a>
+        <a href=".././second-article.html">en</a>
     
 
-</footer><!-- /.post-info --><p>This is some article, in english</p>
+</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
 
                 </article>
                 
@@ -92,8 +92,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article-fr.html" rel="bookmark"
-                           title="Permalink to Deuxième article">Deuxième article</a></h1>
+                    <h1><a href=".././second-article.html" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -113,13 +113,13 @@ Translations:
 
 Translations: 
     
-        <a href=".././second-article.html">en</a>
+        <a href=".././second-article-fr.html">fr</a>
     
 
 </footer><!-- /.post-info -->
-                <p>Ceci est un article, en français.</p>
+                <p>This is some article, in english</p>
 
-                <a class="readmore" href=".././second-article-fr.html">read more</a>
+                <a class="readmore" href=".././second-article.html">read more</a>
                 
                 </div><!-- /.entry-content -->
             </article></li>
diff --git a/tests/output/basic/theme/css/main.css b/tests/output/basic/theme/css/main.css
index bd1eba75..3d94200b 100644
--- a/tests/output/basic/theme/css/main.css
+++ b/tests/output/basic/theme/css/main.css
@@ -97,7 +97,7 @@ dl {margin: 0 0 1.5em 0;}
 dt {font-weight: bold;}
 dd {margin-left: 1.5em;}
 
-pre{background-color: #000; padding: 10px; color: #fff; margin: 10px; overflow: auto;}
+pre{background-color:  rgb(238, 238, 238); padding: 10px; margin: 10px; overflow: auto;}
 
 /* Quotes */
 blockquote {
@@ -308,7 +308,8 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		.social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');}
 		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
 		.social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
-		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.org');}
+		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.png');}
+        .social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');}
 
 /*
 	About
diff --git a/tests/output/basic/theme/css/pygment.css b/tests/output/basic/theme/css/pygment.css
index 594b0fa3..fdd056f6 100644
--- a/tests/output/basic/theme/css/pygment.css
+++ b/tests/output/basic/theme/css/pygment.css
@@ -1,5 +1,5 @@
 .hll {
-background-color:#FFFFCC;
+background-color:#eee;
 }
 .c {
 color:#408090;
diff --git a/tests/output/custom/tag/bar.html b/tests/output/custom/tag/bar.html
index 087b94b4..03ce0de3 100644
--- a/tests/output/custom/tag/bar.html
+++ b/tests/output/custom/tag/bar.html
@@ -59,7 +59,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -76,11 +76,11 @@
 
 Translations: 
     
-        <a href=".././second-article-fr.html">fr</a>
+        <a href=".././second-article.html">en</a>
     
 
-</footer><!-- /.post-info --><p>This is some article, in english</p>
-<p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
+</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
+<p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
                 </article>
                 
             </aside><!-- /#featured -->
@@ -100,8 +100,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article-fr.html" rel="bookmark"
-                           title="Permalink to Deuxième article">Deuxième article</a></h1>
+                    <h1><a href=".././second-article.html" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -121,14 +121,14 @@ Translations:
 
 Translations: 
     
-        <a href=".././second-article.html">en</a>
+        <a href=".././second-article-fr.html">fr</a>
     
 
 </footer><!-- /.post-info -->
-                <p>Ceci est un article, en français.</p>
+                <p>This is some article, in english</p>
 
-                <a class="readmore" href=".././second-article-fr.html">read more</a>
-                <p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
+                <a class="readmore" href=".././second-article.html">read more</a>
+                <p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
                 </div><!-- /.entry-content -->
             </article></li>
         
diff --git a/tests/output/custom/tag/baz.html b/tests/output/custom/tag/baz.html
index 9aab4ffc..e32cc9ea 100644
--- a/tests/output/custom/tag/baz.html
+++ b/tests/output/custom/tag/baz.html
@@ -59,7 +59,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -76,11 +76,11 @@
 
 Translations: 
     
-        <a href=".././second-article-fr.html">fr</a>
+        <a href=".././second-article.html">en</a>
     
 
-</footer><!-- /.post-info --><p>This is some article, in english</p>
-<p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
+</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
+<p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
                 </article>
                 
             </aside><!-- /#featured -->
@@ -100,8 +100,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article-fr.html" rel="bookmark"
-                           title="Permalink to Deuxième article">Deuxième article</a></h1>
+                    <h1><a href=".././second-article.html" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -121,14 +121,14 @@ Translations:
 
 Translations: 
     
-        <a href=".././second-article.html">en</a>
+        <a href=".././second-article-fr.html">fr</a>
     
 
 </footer><!-- /.post-info -->
-                <p>Ceci est un article, en français.</p>
+                <p>This is some article, in english</p>
 
-                <a class="readmore" href=".././second-article-fr.html">read more</a>
-                <p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
+                <a class="readmore" href=".././second-article.html">read more</a>
+                <p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
                 </div><!-- /.entry-content -->
             </article></li>
         
diff --git a/tests/output/custom/tag/foo.html b/tests/output/custom/tag/foo.html
index 42f12a61..9c295933 100644
--- a/tests/output/custom/tag/foo.html
+++ b/tests/output/custom/tag/foo.html
@@ -59,7 +59,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -76,11 +76,11 @@
 
 Translations: 
     
-        <a href=".././second-article-fr.html">fr</a>
+        <a href=".././second-article.html">en</a>
     
 
-</footer><!-- /.post-info --><p>This is some article, in english</p>
-<p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
+</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
+<p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
                 </article>
                 
             </aside><!-- /#featured -->
@@ -100,8 +100,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article-fr.html" rel="bookmark"
-                           title="Permalink to Deuxième article">Deuxième article</a></h1>
+                    <h1><a href=".././second-article.html" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -121,14 +121,14 @@ Translations:
 
 Translations: 
     
-        <a href=".././second-article.html">en</a>
+        <a href=".././second-article-fr.html">fr</a>
     
 
 </footer><!-- /.post-info -->
-                <p>Ceci est un article, en français.</p>
+                <p>This is some article, in english</p>
 
-                <a class="readmore" href=".././second-article-fr.html">read more</a>
-                <p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
+                <a class="readmore" href=".././second-article.html">read more</a>
+                <p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
                 </div><!-- /.entry-content -->
             </article></li>
         
diff --git a/tests/output/custom/theme/css/main.css b/tests/output/custom/theme/css/main.css
index bd1eba75..3d94200b 100644
--- a/tests/output/custom/theme/css/main.css
+++ b/tests/output/custom/theme/css/main.css
@@ -97,7 +97,7 @@ dl {margin: 0 0 1.5em 0;}
 dt {font-weight: bold;}
 dd {margin-left: 1.5em;}
 
-pre{background-color: #000; padding: 10px; color: #fff; margin: 10px; overflow: auto;}
+pre{background-color:  rgb(238, 238, 238); padding: 10px; margin: 10px; overflow: auto;}
 
 /* Quotes */
 blockquote {
@@ -308,7 +308,8 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		.social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');}
 		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
 		.social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
-		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.org');}
+		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.png');}
+        .social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');}
 
 /*
 	About
diff --git a/tests/output/custom/theme/css/pygment.css b/tests/output/custom/theme/css/pygment.css
index 594b0fa3..fdd056f6 100644
--- a/tests/output/custom/theme/css/pygment.css
+++ b/tests/output/custom/theme/css/pygment.css
@@ -1,5 +1,5 @@
 .hll {
-background-color:#FFFFCC;
+background-color:#eee;
 }
 .c {
 color:#408090;