diff --git a/tests/output/basic/a-markdown-powered-article.html b/tests/output/basic/a-markdown-powered-article.html
index ceadf79a..bfa09fdf 100644
--- a/tests/output/basic/a-markdown-powered-article.html
+++ b/tests/output/basic/a-markdown-powered-article.html
@@ -35,7 +35,7 @@
                 
                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/archives.html b/tests/output/basic/archives.html
index 52d00234..dac96a47 100644
--- a/tests/output/basic/archives.html
+++ b/tests/output/basic/archives.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/article-1.html b/tests/output/basic/article-1.html
index bd6f9716..ab1d71d7 100644
--- a/tests/output/basic/article-1.html
+++ b/tests/output/basic/article-1.html
@@ -35,7 +35,7 @@
                 
                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/article-2.html b/tests/output/basic/article-2.html
index 7811204a..52cfff0d 100644
--- a/tests/output/basic/article-2.html
+++ b/tests/output/basic/article-2.html
@@ -35,7 +35,7 @@
                 
                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/article-3.html b/tests/output/basic/article-3.html
index 96acb190..ef97a56d 100644
--- a/tests/output/basic/article-3.html
+++ b/tests/output/basic/article-3.html
@@ -35,7 +35,7 @@
                 
                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/author/alexis-metaireau.html b/tests/output/basic/author/alexis-metaireau.html
index 6bf631eb..ad7b8bee 100644
--- a/tests/output/basic/author/alexis-metaireau.html
+++ b/tests/output/basic/author/alexis-metaireau.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
@@ -88,7 +88,6 @@ YEAH !</p>
         
         
         
-        
             
 
         
@@ -96,7 +95,8 @@ YEAH !</p>
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././this-is-a-super-article.html" rel="bookmark" title="Permalink to This is a super article !">This is a super article !</a></h1>
+                    <h1><a href=".././this-is-a-super-article.html" rel="bookmark"
+                           title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -124,10 +124,10 @@ as well as <strong>inline markup</strong>.</p>
             </article></li>
         
         
-            
-        
-        
             </ol><!-- /#posts-list -->
+            
+                
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/basic/author/dummy-author.html b/tests/output/basic/author/dummy-author.html
index cf23f899..54c81100 100644
--- a/tests/output/basic/author/dummy-author.html
+++ b/tests/output/basic/author/dummy-author.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
@@ -77,7 +77,6 @@
         
         
         
-        
             
 
         
@@ -85,7 +84,8 @@
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././article-1.html" rel="bookmark" title="Permalink to Article 1">Article 1</a></h1>
+                    <h1><a href=".././article-1.html" rel="bookmark"
+                           title="Permalink to Article 1">Article 1</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -112,7 +112,6 @@
             </article></li>
         
         
-        
             
 
         
@@ -120,7 +119,8 @@
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././article-2.html" rel="bookmark" title="Permalink to Article 2">Article 2</a></h1>
+                    <h1><a href=".././article-2.html" rel="bookmark"
+                           title="Permalink to Article 2">Article 2</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -147,7 +147,6 @@
             </article></li>
         
         
-        
             
 
         
@@ -155,7 +154,8 @@
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././article-3.html" rel="bookmark" title="Permalink to Article 3">Article 3</a></h1>
+                    <h1><a href=".././article-3.html" rel="bookmark"
+                           title="Permalink to Article 3">Article 3</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -182,7 +182,6 @@
             </article></li>
         
         
-        
             
 
         
@@ -190,7 +189,8 @@
             
             <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.html" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -204,7 +204,7 @@
                 By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
-<p>In <a href=".././category/content.html">content</a>. </p>
+<p>In <a href=".././category/misc.html">misc</a>. </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>
 
 
@@ -222,7 +222,6 @@ Translations:
             </article></li>
         
         
-        
             
 
         
@@ -230,7 +229,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././unbelievable.html" rel="bookmark" title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+                    <h1><a href=".././unbelievable.html" rel="bookmark"
+                           title="Permalink to Unbelievable !">Unbelievable !</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -244,7 +244,7 @@ Translations:
                 By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
-<p>In <a href=".././category/content.html">content</a>. </p>
+<p>In <a href=".././category/misc.html">misc</a>. </p>
 
 
 
@@ -257,10 +257,10 @@ Translations:
             </article></li>
         
         
-            
-        
-        
             </ol><!-- /#posts-list -->
+            
+                
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/basic/categories.html b/tests/output/basic/categories.html
index db25ed68..d13d0b92 100644
--- a/tests/output/basic/categories.html
+++ b/tests/output/basic/categories.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
@@ -48,7 +48,7 @@
 
     <li><a href="./category/cat1.html">cat1</a></li>
 
