diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index d93ea31852..7a50069c46 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,4 +1,2 @@
 {{- .Scratch.Set "relearnOutputFormat" "HTML" }}
-{{- partial "header.html" . }}
-{{- partial "content-screen.html" . }}
-{{- partial "footer.html" . }}
\ No newline at end of file
+{{- partial "_list.html" . }}
\ No newline at end of file
diff --git a/layouts/_default/list.print.html b/layouts/_default/list.print.html
index 4c2b2ac9e0..eac72a3b86 100644
--- a/layouts/_default/list.print.html
+++ b/layouts/_default/list.print.html
@@ -1,4 +1,2 @@
 {{- .Scratch.Set "relearnOutputFormat" "PRINT" }}
-{{- partial "header.html" . }}
-{{- partial "content-print.html" . }}
-{{- partial "footer.html" . }}
\ No newline at end of file
+{{- partial "_list.html" . }}
\ No newline at end of file
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index d93ea31852..d792465bfc 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,4 +1,2 @@
 {{- .Scratch.Set "relearnOutputFormat" "HTML" }}
-{{- partial "header.html" . }}
-{{- partial "content-screen.html" . }}
-{{- partial "footer.html" . }}
\ No newline at end of file
+{{- partial "_single.html" . }}
\ No newline at end of file
diff --git a/layouts/_default/single.print.html b/layouts/_default/single.print.html
index 4c2b2ac9e0..9403344056 100644
--- a/layouts/_default/single.print.html
+++ b/layouts/_default/single.print.html
@@ -1,4 +1,2 @@
 {{- .Scratch.Set "relearnOutputFormat" "PRINT" }}
-{{- partial "header.html" . }}
-{{- partial "content-print.html" . }}
-{{- partial "footer.html" . }}
\ No newline at end of file
+{{- partial "_single.html" . }}
\ No newline at end of file
diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html
index 8a1a940af8..fb0e02a177 100644
--- a/layouts/_default/taxonomy.html
+++ b/layouts/_default/taxonomy.html
@@ -1,23 +1,2 @@
 {{- .Scratch.Set "relearnOutputFormat" "HTML" }}
-{{- partial "header.html" . }}
-          <article>
-
-<h1>{{ if eq .Kind "term" }}{{ .Data.Singular | humanize }} {{ default "::" .Site.Params.titleSeparator }} {{ end }}{{ .Title }}</h1>
-<ul>
-  {{- range .Data.Terms.Alphabetical }}
-    {{- if and .Page.Title (or (ne (.Page.Scratch.Get "relearnIsHiddenStem") true) (ne .Page.Site.Params.disableTagHiddenPages true) ) }}
-  <li><a href="{{ .Page.RelPermalink }}">{{ .Page.Title }}</a> ({{ len .Pages }})</li>
-    {{- end }}
-  {{- else }}
-    {{- range sort .Pages "Title" }}
-      {{- if and .Title (or (ne (.Scratch.Get "relearnIsHiddenStem") true) (ne .Site.Params.disableTagHiddenPages true) ) }}
-  <li><a href="{{ .RelPermalink }}">{{ .Title }}</a></li>
-      {{- end }}
-    {{- end }}
-  {{- end }}
-</ul>
-
-            <footer class="footline">
-            </footer>
-          </article>
-{{- partial "footer.html" . }}
\ No newline at end of file
+{{- partial "_taxonomy.html" . }}
\ No newline at end of file
diff --git a/layouts/_default/taxonomy.print.html b/layouts/_default/taxonomy.print.html
index f747eea81f..9c47723966 100644
--- a/layouts/_default/taxonomy.print.html
+++ b/layouts/_default/taxonomy.print.html
@@ -1,23 +1,2 @@
 {{- .Scratch.Set "relearnOutputFormat" "PRINT" }}
