diff --git a/tests/output/basic/a-markdown-powered-article.html b/tests/output/basic/a-markdown-powered-article.html
index bfa09fdf..6662f7d2 100644
--- a/tests/output/basic/a-markdown-powered-article.html
+++ b/tests/output/basic/a-markdown-powered-article.html
@@ -4,8 +4,10 @@
         <title>A markdown powered article</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/archives.html b/tests/output/basic/archives.html
index 704fc836..0b9c664e 100644
--- a/tests/output/basic/archives.html
+++ b/tests/output/basic/archives.html
@@ -4,8 +4,10 @@
         <title>A Pelican Blog</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/article-1.html b/tests/output/basic/article-1.html
index ab1d71d7..97813af8 100644
--- a/tests/output/basic/article-1.html
+++ b/tests/output/basic/article-1.html
@@ -4,8 +4,10 @@
         <title>Article 1</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/article-2.html b/tests/output/basic/article-2.html
index 52cfff0d..54157cc6 100644
--- a/tests/output/basic/article-2.html
+++ b/tests/output/basic/article-2.html
@@ -4,8 +4,10 @@
         <title>Article 2</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/article-3.html b/tests/output/basic/article-3.html
index ef97a56d..7b9af9f9 100644
--- a/tests/output/basic/article-3.html
+++ b/tests/output/basic/article-3.html
@@ -4,8 +4,10 @@
         <title>Article 3</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/author/alexis-metaireau.html b/tests/output/basic/author/alexis-metaireau.html
index ad7b8bee..61df3206 100644
--- a/tests/output/basic/author/alexis-metaireau.html
+++ b/tests/output/basic/author/alexis-metaireau.html
@@ -4,8 +4,10 @@
         <title>A Pelican Blog - Alexis Métaireau</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/author/dummy-author.html b/tests/output/basic/author/dummy-author.html
index 54c81100..85b921fe 100644
--- a/tests/output/basic/author/dummy-author.html
+++ b/tests/output/basic/author/dummy-author.html
@@ -4,8 +4,10 @@
         <title>A Pelican Blog - Dummy Author</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/categories.html b/tests/output/basic/categories.html
index d13d0b92..08669b1f 100644
--- a/tests/output/basic/categories.html
+++ b/tests/output/basic/categories.html
@@ -4,8 +4,10 @@
         <title>A Pelican Blog</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/category/bar.html b/tests/output/basic/category/bar.html
index a80656a5..0ad8f799 100644
--- a/tests/output/basic/category/bar.html
+++ b/tests/output/basic/category/bar.html
@@ -4,8 +4,10 @@
         <title>A Pelican Blog - bar</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/category/cat1.html b/tests/output/basic/category/cat1.html
index 3d062ac7..c54353e0 100644
--- a/tests/output/basic/category/cat1.html
+++ b/tests/output/basic/category/cat1.html
@@ -4,8 +4,10 @@
         <title>A Pelican Blog - cat1</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/category/misc.html b/tests/output/basic/category/misc.html
index ff344111..80978d5f 100644
--- a/tests/output/basic/category/misc.html
+++ b/tests/output/basic/category/misc.html
@@ -4,8 +4,10 @@
         <title>A Pelican Blog - misc</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/category/yeah.html b/tests/output/basic/category/yeah.html
index 1d4d7f04..69a709f0 100644
--- a/tests/output/basic/category/yeah.html
+++ b/tests/output/basic/category/yeah.html
@@ -4,8 +4,10 @@
         <title>A Pelican Blog - yeah</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/drafts/a-draft-article.html b/tests/output/basic/drafts/a-draft-article.html
index af0f2476..9996974d 100644
--- a/tests/output/basic/drafts/a-draft-article.html
+++ b/tests/output/basic/drafts/a-draft-article.html
@@ -4,8 +4,10 @@
         <title>A draft article</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/feeds/all-en.atom.xml b/tests/output/basic/feeds/all-en.atom.xml
index b532e454..16163dc0 100644
--- a/tests/output/basic/feeds/all-en.atom.xml
+++ b/tests/output/basic/feeds/all-en.atom.xml
@@ -1,9 +1,9 @@
 <?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="None/feeds/all-en.atom.xml" rel="self"></link><id>.././</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href=".././second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href=".././a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href=".././article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href=".././article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href=".././article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href=".././this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&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-en.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -15,11 +15,11 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href=".././oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href=".././unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/all-fr.atom.xml b/tests/output/basic/feeds/all-fr.atom.xml
