diff --git a/layouts/404.html b/layouts/404.html
index fc2bf44ad7..4b8d5287b8 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -1,11 +1,7 @@
 <!DOCTYPE html>
 <html lang="{{ .Page.Language | default "en" }}" class="js csstransforms3d">
   <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    {{ hugo.Generator -}}
     {{- partial "meta.html" . }}
-    {{ partial "favicon.html" . }}
     {{- .Scratch.Add "title" "" }}
     {{- if eq .Site.Data.titles .Title }}
       {{- .Scratch.Set "title" (index .Site.Data.titles .Title).title }}
@@ -14,24 +10,9 @@
     {{- end }}
     <title>{{ .Scratch.Get "title" }} {{ default "::" .Site.Params.titleSeparator }} {{ .Site.Title }}</title>
 
-    {{- $assetBusting := not .Site.Params.disableAssetsBusting }}
-    <link href="{{"css/nucleus.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
-    <link href="{{"css/fontawesome-all.min.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
-    <link href="{{"css/featherlight.min.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
-    <link href="{{"css/perfect-scrollbar.min.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
-    <link href="{{"css/theme.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
-    {{- with .Site.Params.themeVariant }}
-    <link href="{{(printf "css/theme-%s.css" .) | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
-    <link href="{{"css/variant.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
-    {{- end }}
-    <link href="{{"css/print.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet" media="print">
-    {{- range .Site.Params.custom_css }}
-    <link href="{{(printf "%s" .) | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
-    {{- end }}
+    {{- partial "favicon.html" . }}
+    {{- partial "stylesheet.html" . }}
     <style>
-      :root #header + #content > #left > #rlblock_left {
-        display: none !important;
-      }
       p, li, ul {
         text-align: center
       }
diff --git a/layouts/partials/favicon.html b/layouts/partials/favicon.html
index 9846a90a81..a77568f54d 100644
--- a/layouts/partials/favicon.html
+++ b/layouts/partials/favicon.html
@@ -1,14 +1,14 @@
-{{- $assetBusting := not .Site.Params.disableAssetsBusting -}}
-{{- if (fileExists "/static/images/favicon.svg") -}}
+    {{- $assetBusting := not .Site.Params.disableAssetsBusting }}
+    {{- if (fileExists "/static/images/favicon.svg") }}
     <link rel="icon" href="{{ "/images/favicon.svg" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" type="image/svg+xml">
-{{- else if (fileExists "/static/images/favicon.png") -}}
+    {{- else if (fileExists "/static/images/favicon.png") }}
     <link rel="icon" href="{{ "/images/favicon.png" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" type="image/png">
-{{- else if (fileExists "/static/images/favicon.ico") -}}
+    {{- else if (fileExists "/static/images/favicon.ico") }}
     <link rel="icon" href="{{ "/images/favicon.ico" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" type="image/x-icon">
-{{- else if (fileExists "/static/images/logo.svg") -}}
+    {{- else if (fileExists "/static/images/logo.svg") }}
     <link rel="icon" href="{{ "/images/logo.svg" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" type="image/svg+xml">
-{{- else if (fileExists "/static/images/logo.png") -}}
+    {{- else if (fileExists "/static/images/logo.png") }}
     <link rel="icon" href="{{ "/images/logo.png" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" type="image/png">
-{{- else if (fileExists "/static/images/logo.ico") -}}
+    {{- else if (fileExists "/static/images/logo.ico") }}
     <link rel="icon" href="{{ "/images/logo.ico" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" type="image/x-icon">
-{{- end }}
+    {{- end }}
\ No newline at end of file
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index e12bc6597d..8c833de8af 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -1,44 +1,27 @@
 <!DOCTYPE html>
 <html lang="{{ .Page.Language | default "en" }}" class="js csstransforms3d">
   <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    {{ hugo.Generator -}}
     {{- partial "meta.html" . }}
-    {{ partial "favicon.html" . }}
     <title>{{ .Title }} {{ default "::" .Site.Params.titleSeparator }} {{ .Site.Title }}</title>
 
-    {{- $assetBusting := not .Site.Params.disableAssetsBusting }}
-    <link href="{{"css/nucleus.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
-    <link href="{{"css/fontawesome-all.min.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
-    <link href="{{"css/featherlight.min.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
-    <link href="{{"css/perfect-scrollbar.min.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
-    <link href="{{"css/auto-complete.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
-    <link href="{{"css/theme.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
-    {{- with .Site.Params.themeVariant }}
-    <link href="{{(printf "css/theme-%s.css" .) | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
-    <link href="{{"css/variant.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
+    {{- if not (and .Title (or (ne (.Scratch.Get "relearnIsHiddenStem") true) (ne .Site.Params.disableSeoHiddenPages true) ) ) }}
+    {{- else }}
+        {{- range .AlternativeOutputFormats }}
+            {{- if ne .Name "JSON" }}
+    <link rel="{{ .Rel }}" type="{{ .MediaType.Type }}" href="{{ .Permalink | relURL }}" title="{{ $.Site.Title | safeHTML }}" />
+            {{- end }}
+        {{- end }}
     {{- end }}
-    <link href="{{"css/print.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet" media="print">
-    {{- range .Site.Params.custom_css }}
-    <link href="{{(printf "%s" .) | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
+    {{- if and (ne .Site.Params.disableSeoHiddenPages true) (ne .Site.Params.disableSearchHiddenPages true) }}
+        {{- range .AlternativeOutputFormats }}
+            {{- if eq .Name "JSON" }}
+    <link rel="{{ .Rel }}" type="{{ .MediaType.Type }}" href="{{ .Permalink | relURL }}" title="{{ $.Site.Title | safeHTML }}" />
+            {{- end }}
+        {{- end }}
     {{- end }}
-    <script src="{{"js/jquery.min.js"| relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}"></script>
-    <style>
-      :root #header + #content > #left > #rlblock_left{
-        display:none !important;
-      }
-    {{- if .Site.Params.disableInlineCopyToClipBoard }}
-      :not(pre) > code.copy-to-clipboard-inline + span.copy-to-clipboard {
-          display: none;
-      }
-      :not(pre) > code.copy-to-clipboard-inline {
-          border-bottom-right-radius: 2px;
-          border-top-right-radius: 2px;
-          border-right-width: 1px;
-      }
-    {{- end }}
-    </style>
+
+    {{- partial "favicon.html" . }}
+    {{- partial "stylesheet.html" . }}
     {{- partial "custom-header.html" . }}
   </head>
   <body class="" data-url="{{ .RelPermalink }}">
diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html
index b950b1894e..c616521e93 100644
--- a/layouts/partials/menu.html
+++ b/layouts/partials/menu.html
@@ -1,4 +1,6 @@
 
+    {{ "<!-- hack to let hugo tell us how to get to the root when using relativeURLs, it needs to be called *url= for it to do its magic: -->" | safeHTML }}
+    {{ "<!-- https://github.com/gohugoio/hugo/blob/145b3fcce35fbac25c7033c91c1b7ae6d1179da8/transform/urlreplacers/absurlreplacer.go#L72 -->" | safeHTML }}
     <script>
       var index_url={{ "index.json" | relLangURL }};
       var root_url="/";
diff --git a/layouts/partials/meta.html b/layouts/partials/meta.html
index 9424325340..d418b36627 100644
--- a/layouts/partials/meta.html
+++ b/layouts/partials/meta.html
@@ -1,24 +1,15 @@
-{{- $ver := partial "version.html" }}
-{{- $ver = replaceRE "\\s*(\\S*)" "${1}" $ver }}
+
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    {{ hugo.Generator }}
+    {{- $ver := partial "version.html" }}
+    {{- $ver = replaceRE "\\s*(\\S*)" "${1}" $ver }}
     <meta name="generator" content="Relearn {{ $ver }}">