-{{- partial "header.html" . }}
-          <article>
-
-<h1>{{ if eq .Kind "term" }}{{ .Data.Singular | humanize }} {{ default "::" .Site.Params.titleSeparator }} {{ end }}{{ .Title }}</h1>
-<ul>
-  {{- range .Data.Terms.Alphabetical }}
-    {{- if and .Page.Title (or (ne (.Page.Scratch.Get "relearnIsHiddenStem") true) (ne .Page.Site.Params.disableTagHiddenPages true) ) }}
-  <li><a href="{{ .Page.RelPermalink }}">{{ .Page.Title }}</a> ({{ len .Pages }})</li>
-    {{- end }}
-  {{- else }}
-    {{- range sort .Pages "Title" }}
-      {{- if and .Title (or (ne (.Scratch.Get "relearnIsHiddenStem") true) (ne .Site.Params.disableTagHiddenPages true) ) }}
-  <li><a href="{{ .RelPermalink }}">{{ .Title }}</a></li>
-      {{- end }}
-    {{- end }}
-  {{- end }}
-</ul>
-
-            <footer class="footline">
-            </footer>
-          </article>
-{{- partial "footer.html" . }}
\ No newline at end of file
+{{- partial "_taxonomy.html" . }}
\ No newline at end of file
diff --git a/layouts/index.html b/layouts/index.html
index e6c1830cd8..8eae7b7a35 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,22 +1,2 @@
 {{- .Scratch.Set "relearnOutputFormat" "HTML" }}
-{{- partial "header.html" . }}
-{{- if .Site.Home.Content }}
-  {{- partial "content-screen.html" .Site.Home }}
-{{- else }}
-          <article>
-
-<h1>Customize your own home page</h1>
-<p>
-  The site is working. Don't forget to customize this page with your own. You typically have 3 choices :
-</p>
-<ul>
-  <li><b>1.</b> Create an _index.md document in <b>content</b> folder and fill it with Markdown content</li>
-  <li><b>2.</b> Create an <b>index.html</b> file in the <b>static</b> folder and fill the file with HTML content</li>
-  <li><b>3.</b> Configure your server to automatically redirect home page to one your documentation page</li>
-</ul>
-
-            <footer class="footline">
-          	</footer>
-          </article>
-{{- end }}
-{{- partial "footer.html" . }}
\ No newline at end of file
+{{- partial "_index.html" . }}
\ No newline at end of file
diff --git a/layouts/index.print.html b/layouts/index.print.html
index a04c5856a8..6d7193eb94 100644
--- a/layouts/index.print.html
+++ b/layouts/index.print.html
@@ -1,22 +1,2 @@
 {{- .Scratch.Set "relearnOutputFormat" "PRINT" }}
