Converting front matter to YAMLv0.11

66 files changed, 625 insertions, 560 deletions

diff --git a/docs/content/community/contributing.md b/docs/content/community/contributing.md
index 491a71658..7945e8b03 100644
--- a/docs/content/community/contributing.md
+++ b/docs/content/community/contributing.md
@@ -1,13 +1,15 @@
 ---
-title: "Contributing to Hugo"
-date: "2013-07-01"
-aliases: ["/doc/contributing/", "/meta/contributing/"]
-weight: 30
+aliases:
+- /doc/contributing/
+- /meta/contributing/
+date: 2013-07-01
 menu:
   main:
-    parent: 'community'
-prev: "/community/press"
-next: "/tutorials/github_pages_blog"
+    parent: community
+next: /tutorials/github_pages_blog
+prev: /community/press
+title: Contributing to Hugo
+weight: 30
 ---
 
 All contributions to Hugo are welcome. Whether you want to scratch an itch, or simply contribute to the project. Feel free to pick something from the roadmap
diff --git a/docs/content/community/mailing-list.md b/docs/content/community/mailing-list.md
index cc9debac7..02cb451f2 100644
--- a/docs/content/community/mailing-list.md
+++ b/docs/content/community/mailing-list.md
@@ -1,12 +1,12 @@
 ---
-title: "Mailing List"
-date: "2013-07-01"
-weight: 10
+date: 2013-07-01
 menu:
   main:
-    parent: 'community'
-prev: "/extras/urls"
-next: "/community/press"
+    parent: community
+next: /community/press
+prev: /extras/urls
+title: Mailing List
+weight: 10
 ---
 
 Hugo has two mailing lists:
diff --git a/docs/content/community/press.md b/docs/content/community/press.md
index 207ebd0ab..00ee0c09d 100644
--- a/docs/content/community/press.md
+++ b/docs/content/community/press.md
@@ -1,14 +1,15 @@
-+++
-title = "Press, Blogs and Media Coverage"
-date = 2014-03-24T20:00:00Z 
-linktitle = "Press"
-weight = 20
-notoc = true
-prev = "/community/mailing-list"
-next = "/community/contributing"
-[menu.main]
-    parent = "community"
-+++
+---
+date: 2014-03-24T20:00:00Z
+linktitle: Press
+menu:
+  main:
+    parent: community
+next: /community/contributing
+notoc: true
+prev: /community/mailing-list
+title: Press, Blogs and Media Coverage
+weight: 20
+---
 
 Hugo has been featured in the following Blog Posts, Press and Media.
 
diff --git a/docs/content/content/archetypes.md b/docs/content/content/archetypes.md
index 59287db9b..9004542ef 100644
--- a/docs/content/content/archetypes.md
+++ b/docs/content/content/archetypes.md
@@ -1,14 +1,13 @@
-+++
-title = "Archetypes"
-date = 2014-05-14T02:13:50Z
-weight = 50
-prev = "/content/types"
-next = "/content/ordering"
-
-[menu]
-  [menu.main]
-    parent = "content"
-+++
+---
+date: 2014-05-14T02:13:50Z
+menu:
+  main:
+    parent: content
+next: /content/ordering
+prev: /content/types
+title: Archetypes
+weight: 50
+---
 
 Hugo v0.11 introduced the concept of a content builder. Using the
 command: `hugo new [relative new content path]` you can start a content file
diff --git a/docs/content/content/example.md b/docs/content/content/example.md
index fb9421af7..d4934871c 100644
--- a/docs/content/content/example.md
+++ b/docs/content/content/example.md
@@ -1,15 +1,16 @@
 ---
-title: "Example Content File"
-date: "2013-07-01"
-aliases: ["/doc/example/"]
-linktitle: "Example"
+aliases:
+- /doc/example/
+date: 2013-07-01
+linktitle: Example
 menu:
-    main:
-        parent: 'content'
-weight: 70
+  main:
+    parent: content
+next: /themes/overview
 notoc: true
-prev: '/content/ordering'
-next: '/themes/overview'
+prev: /content/ordering
+title: Example Content File
+weight: 70
 ---
 
 Somethings are better shown than explained. The following is a very basic example of a content file:
diff --git a/docs/content/content/front-matter.md b/docs/content/content/front-matter.md
index 031927967..329519d79 100644
--- a/docs/content/content/front-matter.md
+++ b/docs/content/content/front-matter.md
@@ -1,15 +1,15 @@
-+++
-title = "Front Matter"
-date = "2013-07-01"
-aliases = ["/doc/front-matter/"]
-weight = 20
-prev = "/content/organization"
-next = "/content/sections"
-
-[menu.main]
-    parent = "content"
-
-+++
+---
+aliases:
+- /doc/front-matter/
+date: 2013-07-01
+menu:
+  main:
+    parent: content
+next: /content/sections
+prev: /content/organization
+title: Front Matter
+weight: 20
+---
 
 The front matter is one of the features that gives Hugo its strength. It enables
 you to include the meta data of the content right with it. Hugo supports a few
diff --git a/docs/content/content/ordering.md b/docs/content/content/ordering.md
index 81fcf0e77..dd70a7417 100644
--- a/docs/content/content/ordering.md
+++ b/docs/content/content/ordering.md
@@ -1,13 +1,13 @@
 ---
-title: "Ordering Content"
-date: "2014-03-06"
-linktitle: "Ordering"
+date: 2014-03-06
+linktitle: Ordering
 menu:
   main:
-    parent: "content"
+    parent: content
+next: /content/example
+prev: /content/archetypes
+title: Ordering Content
 weight: 60
-prev: '/content/archetypes'
-next: '/content/example'
 ---
 
 Hugo provides you with all the flexibility you need to organize how your content is ordered.