index 274bd548..c60e2bfe 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="None/feeds/all-fr.atom.xml" rel="self"></link><id>.././</id><updated>2012-05-19T23:55:50Z</updated><entry><title>Trop bien !</title><link href=".././oh-yeah-fr.html" rel="alternate"></link><updated>2012-05-19T23:55:50Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2012-05-19: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;
+<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-05-19T23:55:50Z</updated><entry><title>Trop bien !</title><link href="/oh-yeah-fr.html" rel="alternate"></link><updated>2012-05-19T23:55:50Z</updated><author><name>Dummy Author</name></author><id>tag:,2012-05-19: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/feeds/all.atom.xml b/tests/output/basic/feeds/all.atom.xml
index a0fb9144..27c92e6d 100644
--- a/tests/output/basic/feeds/all.atom.xml
+++ b/tests/output/basic/feeds/all.atom.xml
@@ -1,9 +1,9 @@
 <?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="None/feeds/all.atom.xml" rel="self"></link><id>.././</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href=".././second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href=".././a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href=".././article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href=".././article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href=".././article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href=".././this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&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.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -15,11 +15,11 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href=".././oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href=".././unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/bar.atom.xml b/tests/output/basic/feeds/bar.atom.xml
index 15708734..7b842a63 100644
--- a/tests/output/basic/feeds/bar.atom.xml
+++ b/tests/output/basic/feeds/bar.atom.xml
@@ -1,5 +1,5 @@
 <?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="None/feeds/bar.atom.xml" rel="self"></link><id>.././</id><updated>2010-10-20T10:14:00Z</updated><entry><title>Oh yeah !</title><link href=".././oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/bar.atom.xml" rel="self"></link><id>/</id><updated>2010-10-20T10:14:00Z</updated><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
diff --git a/tests/output/basic/feeds/cat1.atom.xml b/tests/output/basic/feeds/cat1.atom.xml
index 383c8ab7..4ff8e6ca 100644
--- a/tests/output/basic/feeds/cat1.atom.xml
+++ b/tests/output/basic/feeds/cat1.atom.xml
@@ -1,5 +1,5 @@
 <?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="None/feeds/cat1.atom.xml" rel="self"></link><id>.././</id><updated>2011-04-20T00:00:00Z</updated><entry><title>A markdown powered article</title><link href=".././a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href=".././article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href=".././article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href=".././article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/cat1.atom.xml" rel="self"></link><id>/</id><updated>2011-04-20T00:00:00Z</updated><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/misc.atom.xml b/tests/output/basic/feeds/misc.atom.xml
index db33d39b..ec3c79bc 100644
--- a/tests/output/basic/feeds/misc.atom.xml
+++ b/tests/output/basic/feeds/misc.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="None/feeds/misc.atom.xml" rel="self"></link><id>.././</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href=".././second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href=".././unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/misc.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/yeah.atom.xml b/tests/output/basic/feeds/yeah.atom.xml
index e9bb26d0..fabeb52f 100644
--- a/tests/output/basic/feeds/yeah.atom.xml
+++ b/tests/output/basic/feeds/yeah.atom.xml
@@ -1,5 +1,5 @@
 <?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="None/feeds/yeah.atom.xml" rel="self"></link><id>.././</id><updated>2010-12-02T10:14:00Z</updated><entry><title>This is a super article !</title><link href=".././this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/yeah.atom.xml" rel="self"></link><id>/</id><updated>2010-12-02T10:14:00Z</updated><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
diff --git a/tests/output/basic/index.html b/tests/output/basic/index.html
index fe6c2279..7bb846bc 100644
--- a/tests/output/basic/index.html
+++ b/tests/output/basic/index.html
@@ -4,8 +4,10 @@
         <title>A Pelican Blog</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/oh-yeah-fr.html b/tests/output/basic/oh-yeah-fr.html
index 4856347f..5442864a 100644
--- a/tests/output/basic/oh-yeah-fr.html
+++ b/tests/output/basic/oh-yeah-fr.html
@@ -4,8 +4,10 @@
         <title>Trop bien !</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/oh-yeah.html b/tests/output/basic/oh-yeah.html
index bd0c75ee..1dffc0eb 100644
--- a/tests/output/basic/oh-yeah.html
+++ b/tests/output/basic/oh-yeah.html
@@ -4,8 +4,10 @@
         <title>Oh yeah !</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/pages/this-is-a-test-hidden-page.html b/tests/output/basic/pages/this-is-a-test-hidden-page.html