-{{- partial "header.html" . }}
-{{- if .Site.Home.Content }}
-  {{- partial "content-print.html" .Site.Home }}
-{{- else }}
-          <article>
-
-<h1>Customize your own home page</h1>
-<p>
-  The site is working. Don't forget to customize this page with your own. You typically have 3 choices :
-</p>
-<ul>
-  <li><b>1.</b> Create an _index.md document in <b>content</b> folder and fill it with Markdown content</li>
-  <li><b>2.</b> Create an <b>index.html</b> file in the <b>static</b> folder and fill the file with HTML content</li>
-  <li><b>3.</b> Configure your server to automatically redirect home page to one your documentation page</li>
-</ul>
-
-          	<footer class="footline">
-          	</footer>
-          </article>
-{{- end }}
-{{- partial "footer.html" . }}
\ No newline at end of file
+{{- partial "_index.html" . }}
\ No newline at end of file
diff --git a/layouts/partials/_index.html b/layouts/partials/_index.html
new file mode 100644
index 0000000000..8250488442
--- /dev/null
+++ b/layouts/partials/_index.html
@@ -0,0 +1,25 @@
+{{- partial "header.html" . }}
+{{- if .Site.Home.Content }}
+  {{- if eq (.Scratch.Get "relearnOutputFormat") "PRINT" }}
+    {{- partial "body.print.html" .Site.Home }}
+  {{- else }}
+    {{- partial "body.html" .Site.Home }}
+  {{- end }}
+{{- else }}
+          <article>
+
+<h1>Customize your own home page</h1>
+<p>
+  The site is working. Don't forget to customize this page with your own. You typically have 3 choices :
+</p>
+<ul>
+  <li><b>1.</b> Create an _index.md document in <b>content</b> folder and fill it with Markdown content</li>
+  <li><b>2.</b> Create an <b>index.html</b> file in the <b>static</b> folder and fill the file with HTML content</li>
+  <li><b>3.</b> Configure your server to automatically redirect home page to one your documentation page</li>
+</ul>
+
+            <footer class="footline">
+          	</footer>
+          </article>
+{{- end }}
+{{- partial "footer.html" . }}
\ No newline at end of file
diff --git a/layouts/partials/_list.html b/layouts/partials/_list.html
new file mode 100644
index 0000000000..3f7b1dfb5b
--- /dev/null
+++ b/layouts/partials/_list.html
@@ -0,0 +1,7 @@
+{{- partial "header.html" . }}
+{{- if eq (.Scratch.Get "relearnOutputFormat") "PRINT" }}
+  {{- partial "body.print.html" . }}
+{{- else }}
+  {{- partial "body.html" . }}
+{{- end }}
+{{- partial "footer.html" . }}
\ No newline at end of file
diff --git a/layouts/partials/_single.html b/layouts/partials/_single.html
new file mode 100644
index 0000000000..3f7b1dfb5b
--- /dev/null
+++ b/layouts/partials/_single.html
@@ -0,0 +1,7 @@
+{{- partial "header.html" . }}
+{{- if eq (.Scratch.Get "relearnOutputFormat") "PRINT" }}
+  {{- partial "body.print.html" . }}
+{{- else }}
+  {{- partial "body.html" . }}
+{{- end }}
+{{- partial "footer.html" . }}
\ No newline at end of file
diff --git a/layouts/partials/_taxonomy.html b/layouts/partials/_taxonomy.html
new file mode 100644
index 0000000000..7bdf074b7f
--- /dev/null
+++ b/layouts/partials/_taxonomy.html
@@ -0,0 +1,22 @@
+{{- partial "header.html" . }}
+          <article>
+
+<h1>{{ if eq .Kind "term" }}{{ .Data.Singular | humanize }} {{ default "::" .Site.Params.titleSeparator }} {{ end }}{{ .Title }}</h1>
+<ul>
+  {{- range .Data.Terms.Alphabetical }}
+    {{- if and .Page.Title (or (ne (.Page.Scratch.Get "relearnIsHiddenStem") true) (ne .Page.Site.Params.disableTagHiddenPages true) ) }}
+  <li><a href="{{ .Page.RelPermalink }}">{{ .Page.Title }}</a> ({{ len .Pages }})</li>
+    {{- end }}
+  {{- else }}
+    {{- range sort .Pages "Title" }}
+      {{- if and .Title (or (ne (.Scratch.Get "relearnIsHiddenStem") true) (ne .Site.Params.disableTagHiddenPages true) ) }}
+  <li><a href="{{ .RelPermalink }}">{{ .Title }}</a></li>
+      {{- end }}
+    {{- end }}
+  {{- end }}
+</ul>
+
+            <footer class="footline">
+            </footer>
+          </article>
+{{- partial "footer.html" . }}
\ No newline at end of file
diff --git a/layouts/partials/content-screen.html b/layouts/partials/body.html
similarity index 100%
rename from layouts/partials/content-screen.html
rename to layouts/partials/body.html
diff --git a/layouts/partials/content-print.html b/layouts/partials/body.print.html
similarity index 100%
rename from layouts/partials/content-print.html
rename to layouts/partials/body.print.html