diff --git a/docs/content/content/organization.md b/docs/content/content/organization.md
index 8f1544867..7c93adaaf 100644
--- a/docs/content/content/organization.md
+++ b/docs/content/content/organization.md
@@ -1,14 +1,15 @@
 ---
-title: "Content Organization"
-date: "2013-07-01"
-aliases: ["/doc/organization/"]
-linktitle: "Organization"
-weight: 10
+aliases:
+- /doc/organization/
+date: 2013-07-01
+linktitle: Organization
 menu:
   main:
-    parent: 'content'
-prev: '/overview/source-directory'
-next: '/content/front-matter'
+    parent: content
+next: /content/front-matter
+prev: /overview/source-directory
+title: Content Organization
+weight: 10
 ---
 
 Hugo uses markdown files with headers commonly called the front matter. Hugo
diff --git a/docs/content/content/sections.md b/docs/content/content/sections.md
index 94bb02894..261faa89b 100644
--- a/docs/content/content/sections.md
+++ b/docs/content/content/sections.md
@@ -1,13 +1,13 @@
 ---
-title: "Sections"
-date: "2013-07-01"
+date: 2013-07-01
 menu:
-    main:
-        parent: 'content'
-weight: 30
+  main:
+    parent: content
+next: /content/types
 notoc: true
-prev: '/content/front-matter'
-next: '/content/types'
+prev: /content/front-matter
+title: Sections
+weight: 30
 ---
 
 Hugo thinks that you organize your content with a purpose. The same structure
diff --git a/docs/content/content/types.md b/docs/content/content/types.md
index 563e6f7cb..2e8a3c8ce 100644
--- a/docs/content/content/types.md
+++ b/docs/content/content/types.md
@@ -1,13 +1,13 @@
 ---
-title: "Content Types"
-date: "2013-07-01"
-linktitle: "Types"
+date: 2013-07-01
+linktitle: Types
 menu:
-    main:
-        parent: 'content'
+  main:
+    parent: content
+next: /content/archetypes
+prev: /content/sections
+title: Content Types
 weight: 40
-prev: '/content/sections'
-next: '/content/archetypes'
 ---
 
 Hugo has full support for different types of content. A content type can have a
diff --git a/docs/content/extras/aliases.md b/docs/content/extras/aliases.md
index 122e9981c..0bf0e6c29 100644
--- a/docs/content/extras/aliases.md
+++ b/docs/content/extras/aliases.md
@@ -1,16 +1,16 @@
 ---
-title: "Aliases"
-date: "2013-07-09"
 aliases:
-    - /doc/redirects/
-    - /doc/alias/
-    - /doc/aliases/
-weight: 10
+- /doc/redirects/
+- /doc/alias/
+- /doc/aliases/
+date: 2013-07-09
 menu:
   main:
-    parent: 'extras'
-prev: "/taxonomies/ordering"
-next: "/extras/builders"
+    parent: extras
+next: /extras/builders
+prev: /taxonomies/ordering
+title: Aliases
+weight: 10
 ---
 
 For people migrating existing published content to Hugo theres a good chance
diff --git a/docs/content/extras/builders.md b/docs/content/extras/builders.md
index 4fdae9418..981671f8e 100644
--- a/docs/content/extras/builders.md
+++ b/docs/content/extras/builders.md
@@ -1,13 +1,13 @@
 ---
-title: "Hugo Builders"
-linktitle: "Builders"
-date: "2014-05-26"
-weight: 12
+date: 2014-05-26
+linktitle: Builders
 menu:
   main:
-    parent: 'extras'
-prev: "/extras/aliases"
-next: "/extras/comments"
+    parent: extras
+next: /extras/comments
+prev: /extras/aliases
+title: Hugo Builders
+weight: 12
 ---
 
 Hugo provides the functionality to quickly get a site, theme or page
diff --git a/docs/content/extras/comments.md b/docs/content/extras/comments.md
index 3ff95134b..a0f881c51 100644
--- a/docs/content/extras/comments.md
+++ b/docs/content/extras/comments.md
@@ -1,13 +1,13 @@
 ---
-title: "Comments in Hugo"
-linktitle: "Comments"
-date: "2014-05-26"
-weight: 14
+date: 2014-05-26
+linktitle: Comments
 menu:
   main:
-    parent: 'extras'
-prev: "/extras/builders"
-next: "/extras/livereload"
+    parent: extras
+next: /extras/livereload
+prev: /extras/builders
+title: Comments in Hugo
+weight: 14
 ---
 
 As Hugo is a static site generator, the content produced is static and
diff --git a/docs/content/extras/highlighting.md b/docs/content/extras/highlighting.md
index de9812d00..c568fd01f 100644
--- a/docs/content/extras/highlighting.md
+++ b/docs/content/extras/highlighting.md
@@ -1,12 +1,12 @@
 ---
-title: "Syntax Highlighting"
-date: "2013-07-01"
-weight: 50
+date: 2013-07-01
 menu:
   main:
-    parent: 'extras'
-prev: "/extras/shortcodes"
-next: "/extras/toc"
+    parent: extras
+next: /extras/toc
+prev: /extras/shortcodes
+title: Syntax Highlighting
+weight: 50
 ---
 
 Hugo provides the ability for you to highlight source code in two different
diff --git a/docs/content/extras/livereload.md b/docs/content/extras/livereload.md
index ee2a586b7..aded2d093 100644
--- a/docs/content/extras/livereload.md
+++ b/docs/content/extras/livereload.md
@@ -1,12 +1,12 @@
 ---
-title: "Live Reload"
-date: "2014-05-26"
-weight: 15
+date: 2014-05-26
 menu:
   main:
