diff --git a/tests/output/custom/a-markdown-powered-article.html b/tests/output/custom/a-markdown-powered-article.html
index 9ca4763c..6e495efb 100644
--- a/tests/output/custom/a-markdown-powered-article.html
+++ b/tests/output/custom/a-markdown-powered-article.html
@@ -76,6 +76,9 @@
 
 
 
+
+
+
 </footer><!-- /.post-info -->
       <p>You're mutually oblivious.</p>
     </div><!-- /.entry-content -->
diff --git a/tests/output/custom/article-1.html b/tests/output/custom/article-1.html
index b0e0f879..e94373a9 100644
--- a/tests/output/custom/article-1.html
+++ b/tests/output/custom/article-1.html
@@ -76,6 +76,9 @@
 
 
 
+
+
+
 </footer><!-- /.post-info -->
       <p>Article 1</p>
 
diff --git a/tests/output/custom/article-2.html b/tests/output/custom/article-2.html
index 973b870a..f39bb27b 100644
--- a/tests/output/custom/article-2.html
+++ b/tests/output/custom/article-2.html
@@ -76,6 +76,9 @@
 
 
 
+
+
+
 </footer><!-- /.post-info -->
       <p>Article 2</p>
 
diff --git a/tests/output/custom/article-3.html b/tests/output/custom/article-3.html
index 7697a4ef..f0cc6c34 100644
--- a/tests/output/custom/article-3.html
+++ b/tests/output/custom/article-3.html
@@ -76,6 +76,9 @@
 
 
 
+
+
+
 </footer><!-- /.post-info -->
       <p>Article 3</p>
 
diff --git a/tests/output/custom/author/alexis-metaireau.html b/tests/output/custom/author/alexis-metaireau.html
index c64aacb9..42b84647 100644
--- a/tests/output/custom/author/alexis-metaireau.html
+++ b/tests/output/custom/author/alexis-metaireau.html
@@ -74,6 +74,9 @@
 
 
 
+
+
+
 </footer><!-- /.post-info --><p>You're mutually oblivious.</p><p>There are <a href=".././a-markdown-powered-article.html#disqus_thread">comments</a>.</p>
                 </article>
                 
@@ -113,6 +116,9 @@
 
 
 
+
+
+
 </footer><!-- /.post-info -->
                 <p>Article 1</p>
 
@@ -148,6 +154,9 @@
 
 
 
+
+
+
 </footer><!-- /.post-info -->
                 <p>Article 2</p>
 
@@ -183,6 +192,9 @@
 
 
 
+
+
+
 </footer><!-- /.post-info -->
                 <p>Article 3</p>
 
diff --git a/tests/output/custom/author/alexis-metaireau2.html b/tests/output/custom/author/alexis-metaireau2.html
index 53f001fa..32b55f6f 100644
--- a/tests/output/custom/author/alexis-metaireau2.html
+++ b/tests/output/custom/author/alexis-metaireau2.html
@@ -82,11 +82,14 @@
 <p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
 
 
+
+
 Translations: 
     
         <a href=".././oh-yeah-fr.html">fr</a>
     
 
+
 </footer><!-- /.post-info -->
                 <div class="section" id="why-not">
 <h2>Why not ?</h2>
@@ -127,11 +130,14 @@ YEAH !</p>
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
 
 
+
+
 Translations: 
     
         <a href=".././second-article-fr.html">fr</a>
     
 
+
 </footer><!-- /.post-info -->
                 <p>This is some article, in english</p>
 
@@ -167,6 +173,9 @@ Translations:
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
 
 
+
+
+
 </footer><!-- /.post-info -->
                 <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
@@ -203,6 +212,9 @@ as well as <strong>inline markup</strong>.</p>
 
 
 
+
+
+
 </footer><!-- /.post-info -->
                 <p>Or completely awesome. Depends the needs.</p>
 
diff --git a/tests/output/custom/category/bar.html b/tests/output/custom/category/bar.html
index e645f4e2..87263d13 100644
--- a/tests/output/custom/category/bar.html
+++ b/tests/output/custom/category/bar.html
@@ -74,11 +74,14 @@
 <p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
 
 
