diff --git a/pelican/tests/output/basic/a-markdown-powered-article.html b/pelican/tests/output/basic/a-markdown-powered-article.html
index 021f2720..94b6e4ca 100644
--- a/pelican/tests/output/basic/a-markdown-powered-article.html
+++ b/pelican/tests/output/basic/a-markdown-powered-article.html
@@ -1,21 +1,14 @@
+
A markdown powered article
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/basic/archives.html b/pelican/tests/output/basic/archives.html
index c941849e..57f4a57a 100644
--- a/pelican/tests/output/basic/archives.html
+++ b/pelican/tests/output/basic/archives.html
@@ -1,21 +1,14 @@
+
A Pelican Blog
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/basic/article-1.html b/pelican/tests/output/basic/article-1.html
index a86bcbd0..cfe91009 100644
--- a/pelican/tests/output/basic/article-1.html
+++ b/pelican/tests/output/basic/article-1.html
@@ -1,21 +1,14 @@
+
Article 1
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/basic/article-2.html b/pelican/tests/output/basic/article-2.html
index da74685d..70f38852 100644
--- a/pelican/tests/output/basic/article-2.html
+++ b/pelican/tests/output/basic/article-2.html
@@ -1,21 +1,14 @@
+
Article 2
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/basic/article-3.html b/pelican/tests/output/basic/article-3.html
index 03641539..20e58fcc 100644
--- a/pelican/tests/output/basic/article-3.html
+++ b/pelican/tests/output/basic/article-3.html
@@ -1,21 +1,14 @@
+
Article 3
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html
index 9c47c7a0..7f7a8c6b 100644
--- a/pelican/tests/output/basic/author/alexis-metaireau.html
+++ b/pelican/tests/output/basic/author/alexis-metaireau.html
@@ -1,21 +1,14 @@
+
A Pelican Blog - Alexis Métaireau
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/basic/categories.html b/pelican/tests/output/basic/categories.html
index 8f6d9f41..a5eb2621 100644
--- a/pelican/tests/output/basic/categories.html
+++ b/pelican/tests/output/basic/categories.html
@@ -1,21 +1,14 @@
+
A Pelican Blog
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/basic/category/bar.html b/pelican/tests/output/basic/category/bar.html
index deca8aed..9e3b52f1 100644
--- a/pelican/tests/output/basic/category/bar.html
+++ b/pelican/tests/output/basic/category/bar.html
@@ -1,21 +1,14 @@
+
A Pelican Blog - bar
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/basic/category/cat1.html b/pelican/tests/output/basic/category/cat1.html
index 90edd920..c8912fc2 100644
--- a/pelican/tests/output/basic/category/cat1.html
+++ b/pelican/tests/output/basic/category/cat1.html
@@ -1,21 +1,14 @@
+
A Pelican Blog - cat1
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html
index f966bf89..af223812 100644
--- a/pelican/tests/output/basic/category/misc.html
+++ b/pelican/tests/output/basic/category/misc.html
@@ -1,21 +1,14 @@
+
A Pelican Blog - misc
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/basic/category/yeah.html b/pelican/tests/output/basic/category/yeah.html
index bce27b13..f401e3d2 100644
--- a/pelican/tests/output/basic/category/yeah.html
+++ b/pelican/tests/output/basic/category/yeah.html
@@ -1,21 +1,14 @@
+
A Pelican Blog - yeah
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/basic/filename_metadata-example.html b/pelican/tests/output/basic/filename_metadata-example.html
index 0c7f6753..3092742b 100644
--- a/pelican/tests/output/basic/filename_metadata-example.html
+++ b/pelican/tests/output/basic/filename_metadata-example.html
@@ -1,21 +1,14 @@
+
FILENAME_METADATA example
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
index d109f535..c5b9fec3 100644
--- a/pelican/tests/output/basic/index.html
+++ b/pelican/tests/output/basic/index.html
@@ -1,21 +1,14 @@
+
A Pelican Blog
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/basic/oh-yeah.html b/pelican/tests/output/basic/oh-yeah.html
index 82b90905..62834917 100644
--- a/pelican/tests/output/basic/oh-yeah.html
+++ b/pelican/tests/output/basic/oh-yeah.html
@@ -1,21 +1,14 @@
+
Oh yeah !
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/basic/override/index.html b/pelican/tests/output/basic/override/index.html
index 82c1e184..e75c75f7 100644
--- a/pelican/tests/output/basic/override/index.html
+++ b/pelican/tests/output/basic/override/index.html
@@ -1,21 +1,14 @@
+
Override url/save_as
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
index 06e4bcc1..6b5ae4c8 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
@@ -1,21 +1,14 @@
+
This is a test hidden page
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-page.html b/pelican/tests/output/basic/pages/this-is-a-test-page.html
index c40fc879..9f1572af 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-page.html
@@ -1,21 +1,14 @@
+
This is a test page
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/basic/second-article-fr.html b/pelican/tests/output/basic/second-article-fr.html
index 6b3f422e..f0c166de 100644
--- a/pelican/tests/output/basic/second-article-fr.html
+++ b/pelican/tests/output/basic/second-article-fr.html
@@ -1,21 +1,14 @@
+
Deuxième article
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/basic/second-article.html b/pelican/tests/output/basic/second-article.html
index 657e1e5d..6cc42c66 100644
--- a/pelican/tests/output/basic/second-article.html
+++ b/pelican/tests/output/basic/second-article.html
@@ -1,21 +1,14 @@
+
Second article
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html
index 725cd165..20824993 100644
--- a/pelican/tests/output/basic/tag/bar.html
+++ b/pelican/tests/output/basic/tag/bar.html
@@ -1,21 +1,14 @@
+
A Pelican Blog - bar
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/basic/tag/baz.html b/pelican/tests/output/basic/tag/baz.html
index 6a8baa42..65632313 100644
--- a/pelican/tests/output/basic/tag/baz.html
+++ b/pelican/tests/output/basic/tag/baz.html
@@ -1,21 +1,14 @@
+
A Pelican Blog - baz
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/basic/tag/foo.html b/pelican/tests/output/basic/tag/foo.html
index d8e06ee3..05a02a5f 100644
--- a/pelican/tests/output/basic/tag/foo.html
+++ b/pelican/tests/output/basic/tag/foo.html
@@ -1,21 +1,14 @@
+
A Pelican Blog - foo
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/basic/tag/foobar.html b/pelican/tests/output/basic/tag/foobar.html
index ab728689..c683f1a1 100644
--- a/pelican/tests/output/basic/tag/foobar.html
+++ b/pelican/tests/output/basic/tag/foobar.html
@@ -1,21 +1,14 @@
+
A Pelican Blog - foobar
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/basic/tag/oh.html b/pelican/tests/output/basic/tag/oh.html
index d0bd6e6f..610a7aa3 100644
--- a/pelican/tests/output/basic/tag/oh.html
+++ b/pelican/tests/output/basic/tag/oh.html
@@ -1,21 +1,14 @@
+
A Pelican Blog - oh
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/basic/tag/yeah.html b/pelican/tests/output/basic/tag/yeah.html
index c730f7f2..2afb8bd3 100644
--- a/pelican/tests/output/basic/tag/yeah.html
+++ b/pelican/tests/output/basic/tag/yeah.html
@@ -1,21 +1,14 @@
+
A Pelican Blog - yeah
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/basic/this-is-a-super-article.html b/pelican/tests/output/basic/this-is-a-super-article.html
index 0ace28c7..617b8c6d 100644
--- a/pelican/tests/output/basic/this-is-a-super-article.html
+++ b/pelican/tests/output/basic/this-is-a-super-article.html
@@ -1,21 +1,14 @@
+
This is a super article !
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
index 11a68fc5..73c95423 100644
--- a/pelican/tests/output/basic/unbelievable.html
+++ b/pelican/tests/output/basic/unbelievable.html
@@ -1,21 +1,14 @@
+
Unbelievable !
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html
index 3499ac40..7b953a61 100644
--- a/pelican/tests/output/custom/a-markdown-powered-article.html
+++ b/pelican/tests/output/custom/a-markdown-powered-article.html
@@ -1,22 +1,15 @@
+
A markdown powered article
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/custom/archives.html b/pelican/tests/output/custom/archives.html
index 18105799..8437e350 100644
--- a/pelican/tests/output/custom/archives.html
+++ b/pelican/tests/output/custom/archives.html
@@ -1,22 +1,15 @@
+
Alexis' log
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html
index 84b5946f..c52fdd9a 100644
--- a/pelican/tests/output/custom/article-1.html
+++ b/pelican/tests/output/custom/article-1.html
@@ -1,22 +1,15 @@
+
Article 1
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html
index ac5c3e20..7a045bdc 100644
--- a/pelican/tests/output/custom/article-2.html
+++ b/pelican/tests/output/custom/article-2.html
@@ -1,22 +1,15 @@
+
Article 2
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html
index 34899e3b..f887218c 100644
--- a/pelican/tests/output/custom/article-3.html
+++ b/pelican/tests/output/custom/article-3.html
@@ -1,22 +1,15 @@
+
Article 3
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
index cf241fdf..f18b8ce8 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau.html
@@ -1,22 +1,15 @@
+
Alexis' log - Alexis Métaireau
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index 312a2bed..23346f5b 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -1,22 +1,15 @@
+
Alexis' log - Alexis Métaireau
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index 0419984c..4eda0b62 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -1,22 +1,15 @@
+
Alexis' log - Alexis Métaireau
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/custom/categories.html b/pelican/tests/output/custom/categories.html
index 011d1ef4..146d7f3a 100644
--- a/pelican/tests/output/custom/categories.html
+++ b/pelican/tests/output/custom/categories.html
@@ -1,22 +1,15 @@
+
Alexis' log
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
index 68ec424c..2c1fc646 100644
--- a/pelican/tests/output/custom/category/bar.html
+++ b/pelican/tests/output/custom/category/bar.html
@@ -1,22 +1,15 @@
+
Alexis' log - bar
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html
index 39377513..10c4ce76 100644
--- a/pelican/tests/output/custom/category/cat1.html
+++ b/pelican/tests/output/custom/category/cat1.html
@@ -1,22 +1,15 @@
+
Alexis' log - cat1
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index 1f851030..121c9451 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -1,22 +1,15 @@
+
Alexis' log - misc
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html
index edaaf543..6894e3ee 100644
--- a/pelican/tests/output/custom/category/yeah.html
+++ b/pelican/tests/output/custom/category/yeah.html
@@ -1,22 +1,15 @@
+
Alexis' log - yeah
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html
index c70b3d87..493eb611 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article.html
@@ -1,22 +1,15 @@
+
A draft article
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html
index 377baac1..626e8c64 100644
--- a/pelican/tests/output/custom/filename_metadata-example.html
+++ b/pelican/tests/output/custom/filename_metadata-example.html
@@ -1,22 +1,15 @@
+
FILENAME_METADATA example
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
index a008617e..1a1d89e9 100644
--- a/pelican/tests/output/custom/index.html
+++ b/pelican/tests/output/custom/index.html
@@ -1,22 +1,15 @@
+
Alexis' log
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index c0d352f6..8ed54b6e 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -1,22 +1,15 @@
+
Alexis' log
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index 53e4d1f6..cf285ea2 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -1,22 +1,15 @@
+
Alexis' log
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/custom/jinja2_template.html b/pelican/tests/output/custom/jinja2_template.html
index 4932fd1d..95077c2f 100644
--- a/pelican/tests/output/custom/jinja2_template.html
+++ b/pelican/tests/output/custom/jinja2_template.html
@@ -1,22 +1,15 @@
+
Alexis' log
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
index 1184c381..e34e6078 100644
--- a/pelican/tests/output/custom/oh-yeah-fr.html
+++ b/pelican/tests/output/custom/oh-yeah-fr.html
@@ -1,22 +1,15 @@
+
Trop bien !
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
index 0fd32bcd..f9f1f1fb 100644
--- a/pelican/tests/output/custom/oh-yeah.html
+++ b/pelican/tests/output/custom/oh-yeah.html
@@ -1,22 +1,15 @@
+
Oh yeah !
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/custom/override/index.html b/pelican/tests/output/custom/override/index.html
index 353553bb..ad9fb8b1 100644
--- a/pelican/tests/output/custom/override/index.html
+++ b/pelican/tests/output/custom/override/index.html
@@ -1,22 +1,15 @@
+
Override url/save_as
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
index c827c380..b4ac59b0 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
@@ -1,22 +1,15 @@
+
This is a test hidden page
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-page.html b/pelican/tests/output/custom/pages/this-is-a-test-page.html
index 07baf855..571211d9 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-page.html
@@ -1,22 +1,15 @@
+
This is a test page
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
index 56077a89..3d5fbd29 100644
--- a/pelican/tests/output/custom/second-article-fr.html
+++ b/pelican/tests/output/custom/second-article-fr.html
@@ -1,22 +1,15 @@
+
Deuxième article
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html
index 2cd1d2e5..be83983e 100644
--- a/pelican/tests/output/custom/second-article.html
+++ b/pelican/tests/output/custom/second-article.html
@@ -1,22 +1,15 @@
+
Second article
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html
index 8ec3a2b0..2fed02c2 100644
--- a/pelican/tests/output/custom/tag/bar.html
+++ b/pelican/tests/output/custom/tag/bar.html
@@ -1,22 +1,15 @@
+
Alexis' log - bar
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html
index 98e10102..a6d23907 100644
--- a/pelican/tests/output/custom/tag/baz.html
+++ b/pelican/tests/output/custom/tag/baz.html
@@ -1,22 +1,15 @@
+
Alexis' log - baz
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html
index 4a77477d..04cb7529 100644
--- a/pelican/tests/output/custom/tag/foo.html
+++ b/pelican/tests/output/custom/tag/foo.html
@@ -1,22 +1,15 @@
+
Alexis' log - foo
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html
index b0e0b51c..71c2d430 100644
--- a/pelican/tests/output/custom/tag/foobar.html
+++ b/pelican/tests/output/custom/tag/foobar.html
@@ -1,22 +1,15 @@
+
Alexis' log - foobar
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/custom/tag/oh.html b/pelican/tests/output/custom/tag/oh.html
index 861077f6..361b1fd2 100644
--- a/pelican/tests/output/custom/tag/oh.html
+++ b/pelican/tests/output/custom/tag/oh.html
@@ -1,22 +1,15 @@
+
Alexis' log - oh
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
index 528df431..9bbd214b 100644
--- a/pelican/tests/output/custom/tag/yeah.html
+++ b/pelican/tests/output/custom/tag/yeah.html
@@ -1,22 +1,15 @@
+
Alexis' log - yeah
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html
index 058f2f2b..000bd555 100644
--- a/pelican/tests/output/custom/this-is-a-super-article.html
+++ b/pelican/tests/output/custom/this-is-a-super-article.html
@@ -1,22 +1,15 @@
+
This is a super article !
-
-
+
-
-
-
-
-
+
+
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index 8ed9c54c..e7253497 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -1,22 +1,15 @@
+
Unbelievable !
-
-
+
-
-
-
-
-
+
+