-    parent: 'extras'
-prev: "/extras/comments"
-next: "/extras/menus"
+    parent: extras
+next: /extras/menus
+prev: /extras/comments
+title: Live Reload
+weight: 15
 ---
 
 Hugo may not be the first static site generator to utilize live reload
diff --git a/docs/content/extras/menus.md b/docs/content/extras/menus.md
index d557451d4..24b24b775 100644
--- a/docs/content/extras/menus.md
+++ b/docs/content/extras/menus.md
@@ -1,13 +1,13 @@
-+++
-title = "Menus"
-weight = 20
-prev = "/extras/livereload"
-next = "/extras/permalinks"
-date = 2014-05-14T02:36:37Z
-[menu]
-  [menu.main]
-    parent = "extras"
-+++
+---
+date: 2014-05-14T02:36:37Z
+menu:
+  main:
+    parent: extras
+next: /extras/permalinks
+prev: /extras/livereload
+title: Menus
+weight: 20
+---
 
 Hugo has a simple yet powerful menu system that permits content to be
 placed in menus with a good degree of control without a lot of work. 
diff --git a/docs/content/extras/permalinks.md b/docs/content/extras/permalinks.md
index 6282e61c6..54b4c6104 100644
--- a/docs/content/extras/permalinks.md
+++ b/docs/content/extras/permalinks.md
@@ -1,15 +1,15 @@
 ---
-title: "Permalinks"
-date: "2013-11-18"
 aliases:
-  - "/doc/permalinks/"
-weight: 30
-notoc: true
+- /doc/permalinks/
+date: 2013-11-18
 menu:
   main:
-    parent: 'extras'
-prev: "/extras/menus"
-next: "/extras/shortcodes"
+    parent: extras
+next: /extras/shortcodes
+notoc: true
+prev: /extras/menus
+title: Permalinks
+weight: 30
 ---
 
 By default, content is laid out into the target `publishdir` (public)
diff --git a/docs/content/extras/shortcodes.md b/docs/content/extras/shortcodes.md
index a9b2a31ca..0589b5801 100644
--- a/docs/content/extras/shortcodes.md
+++ b/docs/content/extras/shortcodes.md
@@ -1,13 +1,14 @@
 ---
-title: "Shortcodes"
-date: "2013-07-01"
-aliases: ["/doc/shortcodes/"]
-weight: 40
+aliases:
+- /doc/shortcodes/
+date: 2013-07-01
 menu:
   main:
-    parent: 'extras'
-prev: "/extras/permalinks"
-next: "/extras/highlighting"
+    parent: extras
+next: /extras/highlighting
+prev: /extras/permalinks
+title: Shortcodes
+weight: 40
 ---
 
 Because Hugo uses markdown for its simple content format, however there's a lot
diff --git a/docs/content/extras/toc.md b/docs/content/extras/toc.md
index f91511c2a..d50e37f2e 100644
--- a/docs/content/extras/toc.md
+++ b/docs/content/extras/toc.md
@@ -1,12 +1,12 @@
 ---
-title: "Table of Contents"
-date: "2013-07-09"
-weight: 60
+date: 2013-07-09
 menu:
   main:
-    parent: 'extras'
-prev: "/extras/highlighting"
-next: "/extras/urls"
+    parent: extras
+next: /extras/urls
+prev: /extras/highlighting
+title: Table of Contents
+weight: 60
 ---
 
 Hugo will automatically parse the markdown for your content and create
diff --git a/docs/content/extras/urls.md b/docs/content/extras/urls.md
index 123bc87d7..1d4ab3403 100644
--- a/docs/content/extras/urls.md
+++ b/docs/content/extras/urls.md
@@ -1,15 +1,15 @@
 ---
-title: "URLs"
-date: "2014-01-03"
 aliases:
-  - "/doc/urls/"
-weight: 70
-notoc: true
+- /doc/urls/
+date: 2014-01-03
 menu:
   main:
-    parent: 'extras'
-prev: "/extras/toc"
-next: "/community/mailing-list"
+    parent: extras
+next: /community/mailing-list
+notoc: true
+prev: /extras/toc
+title: URLs
+weight: 70
 ---
 
 ## Pretty Urls
diff --git a/docs/content/meta/license.md b/docs/content/meta/license.md
index 41372c13c..5e71de60a 100644
--- a/docs/content/meta/license.md
+++ b/docs/content/meta/license.md
@@ -1,11 +1,14 @@
 ---
-title: "License"
-date: "2013-07-01"
-aliases: ["/doc/license/", "/license/", "/meta/license/"]
-weight: 50
+aliases:
+- /doc/license/
+- /license/
+- /meta/license/
+date: 2013-07-01
 menu:
   main:
-    parent: 'about'
+    parent: about
+title: License
+weight: 50
 ---
 
 Hugo is released under the Simple Public License.
diff --git a/docs/content/meta/release-notes.md b/docs/content/meta/release-notes.md
index 5d29dea4b..d41b83e2d 100644
--- a/docs/content/meta/release-notes.md
+++ b/docs/content/meta/release-notes.md
@@ -1,11 +1,13 @@
 ---
-title: "Release Notes"
-date: "2013-07-01"
-aliases: ["/doc/release-notes/", "/meta/release-notes/"]
-weight: 10
+aliases:
+- /doc/release-notes/
+- /meta/release-notes/
+date: 2013-07-01
 menu:
   main:
-    parent: 'about'
+    parent: about
+title: Release Notes
+weight: 10
 ---
 
 ## **0.11.0** May 28, 2014
diff --git a/docs/content/meta/roadmap.md b/docs/content/meta/roadmap.md
index d60290f11..5b9fe11db 100644
--- a/docs/content/meta/roadmap.md
+++ b/docs/content/meta/roadmap.md
@@ -1,12 +1,14 @@
 ---
