diff --git a/layouts/404.html b/layouts/404.html
index 050950a38d..f319b3241a 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -1,5 +1,6 @@
-{{- partialCached "page-meta.hugo" . . }}
 <!DOCTYPE html>
+{{- partialCached "page-meta.hugo" . . }}
+{{- $outputFormat := partial "output-format.hugo" . }}
 <html lang="{{ .Page.Language | default "en" }}" dir="{{ T "Reading-direction" | default "ltr" }}">
   <head>
     {{- partial "meta.html" . }}
@@ -12,7 +13,7 @@
     <title>{{ .Scratch.Get "title" }} {{ default "::" .Site.Params.titleSeparator }} {{ .Site.Title }}</title>
 
     {{- partialCached "favicon.html" . }}
-    {{- partial "stylesheet.html" . }}
+    {{- partialCached "stylesheet.html" (dict "page" . "outputFormat" $outputFormat) $outputFormat }}
     <style>
       p, li, ul {
         text-align: center
diff --git a/layouts/partials/_main.hugo b/layouts/partials/_main.hugo
index 9e812b6c05..444fbc6b95 100644
--- a/layouts/partials/_main.hugo
+++ b/layouts/partials/_main.hugo
@@ -1,8 +1,9 @@
 {{- partialCached "page-meta.hugo" . . }}
-{{- partial "output-partial.hugo" (dict "base" "header" "page" . "parameter" .) }}
+{{- $outputFormat := partial "output-format.hugo" . }}
+{{- partial "output-partial.hugo" (dict "base" "header" "page" . "parameter" . "outputFormat" $outputFormat) }}
 {{- if not .File }}
-  {{- partial "output-partial.hugo" (dict "base" "body" "page" . "parameter" (dict "page" . "content" (partial "output-partial.hugo" (dict "base" "initial" "page" . "parameter" .)))) }}
+  {{- partial "output-partial.hugo" (dict "base" "body" "page" . "parameter" (dict "page" . "content" (partial "output-partial.hugo" (dict "base" "initial" "page" . "parameter" . "outputFormat" $outputFormat))) "outputFormat" $outputFormat) }}
 {{- else }}
-  {{- partial "output-partial.hugo" (dict "base" "body" "page" . "parameter" (dict "page" . "content" (partial "output-partial.hugo" (dict "base" "content" "page" . "parameter" .)))) }}
+  {{- partial "output-partial.hugo" (dict "base" "body" "page" . "parameter" (dict "page" . "content" (partial "output-partial.hugo" (dict "base" "content" "page" . "parameter" . "outputFormat" $outputFormat))) "outputFormat" $outputFormat) }}
 {{- end }}
-{{- partial "output-partial.hugo" (dict "base" "footer" "page" . "parameter" .) }}
\ No newline at end of file
+{{- partial "output-partial.hugo" (dict "base" "footer" "page" . "parameter" . "outputFormat" $outputFormat) }}
\ No newline at end of file
diff --git a/layouts/partials/archetype.hugo b/layouts/partials/archetype.hugo
index c4ac29402e..854b20465d 100644
--- a/layouts/partials/archetype.hugo
+++ b/layouts/partials/archetype.hugo
@@ -1,6 +1,10 @@
 {{- $hook := .hook }}
 {{- $page := .page }}
 {{- $parameter := .parameter }}
+{{- $outputFormat := .outputFormat }}
+{{- if not $outputFormat }}
+  {{- $outputFormat = partial "output-format.hugo" $page }}
+{{- end }}
 {{- $archetype := "default" }}
 {{- if $page.Params.archetype }}
   {{- $archetype = $page.Params.archetype }}
@@ -13,4 +17,4 @@
 {{- if not (partialCached "fileExists.hugo" $f $f) }}
   {{- $archetype = "default" }}
 {{- end }}
-{{- partial "output-partial.hugo" (dict "base" (printf "archetypes/%s/%s" $archetype $hook) "page" $page "parameter" $parameter) }}
\ No newline at end of file
+{{- partial "output-partial.hugo" (dict "base" (printf "archetypes/%s/%s" $archetype $hook) "page" $page "parameter" $parameter "outputFormat" $outputFormat) }}
\ No newline at end of file
diff --git a/layouts/partials/article.html b/layouts/partials/article.html
index a3e4708d8e..51ba66da08 100644
--- a/layouts/partials/article.html
+++ b/layouts/partials/article.html
@@ -1,3 +1,4 @@
 {{- $page := .page }}
 {{- $content := .content }}
-{{- partial "archetype.hugo" (dict "hook" "article" "page" $page "parameter" (dict "page" $page "content" $content)) }}
\ No newline at end of file
+{{- $outputFormat := .outputFormat }}
+{{- partial "archetype.hugo" (dict "hook" "article" "page" $page "parameter" (dict "page" $page "content" $content) "outputFormat" $outputFormat) }}
\ No newline at end of file
diff --git a/layouts/partials/body.html b/layouts/partials/body.html
index 8c48acf563..840372e60d 100644
--- a/layouts/partials/body.html
+++ b/layouts/partials/body.html
@@ -1,3 +1,4 @@
 {{- $page := .page }}
 {{- $content := .content }}
-{{- partial "single-article.hugo" (dict "page" $page "content" $content) }}
\ No newline at end of file
+{{- $outputFormat := partial "output-format.hugo" .page }}
+{{- partial "single-article.hugo" (dict "page" $page "content" $content "outputFormat" $outputFormat) }}
\ No newline at end of file
diff --git a/layouts/partials/body.print.html b/layouts/partials/body.print.html
index bb35642354..225f9eb021 100644
--- a/layouts/partials/body.print.html
+++ b/layouts/partials/body.print.html
@@ -1,3 +1,4 @@
 {{- $page := .page }}
 {{- $content := .content }}
-{{- partial "nested-article.hugo" (dict "page" $page) }}
\ No newline at end of file
+{{- $outputFormat := partial "output-format.hugo" .page }}
+{{- partial "nested-article.hugo" (dict "page" $page "outputFormat" $outputFormat) }}
\ No newline at end of file
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 4f84205d36..037be0a602 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+{{- $outputFormat := partial "output-format.hugo" . }}
 <html lang="{{ .Page.Language | default "en" }}" dir="{{ T "Reading-direction" | default "ltr" }}">
   <head>
     {{- partial "meta.html" . }}
@@ -30,10 +31,10 @@
     {{- end }}
 
     {{- partialCached "favicon.html" . }}
-    {{- partial "stylesheet.html" . }}
+    {{- partialCached "stylesheet.html" (dict "page" . "outputFormat" $outputFormat) $outputFormat }}
     {{- partial "custom-header.html" . }}
   </head>
-  <body class="mobile-support {{ (partial "output-format.hugo" .) }}{{- if .Site.Params.disableInlineCopyToClipBoard }} disableInlineCopyToClipboard{{ end }}" data-url="{{ .RelPermalink }}">
+  <body class="mobile-support {{ $outputFormat }}{{- if .Site.Params.disableInlineCopyToClipBoard }} disableInlineCopyToClipboard{{ end }}" data-url="{{ .RelPermalink }}">
     <div id="body" class="default-animation">
       <div id="sidebar-overlay"></div>
       <div id="toc-overlay"></div>
diff --git a/layouts/partials/nested-article.hugo b/layouts/partials/nested-article.hugo
index d3be53c5dc..a29fa28d19 100644
--- a/layouts/partials/nested-article.hugo
+++ b/layouts/partials/nested-article.hugo
@@ -1,5 +1,6 @@
 {{- $page := .page }}
-{{- $page.Page.Store.Set (printf "%sIsNested" (partial "output-format.hugo" $page)) true }}
+{{- $outputFormat := .outputFormat }}
+{{- $page.Page.Store.Set (printf "%sIsNested" $outputFormat) true }}
 {{- with $page }}
   {{- $currentNode := . }}
   {{- $isActive := .IsHome }}
@@ -17,22 +18,22 @@
   {{- $defaultOrdersectionsby := .Site.Params.ordersectionsby | default "weight" }}
   {{- $currentOrdersectionsby := .Site.Home.Params.ordersectionsby | default $defaultOrdersectionsby }}
   {{- if $isShortcut }}
-    {{- template "section-print" dict "sect" . "currentnode" $currentNode }}
+    {{- template "section-print" dict "sect" . "currentnode" $currentNode "outputFormat" $outputFormat }}
   {{- else }}
     {{- if $isActive }}
-      {{- template "section-print" dict "sect" . "currentnode" $currentNode }}
-      {{- if or $pages }}
+      {{- template "section-print" dict "sect" . "currentnode" $currentNode "outputFormat" $outputFormat }}
+      {{- if $pages }}
               <section>
                 <h1 class="a11y-only">{{ T "Subsections" .Title }}</h1>
       {{- end }}
     {{- end }}
     {{- if eq $currentOrdersectionsby "title" }}
       {{- range $pages.ByTitle }}
-        {{- template "section-tree-print" dict "sect" . "currentnode" $currentNode "isActive" $isActive }}
+        {{- template "section-tree-print" dict "sect" . "currentnode" $currentNode "outputFormat" $outputFormat "isActive" $isActive }}
       {{- end }}
     {{- else }}
       {{- range $pages.ByWeight }}
-        {{- template "section-tree-print" dict "sect" . "currentnode" $currentNode "isActive" $isActive }}
+        {{- template "section-tree-print" dict "sect" . "currentnode" $currentNode "outputFormat" $outputFormat "isActive" $isActive }}
       {{- end }}
     {{- end }}
     {{- if $isActive }}
@@ -44,6 +45,7 @@
 {{- end }}
 {{- define "section-tree-print" }}
   {{- $currentNode := .currentnode }}
+  {{- $outputFormat := .outputFormat }}
   {{- $isActive := .isActive }}
   {{- $currentFileRelPermalink := .currentnode.RelPermalink }}
   {{- with .sect }}
@@ -63,7 +65,7 @@
       {{- $defaultOrdersectionsby := .Site.Params.ordersectionsby | default "weight" }}
       {{- $currentOrdersectionsby := .Params.ordersectionsby | default $defaultOrdersectionsby }}
       {{- if $isActive }}
-        {{- template "section-print" dict "sect" . "currentnode" $currentNode }}
+        {{- template "section-print" dict "sect" . "currentnode" $currentNode "outputFormat" $outputFormat }}
         {{- if $pages }}
           <section>
             <h1 class="a11y-only">{{ T "Subsections" .Title }}</h1>
@@ -71,11 +73,11 @@
       {{- end }}
       {{- if eq $currentOrdersectionsby "title" }}
         {{- range $pages.ByTitle }}
-          {{- template "section-tree-print" dict "sect" . "currentnode" $currentNode "isActive" $isActive }}
+          {{- template "section-tree-print" dict "sect" . "currentnode" $currentNode "outputFormat" $outputFormat "isActive" $isActive }}
         {{- end }}
       {{- else }}
         {{- range $pages.ByWeight }}
-          {{- template "section-tree-print" dict "sect" . "currentnode" $currentNode "isActive" $isActive }}
+          {{- template "section-tree-print" dict "sect" . "currentnode" $currentNode "outputFormat" $outputFormat "isActive" $isActive }}
         {{- end }}
       {{- end }}
       {{- if $isActive }}
@@ -88,13 +90,14 @@
 {{- end }}
 {{- define "section-print" }}
   {{- $currentNode := .currentnode }}
+  {{- $outputFormat := .outputFormat }}
   {{- with .sect }}
     {{- $page := . }}
     {{/* if we have a relative link in a print page, our print URL is one level to deep; so we are making it absolute to our page by prepending the page's permalink */}}
     {{- $link_prefix := strings.TrimRight "/" .Page.RelPermalink }}
-    {{- $content := partial "output-partial.hugo" (dict "base" "content" "page" . "parameter" $page) }}
+    {{- $content := partial "output-partial.hugo" (dict "base" "content" "page" . "parameter" $page "outputFormat" $outputFormat) }}
     {{- $content = replaceRE "((?:src|href)\\s*=(?:\\s*[\"']\\s*)?)(\\.[^\"'\\s>]*|[\\w]+[^\"'\\s>:]*)([\"'\\s>])" (printf "${1}%s/${2}${3}" $link_prefix) $content }}
-    {{- partial "output-partial.hugo" (dict "base" "article" "page" $page "parameter" (dict "page" $page "content" $content)) }}
+    {{- partial "output-partial.hugo" (dict "base" "article" "page" $page "parameter" (dict "page" $page "content" $content "outputFormat" $outputFormat) "outputFormat" $outputFormat) }}
     {{- $currentNode.Page.Store.Set "nestedHasMathJax" (or ($currentNode.Page.Store.Get "nestedHasMathJax") (.Page.Store.Get "hasMathJax")) }}
     {{- $currentNode.Page.Store.Set "nestedHasMermaid" (or ($currentNode.Page.Store.Get "nestedHasMermaid") (.Page.Store.Get "hasMermaid")) }}
     {{- $currentNode.Page.Store.Set "nestedHasSwagger" (or ($currentNode.Page.Store.Get "nestedHasSwagger") (.Page.Store.Get "hasSwagger")) }}
diff --git a/layouts/partials/output-partial.hugo b/layouts/partials/output-partial.hugo
index d8e276eabd..00dfa8cb33 100644
--- a/layouts/partials/output-partial.hugo
+++ b/layouts/partials/output-partial.hugo
@@ -1,7 +1,10 @@
 {{- $base := .base }}
 {{- $page := .page }}
 {{- $parameter := .parameter }}
-{{- $outputFormat := partial "output-format.hugo" $page }}
+{{- $outputFormat := .outputFormat }}
+{{- if not $outputFormat }}
+  {{- $outputFormat = partial "output-format.hugo" $page }}
+{{- end }}
 {{- $suffix := partialCached "output-suffix.hugo" $page $page $outputFormat }}
 {{- $f := printf "/layouts/partials/%s.%s.%s" $base $outputFormat $suffix }}
 {{- if or (not $outputFormat) (not (partialCached "fileExists.hugo" $f $f)) }}
diff --git a/layouts/partials/single-article.hugo b/layouts/partials/single-article.hugo
index 575e028930..1e76d4bba8 100644
--- a/layouts/partials/single-article.hugo
+++ b/layouts/partials/single-article.hugo
@@ -1,4 +1,5 @@
 {{- $page := .page }}
 {{- $content := .content }}
-{{- $page.Page.Store.Set (printf "%sIsNested" (partial "output-format.hugo" $page)) false }}
-{{- partial "output-partial.hugo" (dict "base" "article" "page" $page "parameter" (dict "page" $page "content" $content)) }}
\ No newline at end of file
+{{- $outputFormat := .outputFormat }}
+{{- $page.Page.Store.Set (printf "%sIsNested" $outputFormat) false }}
+{{- partial "output-partial.hugo" (dict "base" "article" "page" $page "parameter" (dict "page" $page "content" $content "outputFormat" $outputFormat) "outputFormat" $outputFormat) }}
\ No newline at end of file
diff --git a/layouts/partials/stylesheet.html b/layouts/partials/stylesheet.html
index ea2654a1a4..94d5d9b38e 100644
--- a/layouts/partials/stylesheet.html
+++ b/layouts/partials/stylesheet.html
@@ -1,3 +1,10 @@
+  {{- $page := .page }}
+  {{- $outputFormat := .outputFormat }}
+  {{- if not $page }}
+    {{- $page = . }}
+    {{- $outputFormat = partial "output-format.hugo" $page }}
+  {{- end }}
+  {{- with $page }}
     {{- $assetBusting := not .Site.Params.disableAssetsBusting }}
     {{ "<!-- https://github.com/filamentgroup/loadCSS/blob/master/README.md#how-to-use -->" | safeHTML }}
     <link href="{{"css/fontawesome-all.min.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet" media="print" onload="this.media='all';this.onload=null;"><noscript><link href="{{"css/fontawesome-all.min.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet"></noscript>
@@ -14,7 +21,6 @@
     <link href="{{"css/ie.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
     <link href="{{"css/variant.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
     <link href="{{"css/print.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet" media="print">
-    {{- $outputFormat := partial "output-format.hugo" . }}
     {{- $f := printf "/static/css/format-%s.css" $outputFormat }}
     {{- if partialCached "fileExists.hugo" $f $f }}
     <link href="{{(printf "css/format-%s.css" $outputFormat) | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
@@ -44,4 +50,5 @@
       {{- end }}
       window.variants && variants.init( [ {{ delimit $quotedthemevariants ", " | safeJS }} ] );
     </script>
-    <script src="{{"js/jquery.min.js"| relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" defer></script>
\ No newline at end of file
+    <script src="{{"js/jquery.min.js"| relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" defer></script>
+  {{- end }}
\ No newline at end of file