-    <li><a href="./category/content.html">content</a></li>
+    <li><a href="./category/misc.html">misc</a></li>
 
     <li><a href="./category/yeah.html">yeah</a></li>
 
diff --git a/tests/output/basic/category/bar.html b/tests/output/basic/category/bar.html
index 77d0187b..a80656a5 100644
--- a/tests/output/basic/category/bar.html
+++ b/tests/output/basic/category/bar.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
@@ -85,8 +85,8 @@ YEAH !</p>
         
         
         
-        
             </ol><!-- /#posts-list -->
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/basic/category/cat1.html b/tests/output/basic/category/cat1.html
index 1d8d67e8..3d062ac7 100644
--- a/tests/output/basic/category/cat1.html
+++ b/tests/output/basic/category/cat1.html
@@ -35,7 +35,7 @@
                 
                     <li class="active"><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
@@ -77,7 +77,6 @@
         
         
         
-        
             
 
         
@@ -85,7 +84,8 @@
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././article-1.html" rel="bookmark" title="Permalink to Article 1">Article 1</a></h1>
+                    <h1><a href=".././article-1.html" rel="bookmark"
+                           title="Permalink to Article 1">Article 1</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -112,7 +112,6 @@
             </article></li>
         
         
-        
             
 
         
@@ -120,7 +119,8 @@
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././article-2.html" rel="bookmark" title="Permalink to Article 2">Article 2</a></h1>
+                    <h1><a href=".././article-2.html" rel="bookmark"
+                           title="Permalink to Article 2">Article 2</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -147,7 +147,6 @@
             </article></li>
         
         
-        
             
 
         
@@ -155,7 +154,8 @@
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././article-3.html" rel="bookmark" title="Permalink to Article 3">Article 3</a></h1>
+                    <h1><a href=".././article-3.html" rel="bookmark"
+                           title="Permalink to Article 3">Article 3</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -182,10 +182,10 @@
             </article></li>
         
         
-            
-        
-        
             </ol><!-- /#posts-list -->
+            
+                
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/basic/category/misc.html b/tests/output/basic/category/misc.html
new file mode 100644
index 00000000..ff344111
--- /dev/null
+++ b/tests/output/basic/category/misc.html
@@ -0,0 +1,147 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <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]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
+                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+        <header id="banner" class="body">
+                <h1><a href="../.">A Pelican Blog </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li class="active"><a href=".././category/misc.html">misc</a></li>
+                
+                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+
+            
+
+        
+        
+            <aside id="featured" class="body">
+                <article>
+                    <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
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
+        </address>
+        
+<p>In <a href=".././category/misc.html">misc</a>. </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>
+
+                </article>
+                
+            </aside><!-- /#featured -->
+            
+                <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                    <ol id="posts-list" class="hfeed">
+            
+        
+        
+        
+            
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                    <h1><a href=".././unbelievable.html" rel="bookmark"
+                           title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2010-10-15T20:30:00">
+                Fri 15 October 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
+        </address>
+        
+<p>In <a href=".././category/misc.html">misc</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+                <p>Or completely awesome. Depends the needs.</p>
+
+                <a class="readmore" href=".././unbelievable.html">read more</a>
+                
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+            </ol><!-- /#posts-list -->
+            
+                
+            
+            </section><!-- /#content -->
+        
+    
+
+
+        <section id="extras" class="body">
+        
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/basic/category/yeah.html b/tests/output/basic/category/yeah.html
index 747cad37..1d4d7f04 100644
--- a/tests/output/basic/category/yeah.html
+++ b/tests/output/basic/category/yeah.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li class="active"><a href=".././category/yeah.html">yeah</a></li>
                 
@@ -86,8 +86,8 @@
         
         
         
-        
             </ol><!-- /#posts-list -->
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/basic/drafts/a-draft-article.html b/tests/output/basic/drafts/a-draft-article.html
index 99b90c33..af0f2476 100644
--- a/tests/output/basic/drafts/a-draft-article.html
+++ b/tests/output/basic/drafts/a-draft-article.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li class="active"><a href=".././category/content.html">content</a></li>
+                    <li class="active"><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
@@ -53,8 +53,8 @@
 
     <div class="entry-content">
       <footer class="post-info">
-        <abbr class="published" title="2012-03-02T14:01:01">
-                Fri 02 March 2012
+        <abbr class="published" title="2012-05-19T23:55:50.764304">
+                Sat 19 May 2012
         </abbr>
 
         
@@ -62,7 +62,7 @@
                 By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