-title: "Hugo Roadmap"
-date: "2013-07-01"
-aliases: ["/doc/roadmap/","/meta/roadmap/"]
-weight: 20
-notoc: true
+aliases:
+- /doc/roadmap/
+- /meta/roadmap/
+date: 2013-07-01
 menu:
   main:
-    parent: 'about'
+    parent: about
+notoc: true
+title: Hugo Roadmap
+weight: 20
 ---
 
 In no particular order, here is what we are working on:
diff --git a/docs/content/overview/configuration.md b/docs/content/overview/configuration.md
index 799e3746e..4942a02b7 100644
--- a/docs/content/overview/configuration.md
+++ b/docs/content/overview/configuration.md
@@ -1,15 +1,16 @@
 ---
-title: "Configuring Hugo"
-date: "2013-07-01"
-aliases: ["/doc/configuration/"]
-linktitle: "Configuration"
-weight: 40
-notoc: true
+aliases:
+- /doc/configuration/
+date: 2013-07-01
+linktitle: Configuration
 menu:
   main:
-    parent: 'getting started'
-prev: '/overview/usage'
-next: '/overview/source-directory'
+    parent: getting started
+next: /overview/source-directory
+notoc: true
+prev: /overview/usage
+title: Configuring Hugo
+weight: 40
 ---
 
 The directory structure and templates provide the majority of the
diff --git a/docs/content/overview/installing.md b/docs/content/overview/installing.md
index 69d55425f..ea5df30ba 100644
--- a/docs/content/overview/installing.md
+++ b/docs/content/overview/installing.md
@@ -1,15 +1,14 @@
 ---
-title: "Installing Hugo"
-date: "2013-07-01"
-aliases: ["/doc/installing/"]
-weight: 20
+aliases:
+- /doc/installing/
+date: 2013-07-01
 menu:
   main:
-    parent: 'getting started'
-
-prev: '/overview/quickstart'
-next: '/overview/usage'
-
+    parent: getting started
+next: /overview/usage
+prev: /overview/quickstart
+title: Installing Hugo
+weight: 20
 ---
 
 Hugo is written in Go with support for Windows, Linux, FreeBSD and OSX.
diff --git a/docs/content/overview/introduction.md b/docs/content/overview/introduction.md
index eaea859f0..bd5ecdd40 100644
--- a/docs/content/overview/introduction.md
+++ b/docs/content/overview/introduction.md
@@ -1,12 +1,12 @@
 ---
-title: "Introduction to Hugo"
-date: "2013-07-01"
-linktitle: "Introduction"
-weight: 5
+date: 2013-07-01
+linktitle: Introduction
 menu:
   main:
-    parent: 'getting started'
-next: '/overview/quickstart'
+    parent: getting started
+next: /overview/quickstart
+title: Introduction to Hugo
+weight: 5
 ---
 
 ## What is Hugo?
diff --git a/docs/content/overview/quickstart.md b/docs/content/overview/quickstart.md
index 68d5fb441..7f09f3c7e 100644
--- a/docs/content/overview/quickstart.md
+++ b/docs/content/overview/quickstart.md
@@ -1,13 +1,13 @@
 ---
-title: "Hugo Quickstart Guide"
-date: "2013-07-01"
-linktitle: "Quickstart"
-weight: 10
+date: 2013-07-01
+linktitle: Quickstart
 menu:
   main:
-    parent: 'getting started'
-prev: '/overview/introduction'
-next: '/overview/installing'
+    parent: getting started
+next: /overview/installing
+prev: /overview/introduction
+title: Hugo Quickstart Guide
+weight: 10
 ---
 
 _This quickstart depends on features introduced in hugo v0.11. If you
diff --git a/docs/content/overview/source-directory.md b/docs/content/overview/source-directory.md
index 2731afd15..4acbc6b3c 100644
--- a/docs/content/overview/source-directory.md
+++ b/docs/content/overview/source-directory.md
@@ -1,14 +1,15 @@
 ---
-title: "Source Organization"
-date: "2013-07-01"
-aliases: ["/doc/source-directory/"]
-weight: 50
-notoc: true
+aliases:
+- /doc/source-directory/
+date: 2013-07-01
 menu:
   main:
-    parent: 'getting started'
-prev: '/overview/configuration'
-next: '/content/organization'
+    parent: getting started
+next: /content/organization
+notoc: true
+prev: /overview/configuration
+title: Source Organization
+weight: 50
 ---
 
 Hugo takes a single directory and uses it as the input for creating a complete
diff --git a/docs/content/overview/usage.md b/docs/content/overview/usage.md
index 38df28f05..d9f6e746b 100644
--- a/docs/content/overview/usage.md
+++ b/docs/content/overview/usage.md
@@ -1,14 +1,15 @@
 ---
-title: "Using Hugo"
-date: "2013-07-01"
-aliases: ["/doc/usage/"]
-weight: 30
-notoc: true
+aliases:
+- /doc/usage/
+date: 2013-07-01
 menu:
   main:
-    parent: 'getting started'
-prev: '/overview/installing'
-next: '/overview/configuration'
+    parent: getting started
+next: /overview/configuration
+notoc: true
+prev: /overview/installing
+title: Using Hugo
+weight: 30
 ---
 
 Make sure either hugo is in your path or provide a path to it.
