13 files changed, 120 insertions, 103 deletions
diff --git a/docs/content/templates/404.md b/docs/content/templates/404.md
index fd3ff04a5..6c8d8b419 100644
--- a/docs/content/templates/404.md
+++ b/docs/content/templates/404.md
@@ -1,15 +1,16 @@
 ---
-title: "404.html Templates"
+aliases:
+- /layout/404/
+date: 2013-08-21
 linktitle: "404"
-date: "2013-08-21"
-notoc: true
-weight: 100
 menu:
   main:
-    parent: 'layout'
-aliases: ["/layout/404/"]
-prev: "/templates/sitemap"
-next: "/taxonomies/overview"
+    parent: layout
+next: /taxonomies/overview
+notoc: true
+prev: /templates/sitemap
+title: 404.html Templates
+weight: 100
 ---
 
 When using Hugo with [github pages](http://pages.github.com/) you can provide
diff --git a/docs/content/templates/content.md b/docs/content/templates/content.md
index e4ac4c43e..3764103f5 100644
--- a/docs/content/templates/content.md
+++ b/docs/content/templates/content.md
@@ -1,14 +1,15 @@
 ---
-title: "Single Content Template"
-linktitle: "Single"
-date: "2013-07-01"
-weight: 30
+aliases:
+- /layout/functions/
+date: 2013-07-01
+linktitle: Single
 menu:
   main:
-    parent: 'layout'
-aliases: ["/layout/functions/"]
-prev: "/templates/variables"
-next: "/templates/list"
+    parent: layout
+next: /templates/list
+prev: /templates/variables
+title: Single Content Template
+weight: 30
 ---
 
 The primary view of content in hugo is the single view. Hugo for every
diff --git a/docs/content/templates/functions.md b/docs/content/templates/functions.md
index 307a0cffd..a9297294d 100644
--- a/docs/content/templates/functions.md
+++ b/docs/content/templates/functions.md
@@ -1,14 +1,15 @@
 ---
-title: "Hugo Template Functions"
-date: "2013-07-01"
-linktitle: "Functions"
-aliases: ["/layout/functions/"]
-weight: 20
+aliases:
+- /layout/functions/
+date: 2013-07-01
+linktitle: Functions
 menu:
   main:
-    parent: 'layout'
-prev: "/templates/go-templates"
-next: "/templates/variables"
+    parent: layout
+next: /templates/variables
+prev: /templates/go-templates
+title: Hugo Template Functions
+weight: 20
 ---
 
 Hugo uses the excellent go html/template library for its template engine.
diff --git a/docs/content/templates/go-templates.md b/docs/content/templates/go-templates.md
index 32031a2cc..03783e16e 100644
--- a/docs/content/templates/go-templates.md
+++ b/docs/content/templates/go-templates.md
@@ -1,13 +1,14 @@
 ---
-title: "Go Template Primer"
-date: "2013-07-01"
-aliases: ["/layout/go-templates/"]
-weight: 15
+aliases:
+- /layout/go-templates/
+date: 2013-07-01
 menu:
   main:
-    parent: 'layout'
-prev: "/templates/overview"
-next: "/templates/functions"
+    parent: layout
+next: /templates/functions
+prev: /templates/overview
+title: Go Template Primer
+weight: 15
 ---
 
 Hugo uses the excellent [go][] [html/template][gohtmltemplate] library for
diff --git a/docs/content/templates/homepage.md b/docs/content/templates/homepage.md
index 8f5e1ab44..874a9c6b7 100644
--- a/docs/content/templates/homepage.md
+++ b/docs/content/templates/homepage.md
@@ -1,14 +1,15 @@
 ---
-title: "Homepage"
-date: "2013-07-01"
-weight: 50
-notoc: true
+aliases:
+- /layout/homepage/
+date: 2013-07-01
 menu:
   main:
-    parent: 'layout'
-aliases: ["/layout/homepage/"]
-prev: "/templates/list"
-next: "/templates/terms"
+    parent: layout
+next: /templates/terms
+notoc: true
+prev: /templates/list
+title: Homepage
+weight: 50
 ---
 
 The home page of a website is often formatted differently than the other
diff --git a/docs/content/templates/list.md b/docs/content/templates/list.md
index 05ac3c100..c86245afe 100644
--- a/docs/content/templates/list.md
+++ b/docs/content/templates/list.md
@@ -1,14 +1,15 @@
 ---
-title: "Content List Template"
-linktitle: "List"
-date: "2013-07-01"
-weight: 40
+aliases:
+- /layout/indexes/
+date: 2013-07-01
+linktitle: List
 menu:
   main:
-    parent: 'layout'
-aliases: ["/layout/indexes/"]
-prev: "/templates/content"
-next: "/templates/homepage"
+    parent: layout
+next: /templates/homepage
+prev: /templates/content
+title: Content List Template
+weight: 40
 ---
 
 A list template is any template that will be used to render multiple pieces of
diff --git a/docs/content/templates/overview.md b/docs/content/templates/overview.md
index 711dfed45..d04db7a9d 100644
--- a/docs/content/templates/overview.md
+++ b/docs/content/templates/overview.md
@@ -1,14 +1,16 @@
 ---
-title: "Hugo Templates"
-date: "2013-07-01"
-aliases: ["/doc/templates/", "/layout/templates/"]
-linktitle: "Overview"
-weight: 10
+aliases:
+- /doc/templates/
+- /layout/templates/
+date: 2013-07-01
+linktitle: Overview
 menu:
   main:
-    parent: 'layout'
-prev: "/themes/creation"
-next: "/templates/go-templates"
+    parent: layout
+next: /templates/go-templates
+prev: /themes/creation
+title: Hugo Templates
+weight: 10
 ---
 
 Hugo uses the excellent go html/template library for its template engine.
diff --git a/docs/content/templates/partials.md b/docs/content/templates/partials.md
index d213592ff..e4766ffe5 100644
--- a/docs/content/templates/partials.md
+++ b/docs/content/templates/partials.md
@@ -1,13 +1,14 @@
 ---
-title: "Partial Templates"
-date: "2013-07-01"
-weight: 80
+aliases:
+- /layout/chrome/
+date: 2013-07-01
 menu:
   main:
-    parent: 'layout'
-aliases: ["/layout/chrome/"]
-prev: "/templates/views"
-next: "/templates/rss"
+    parent: layout
+next: /templates/rss
+prev: /templates/views
+title: Partial Templates
+weight: 80
 ---
 
 It's not a requirement to have this, but in practice it's very
diff --git a/docs/content/templates/rss.md b/docs/content/templates/rss.md
index 7799c0e49..8d39520b1 100644
--- a/docs/content/templates/rss.md
+++ b/docs/content/templates/rss.md
@@ -1,15 +1,16 @@
 ---
-title: "RSS (feed) Templates"
-linktitle: "RSS"
-date: "2013-07-01"
-weight: 90
-notoc: "one"
+aliases:
+- /layout/rss/
+date: 2013-07-01
+linktitle: RSS
 menu:
   main:
-    parent: 'layout'
-aliases: ["/layout/rss/"]
-prev: "/templates/partials"
-next: "/templates/sitemap"
+    parent: layout
+next: /templates/sitemap
+notoc: one
+prev: /templates/partials
+title: RSS (feed) Templates
+weight: 90
 ---
 
 Like all other templates, you can use a single RSS template to generate
diff --git a/docs/content/templates/sitemap.md b/docs/content/templates/sitemap.md
index 6d3645022..a225df19d 100644
--- a/docs/content/templates/sitemap.md
+++ b/docs/content/templates/sitemap.md
@@ -1,15 +1,16 @@
 ---
-title: "Sitemap Template"
-linktitle: "Sitemap"
-date: "2014-05-07"
-weight: 95
-notoc: true
+aliases:
+- /layout/sitemap/
+date: 2014-05-07
+linktitle: Sitemap
 menu:
   main:
-    parent: 'layout'
-aliases: ["/layout/sitemap/"]
-prev: "/templates/rss"
-next: "/templates/404"
+    parent: layout
+next: /templates/404
+notoc: true
+prev: /templates/rss
+title: Sitemap Template
+weight: 95
 ---
 
 A single Sitemap template is used to generate the `sitemap.xml` file.
diff --git a/docs/content/templates/terms.md b/docs/content/templates/terms.md
index c3c193787..a927c7189 100644
--- a/docs/content/templates/terms.md
+++ b/docs/content/templates/terms.md
@@ -1,14 +1,17 @@
 ---
-title: "Taxonomy Terms Template"
-linktitle: "Taxonomy Terms"
-date: "2014-05-21"
-weight: 60
-aliases: ["/indexes/lists/","/doc/indexes/", "/extras/indexes"]
+aliases:
+- /indexes/lists/
+- /doc/indexes/
+- /extras/indexes
+date: 2014-05-21
+linktitle: Taxonomy Terms
 menu:
   main:
-    parent: 'layout'
-prev: "/templates/homepage"
-next: "/templates/views"
+    parent: layout
+next: /templates/views
+prev: /templates/homepage
+title: Taxonomy Terms Template
+weight: 60
 ---
 
 A unique template is needed to create a list of the terms for a given
diff --git a/docs/content/templates/variables.md b/docs/content/templates/variables.md
index b64c7989d..3cecf2169 100644
--- a/docs/content/templates/variables.md
+++ b/docs/content/templates/variables.md
@@ -1,14 +1,16 @@
 ---
-title: "Template Variables"
-linktitle: "Variables"
-date: "2013-07-01"
-aliases: ["/doc/variables/","/layout/variables/"]
-weight: 20
+aliases:
+- /doc/variables/
+- /layout/variables/
+date: 2013-07-01
+linktitle: Variables
 menu:
   main:
-    parent: 'layout'
-prev: "/templates/functions"
-next: "/templates/content"
+    parent: layout
+next: /templates/content
+prev: /templates/functions
+title: Template Variables
+weight: 20
 ---
 
 Hugo makes a set of values available to the templates. Go templates are context based. The following
diff --git a/docs/content/templates/views.md b/docs/content/templates/views.md
index 34af2e807..ab86711d7 100644
--- a/docs/content/templates/views.md
+++ b/docs/content/templates/views.md
@@ -1,13 +1,14 @@
 ---
-title: "Content Views"
-date: "2013-07-01"
-weight: 70
+aliases:
+- /templates/views/
+date: 2013-07-01
 menu:
   main:
-    parent: 'layout'
-aliases: ["/templates/views/"]
-prev: "/templates/terms"
-next: "/templates/partials"
+    parent: layout
+next: /templates/partials
+prev: /templates/terms
+title: Content Views
+weight: 70
 ---
 
 In addition to the [single content template](/templates/content/), Hugo can render alternative views of