15 files changed, 26 insertions, 35 deletions
diff --git a/layouts/docs/baseof.html b/layouts/docs/baseof.html
index 9f7f942..8509b14 100644
--- a/layouts/docs/baseof.html
+++ b/layouts/docs/baseof.html
@@ -1,25 +1,26 @@
 <!DOCTYPE html>
 <html>
 <head>
-  {{ partial "book/html-head" . }}
-  <title>{{ block "title" . }}{{ .Site.Title }}{{ end }}</title>
+  {{ partial "docs/html-head" . }}
+  {{ partial "docs/inject/head" . }}
+  <title>{{ block "title" . }} {{- .Site.Title -}} {{ end }}</title>
 </head>
 
 <body>
   <div class="pure-g">
 
     <div class="pure-u book-nav">
-      {{ partial "book/nav" . }}
+      {{ partial "docs/nav" . }}
     </div>
     <div class="pure-u book-content">
       <div class="pure-g">
 
         <div class="pure-u book-page markdown">
-          {{ block "main" . }}{{ end }}
+          {{ block "main" . }} {{- .Content -}} {{ end }}
         </div>
         {{ if and (default true .Site.Params.BookShowTOC) (.Page.TableOfContents) }}
         <div class="pure-u book-toc">
-          {{ partial "book/toc" . }}
+          {{ partial "docs/toc" . }}
         </div>
         {{ end }}
 
@@ -27,5 +28,6 @@
     </div>
 
   </div>
+  {{ partial "docs/inject/body" . }}
 </body>
 </html>
 \ No newline at end of file
diff --git a/layouts/docs/list.html b/layouts/docs/list.html
index 130cc89..a54943b 100644
--- a/layouts/docs/list.html
+++ b/layouts/docs/list.html
@@ -1,7 +1 @@
-{{- define "title" -}}
-  {{ .Site.Title }}
-{{ end }}
-
-{{- define "main" -}}
-  <div>{{ .Content }}</div>
-{{ end }}
-\ No newline at end of file
+{{ define "." }} {{ end }}
+\ No newline at end of file
diff --git a/layouts/docs/single.html b/layouts/docs/single.html
index 130cc89..a54943b 100644
--- a/layouts/docs/single.html
+++ b/layouts/docs/single.html
@@ -1,7 +1 @@
-{{- define "title" -}}
-  {{ .Site.Title }}
-{{ end }}
-
-{{- define "main" -}}
-  <div>{{ .Content }}</div>
-{{ end }}
-\ No newline at end of file
+{{ define "." }} {{ end }}
+\ No newline at end of file
diff --git a/layouts/partials/book/nav-bundle.html b/layouts/partials/book/nav-bundle.html
deleted file mode 100644
index 46665ad..0000000
--- a/layouts/partials/book/nav-bundle.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<nav role="navigation">
-  {{ partial "book/nav-brand" . }}
-  {{ with .Site.GetPage .Site.Params.BookMenuBundle }}{{ .Content }}{{ end }}
-  {{ partial "book/nav-after" . }}
-</nav>
diff --git a/layouts/partials/book/nav.html b/layouts/partials/book/nav.html
deleted file mode 100644
index 929b1b7..0000000
--- a/layouts/partials/book/nav.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{{ if .Site.Params.BookMenuBundle }}
-  {{ partial "book/nav-bundle" . }}
-{{ else }}
-  {{ partial "book/nav-tree" . }}
-{{ end }}
-\ No newline at end of file
diff --git a/layouts/partials/book/html-head.html b/layouts/partials/docs/html-head.html
index b171d7c..bf7db42 100644
--- a/layouts/partials/book/html-head.html
+++ b/layouts/partials/docs/html-head.html
@@ -6,6 +6,4 @@
 <!-- <link href="/css/grids-responsive-min.css" rel="stylesheet"> -->
 
 {{ $styles := resources.Get "styles.scss" | resources.ToCSS | resources.Minify | resources.Fingerprint }}
-<link rel="stylesheet" href="{{ $styles.Permalink }}">
-
-{{ partial "book/html-head-after" . }}
-\ No newline at end of file
+<link rel="stylesheet" href="{{ $styles.Permalink }}">
+\ No newline at end of file
diff --git a/layouts/partials/book/html-head-after.html b/layouts/partials/docs/inject/body.html
index e69de29..e69de29 100644
--- a/layouts/partials/book/html-head-after.html
+++ b/layouts/partials/docs/inject/body.html
diff --git a/layouts/partials/book/nav-after.html b/layouts/partials/docs/inject/head.html
index e69de29..e69de29 100644
--- a/layouts/partials/book/nav-after.html
+++ b/layouts/partials/docs/inject/head.html
diff --git a/layouts/partials/book/nav-before.html b/layouts/partials/docs/inject/nav-after.html
index e69de29..e69de29 100644
--- a/layouts/partials/book/nav-before.html
+++ b/layouts/partials/docs/inject/nav-after.html
diff --git a/layouts/partials/docs/inject/nav-before.html b/layouts/partials/docs/inject/nav-before.html
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layouts/partials/docs/inject/nav-before.html
diff --git a/layouts/partials/book/nav-brand.html b/layouts/partials/docs/nav-brand.html
index 5a2c9cb..5a2c9cb 100644
--- a/layouts/partials/book/nav-brand.html
+++ b/layouts/partials/docs/nav-brand.html
diff --git a/layouts/partials/docs/nav-bundle.html b/layouts/partials/docs/nav-bundle.html
new file mode 100644
index 0000000..221325e
--- /dev/null
+++ b/layouts/partials/docs/nav-bundle.html
@@ -0,0 +1,8 @@
+<nav role="navigation">
+  {{ partial "docs/nav-brand" . }}
+  {{ partial "docs/inject/nav-before" . }}
+  {{ with .Site.GetPage .Site.Params.BookMenuBundle }}
+    {{- .Content -}}
+  {{ end }}
+  {{ partial "docs/inject/nav-after" . }}
+</nav>
diff --git a/layouts/partials/book/nav-tree.html b/layouts/partials/docs/nav-tree.html
index b87e944..6d0a2d5 100644
--- a/layouts/partials/book/nav-tree.html
+++ b/layouts/partials/docs/nav-tree.html
@@ -13,8 +13,8 @@
 {{ end }}
 
 <nav role="navigation">
-  {{ partial "book/nav-brand" . }}
-  {{ partial "book/nav-before" . }}
+  {{ partial "docs/nav-brand" . }}
+  {{ partial "docs/inject/nav-before" . }}
 
   <ul>
   {{ range .Scratch.Get "BookSections" }}
@@ -22,7 +22,7 @@
   {{ end }}
   </ul>
 
-  {{ partial "book/nav-after" . }}
+  {{ partial "docs/inject/nav-after" . }}
 </nav>
 
 <!-- Single section of menu (recursive) -->
diff --git a/layouts/partials/docs/nav.html b/layouts/partials/docs/nav.html
new file mode 100644
index 0000000..96bc233
--- /dev/null
+++ b/layouts/partials/docs/nav.html
@@ -0,0 +1,5 @@
+{{ if .Site.Params.BookMenuBundle }}
+  {{ partial "docs/nav-bundle" . }}
+{{ else }}
+  {{ partial "docs/nav-tree" . }}
+{{ end }}
+\ No newline at end of file
diff --git a/layouts/partials/book/toc.html b/layouts/partials/docs/toc.html
index aca3785..aca3785 100644
--- a/layouts/partials/book/toc.html
+++ b/layouts/partials/docs/toc.html