diff --git a/docs/content/showcase/antzucaro.md b/docs/content/showcase/antzucaro.md
index 85cb5043f..eb5d7ed32 100644
--- a/docs/content/showcase/antzucaro.md
+++ b/docs/content/showcase/antzucaro.md
@@ -1,11 +1,15 @@
-+++
-title = "Ant Zucaro"
-date = 2014-02-03T20:00:00Z 
-description = "Ant Zucaro's Blog"
-license = "GPL"
-licenseLink = ""
-sourceLink = "http://github.com/antzucaro/az.com"
-sitelink = "http://antzucaro.com"
-thumbnail = "/static/img/antzucaro-tn.jpg"
-tags = ["personal", "blog", "foundation"]
-+++
+---
+date: 2014-02-03T20:00:00Z
+description: Ant Zucaro's Blog
+license: GPL
+licenseLink: ""
+sitelink: http://antzucaro.com
+sourceLink: http://github.com/antzucaro/az.com
+tags:
+- personal
+- blog
+- foundation
+thumbnail: /static/img/antzucaro-tn.jpg
+title: Ant Zucaro
+---
+
diff --git a/docs/content/showcase/asc.md b/docs/content/showcase/asc.md
index be73d2e65..7be2470e9 100644
--- a/docs/content/showcase/asc.md
+++ b/docs/content/showcase/asc.md
@@ -1,11 +1,14 @@
-+++
-title = "Andrew S Codispoti"
-date = 2014-01-22T07:32:00Z
-description = ""
-license = "CC-BY-SA"
-licenseLink = ""
-sourceLink = "https://gitlab.com/acodispo/andrewcodispoti-com"
-sitelink = "http://andrewcodispoti.com"
-thumbnail = "/static/img/asc-tn.jpg"
-tags = [ "personal", "bootstrap" ]
-+++
+---
+date: 2014-01-22T07:32:00Z
+description: ""
+license: CC-BY-SA
+licenseLink: ""
+sitelink: http://andrewcodispoti.com
+sourceLink: https://gitlab.com/acodispo/andrewcodispoti-com
+tags:
+- personal
+- bootstrap
+thumbnail: /static/img/asc-tn.jpg
+title: Andrew S Codispoti
+---
+
diff --git a/docs/content/showcase/chimera-art-space.md b/docs/content/showcase/chimera-art-space.md
index 06e12abe7..d0145b996 100644
--- a/docs/content/showcase/chimera-art-space.md
+++ b/docs/content/showcase/chimera-art-space.md
@@ -1,11 +1,14 @@
-+++
-title = "Chimera Art Space"
-date = 2013-10-02T07:32:00Z 
-description = ""
-license = "CC-SA"
-licenseLink = ""
-sourceLink = "https://github.com/chimera/chimeraarts.org"
-sitelink = "http://chimeraarts.org"
-thumbnail = "/static/img/chimera-tn.jpg"
-tags = ["company", "bootstrap" ]
-+++
+---
+date: 2013-10-02T07:32:00Z
+description: ""
+license: CC-SA
+licenseLink: ""
+sitelink: http://chimeraarts.org
+sourceLink: https://github.com/chimera/chimeraarts.org
+tags:
+- company
+- bootstrap
+thumbnail: /static/img/chimera-tn.jpg
+title: Chimera Art Space
+---
+
diff --git a/docs/content/showcase/cloudshark.md b/docs/content/showcase/cloudshark.md
index a8cf64524..0a9e015f3 100644
--- a/docs/content/showcase/cloudshark.md
+++ b/docs/content/showcase/cloudshark.md
@@ -1,11 +1,14 @@
-+++
-title = "CloudShark"
-date = 2014-03-27T09:45:00Z 
-description = "CloudShark Appliance homepage and documentation"
-license = ""
-licenseLink = ""
-sitelink = "https://appliance.cloudshark.org"
-thumbnail = "/static/img/cloudshark-tn.jpg"
-tags = ["company", "documentation", "foundation"]
-+++
+---
+date: 2014-03-27T09:45:00Z
+description: CloudShark Appliance homepage and documentation
+license: ""
+licenseLink: ""
+sitelink: https://appliance.cloudshark.org
+tags:
+- company
+- documentation
+- foundation
+thumbnail: /static/img/cloudshark-tn.jpg
+title: CloudShark
+---
 
diff --git a/docs/content/showcase/heyitsalex.md b/docs/content/showcase/heyitsalex.md
index b72d6d809..c617d307e 100644
--- a/docs/content/showcase/heyitsalex.md
+++ b/docs/content/showcase/heyitsalex.md
@@ -1,11 +1,14 @@
-+++
-title = "Hey, it's Alex"
-date = 2014-03-09T06:00:00Z 
-description = ""
-license = "MIT"
-licenseLink = ""
-sourceLink = "https://github.com/alexandre-normand/alexandre-normand"
-sitelink = "http://heyitsalex.net"
-thumbnail = "/static/img/heyitsalex-tn.jpg"
-tags = [ "personal", "blog" ]
-+++
+---
+date: 2014-03-09T06:00:00Z
+description: ""
+license: MIT
+licenseLink: ""
+sitelink: http://heyitsalex.net
+sourceLink: https://github.com/alexandre-normand/alexandre-normand
+tags:
+- personal
+- blog
+thumbnail: /static/img/heyitsalex-tn.jpg
+title: Hey, it's Alex
+---
+
diff --git a/docs/content/showcase/hugo.md b/docs/content/showcase/hugo.md
index bf006d9a9..3a6fb4271 100644
--- a/docs/content/showcase/hugo.md
+++ b/docs/content/showcase/hugo.md
@@ -1,12 +1,14 @@
-+++
-title = "Hugo"
-date = 2013-07-01T07:32:00Z 
-description = "This site"
-license = "Simpl"
-licenseLink = ""
-sourceLink = "http://github.com/spf13/hugo/docs"
-sitelink = "http://hugo.spf13.com"
-thumbnail = "/static/img/hugo-tn.jpg"
-tags = ["documentation", "bootstrap"]
-+++
+---
+date: 2013-07-01T07:32:00Z
+description: This site
+license: Simpl
+licenseLink: ""
+sitelink: http://hugo.spf13.com
+sourceLink: http://github.com/spf13/hugo/docs
+tags:
+- documentation
+- bootstrap
+thumbnail: /static/img/hugo-tn.jpg
+title: Hugo
+---
 