-<p>In <a href=".././category/content.html">content</a>. </p>
+<p>In <a href=".././category/misc.html">misc</a>. </p>
 
 
 
diff --git a/tests/output/basic/feeds/all-fr.atom.xml b/tests/output/basic/feeds/all-fr.atom.xml
index ce245dee..274bd548 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-03-02T14:01:01Z</updated><entry><title>Trop bien !</title><link href=".././oh-yeah-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="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;
 </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/misc.atom.xml b/tests/output/basic/feeds/misc.atom.xml
new file mode 100644
index 00000000..db33d39b
--- /dev/null
+++ b/tests/output/basic/feeds/misc.atom.xml
@@ -0,0 +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;
+</summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/index.html b/tests/output/basic/index.html
index 1f247443..fe6c2279 100644
--- a/tests/output/basic/index.html
+++ b/tests/output/basic/index.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
@@ -60,7 +60,7 @@
                 By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
         </address>
         
-<p>In <a href="./category/content.html">content</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>. </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>
 
 
@@ -83,7 +83,6 @@ Translations:
         
         
         
-        
             
 
         
@@ -91,7 +90,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href="./a-markdown-powered-article.html" rel="bookmark" title="Permalink to A markdown powered article">A markdown powered article</a></h1>
+                    <h1><a href="./a-markdown-powered-article.html" rel="bookmark"
+                           title="Permalink to A markdown powered article">A markdown powered article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -117,7 +117,6 @@ Translations:
             </article></li>
         
         
-        
             
 
         
@@ -125,7 +124,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href="./article-1.html" rel="bookmark" title="Permalink to Article 1">Article 1</a></h1>
+                    <h1><a href="./article-1.html" rel="bookmark"
+                           title="Permalink to Article 1">Article 1</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -152,7 +152,6 @@ Translations:
             </article></li>
         
         
-        
             
 
         
@@ -160,7 +159,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href="./article-2.html" rel="bookmark" title="Permalink to Article 2">Article 2</a></h1>
+                    <h1><a href="./article-2.html" rel="bookmark"
+                           title="Permalink to Article 2">Article 2</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -187,7 +187,6 @@ Translations:
             </article></li>
         
         
-        
             
 
         
@@ -195,7 +194,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href="./article-3.html" rel="bookmark" title="Permalink to Article 3">Article 3</a></h1>
+                    <h1><a href="./article-3.html" rel="bookmark"
+                           title="Permalink to Article 3">Article 3</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -222,7 +222,6 @@ Translations:
             </article></li>
         
         
-        
             
 
         
@@ -230,7 +229,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href="./this-is-a-super-article.html" rel="bookmark" title="Permalink to This is a super article !">This is a super article !</a></h1>
+                    <h1><a href="./this-is-a-super-article.html" rel="bookmark"
+                           title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -258,7 +258,6 @@ as well as <strong>inline markup</strong>.</p>
             </article></li>
         
         
-        
             
 
         
@@ -266,7 +265,8 @@ as well as <strong>inline markup</strong>.</p>
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href="./oh-yeah.html" rel="bookmark" title="Permalink to Oh yeah !">Oh yeah !</a></h1>
+                    <h1><a href="./oh-yeah.html" rel="bookmark"
+                           title="Permalink to Oh yeah !">Oh yeah !</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -303,7 +303,6 @@ YEAH !</p>
             </article></li>
         
         
-        
             
 
         
@@ -311,7 +310,8 @@ YEAH !</p>
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href="./unbelievable.html" rel="bookmark" title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+                    <h1><a href="./unbelievable.html" rel="bookmark"
+                           title="Permalink to Unbelievable !">Unbelievable !</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -325,7 +325,7 @@ YEAH !</p>
                 By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
         </address>
         
-<p>In <a href="./category/content.html">content</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>. </p>
 
 
 
@@ -338,10 +338,10 @@ YEAH !</p>
             </article></li>
         
         
-            
-        
-        
             </ol><!-- /#posts-list -->
+            
+                
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/basic/oh-yeah-fr.html b/tests/output/basic/oh-yeah-fr.html
index 666a961f..4856347f 100644
--- a/tests/output/basic/oh-yeah-fr.html
+++ b/tests/output/basic/oh-yeah-fr.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li class="active"><a href="./category/content.html">content</a></li>
+                    <li class="active"><a href="./category/misc.html">misc</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
@@ -53,8 +53,8 @@
 
     <div class="entry-content">
       <footer class="post-info">
-        <abbr class="published" title="2012-03-02T14:01:01">
-                Fri 02 March 2012
+        <abbr class="published" title="2012-05-19T23:55:50.764304">
+                Sat 19 May 2012
         </abbr>
 
         