index 4412d600..864d1109 100644
--- a/tests/output/basic/pages/this-is-a-test-hidden-page.html
+++ b/tests/output/basic/pages/this-is-a-test-hidden-page.html
@@ -4,8 +4,10 @@
         <title>This is a test hidden page</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/pages/this-is-a-test-page.html b/tests/output/basic/pages/this-is-a-test-page.html
index 14a78a29..58807c1d 100644
--- a/tests/output/basic/pages/this-is-a-test-page.html
+++ b/tests/output/basic/pages/this-is-a-test-page.html
@@ -4,8 +4,10 @@
         <title>This is a test page</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/second-article-fr.html b/tests/output/basic/second-article-fr.html
index a3701245..b7c023ee 100644
--- a/tests/output/basic/second-article-fr.html
+++ b/tests/output/basic/second-article-fr.html
@@ -4,8 +4,10 @@
         <title>Deuxième article</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/second-article.html b/tests/output/basic/second-article.html
index cbae942b..3a607a51 100644
--- a/tests/output/basic/second-article.html
+++ b/tests/output/basic/second-article.html
@@ -4,8 +4,10 @@
         <title>Second article</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/tag/bar.html b/tests/output/basic/tag/bar.html
index 99c2cb7f..6b80b5fe 100644
--- a/tests/output/basic/tag/bar.html
+++ b/tests/output/basic/tag/bar.html
@@ -4,8 +4,10 @@
         <title>A Pelican Blog - bar</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
@@ -49,7 +51,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -66,10 +68,10 @@
 
 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>
+</footer><!-- /.post-info --><p>This is some article, in english</p>
 
                 </article>
                 
@@ -90,8 +92,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article.html" rel="bookmark"
-                           title="Permalink to Second article">Second article</a></h1>
+                    <h1><a href=".././second-article-fr.html" rel="bookmark"
+                           title="Permalink to Deuxième article">Deuxième article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -111,13 +113,13 @@ Translations:
 
 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>Ceci est un article, en français.</p>
 
-                <a class="readmore" href=".././second-article.html">read more</a>
+                <a class="readmore" href=".././second-article-fr.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 1cd80a0b..10c19b91 100644
--- a/tests/output/basic/tag/baz.html
+++ b/tests/output/basic/tag/baz.html
@@ -4,8 +4,10 @@
         <title>A Pelican Blog - baz</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
@@ -49,7 +51,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -66,10 +68,10 @@
 
 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>
+</footer><!-- /.post-info --><p>This is some article, in english</p>
 
                 </article>
                 
@@ -90,8 +92,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article.html" rel="bookmark"
-                           title="Permalink to Second article">Second article</a></h1>
+                    <h1><a href=".././second-article-fr.html" rel="bookmark"
+                           title="Permalink to Deuxième article">Deuxième article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -111,13 +113,13 @@ Translations:
 
 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>Ceci est un article, en français.</p>
 
-                <a class="readmore" href=".././second-article.html">read more</a>
+                <a class="readmore" href=".././second-article-fr.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 36798b17..5a025bab 100644
--- a/tests/output/basic/tag/foo.html
+++ b/tests/output/basic/tag/foo.html
@@ -4,8 +4,10 @@
         <title>A Pelican Blog - foo</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
@@ -49,7 +51,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -66,10 +68,10 @@
 
 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>
+</footer><!-- /.post-info --><p>This is some article, in english</p>
 
                 </article>
                 
@@ -90,8 +92,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article.html" rel="bookmark"
-                           title="Permalink to Second article">Second article</a></h1>
+                    <h1><a href=".././second-article-fr.html" rel="bookmark"
+                           title="Permalink to Deuxième article">Deuxième article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -111,13 +113,13 @@ Translations:
 
 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>Ceci est un article, en français.</p>
 
-                <a class="readmore" href=".././second-article.html">read more</a>
+                <a class="readmore" href=".././second-article-fr.html">read more</a>
                 
                 </div><!-- /.entry-content -->
             </article></li>
diff --git a/tests/output/basic/tag/foobar.html b/tests/output/basic/tag/foobar.html
index 782a0128..7a64add9 100644
--- a/tests/output/basic/tag/foobar.html
+++ b/tests/output/basic/tag/foobar.html
@@ -4,8 +4,10 @@
         <title>A Pelican Blog - foobar</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/tag/oh.html b/tests/output/basic/tag/oh.html