+
+
 Translations: 
     
         <a href=".././oh-yeah-fr.html">fr</a>
     
 
+
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
diff --git a/tests/output/custom/category/cat1.html b/tests/output/custom/category/cat1.html
index 4d76e095..af5ad56c 100644
--- a/tests/output/custom/category/cat1.html
+++ b/tests/output/custom/category/cat1.html
@@ -74,6 +74,9 @@
 
 
 
+
+
+
 </footer><!-- /.post-info --><p>You're mutually oblivious.</p><p>There are <a href=".././a-markdown-powered-article.html#disqus_thread">comments</a>.</p>
                 </article>
                 
@@ -113,6 +116,9 @@
 
 
 
+
+
+
 </footer><!-- /.post-info -->
                 <p>Article 1</p>
 
@@ -148,6 +154,9 @@
 
 
 
+
+
+
 </footer><!-- /.post-info -->
                 <p>Article 2</p>
 
@@ -183,6 +192,9 @@
 
 
 
+
+
+
 </footer><!-- /.post-info -->
                 <p>Article 3</p>
 
diff --git a/tests/output/custom/category/misc.html b/tests/output/custom/category/misc.html
index a0ac83a5..90948668 100644
--- a/tests/output/custom/category/misc.html
+++ b/tests/output/custom/category/misc.html
@@ -74,11 +74,14 @@
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
 
 
+
+
 Translations: 
     
         <a href=".././second-article-fr.html">fr</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>
                 </article>
@@ -119,6 +122,9 @@ Translations:
 
 
 
+
+
+
 </footer><!-- /.post-info -->
                 <p>Or completely awesome. Depends the needs.</p>
 
diff --git a/tests/output/custom/category/yeah.html b/tests/output/custom/category/yeah.html
index ece5f0eb..a848c4a4 100644
--- a/tests/output/custom/category/yeah.html
+++ b/tests/output/custom/category/yeah.html
@@ -74,6 +74,9 @@
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
 
 
+
+
+
 </footer><!-- /.post-info --><p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
diff --git a/tests/output/custom/drafts/a-draft-article.html b/tests/output/custom/drafts/a-draft-article.html
index e38fb7b2..bcfd1243 100644
--- a/tests/output/custom/drafts/a-draft-article.html
+++ b/tests/output/custom/drafts/a-draft-article.html
@@ -76,6 +76,9 @@
 
 
 
+
+
+
 </footer><!-- /.post-info -->
       <p>This is a draft article, it should live under the /drafts/ folder and not be
 listed anywhere else.</p>
diff --git a/tests/output/custom/index.html b/tests/output/custom/index.html
index 80913795..3bcea824 100644
--- a/tests/output/custom/index.html
+++ b/tests/output/custom/index.html
@@ -74,11 +74,14 @@
 <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>
 
 
+
+
 Translations: 
     
         <a href="./second-article-fr.html">fr</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>
                 </article>
@@ -119,6 +122,9 @@ Translations:
 
 
 
+
+
+
 </footer><!-- /.post-info -->
                 <p>You're mutually oblivious.</p>
                 <a class="readmore" href="./a-markdown-powered-article.html">read more</a>
@@ -153,6 +159,9 @@ Translations:
 
 
 
+
+
+
 </footer><!-- /.post-info -->
                 <p>Article 1</p>
 
@@ -188,6 +197,9 @@ Translations:
 
 
 
+
+
+
 </footer><!-- /.post-info -->
                 <p>Article 2</p>
 
diff --git a/tests/output/custom/index2.html b/tests/output/custom/index2.html
index 1eb336b6..bba153f4 100644
--- a/tests/output/custom/index2.html
+++ b/tests/output/custom/index2.html
@@ -82,6 +82,9 @@
 
 
 
+
+
+
 </footer><!-- /.post-info -->
                 <p>Article 3</p>
 
@@ -117,6 +120,9 @@
 <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/foobar.html">foobar</a></p>
 
 
+
+
+
 </footer><!-- /.post-info -->
                 <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