@@ -62,7 +62,7 @@
                 By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
         </address>
         
-<p>In <a href="./category/content.html">content</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>. </p>
 
 
 
diff --git a/tests/output/basic/oh-yeah.html b/tests/output/basic/oh-yeah.html
index c8f1af74..bd0c75ee 100644
--- a/tests/output/basic/oh-yeah.html
+++ b/tests/output/basic/oh-yeah.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
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
new file mode 100644
index 00000000..4412d600
--- /dev/null
+++ b/tests/output/basic/pages/this-is-a-test-hidden-page.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <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]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
+                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+        <header id="banner" class="body">
+                <h1><a href="../.">A Pelican Blog </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/misc.html">misc</a></li>
+                
+                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+<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>
+
+</section>
+
+        <section id="extras" class="body">
+        
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+</body>
+</html>
\ No newline at end of file
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 cc282243..14a78a29 100644
--- a/tests/output/basic/pages/this-is-a-test-page.html
+++ b/tests/output/basic/pages/this-is-a-test-page.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/second-article-fr.html b/tests/output/basic/second-article-fr.html
index 11960efc..a3701245 100644
--- a/tests/output/basic/second-article-fr.html
+++ b/tests/output/basic/second-article-fr.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li class="active"><a href="./category/content.html">content</a></li>
+                    <li class="active"><a href="./category/misc.html">misc</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
@@ -62,7 +62,7 @@
                 By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
         </address>
         
-<p>In <a href="./category/content.html">content</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>. </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>
 
 
diff --git a/tests/output/basic/second-article.html b/tests/output/basic/second-article.html
index 171717ba..cbae942b 100644
--- a/tests/output/basic/second-article.html
+++ b/tests/output/basic/second-article.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li class="active"><a href="./category/content.html">content</a></li>
+                    <li class="active"><a href="./category/misc.html">misc</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
@@ -62,7 +62,7 @@
                 By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
         </address>
         
-<p>In <a href="./category/content.html">content</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>. </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>
 
 
diff --git a/tests/output/basic/tag/bar.html b/tests/output/basic/tag/bar.html
index 8ffd84d8..47a427cb 100644
--- a/tests/output/basic/tag/bar.html
+++ b/tests/output/basic/tag/bar.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
@@ -49,7 +49,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
@@ -60,16 +60,16 @@
                 By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
-<p>In <a href=".././category/content.html">content</a>. </p>
+<p>In <a href=".././category/misc.html">misc</a>. </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.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>
                 
@@ -83,7 +83,6 @@ Translations:
         
         
         
-        
             
 
         
@@ -91,7 +90,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">
@@ -105,25 +105,24 @@ Translations:
                 By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
-<p>In <a href=".././category/content.html">content</a>. </p>
+<p>In <a href=".././category/misc.html">misc</a>. </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>
+        <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>
         
         
-        
             
 
         
@@ -131,7 +130,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././this-is-a-super-article.html" rel="bookmark" title="Permalink to This is a super article !">This is a super article !</a></h1>
+                    <h1><a href=".././this-is-a-super-article.html" rel="bookmark"
+                           title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -159,7 +159,6 @@ as well as <strong>inline markup</strong>.</p>
             </article></li>
         
         
-        
             
 
         
@@ -167,7 +166,8 @@ as well as <strong>inline markup</strong>.</p>
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././oh-yeah.html" rel="bookmark" title="Permalink to Oh yeah !">Oh yeah !</a></h1>
+                    <h1><a href=".././oh-yeah.html" rel="bookmark"
+                           title="Permalink to Oh yeah !">Oh yeah !</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -204,10 +204,10 @@ YEAH !</p>
             </article></li>
         
         
-            
-        
-        
             </ol><!-- /#posts-list -->
+            
+                
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/basic/tag/baz.html b/tests/output/basic/tag/baz.html
index ea01a199..d5c2904f 100644
--- a/tests/output/basic/tag/baz.html
+++ b/tests/output/basic/tag/baz.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
@@ -49,7 +49,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
@@ -60,16 +60,16 @@
                 By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
-<p>In <a href=".././category/content.html">content</a>. </p>
+<p>In <a href=".././category/misc.html">misc</a>. </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.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>
                 
@@ -83,7 +83,6 @@ Translations:
         
         
         
-        
             
 
         
@@ -91,7 +90,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">
@@ -105,28 +105,28 @@ Translations:
                 By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
-<p>In <a href=".././category/content.html">content</a>. </p>
+<p>In <a href=".././category/misc.html">misc</a>. </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>
+        <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>
         
         
-            
-        
-        
             </ol><!-- /#posts-list -->