index 675e12cc..a08fb39c 100644
--- a/tests/output/basic/tag/oh.html
+++ b/tests/output/basic/tag/oh.html
@@ -4,8 +4,10 @@
         <title>A Pelican Blog - oh</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/tag/yeah.html b/tests/output/basic/tag/yeah.html
index 312523a0..3c175905 100644
--- a/tests/output/basic/tag/yeah.html
+++ b/tests/output/basic/tag/yeah.html
@@ -4,8 +4,10 @@
         <title>A Pelican Blog - yeah</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/theme/css/main.css b/tests/output/basic/theme/css/main.css
index dce9e247..0648bf2e 100644
--- a/tests/output/basic/theme/css/main.css
+++ b/tests/output/basic/theme/css/main.css
@@ -144,8 +144,8 @@ aside, nav, article, figure {
 
 /***** Layout *****/
 .body {clear: both; margin: 0 auto; width: 800px;}
-img.right figure.right {float: right; margin: 0 0 2em 2em;}
-img.left, figure.left {float: right; margin: 0 0 2em 2em;}
+img.right, figure.right {float: right; margin: 0 0 2em 2em;}
+img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 
 /*
 	Header
diff --git a/tests/output/basic/this-is-a-super-article.html b/tests/output/basic/this-is-a-super-article.html
index 6b890f2a..0e77b70e 100644
--- a/tests/output/basic/this-is-a-super-article.html
+++ b/tests/output/basic/this-is-a-super-article.html
@@ -4,8 +4,10 @@
         <title>This is a super article !</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/unbelievable.html b/tests/output/basic/unbelievable.html
index 3f9cc830..407d7289 100644
--- a/tests/output/basic/unbelievable.html
+++ b/tests/output/basic/unbelievable.html
@@ -4,8 +4,10 @@
         <title>Unbelievable !</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/custom/a-markdown-powered-article.html b/tests/output/custom/a-markdown-powered-article.html
index d3d0f53c..785440c2 100644
--- a/tests/output/custom/a-markdown-powered-article.html
+++ b/tests/output/custom/a-markdown-powered-article.html
@@ -4,8 +4,10 @@
         <title>A markdown powered article</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/archives.html b/tests/output/custom/archives.html
index d370ee71..ed74e782 100644
--- a/tests/output/custom/archives.html
+++ b/tests/output/custom/archives.html
@@ -4,8 +4,10 @@
         <title>Alexis' log</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/article-1.html b/tests/output/custom/article-1.html
index 4402d227..be593d9b 100644
--- a/tests/output/custom/article-1.html
+++ b/tests/output/custom/article-1.html
@@ -4,8 +4,10 @@
         <title>Article 1</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/article-2.html b/tests/output/custom/article-2.html
index ec6a86c8..a10950ad 100644
--- a/tests/output/custom/article-2.html
+++ b/tests/output/custom/article-2.html
@@ -4,8 +4,10 @@
         <title>Article 2</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/article-3.html b/tests/output/custom/article-3.html
index 0d39654c..76b03ced 100644
--- a/tests/output/custom/article-3.html
+++ b/tests/output/custom/article-3.html
@@ -4,8 +4,10 @@
         <title>Article 3</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/author/alexis-metaireau.html b/tests/output/custom/author/alexis-metaireau.html
index b60a01ef..3fb51b8b 100644
--- a/tests/output/custom/author/alexis-metaireau.html
+++ b/tests/output/custom/author/alexis-metaireau.html
@@ -4,8 +4,10 @@
         <title>Alexis' log - Alexis Métaireau</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/author/alexis-metaireau2.html b/tests/output/custom/author/alexis-metaireau2.html
index cbf4387b..594304bc 100644
--- a/tests/output/custom/author/alexis-metaireau2.html
+++ b/tests/output/custom/author/alexis-metaireau2.html
@@ -4,8 +4,10 @@
         <title>Alexis' log - Alexis Métaireau</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/categories.html b/tests/output/custom/categories.html
index 74f1c16b..81ef2b76 100644
--- a/tests/output/custom/categories.html
+++ b/tests/output/custom/categories.html
@@ -4,8 +4,10 @@
         <title>Alexis' log</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/category/bar.html b/tests/output/custom/category/bar.html
index 7860bd15..5183aaf8 100644
--- a/tests/output/custom/category/bar.html
+++ b/tests/output/custom/category/bar.html
@@ -4,8 +4,10 @@
         <title>Alexis' log - bar</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/category/cat1.html b/tests/output/custom/category/cat1.html
index b01c1ad6..160e4e4e 100644
--- a/tests/output/custom/category/cat1.html
+++ b/tests/output/custom/category/cat1.html
@@ -4,8 +4,10 @@
         <title>Alexis' log - cat1</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/category/misc.html b/tests/output/custom/category/misc.html
index 0161b441..54608de8 100644
--- a/tests/output/custom/category/misc.html
+++ b/tests/output/custom/category/misc.html
@@ -4,8 +4,10 @@
         <title>Alexis' log - misc</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/category/yeah.html b/tests/output/custom/category/yeah.html
index 27e929c4..032a9333 100644
--- a/tests/output/custom/category/yeah.html
+++ b/tests/output/custom/category/yeah.html
@@ -4,8 +4,10 @@
         <title>Alexis' log - yeah</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/drafts/a-draft-article.html b/tests/output/custom/drafts/a-draft-article.html
index 35264ed6..59d5c6af 100644
--- a/tests/output/custom/drafts/a-draft-article.html
+++ b/tests/output/custom/drafts/a-draft-article.html
@@ -4,8 +4,10 @@
         <title>A draft article</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/index.html b/tests/output/custom/index.html
index 79882019..fbdc2f38 100644
--- a/tests/output/custom/index.html
+++ b/tests/output/custom/index.html
@@ -4,8 +4,10 @@
         <title>Alexis' log</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/index2.html b/tests/output/custom/index2.html
index d6079fd9..52b2f723 100644
--- a/tests/output/custom/index2.html
+++ b/tests/output/custom/index2.html
@@ -4,8 +4,10 @@
         <title>Alexis' log</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/oh-yeah-fr.html b/tests/output/custom/oh-yeah-fr.html
index 25f67032..46eaffe6 100644
--- a/tests/output/custom/oh-yeah-fr.html
+++ b/tests/output/custom/oh-yeah-fr.html
@@ -4,8 +4,10 @@
         <title>Trop bien !</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/oh-yeah.html b/tests/output/custom/oh-yeah.html
index fc635dc7..90478b4b 100644
--- a/tests/output/custom/oh-yeah.html
+++ b/tests/output/custom/oh-yeah.html
@@ -4,8 +4,10 @@
         <title>Oh yeah !</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/pages/this-is-a-test-hidden-page.html b/tests/output/custom/pages/this-is-a-test-hidden-page.html
index b5eca671..231b1c8a 100644
--- a/tests/output/custom/pages/this-is-a-test-hidden-page.html
+++ b/tests/output/custom/pages/this-is-a-test-hidden-page.html
@@ -4,8 +4,10 @@
         <title>This is a test hidden page</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/pages/this-is-a-test-page.html b/tests/output/custom/pages/this-is-a-test-page.html
index 85161430..d45bfac2 100644
--- a/tests/output/custom/pages/this-is-a-test-page.html
+++ b/tests/output/custom/pages/this-is-a-test-page.html
@@ -4,8 +4,10 @@
         <title>This is a test page</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/second-article-fr.html b/tests/output/custom/second-article-fr.html
index 9ed39cec..8446d6aa 100644
--- a/tests/output/custom/second-article-fr.html
+++ b/tests/output/custom/second-article-fr.html
@@ -4,8 +4,10 @@
         <title>Deuxième article</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/second-article.html b/tests/output/custom/second-article.html
index 93e421fb..0b287424 100644
--- a/tests/output/custom/second-article.html
+++ b/tests/output/custom/second-article.html
@@ -4,8 +4,10 @@
         <title>Second article</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/tag/bar.html b/tests/output/custom/tag/bar.html
index 74cdb11d..3d3c27c2 100644
--- a/tests/output/custom/tag/bar.html
+++ b/tests/output/custom/tag/bar.html
@@ -4,8 +4,10 @@
         <title>Alexis' log - bar</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
@@ -57,7 +59,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -74,11 +76,11 @@
 
 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>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
+</footer><!-- /.post-info --><p>This is some article, in english</p>
+<p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
                 </article>
                 
             </aside><!-- /#featured -->
@@ -98,8 +100,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article.html" rel="bookmark"
-                           title="Permalink to Second article">Second article</a></h1>
+                    <h1><a href=".././second-article-fr.html" rel="bookmark"
+                           title="Permalink to Deuxième article">Deuxième article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -119,14 +121,14 @@ Translations:
 
 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>Ceci est un article, en français.</p>
 
-                <a class="readmore" href=".././second-article.html">read more</a>
-                <p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</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>
                 </div><!-- /.entry-content -->
             </article></li>
         
diff --git a/tests/output/custom/tag/baz.html b/tests/output/custom/tag/baz.html
index ee0a0728..83466283 100644
--- a/tests/output/custom/tag/baz.html
+++ b/tests/output/custom/tag/baz.html
@@ -4,8 +4,10 @@
         <title>Alexis' log - baz</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
@@ -57,7 +59,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -74,11 +76,11 @@
 
 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>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
+</footer><!-- /.post-info --><p>This is some article, in english</p>
+<p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
                 </article>
                 
             </aside><!-- /#featured -->
@@ -98,8 +100,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article.html" rel="bookmark"
-                           title="Permalink to Second article">Second article</a></h1>
+                    <h1><a href=".././second-article-fr.html" rel="bookmark"
+                           title="Permalink to Deuxième article">Deuxième article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -119,14 +121,14 @@ Translations:
 
 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>Ceci est un article, en français.</p>
 
-                <a class="readmore" href=".././second-article.html">read more</a>
-                <p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</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>
                 </div><!-- /.entry-content -->
             </article></li>
         
diff --git a/tests/output/custom/tag/foo.html b/tests/output/custom/tag/foo.html
index dfbcb68b..d8d58f41 100644
--- a/tests/output/custom/tag/foo.html
+++ b/tests/output/custom/tag/foo.html
@@ -4,8 +4,10 @@
         <title>Alexis' log - foo</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
@@ -57,7 +59,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -74,11 +76,11 @@
 
 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>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
+</footer><!-- /.post-info --><p>This is some article, in english</p>
+<p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
                 </article>
                 
             </aside><!-- /#featured -->
@@ -98,8 +100,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article.html" rel="bookmark"
-                           title="Permalink to Second article">Second article</a></h1>
+                    <h1><a href=".././second-article-fr.html" rel="bookmark"
+                           title="Permalink to Deuxième article">Deuxième article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -119,14 +121,14 @@ Translations:
 
 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>Ceci est un article, en français.</p>
 
-                <a class="readmore" href=".././second-article.html">read more</a>
-                <p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</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>
                 </div><!-- /.entry-content -->
             </article></li>
         
diff --git a/tests/output/custom/tag/foobar.html b/tests/output/custom/tag/foobar.html
index d14a9c71..0d2ce6af 100644
--- a/tests/output/custom/tag/foobar.html
+++ b/tests/output/custom/tag/foobar.html
@@ -4,8 +4,10 @@
         <title>Alexis' log - foobar</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/tag/oh.html b/tests/output/custom/tag/oh.html
index abc98868..99d40c14 100644
--- a/tests/output/custom/tag/oh.html
+++ b/tests/output/custom/tag/oh.html
@@ -4,8 +4,10 @@
         <title>Alexis' log - oh</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/tag/yeah.html b/tests/output/custom/tag/yeah.html
index 199adbe0..f1884cc6 100644
--- a/tests/output/custom/tag/yeah.html
+++ b/tests/output/custom/tag/yeah.html
@@ -4,8 +4,10 @@
         <title>Alexis' log - yeah</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/theme/css/main.css b/tests/output/custom/theme/css/main.css
index dce9e247..0648bf2e 100644
--- a/tests/output/custom/theme/css/main.css
+++ b/tests/output/custom/theme/css/main.css
@@ -144,8 +144,8 @@ aside, nav, article, figure {
 
 /***** Layout *****/
 .body {clear: both; margin: 0 auto; width: 800px;}
-img.right figure.right {float: right; margin: 0 0 2em 2em;}
-img.left, figure.left {float: right; margin: 0 0 2em 2em;}
+img.right, figure.right {float: right; margin: 0 0 2em 2em;}
+img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 
 /*
 	Header
diff --git a/tests/output/custom/this-is-a-super-article.html b/tests/output/custom/this-is-a-super-article.html
index 640301db..d12936d2 100644
--- a/tests/output/custom/this-is-a-super-article.html
+++ b/tests/output/custom/this-is-a-super-article.html
@@ -4,8 +4,10 @@
         <title>This is a super article !</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/unbelievable.html b/tests/output/custom/unbelievable.html
index 83eed167..742a9c0d 100644
--- a/tests/output/custom/unbelievable.html
+++ b/tests/output/custom/unbelievable.html
@@ -4,8 +4,10 @@
         <title>Unbelievable !</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />