diff --git a/site/layouts/_default/baseof.html b/site/layouts/_default/baseof.html
deleted file mode 100644
index 713ab2864ad0..000000000000
--- a/site/layouts/_default/baseof.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    {{ partial "header" . }}
-  </head>
-  {{ block "body_override" . }}<body>{{ end }}
-    {{ partial "skippy" . }}
-
-    {{ partial "docs-navbar" . }}
-
-    {{ block "main" . }}
-    {{ end }}
-
-    {{ partial "footer" . }}
-    {{ partial "scripts" . }}
-
-    {{ block "footer" . }}
-    {{ end }}
-  </body>
-</html>
diff --git a/site/layouts/_default/docs.html b/site/layouts/_default/docs.html
index 34ac933f2b11..c2e3776669f9 100644
--- a/site/layouts/_default/docs.html
+++ b/site/layouts/_default/docs.html
@@ -1,25 +1,37 @@
-{{ define "main" }}
-  <div class="container-fluid">
-    <div class="row flex-xl-nowrap">
-      <div class="col-md-3 col-xl-2 bd-sidebar">
-        {{ partial "docs-sidebar" . }}
-      </div>
+<!doctype html>
+<html lang="en">
+  <head>
+    {{ partial "header" . }}
+  </head>
+  <body>
+    {{ partial "skippy" . }}
 
-      {{ if (eq .Page.Params.toc true) }}
-        <nav class="d-none d-xl-block col-xl-2 bd-toc" aria-label="Secondary navigation">
-          {{ .TableOfContents }}
-        </nav>
-      {{ end }}
+    {{ partial "docs-navbar" . }}
 
-      <main class="col-md-9 col-xl-8 py-md-3 pl-md-5 bd-content" role="main">
-        <div class="d-md-flex flex-md-row-reverse align-items-center justify-content-between">
-          <a class="btn btn-sm btn-bd-light my-2 my-md-0" href="{{ .Site.Params.repo }}/blob/v4-dev/site/content/{{ .Page.File.Path | replaceRE `\\` "/" }}" title="View and edit this file on GitHub" target="_blank" rel="noopener">View on GitHub</a>
-          <h1 class="bd-title" id="content">{{ .Title | markdownify }}</h1>
+    <div class="container-fluid">
+      <div class="row flex-xl-nowrap">
+        <div class="col-md-3 col-xl-2 bd-sidebar">
+          {{ partial "docs-sidebar" . }}
         </div>
-        <p class="bd-lead">{{ .Page.Params.Description | markdownify }}</p>
-        {{ partial "ads" . }}
-        {{ .Content }}
-      </main>
+
+        {{ if (eq .Page.Params.toc true) }}
+          <nav class="d-none d-xl-block col-xl-2 bd-toc" aria-label="Secondary navigation">
+            {{ .TableOfContents }}
+          </nav>
+        {{ end }}
+
+        <main class="col-md-9 col-xl-8 py-md-3 pl-md-5 bd-content" role="main">
+          <div class="d-md-flex flex-md-row-reverse align-items-center justify-content-between">
+            <a class="btn btn-sm btn-bd-light my-2 my-md-0" href="{{ .Site.Params.repo }}/blob/v4-dev/site/content/{{ .Page.File.Path | replaceRE `\\` "/" }}" title="View and edit this file on GitHub" target="_blank" rel="noopener">View on GitHub</a>
+            <h1 class="bd-title" id="content">{{ .Title | markdownify }}</h1>
+          </div>
+          <p class="bd-lead">{{ .Page.Params.Description | markdownify }}</p>
+          {{ partial "ads" . }}
+          {{ .Content }}
+        </main>
+      </div>
     </div>
-  </div>
-{{ end }}
+
+    {{ partial "scripts" . }}
+  </body>
+</html>
diff --git a/site/layouts/_default/home.html b/site/layouts/_default/home.html
index 6126e4d26558..c03de11abbed 100644
--- a/site/layouts/_default/home.html
+++ b/site/layouts/_default/home.html
@@ -1,6 +1,19 @@
-{{ define "main" }}
-  {{ partial "home/masthead" . }}
-  {{ partial "home/masthead-followup" . }}
+<!doctype html>
+<html lang="en">
+  <head>
+    {{ partial "header" . }}
+  </head>
+  <body>
+    {{ partial "skippy" . }}
 
-  {{ .Content }}
-{{ end }}
+    {{ partial "docs-navbar" . }}
+
+    {{ partial "home/masthead" . }}
+    {{ partial "home/masthead-followup" . }}
+
+    {{ .Content }}
+
+    {{ partial "footer" . }}
+    {{ partial "scripts" . }}
+  </body>
+</html>
diff --git a/site/layouts/_default/redirect.html b/site/layouts/_default/redirect.html
index 63ded089e872..f675d0c6cf0f 100644
--- a/site/layouts/_default/redirect.html
+++ b/site/layouts/_default/redirect.html
@@ -1 +1,11 @@
-{{ partial "redirect" (.Page.Params.redirect | absURL) }}
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <title>{{ .Page.Params.redirect | absURL }}</title>
+    <link rel="canonical" href="{{ .Page.Params.redirect | absURL }}">
+    <meta name="robots" content="noindex">
+    <meta http-equiv="refresh" content="0; url={{ .Page.Params.redirect | absURL }}">
+  </head>
+</html>
diff --git a/site/layouts/_default/single.html b/site/layouts/_default/single.html
index 13f7ddd2e780..58b55331c112 100644
--- a/site/layouts/_default/single.html
+++ b/site/layouts/_default/single.html
@@ -1,39 +1,52 @@
-{{ define "main" }}
-  <header class="d-flex flex-column flex-md-row align-items-md-center p-5 bg-light">
-    <div class="pt-md-3 pb-md-4">
-      <h1 class="bd-title mt-0">{{ .Title | markdownify }}</h1>
-      <p class="bd-lead">{{ .Page.Params.Description | markdownify }}</p>
-      {{ if eq .Title "Examples" }}
-      <div class="d-flex flex-column flex-sm-row">
-        <a href="{{ .Site.Params.download.dist_examples }}" class="btn btn-bd-primary py-2 px-3" onclick="ga('send', 'event', 'Examples', 'Hero', 'Download Examples');">Download examples</a>
-        <a href="{{ .Site.Params.download.source }}" class="btn btn-outline-secondary py-2 px-3 mt-3 mt-sm-0 ml-sm-3" onclick="ga('send', 'event', 'Examples', 'Hero', 'Download');">Download source code</a>
+<!doctype html>
+<html lang="en">
+  <head>
+    {{ partial "header" . }}
+  </head>
+  <body>
+    {{ partial "skippy" . }}
+
+    {{ partial "docs-navbar" . }}
+
+    <header class="d-flex flex-column flex-md-row align-items-md-center p-5 bg-light">
+      <div class="pt-md-3 pb-md-4">
+        <h1 class="bd-title mt-0">{{ .Title | markdownify }}</h1>
+        <p class="bd-lead">{{ .Page.Params.Description | markdownify }}</p>
+        {{ if eq .Title "Examples" }}
+        <div class="d-flex flex-column flex-sm-row">
+          <a href="{{ .Site.Params.download.dist_examples }}" class="btn btn-bd-primary py-2 px-3" onclick="ga('send', 'event', 'Examples', 'Hero', 'Download Examples');">Download examples</a>
+          <a href="{{ .Site.Params.download.source }}" class="btn btn-outline-secondary py-2 px-3 mt-3 mt-sm-0 ml-sm-3" onclick="ga('send', 'event', 'Examples', 'Hero', 'Download');">Download source code</a>
+        </div>
+        {{- end -}}
       </div>
-      {{- end -}}
-    </div>
-    {{ partial "ads" . }}
-  </header>
+      {{ partial "ads" . }}
+    </header>
 
-  <main class="bd-content p-5" id="content" role="main">
-    {{ .Content }}
+    <main class="bd-content p-5" id="content" role="main">
+      {{ .Content }}
 
