diff --git a/layouts/404.html b/layouts/404.html
index bcd910f7..404df1b9 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -1,5 +1,5 @@
-{{ partial "header.html" . }}
-{{ partial "navbar.html" . }}
+{{- define "main" -}}
+
 <div class="universal-wrapper pt-3">
 
   <h1>{{ i18n "page_not_found" }}</h1>
@@ -27,5 +27,5 @@
   {{ end }}
 
 </div>
-{{ partial "footer_container.html" . }}
-{{ partial "footer.html" . }}
+
+{{- end -}}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index a24bdb29..4a86e6a0 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,5 +1,4 @@
-{{ partial "header.html" . }}
-{{ partial "navbar.html" . }}
+{{- define "main" -}}
 
 {{ partial "page_header.html" . }}
 
@@ -26,5 +25,5 @@
 
   {{ partial "pagination" . }}
 </div>
-{{ partial "footer_container.html" . }}
-{{ partial "footer.html" . }}
+
+{{- end -}}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 720f15ca..db72d11e 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,5 +1,4 @@
-{{ partial "header.html" . }}
-{{ partial "navbar.html" . }}
+{{- define "main" -}}
 
 <article class="article" itemscope itemtype="http://schema.org/Article">
 
@@ -40,5 +39,4 @@
   </div>
 </article>
 
-{{ partial "footer_container.html" . }}
-{{ partial "footer.html" . }}
+{{- end -}}
diff --git a/layouts/authors/list.html b/layouts/authors/list.html
index 20343fbf..2176e094 100644
--- a/layouts/authors/list.html
+++ b/layouts/authors/list.html
@@ -1,7 +1,6 @@
 {{/* Author profile page. */}}
 
-{{ partial "header.html" . }}
-{{ partial "navbar.html" . }}
+{{- define "main" -}}
 
 {{/* If an account has not been created for this user, just display their name as the title. */}}
 {{ if not .File }}
@@ -38,5 +37,4 @@
   {{ end }}
 </section>
 
-{{ partial "footer_container.html" . }}
-{{ partial "footer.html" . }}
+{{- end -}}
diff --git a/layouts/authors/terms.html b/layouts/authors/terms.html
index 42dc07b1..f896944b 100644
--- a/layouts/authors/terms.html
+++ b/layouts/authors/terms.html
@@ -1,7 +1,6 @@
 {{/* List of all authors. */}}
 
-{{ partial "header.html" . }}
-{{ partial "navbar.html" . }}
+{{- define "main" -}}
 
 {{ partial "page_header.html" . }}
 
@@ -20,5 +19,5 @@
 
   {{ partial "pagination" . }}
 </div>
-{{ partial "footer_container.html" . }}
-{{ partial "footer.html" . }}
+
+{{- end -}}
diff --git a/layouts/partials/docs_layout.html b/layouts/partials/docs_layout.html
index 721c2484..e2ebb32f 100644
--- a/layouts/partials/docs_layout.html
+++ b/layouts/partials/docs_layout.html
@@ -1,5 +1,5 @@
-{{ partial "header.html" . }}
-{{ partial "navbar.html" . }}
+{{- define "main" -}}
+
 {{ $current_page := . }}
 
 <div class="container-fluid docs">
@@ -46,10 +46,10 @@
 
       </article>
 
-      {{ partial "footer_section.html" . }}
+      {{ partial "site_footer.html" . }}
 
     </main>
   </div>
 </div>
 
-{{ partial "footer.html" . }}
+{{- end -}}
diff --git a/layouts/partials/widget_page.html b/layouts/partials/widget_page.html
index dc19bc4e..00be9ef3 100644
--- a/layouts/partials/widget_page.html
+++ b/layouts/partials/widget_page.html
@@ -1,5 +1,4 @@
-{{ partial "header.html" . }}
-{{ partial "navbar.html" . }}
+{{- define "main" -}}
 
 {{/* Notify JS that this is a widget page */}}
 <span class="js-widget-page d-none"></span>
@@ -76,5 +75,4 @@
   </section>
 {{ end }}
 