diff --git a/docs/content/showcase/ifup.md b/docs/content/showcase/ifup.md
index 7c88054e8..a477fa915 100644
--- a/docs/content/showcase/ifup.md
+++ b/docs/content/showcase/ifup.md
@@ -1,11 +1,14 @@
-+++
-title = "ifup"
-date = 2013-11-02T07:32:00Z 
-description = ""
-license = "MIT"
-licenseLink = ""
-sourceLink = "http://www.ifup.org"
-sitelink = "http://ifup.org"
-thumbnail = "/static/img/ifup-tn.jpg"
-tags = [ "personal", "blog" ]
-+++
+---
+date: 2013-11-02T07:32:00Z
+description: ""
+license: MIT
+licenseLink: ""
+sitelink: http://ifup.org
+sourceLink: http://www.ifup.org
+tags:
+- personal
+- blog
+thumbnail: /static/img/ifup-tn.jpg
+title: ifup
+---
+
diff --git a/docs/content/showcase/kieranhealy.md b/docs/content/showcase/kieranhealy.md
index 25a9d1103..25c02500d 100644
--- a/docs/content/showcase/kieranhealy.md
+++ b/docs/content/showcase/kieranhealy.md
@@ -1,11 +1,15 @@
-+++
-title = "Kieran Healy"
-date = 2014-02-27T20:35:00Z 
-description = "Kieran Healy's Website"
-license = ""
-licenseLink = ""
-sourceLink = "http://github.com/kjhealy/kieranhealy.hugo"
-sitelink = "http://kieranhealy.org"
-thumbnail = "/static/img/kjhealy-tn.jpg"
-tags = ["personal", "blog", "academic"]
-+++
+---
+date: 2014-02-27T20:35:00Z
+description: Kieran Healy's Website
+license: ""
+licenseLink: ""
+sitelink: http://kieranhealy.org
+sourceLink: http://github.com/kjhealy/kieranhealy.hugo
+tags:
+- personal
+- blog
+- academic
+thumbnail: /static/img/kjhealy-tn.jpg
+title: Kieran Healy
+---
+
diff --git a/docs/content/showcase/spf13.md b/docs/content/showcase/spf13.md
index 6a54b2b53..b7121ed1e 100644
--- a/docs/content/showcase/spf13.md
+++ b/docs/content/showcase/spf13.md
@@ -1,11 +1,14 @@
-+++
-title = "spf13.com"
-date = 2013-07-01T07:32:00Z 
-description = "The first Hugo powered website."
-license = "MIT"
-licenseLink = ""
-sourceLink = "http://github.com/spf13/spf13.com"
-sitelink = "http://spf13.com"
-thumbnail = "/static/img/spf13-tn.jpg"
-tags = ["personal", "blog"]
-+++
+---
+date: 2013-07-01T07:32:00Z
+description: The first Hugo powered website.
+license: MIT
+licenseLink: ""
+sitelink: http://spf13.com
+sourceLink: http://github.com/spf13/spf13.com
+tags:
+- personal
+- blog
+thumbnail: /static/img/spf13-tn.jpg
+title: spf13.com
+---
+
diff --git a/docs/content/showcase/techmadeplain.md b/docs/content/showcase/techmadeplain.md
index 2a22d0b70..84f5e0714 100644
--- a/docs/content/showcase/techmadeplain.md
+++ b/docs/content/showcase/techmadeplain.md
@@ -1,11 +1,13 @@
-+++
-title = "Tech Made Plain"
-date = 2014-05-22T19:54:00Z 
-description = "Tech Coaching site"
-license = ""
-licenseLink = ""
-sitelink = "http://techmadeplain.com"
-thumbnail = "/static/img/techmadeplain-tn.jpg"
-tags = ["personal", "blog"]
-+++
+---
+date: 2014-05-22T19:54:00Z
+description: Tech Coaching site
+license: ""
+licenseLink: ""
+sitelink: http://techmadeplain.com
+tags:
+- personal
+- blog
+thumbnail: /static/img/techmadeplain-tn.jpg
+title: Tech Made Plain
+---
 
diff --git a/docs/content/showcase/yslow-rules.md b/docs/content/showcase/yslow-rules.md
index d77694e46..ac2bf14a2 100644
--- a/docs/content/showcase/yslow-rules.md
+++ b/docs/content/showcase/yslow-rules.md
@@ -1,12 +1,15 @@
-+++
-title = "YSlow Rules"
-date = 2014-04-07T10:45:00Z 
-description = "Community project of YSlow rules translations"
-sourceLink = "https://github.com/checkmyws/yslow-rules"
-license = "MIT License"
-licenseLink = "https://raw.github.com/checkmyws/yslow-rules/master/LICENSE"
-sitelink = "http://checkmyws.github.io/yslow-rules/"
-thumbnail = "/static/img/yslow-rules.jpg"
-tags = ["community", "documentation", "translation"]
-+++
+---
+date: 2014-04-07T10:45:00Z
+description: Community project of YSlow rules translations
+license: MIT License
+licenseLink: https://raw.github.com/checkmyws/yslow-rules/master/LICENSE
+sitelink: http://checkmyws.github.io/yslow-rules/
+sourceLink: https://github.com/checkmyws/yslow-rules
+tags:
+- community
+- documentation
+- translation
+thumbnail: /static/img/yslow-rules.jpg
+title: YSlow Rules
+---
 