-    {{ if eq .Title "Examples" }}
-      <hr class="my-5">
-      <div class="container">
-        <div class="text-center">
-          <div class="masthead-followup-icon d-inline-block mb-2 text-white bg-danger">
-            {{ partial "icons/droplet-fill.svg" (dict "width" "32" "height" "32") }}
+      {{ if eq .Title "Examples" }}
+        <hr class="my-5">
+        <div class="container">
+          <div class="text-center">
+            <div class="masthead-followup-icon d-inline-block mb-2 text-white bg-danger">
+              {{ partial "icons/droplet-fill.svg" (dict "width" "32" "height" "32") }}
+            </div>
+            <h2>Go further with Bootstrap Themes</h2>
+            <p class="col-md-10 mx-auto lead font-weight-normal">
+              Need something more than these examples? Take Bootstrap to the next level with premium themes from the <a href="{{ $.Site.Params.themes }}">official Bootstrap Themes marketplace</a>. They’re built as their own extended frameworks, rich with new components and plugins, documentation, and powerful build tools.
+            </p>
+            <a href="{{ .Site.Params.themes }}" class="btn btn-lg btn-outline-primary mb-3">Browse themes</a>
           </div>
-          <h2>Go further with Bootstrap Themes</h2>
-          <p class="col-md-10 mx-auto lead font-weight-normal">
-            Need something more than these examples? Take Bootstrap to the next level with premium themes from the <a href="{{ $.Site.Params.themes }}">official Bootstrap Themes marketplace</a>. They’re built as their own extended frameworks, rich with new components and plugins, documentation, and powerful build tools.
-          </p>
-          <a href="{{ .Site.Params.themes }}" class="btn btn-lg btn-outline-primary mb-3">Browse themes</a>
+          <img class="d-block img-fluid mt-3 mx-auto" srcset="/docs/{{ .Site.Params.docs_version }}/assets/img/bootstrap-themes-collage.png,
+                                                              /docs/{{ .Site.Params.docs_version }}/assets/img/bootstrap-themes-collage@2x.png 2x"
+                                                      src="/docs/{{ .Site.Params.docs_version }}/assets/img/bootstrap-themes-collage.png"
+                                                      alt="Bootstrap Themes" width="1151" height="320" loading="lazy">
         </div>
-        <img class="d-block img-fluid mt-3 mx-auto" srcset="/docs/{{ .Site.Params.docs_version }}/assets/img/bootstrap-themes-collage.png,
-                                                            /docs/{{ .Site.Params.docs_version }}/assets/img/bootstrap-themes-collage@2x.png 2x"
-                                                    src="/docs/{{ .Site.Params.docs_version }}/assets/img/bootstrap-themes-collage.png"
-                                                    alt="Bootstrap Themes" width="1151" height="320" loading="lazy">
-      </div>
-    {{ end }}
-  </main>
-{{ end }}
+      {{ end }}
+    </main>
+
+    {{ partial "footer" . }}
+    {{ partial "scripts" . }}
+  </body>
+</html>
diff --git a/site/layouts/alias.html b/site/layouts/alias.html
index 35765c490767..a6c397a7f495 100644
--- a/site/layouts/alias.html
+++ b/site/layouts/alias.html
@@ -1 +1,11 @@
-{{ partial "redirect" .Permalink }}
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <title>{{ .Permalink }}</title>
+    <link rel="canonical" href="{{ .Permalink }}">
+    <meta name="robots" content="noindex">
+    <meta http-equiv="refresh" content="0; url={{ .Permalink }}">
+  </head>
+</html>
diff --git a/site/layouts/partials/redirect.html b/site/layouts/partials/redirect.html
deleted file mode 100644
index cee885bf8c34..000000000000
--- a/site/layouts/partials/redirect.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <title>{{ . }}</title>
-    <link rel="canonical" href="{{ . }}">
-    <meta name="robots" content="noindex">
-    <meta http-equiv="refresh" content="0; url={{ . }}">
-  </head>
-</html>