-{{ partial "footer_container.html" . }}
-{{ partial "footer.html" . }}
+{{- end -}}
diff --git a/layouts/project/single.html b/layouts/project/single.html
index 48ba6f28..c74e9e9a 100644
--- a/layouts/project/single.html
+++ b/layouts/project/single.html
@@ -1,5 +1,4 @@
-{{ partial "header.html" . }}
-{{ partial "navbar.html" . }}
+{{- define "main" -}}
 
 <article class="article article-project" itemscope itemtype="http://schema.org/Article">
 
@@ -73,5 +72,4 @@
 </div>
 {{ end }}
 
-{{ partial "footer_container.html" . }}
-{{ partial "footer.html" . }}
+{{- end -}}
diff --git a/layouts/publication/single.html b/layouts/publication/single.html
index ea77e0f9..b1550516 100644
--- a/layouts/publication/single.html
+++ b/layouts/publication/single.html
@@ -1,5 +1,5 @@
-{{ partial "header.html" . }}
-{{ partial "navbar.html" . }}
+{{- define "main" -}}
+
 <div class="pub" itemscope itemtype="http://schema.org/CreativeWork">
 
   {{ partial "page_header.html" . }}
@@ -62,5 +62,4 @@
 </div>
 {{ end }}
 
-{{ partial "footer_container.html" . }}
-{{ partial "footer.html" . }}
+{{- end -}}
diff --git a/layouts/section/docs.html b/layouts/section/docs.html
index 15a730dc..bd65fc2e 100644
--- a/layouts/section/docs.html
+++ b/layouts/section/docs.html
@@ -1,5 +1,4 @@
-{{ partial "header.html" . }}
-{{ partial "navbar.html" . }}
+{{- define "main" -}}
 
 {{ partial "page_header.html" . }}
 
@@ -16,5 +15,4 @@
   </ul>
 </div>
 
-{{ partial "footer_container.html" . }}
-{{ partial "footer.html" . }}
+{{- end -}}
diff --git a/layouts/section/post.html b/layouts/section/post.html
index da41003e..2f7df9f3 100644
--- a/layouts/section/post.html
+++ b/layouts/section/post.html
@@ -1,5 +1,4 @@
-{{ partial "header.html" . }}
-{{ partial "navbar.html" . }}
+{{- define "main" -}}
 
 {{ partial "page_header.html" . }}
 
@@ -23,5 +22,5 @@
   {{ partial "pagination" . }}
 
 </div>
-{{ partial "footer_container.html" . }}
-{{ partial "footer.html" . }}
+
+{{- end -}}
diff --git a/layouts/section/publication.html b/layouts/section/publication.html
index a1f3c97a..d6b3fb75 100644
--- a/layouts/section/publication.html
+++ b/layouts/section/publication.html
@@ -1,5 +1,4 @@
-{{ partial "header.html" . }}
-{{ partial "navbar.html" . }}
+{{- define "main" -}}
 
 {{ partial "page_header.html" . }}
 
@@ -75,5 +74,5 @@
     </div>
   </div>
 </div>
-{{ partial "footer_container.html" . }}
-{{ partial "footer.html" . }}
+
+{{- end -}}
diff --git a/layouts/section/talk.html b/layouts/section/talk.html
index 2983a806..ca2951ce 100644
--- a/layouts/section/talk.html
+++ b/layouts/section/talk.html
@@ -1,5 +1,4 @@
-{{ partial "header.html" . }}
-{{ partial "navbar.html" . }}
+{{- define "main" -}}
 
 {{ partial "page_header.html" . }}
 
@@ -36,5 +35,5 @@
   </div>
 
 </div>
-{{ partial "footer_container.html" . }}
-{{ partial "footer.html" . }}
+
+{{- end -}}
diff --git a/layouts/talk/single.html b/layouts/talk/single.html
index 412014b9..a4262b13 100644
--- a/layouts/talk/single.html
+++ b/layouts/talk/single.html
@@ -1,5 +1,5 @@
-{{ partial "header.html" . }}
-{{ partial "navbar.html" . }}
+{{- define "main" -}}
+
 <div class="pub" itemscope itemtype="http://schema.org/Event">
 
   {{ partial "page_header.html" . }}
@@ -84,5 +84,4 @@
 </div>
 {{ end }}
 
-{{ partial "footer_container.html" . }}
-{{ partial "footer.html" . }}
+{{- end -}}