diff --git a/docs/content/taxonomies/displaying.md b/docs/content/taxonomies/displaying.md
index 118fc8f23..3abe6bed2 100644
--- a/docs/content/taxonomies/displaying.md
+++ b/docs/content/taxonomies/displaying.md
@@ -1,14 +1,15 @@
 ---
-title:  "Displaying Taxonomies"
-date: "2013-07-01"
-linktitle: "Displaying"
-aliases: ["/indexes/displaying/"]
-weight: 20
+aliases:
+- /indexes/displaying/
+date: 2013-07-01
+linktitle: Displaying
 menu:
   main:
-    parent: 'taxonomy'
-prev: "/taxonomies/usage"
-next: "/taxonomies/templates"
+    parent: taxonomy
+next: /taxonomies/templates
+prev: /taxonomies/usage
+title: Displaying Taxonomies
+weight: 20
 ---
 
 There are four common ways you can display the data in your
diff --git a/docs/content/taxonomies/ordering.md b/docs/content/taxonomies/ordering.md
index 632bd1dc8..b5e178d98 100644
--- a/docs/content/taxonomies/ordering.md
+++ b/docs/content/taxonomies/ordering.md
@@ -1,15 +1,16 @@
 ---
-title: "Ordering Taxonomies"
-date: "2013-07-01"
-linktitle: "Ordering"
-aliases: ["/indexes/ordering/"]
-weight: 60
+aliases:
+- /indexes/ordering/
+date: 2013-07-01
+linktitle: Ordering
 menu:
   main:
-    identifier: "Ordering Taxonomies"
-    parent: 'taxonomy'
-prev: "/taxonomies/templates"
-next: "/extras/aliases"
+    identifier: Ordering Taxonomies
+    parent: taxonomy
+next: /extras/aliases
+prev: /taxonomies/templates
+title: Ordering Taxonomies
+weight: 60
 ---
 
 Hugo provides the ability to both:
diff --git a/docs/content/taxonomies/overview.md b/docs/content/taxonomies/overview.md
index b9244ef59..472159d28 100644
--- a/docs/content/taxonomies/overview.md
+++ b/docs/content/taxonomies/overview.md
@@ -1,15 +1,18 @@
 ---
-title: "Taxonomy Overview"
-linktitle: "Overview"
-date: "2013-07-01"
-aliases: ["/indexes/overview/","/doc/indexes/", "/extras/indexes"]
-weight: 10
+aliases:
+- /indexes/overview/
+- /doc/indexes/
+- /extras/indexes
+date: 2013-07-01
+linktitle: Overview
 menu:
   main:
-    parent: 'taxonomy'
-    identifier: 'taxonomy overview'
-prev: "/templates/404"
-next: "/taxonomies/usage"
+    identifier: taxonomy overview
+    parent: taxonomy
+next: /taxonomies/usage
+prev: /templates/404
+title: Taxonomy Overview
+weight: 10
 ---
 
 Hugo includes support for user defined groupings of content called
diff --git a/docs/content/taxonomies/templates.md b/docs/content/taxonomies/templates.md
index 969d27a1a..43e27a6aa 100644
--- a/docs/content/taxonomies/templates.md
+++ b/docs/content/taxonomies/templates.md
@@ -1,14 +1,15 @@
 ---
-title: "Taxonomy Templates"
-date: "2013-07-01"
-linktitle: "Templates"
-aliases: ["/indexes/templates/"]
-weight: 30
+aliases:
+- /indexes/templates/
+date: 2013-07-01
+linktitle: Templates
 menu:
   main:
-    parent: 'taxonomy'
-prev: "/templates/displaying"
-next: "/taxonomies/ordering"
+    parent: taxonomy
+next: /taxonomies/ordering
+prev: /templates/displaying
+title: Taxonomy Templates
+weight: 30
 ---
 
 There are two different templates that the use of taxonomies will require you to provide.
diff --git a/docs/content/taxonomies/usage.md b/docs/content/taxonomies/usage.md
index 49ac2b06f..1b16e5580 100644
--- a/docs/content/taxonomies/usage.md
+++ b/docs/content/taxonomies/usage.md
@@ -1,13 +1,13 @@
 ---
-title: "Using Taxonomies"
-linktitle: "Usage"
-date: "2014-05-26"
-weight: 15
+date: 2014-05-26
+linktitle: Usage
 menu:
   main:
-    parent: 'taxonomy'
-prev: "/taxonomies/overview"
-next: "/taxonomies/displaying"
+    parent: taxonomy
+next: /taxonomies/displaying
+prev: /taxonomies/overview
+title: Using Taxonomies
+weight: 15
 ---
 
 ## Defining taxonomies for a site
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
diff --git a/docs/content/themes/creation.md b/docs/content/themes/creation.md
index de679db6e..515fed987 100644
--- a/docs/content/themes/creation.md
+++ b/docs/content/themes/creation.md
@@ -1,14 +1,13 @@
-+++
-title = "Creating a Theme"
-weight = 50
-date = 2014-05-12T10:09:17Z
-prev = "/themes/customizing"
-next = "/templates/overview"
-
-[menu]
-  [menu.main]
-    parent = "themes"
-+++
+---
+date: 2014-05-12T10:09:17Z
+menu:
+  main:
+    parent: themes
+next: /templates/overview
+prev: /themes/customizing
+title: Creating a Theme
+weight: 50
+---
 
 Hugo has the ability to create a new theme in your themes directory for you
 using the `hugo new` command.
