diff --git a/docs/content/content/archetypes.md b/docs/content/content/archetypes.md
index 898c0f6ba..8461fc798 100644
--- a/docs/content/content/archetypes.md
+++ b/docs/content/content/archetypes.md
@@ -7,6 +7,7 @@ next: /content/ordering
 prev: /content/types
 title: Archetypes
 weight: 50
+toc: true
 ---
 
 Hugo v0.11 introduced the concept of a content builder. Using the
diff --git a/docs/content/content/front-matter.md b/docs/content/content/front-matter.md
index a733215a4..31bf52b5a 100644
--- a/docs/content/content/front-matter.md
+++ b/docs/content/content/front-matter.md
@@ -9,6 +9,7 @@ next: /content/sections
 prev: /content/organization
 title: Front Matter
 weight: 20
+toc: true
 ---
 
 The **front matter** is one of the features that gives Hugo its strength. It enables
@@ -25,7 +26,7 @@ Supported formats:
 [YAML]: http://www.yaml.org/ "YAML Ain't Markup Language"
 [JSON]: http://www.json.org/ "JavaScript Object Notation"
 
-### TOML Example
+## TOML Example
 
     +++
     title = "spf13-vim 3.0 release and new website"
@@ -41,7 +42,7 @@ Supported formats:
     
     Content of the file goes Here
 
-### YAML Example
+## YAML Example
 
     ---
     title: "spf13-vim 3.0 release and new website"
@@ -56,7 +57,7 @@ Supported formats:
     
     Content of the file goes Here
 