@@ -153,11 +159,14 @@ as well as <strong>inline markup</strong>.</p>
 <p>tags: <a href="./tag/oh.html">oh</a><a href="./tag/bar.html">bar</a><a href="./tag/yeah.html">yeah</a></p>
 
 
+
+
 Translations: 
     
         <a href="./oh-yeah-fr.html">fr</a>
     
 
+
 </footer><!-- /.post-info -->
                 <div class="section" id="why-not">
 <h2>Why not ?</h2>
@@ -198,6 +207,9 @@ YEAH !</p>
 
 
 
+
+
+
 </footer><!-- /.post-info -->
                 <p>Or completely awesome. Depends the needs.</p>
 
diff --git a/tests/output/custom/oh-yeah-fr.html b/tests/output/custom/oh-yeah-fr.html
index fb669e9b..ddc17b30 100644
--- a/tests/output/custom/oh-yeah-fr.html
+++ b/tests/output/custom/oh-yeah-fr.html
@@ -76,11 +76,14 @@
 
 
 
+
+
 Translations: 
     
         <a href="./oh-yeah.html">en</a>
     
 
+
 </footer><!-- /.post-info -->
       <p>Et voila du contenu en français</p>
 
diff --git a/tests/output/custom/oh-yeah.html b/tests/output/custom/oh-yeah.html
index c4eb421f..a48044ab 100644
--- a/tests/output/custom/oh-yeah.html
+++ b/tests/output/custom/oh-yeah.html
@@ -76,11 +76,14 @@
 <p>tags: <a href="./tag/oh.html">oh</a><a href="./tag/bar.html">bar</a><a href="./tag/yeah.html">yeah</a></p>
 
 
+
+
 Translations: 
     
         <a href="./oh-yeah-fr.html">fr</a>
     
 
+
 </footer><!-- /.post-info -->
       <div class="section" id="why-not">
 <h2>Why not ?</h2>
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 913a5974..2b489963 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
@@ -55,6 +55,10 @@
 <section id="content" class="body">    
     <h1 class="entry-title">This is a test hidden page</h1>
     
+    
+
+
+    
     <p>This is great for things like error(404) pages
 Anyone can see this page but it's not linked to anywhere!</p>
 
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 87e4925f..7d74011d 100644
--- a/tests/output/custom/pages/this-is-a-test-page.html
+++ b/tests/output/custom/pages/this-is-a-test-page.html
@@ -55,6 +55,10 @@
 <section id="content" class="body">    
     <h1 class="entry-title">This is a test page</h1>
     
+    
+
+
+    
     <p>Just an image.</p>
 <img alt="alternate text" src="../static/pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
 
diff --git a/tests/output/custom/second-article-fr.html b/tests/output/custom/second-article-fr.html
index 1100df29..cd1ee194 100644
--- a/tests/output/custom/second-article-fr.html
+++ b/tests/output/custom/second-article-fr.html
@@ -76,11 +76,14 @@
 <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>
 
 
+
+
 Translations: 
     
         <a href="./second-article.html">en</a>
     
 
+
 </footer><!-- /.post-info -->
       <p>Ceci est un article, en français.</p>
 
diff --git a/tests/output/custom/second-article.html b/tests/output/custom/second-article.html
index 7a908526..ebabacc3 100644
--- a/tests/output/custom/second-article.html
+++ b/tests/output/custom/second-article.html
@@ -76,11 +76,14 @@
 <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>
 
 
+
+
 Translations: 
     
         <a href="./second-article-fr.html">fr</a>
     
 
+
 </footer><!-- /.post-info -->
       <p>This is some article, in english</p>
 
diff --git a/tests/output/custom/tag/bar.html b/tests/output/custom/tag/bar.html
index 03ce0de3..b9ef8402 100644
--- a/tests/output/custom/tag/bar.html
+++ b/tests/output/custom/tag/bar.html
@@ -74,11 +74,14 @@
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
 
 
+
+
 Translations: 
     
         <a href=".././second-article.html">en</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>
                 </article>
@@ -119,11 +122,14 @@ Translations:
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
 
 
+
+
 Translations: 
     
         <a href=".././second-article-fr.html">fr</a>
     
 
+
 </footer><!-- /.post-info -->
                 <p>This is some article, in english</p>
 
@@ -159,6 +165,9 @@ Translations:
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
 
 
+
+
+
 </footer><!-- /.post-info -->
                 <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
@@ -195,11 +204,14 @@ as well as <strong>inline markup</strong>.</p>
 <p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
 
 
+
+
 Translations: 
     
         <a href=".././oh-yeah-fr.html">fr</a>
     
 
+
 </footer><!-- /.post-info -->
                 <div class="section" id="why-not">
 <h2>Why not ?</h2>
diff --git a/tests/output/custom/tag/baz.html b/tests/output/custom/tag/baz.html
index e32cc9ea..29c1fae9 100644
--- a/tests/output/custom/tag/baz.html
+++ b/tests/output/custom/tag/baz.html
@@ -74,11 +74,14 @@
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
 
 
+
+
 Translations: 
     
         <a href=".././second-article.html">en</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>
                 </article>
@@ -119,11 +122,14 @@ Translations:
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
 
 
+
+
 Translations: 
     
         <a href=".././second-article-fr.html">fr</a>
     
 
+
 </footer><!-- /.post-info -->
                 <p>This is some article, in english</p>
 
diff --git a/tests/output/custom/tag/foo.html b/tests/output/custom/tag/foo.html
index 9c295933..04415b2c 100644
--- a/tests/output/custom/tag/foo.html
+++ b/tests/output/custom/tag/foo.html
@@ -74,11 +74,14 @@
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
 
 
+
+
 Translations: 
     
         <a href=".././second-article.html">en</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>
                 </article>
@@ -119,11 +122,14 @@ Translations:
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
 
 
+
+
 Translations: 
     
         <a href=".././second-article-fr.html">fr</a>
     
 
+
 </footer><!-- /.post-info -->
                 <p>This is some article, in english</p>
 
@@ -159,6 +165,9 @@ Translations:
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
 
 
+
+
+
 </footer><!-- /.post-info -->
                 <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
diff --git a/tests/output/custom/tag/foobar.html b/tests/output/custom/tag/foobar.html
index cad2dae3..38c4c61e 100644
--- a/tests/output/custom/tag/foobar.html
+++ b/tests/output/custom/tag/foobar.html
@@ -74,6 +74,9 @@
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
 
 
+
+
+
 </footer><!-- /.post-info --><p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
diff --git a/tests/output/custom/tag/oh.html b/tests/output/custom/tag/oh.html
index 53d45369..498b3fde 100644
--- a/tests/output/custom/tag/oh.html
+++ b/tests/output/custom/tag/oh.html
@@ -74,11 +74,14 @@
 <p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
 
 
+
+
 Translations: 
     
         <a href=".././oh-yeah-fr.html">fr</a>
     
 
+
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
diff --git a/tests/output/custom/tag/yeah.html b/tests/output/custom/tag/yeah.html
index bfd7b4cd..16d325f2 100644
--- a/tests/output/custom/tag/yeah.html
+++ b/tests/output/custom/tag/yeah.html
@@ -74,11 +74,14 @@
 <p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
 
 
+
+
 Translations: 
     
         <a href=".././oh-yeah-fr.html">fr</a>
     
 
+
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
diff --git a/tests/output/custom/this-is-a-super-article.html b/tests/output/custom/this-is-a-super-article.html
index f1e3fa40..8d024437 100644
--- a/tests/output/custom/this-is-a-super-article.html
+++ b/tests/output/custom/this-is-a-super-article.html
@@ -76,6 +76,9 @@
 <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/foobar.html">foobar</a></p>
 
 
+
+
+
 </footer><!-- /.post-info -->
       <p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
diff --git a/tests/output/custom/unbelievable.html b/tests/output/custom/unbelievable.html
index e08b2952..1a1b0788 100644
--- a/tests/output/custom/unbelievable.html
+++ b/tests/output/custom/unbelievable.html
@@ -76,6 +76,9 @@
 
 
 
+
+
+
 </footer><!-- /.post-info -->
       <p>Or completely awesome. Depends the needs.</p>