+            
+                
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/basic/tag/foo.html b/tests/output/basic/tag/foo.html
index ea674062..ba5ee57d 100644
--- a/tests/output/basic/tag/foo.html
+++ b/tests/output/basic/tag/foo.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
@@ -49,7 +49,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
@@ -60,16 +60,16 @@
                 By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
-<p>In <a href=".././category/content.html">content</a>. </p>
+<p>In <a href=".././category/misc.html">misc</a>. </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.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>
                 
@@ -83,7 +83,6 @@ Translations:
         
         
         
-        
             
 
         
@@ -91,7 +90,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">
@@ -105,25 +105,24 @@ Translations:
                 By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
-<p>In <a href=".././category/content.html">content</a>. </p>
+<p>In <a href=".././category/misc.html">misc</a>. </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>
+        <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>
         
         
-        
             
 
         
@@ -131,7 +130,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././this-is-a-super-article.html" rel="bookmark" title="Permalink to This is a super article !">This is a super article !</a></h1>
+                    <h1><a href=".././this-is-a-super-article.html" rel="bookmark"
+                           title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -159,10 +159,10 @@ as well as <strong>inline markup</strong>.</p>
             </article></li>
         
         
-            
-        
-        
             </ol><!-- /#posts-list -->
+            
+                
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/basic/tag/foobar.html b/tests/output/basic/tag/foobar.html
index 1817aa88..782a0128 100644
--- a/tests/output/basic/tag/foobar.html
+++ b/tests/output/basic/tag/foobar.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
@@ -86,8 +86,8 @@
         
         
         
-        
             </ol><!-- /#posts-list -->
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/basic/tag/oh.html b/tests/output/basic/tag/oh.html
index 3ff36f49..675e12cc 100644
--- a/tests/output/basic/tag/oh.html
+++ b/tests/output/basic/tag/oh.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
@@ -85,8 +85,8 @@ YEAH !</p>
         
         
         
-        
             </ol><!-- /#posts-list -->
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/basic/tag/yeah.html b/tests/output/basic/tag/yeah.html
index 76ca35a3..312523a0 100644
--- a/tests/output/basic/tag/yeah.html
+++ b/tests/output/basic/tag/yeah.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
@@ -85,8 +85,8 @@ YEAH !</p>
         
         
         
-        
             </ol><!-- /#posts-list -->
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/basic/theme/css/main.css b/tests/output/basic/theme/css/main.css
index 92905076..dce9e247 100644
--- a/tests/output/basic/theme/css/main.css
+++ b/tests/output/basic/theme/css/main.css
@@ -312,6 +312,7 @@ img.left, figure.left {float: right; margin: 0 0 2em 2em;}
 		.social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');}
 		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
 		.social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
+		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.org');}
 
 /*
 	About
diff --git a/tests/output/basic/theme/images/icons/gitorious.png b/tests/output/basic/theme/images/icons/gitorious.png
new file mode 100644
index 00000000..6485f5ec
Binary files /dev/null and b/tests/output/basic/theme/images/icons/gitorious.png differ
diff --git a/tests/output/basic/this-is-a-super-article.html b/tests/output/basic/this-is-a-super-article.html
index 1e8c160f..6b890f2a 100644
--- a/tests/output/basic/this-is-a-super-article.html
+++ b/tests/output/basic/this-is-a-super-article.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
                 
                     <li class="active"><a href="./category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/unbelievable.html b/tests/output/basic/unbelievable.html
index db018d81..3f9cc830 100644
--- a/tests/output/basic/unbelievable.html
+++ b/tests/output/basic/unbelievable.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li class="active"><a href="./category/content.html">content</a></li>
+                    <li class="active"><a href="./category/misc.html">misc</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
@@ -62,7 +62,7 @@
                 By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
         </address>
         
-<p>In <a href="./category/content.html">content</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>. </p>
 
 
 
diff --git a/tests/output/custom/tag/bar.html b/tests/output/custom/tag/bar.html
index 74cdb11d..fe007074 100644
--- a/tests/output/custom/tag/bar.html
+++ b/tests/output/custom/tag/bar.html
@@ -57,7 +57,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 +74,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 +98,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 +119,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..8e202cbe 100644
--- a/tests/output/custom/tag/baz.html
+++ b/tests/output/custom/tag/baz.html
@@ -57,7 +57,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 +74,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 +98,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 +119,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..6e2cbf11 100644
--- a/tests/output/custom/tag/foo.html
+++ b/tests/output/custom/tag/foo.html
@@ -57,7 +57,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 +74,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 +98,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 +119,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>