-{{- partial "page-meta.go" . }}
-{{- if not (and .Title (or (ne (.Scratch.Get "relearnIsHiddenStem") true) (ne .Site.Params.disableSeoHiddenPages true) ) ) }}
+    {{- partial "page-meta.go" . }}
+    {{- if not (and .Title (or (ne (.Scratch.Get "relearnIsHiddenStem") true) (ne .Site.Params.disableSeoHiddenPages true) ) ) }}
     <meta name="robots" content="noindex, nofollow, noarchive, noimageindex">
-{{- else }}
-    {{- range .AlternativeOutputFormats }}
-    {{- if ne .Name "JSON" }}
-    <link rel="{{ .Rel }}" type="{{ .MediaType.Type }}" href="{{ .Permalink | relURL }}" title="{{ $.Site.Title | safeHTML }}" />
     {{- end }}
-    {{- end }}
-{{- end }}
-{{- if and (ne .Site.Params.disableSeoHiddenPages true) (ne .Site.Params.disableSearchHiddenPages true) }}
-{{- range .AlternativeOutputFormats }}
-{{- if eq .Name "JSON" }}
-    <link rel="{{ .Rel }}" type="{{ .MediaType.Type }}" href="{{ .Permalink | relURL }}" title="{{ $.Site.Title | safeHTML }}" />
-{{- end }}
-{{- end }}
-{{- end }}
     <meta name="description" content="{{ with .Description }}{{ . }}{{ else }}{{ with .Site.Params.description }}{{ . }}{{ end }}{{ end }}">
-{{- with .Site.Params.author }}
+    {{- with .Site.Params.author }}
     <meta name="author" content="{{ . }}">
-{{- end }}
\ No newline at end of file
+    {{- end }}
\ No newline at end of file
diff --git a/layouts/partials/search.html b/layouts/partials/search.html
index 2b2a38bb4f..04657fc825 100644
--- a/layouts/partials/search.html
+++ b/layouts/partials/search.html
@@ -6,6 +6,4 @@
         {{- $assetBusting := not .Site.Params.disableAssetsBusting }}
         <script src="{{"js/lunr.min.js" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}"></script>
         <script src="{{"js/auto-complete.js" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}"></script>
-        {{ "<!-- hack to let hugo tell us how to get to the root when using relativeURLs, it needs to be called *url= for it to do its magic: -->" | safeHTML }}
-        {{ "<!-- https://github.com/gohugoio/hugo/blob/145b3fcce35fbac25c7033c91c1b7ae6d1179da8/transform/urlreplacers/absurlreplacer.go#L72 -->" | safeHTML }}
         <script src="{{ "js/search.js" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}"></script>
\ No newline at end of file
diff --git a/layouts/partials/stylesheet.html b/layouts/partials/stylesheet.html
new file mode 100644
index 0000000000..32de928521
--- /dev/null
+++ b/layouts/partials/stylesheet.html
@@ -0,0 +1,31 @@
+    {{- $assetBusting := not .Site.Params.disableAssetsBusting }}
+    <link href="{{"css/nucleus.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
+    <link href="{{"css/fontawesome-all.min.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
+    <link href="{{"css/featherlight.min.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
+    <link href="{{"css/perfect-scrollbar.min.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
+    <link href="{{"css/auto-complete.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
+    <link href="{{"css/theme.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
+    {{- with .Site.Params.themeVariant }}
+    <link href="{{(printf "css/theme-%s.css" .) | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
+    <link href="{{"css/variant.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
+    {{- end }}
+    <link href="{{"css/print.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet" media="print">
+    {{- range .Site.Params.custom_css }}
+    <link href="{{(printf "%s" .) | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
+    {{- end }}
+    <style>
+      :root #header + #content > #left > #rlblock_left{
+        display:none !important;
+      }
+    {{- if .Site.Params.disableInlineCopyToClipBoard }}
+      :not(pre) > code.copy-to-clipboard-inline + span.copy-to-clipboard {
+        display: none;
+      }
+      :not(pre) > code.copy-to-clipboard-inline {
+        border-bottom-right-radius: 2px;
+        border-top-right-radius: 2px;
+        border-right-width: 1px;
+      }
+    {{- end }}
+    </style>
+    <script src="{{"js/jquery.min.js"| relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}"></script>
\ No newline at end of file