diff --git a/docs/content/themes/customizing.md b/docs/content/themes/customizing.md
index e21496d9b..d63f3541b 100644
--- a/docs/content/themes/customizing.md
+++ b/docs/content/themes/customizing.md
@@ -1,14 +1,13 @@
-+++
-title = "Customizing a Theme"
-weight = 40
-date = 2014-05-12T10:09:34Z
-prev = "/themes/usage"
-next = "/themes/creation"
-
-[menu]
-  [menu.main]
-    parent = "themes"
-+++
+---
+date: 2014-05-12T10:09:34Z
+menu:
+  main:
+    parent: themes
+next: /themes/creation
+prev: /themes/usage
+title: Customizing a Theme
+weight: 40
+---
 
 Hugo themes permit you to supplement or override any template or file
 from within your working directory.
diff --git a/docs/content/themes/installing.md b/docs/content/themes/installing.md
index c4a0f9e43..4ad81a482 100644
--- a/docs/content/themes/installing.md
+++ b/docs/content/themes/installing.md
@@ -1,14 +1,13 @@
-+++
-title = "Installing Themes"
-weight = 20
-date = 2014-05-12T10:09:49Z
-prev = "/themes/overview"
-next = "/themes/usage"
-
-[menu]
-  [menu.main]
-    parent = "themes"
-+++
+---
+date: 2014-05-12T10:09:49Z
+menu:
+  main:
+    parent: themes
+next: /themes/usage
+prev: /themes/overview
+title: Installing Themes
+weight: 20
+---
 
 Hugo themes are located in a centralized github repository. [Hugo Themes
 Repo](http://github.com/spf13/hugoThemes) itself is really a meta
diff --git a/docs/content/themes/overview.md b/docs/content/themes/overview.md
index 086bcaeb1..393213e0f 100644
--- a/docs/content/themes/overview.md
+++ b/docs/content/themes/overview.md
@@ -1,14 +1,13 @@
-+++
-title = "Themes Overview"
-weight = 10
-date = 2014-05-12T10:03:52Z
-prev = "/content/example"
-next = "/themes/installing"
-
-[menu]
-  [menu.main]
-    parent = "themes"
-+++
+---
+date: 2014-05-12T10:03:52Z
+menu:
+  main:
+    parent: themes
+next: /themes/installing
+prev: /content/example
+title: Themes Overview
+weight: 10
+---
 
 Hugo provides a robust theming system which is simple, yet capable of producing
 even the most complicated websites.
diff --git a/docs/content/themes/usage.md b/docs/content/themes/usage.md
index 9cdc4637d..71cf43a92 100644
--- a/docs/content/themes/usage.md
+++ b/docs/content/themes/usage.md
@@ -1,14 +1,13 @@
-+++
-title = "Using a Theme"
-weight = 30
-date = 2014-05-12T10:09:27Z
-prev = "/themes/installing"
-next = "/themes/customizing"
-
-[menu]
-  [menu.main]
-    parent = "themes"
-+++
+---
+date: 2014-05-12T10:09:27Z
+menu:
+  main:
+    parent: themes
+next: /themes/customizing
+prev: /themes/installing
+title: Using a Theme
+weight: 30
+---
 
 Please make certain you have installed the themes you want to use in the
 /themes directory.
diff --git a/docs/content/tutorials/github_pages_blog.md b/docs/content/tutorials/github_pages_blog.md
index 4df0524fa..f01d3c214 100644
--- a/docs/content/tutorials/github_pages_blog.md
+++ b/docs/content/tutorials/github_pages_blog.md
@@ -1,14 +1,14 @@
 ---
-title: "Hosting on GitHub Pages"
-linktitle: "Hosting on GitHub"
-date: "2014-03-21"
-weight: 10
-author: "Spencer Lyon"
+author: Spencer Lyon
+date: 2014-03-21
+linktitle: Hosting on GitHub
 menu:
   main:
-    parent: 'tutorials'
-prev: "/community/contributing"
-next: "/tutorials/mathjax"
+    parent: tutorials
+next: /tutorials/mathjax
+prev: /community/contributing
+title: Hosting on GitHub Pages
+weight: 10
 ---
 
 ## Intro
diff --git a/docs/content/tutorials/mathjax.md b/docs/content/tutorials/mathjax.md
index 249505ee3..038feea4a 100644
--- a/docs/content/tutorials/mathjax.md
+++ b/docs/content/tutorials/mathjax.md
@@ -1,13 +1,13 @@
 ---
-title: "MathJax Support"
-date: "2014-03-20"
-weight: 10
-author: "Spencer Lyon"
+author: Spencer Lyon
+date: 2014-03-20
 menu:
   main:
-    parent: 'tutorials'
-prev: "/tutorials/github_pages_blog"
-next: "/tutorials/migrate-from-jekyll"
+    parent: tutorials
+next: /tutorials/migrate-from-jekyll
+prev: /tutorials/github_pages_blog
+title: MathJax Support
+weight: 10
 ---
 
 ## What is MathJax?
diff --git a/docs/content/tutorials/migrate-from-jekyll.md b/docs/content/tutorials/migrate-from-jekyll.md
index b17427739..9d682217e 100644
--- a/docs/content/tutorials/migrate-from-jekyll.md
+++ b/docs/content/tutorials/migrate-from-jekyll.md
@@ -1,12 +1,12 @@
 ---
-title: "Migrate to Hugo from Jekyll"
-linktitle: "Migrating from Jekyll"
-date: "2014-03-10"
-weight: 10
+date: 2014-03-10
+linktitle: Migrating from Jekyll
 menu:
   main:
-    parent: 'tutorials'
-prev: "/tutorials/mathjax"
+    parent: tutorials
+prev: /tutorials/mathjax
+title: Migrate to Hugo from Jekyll
+weight: 10
 ---
 
 ## Move static content to `static`