-### JSON Example
+## JSON Example
 
     {
         "title": "spf13-vim 3.0 release and new website",
diff --git a/docs/content/content/organization.md b/docs/content/content/organization.md
index 7b887ef78..9a218c0f8 100644
--- a/docs/content/content/organization.md
+++ b/docs/content/content/organization.md
@@ -10,6 +10,7 @@ next: /content/front-matter
 prev: /overview/source-directory
 title: Content Organization
 weight: 10
+toc: true
 ---
 
 Hugo uses Markdown files with headers commonly called the *front matter*. Hugo
diff --git a/docs/content/content/types.md b/docs/content/content/types.md
index 246ab7368..90b4e0cf3 100644
--- a/docs/content/content/types.md
+++ b/docs/content/content/types.md
@@ -8,6 +8,7 @@ next: /content/archetypes
 prev: /content/sections
 title: Content Types
 weight: 40
+toc: true
 ---
 
 Hugo has full support for different types of content. A content type can have a
diff --git a/docs/content/taxonomies/displaying.md b/docs/content/taxonomies/displaying.md
index 1d8e8c0d0..78a221e0d 100644
--- a/docs/content/taxonomies/displaying.md
+++ b/docs/content/taxonomies/displaying.md
@@ -10,6 +10,7 @@ next: /taxonomies/templates
 prev: /taxonomies/usage
 title: Displaying Taxonomies
 weight: 20
+toc: true
 ---
 
 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 7dfaf405b..f5d013a47 100644
--- a/docs/content/taxonomies/ordering.md
+++ b/docs/content/taxonomies/ordering.md
@@ -11,6 +11,7 @@ next: /taxonomies/methods
 prev: /taxonomies/templates
 title: Ordering Taxonomies
 weight: 60
+toc: true
 ---
 
 Hugo provides the ability to both:
@@ -22,7 +23,7 @@ Hugo provides the ability to both:
 ## Ordering Taxonomies
 Taxonomies can be ordered by either alphabetical key or by the number of content pieces assigned to that key.
 
-### Order Alphabetically Example:
+### Order Alphabetically Example
 
     <ul>
     {{ $data := .Data }}
@@ -31,7 +32,7 @@ Taxonomies can be ordered by either alphabetical key or by the number of content
     {{ end }}
     </ul>
 
-### Order by Popularity Example:
+### Order by Popularity Example
 
     <ul>
     {{ $data := .Data }}
diff --git a/docs/content/templates/content.md b/docs/content/templates/content.md
index d0608576d..899d9f1ed 100644
--- a/docs/content/templates/content.md
+++ b/docs/content/templates/content.md
@@ -10,6 +10,7 @@ next: /templates/list
 prev: /templates/variables
 title: Single Content Template
 weight: 30
+toc: true
 ---
 
 The primary view of content in Hugo is the single view. Hugo, for every
@@ -61,7 +62,7 @@ same as the other types, but the directory must be called "\_default".
           single.html
 
 
-## post/single.html
+### post/single.html
 This content template is used for [spf13.com](http://spf13.com/).
 It makes use of [partial templates](/templates/partials/)
 
@@ -109,7 +110,7 @@ It makes use of [partial templates](/templates/partials/)
     {{ partial "footer.html" . }}
 
 
-## project/single.html
+### project/single.html
 This content template is used for [spf13.com](http://spf13.com/).
 It makes use of [partial templates](/templates/partials/)
 
diff --git a/docs/content/templates/go-templates.md b/docs/content/templates/go-templates.md
index b65294c01..e66af25f1 100644
--- a/docs/content/templates/go-templates.md
+++ b/docs/content/templates/go-templates.md
@@ -10,6 +10,7 @@ next: /templates/ace
 prev: /templates/overview
 title: Go Template Primer
 weight: 15
+toc: true
 ---
 
 Hugo uses the excellent [Go][] [html/template][gohtmltemplate] library for
diff --git a/docs/content/templates/list.md b/docs/content/templates/list.md
index 6e24e21e6..7e6cb4568 100644
--- a/docs/content/templates/list.md
+++ b/docs/content/templates/list.md
@@ -10,6 +10,7 @@ next: /templates/homepage
 prev: /templates/content
 title: Content List Template
 weight: 40
+toc: true
 ---
 
 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 f875e7299..e10298578 100644
--- a/docs/content/templates/overview.md
+++ b/docs/content/templates/overview.md
@@ -12,6 +12,7 @@ next: /templates/go-templates
 prev: /themes/creation
 title: Hugo Templates
 weight: 10
+toc: true
 ---
 
 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 be81058ac..756695c82 100644
--- a/docs/content/templates/partials.md
+++ b/docs/content/templates/partials.md
@@ -9,6 +9,7 @@ next: /templates/rss
 prev: /templates/views
 title: Partial Templates
 weight: 80
+toc: true
 ---
 
 In practice, it's very convenient to split out common template portions into a
diff --git a/docs/content/templates/rss.md b/docs/content/templates/rss.md
index 8de1df5c9..2d5d9bee5 100644
--- a/docs/content/templates/rss.md
+++ b/docs/content/templates/rss.md
@@ -11,6 +11,7 @@ notoc: one
 prev: /templates/partials
 title: RSS (feed) Templates
 weight: 90
+toc: true
 ---
 
 Like all other templates, you can use a single RSS template to generate all of your RSS feeds, or you can create a specific template for each individual feed. 
diff --git a/docs/content/templates/terms.md b/docs/content/templates/terms.md
index 47692ec17..7f282ef74 100644
--- a/docs/content/templates/terms.md
+++ b/docs/content/templates/terms.md
@@ -12,6 +12,7 @@ next: /templates/views
 prev: /templates/homepage
 title: Taxonomy Terms Template
 weight: 60
+toc: true
 ---
 
 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 3b8660d32..8506fb1d6 100644
--- a/docs/content/templates/variables.md
+++ b/docs/content/templates/variables.md
@@ -11,6 +11,7 @@ next: /templates/content
 prev: /templates/functions
 title: Template Variables
 weight: 20
+toc: true
 ---
 
 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 23457b501..fb540c645 100644
--- a/docs/content/templates/views.md
+++ b/docs/content/templates/views.md
@@ -9,6 +9,7 @@ next: /templates/partials
 prev: /templates/terms
 title: Content Views
 weight: 70
+toc: true
 ---
 
 In addition to the [single content template](/templates/content/), Hugo can render alternative views of
diff --git a/docs/content/themes/customizing.md b/docs/content/themes/customizing.md
index ec66be712..81f6ad346 100644
--- a/docs/content/themes/customizing.md
+++ b/docs/content/themes/customizing.md
@@ -7,6 +7,7 @@ next: /themes/creation
 prev: /themes/usage
 title: Customizing a Theme
 weight: 40
+toc: true
 ---
 
 _The following are key concepts for Hugo site customization. Hugo permits you to **supplement or override** any theme template or static file, with files in your working directory._ 
diff --git a/docs/content/tutorials/mathjax.md b/docs/content/tutorials/mathjax.md
index 5d3da6332..8324a2d8d 100644
--- a/docs/content/tutorials/mathjax.md
+++ b/docs/content/tutorials/mathjax.md
@@ -7,6 +7,7 @@ menu:
 next: /tutorials/migrate-from-jekyll
 prev: /tutorials/installing-on-windows
 title: MathJax Support
+toc: true
 weight: 10
 ---