diff --git a/assets/css/variables.css b/assets/css/variables.css
new file mode 100644
index 0000000..5cc96ac
--- /dev/null
+++ b/assets/css/variables.css
@@ -0,0 +1,30 @@
+/* Hugo template to derive CSS variables from site and page parameters */
+
+/* Do not remove the following comment. It is used by Hugo to render CSS variables.
+{{- $pageWidth := .Params.width | default .Site.Params.page.width -}}
+{{- $maxPageWidth := cond (eq $pageWidth "wide") "90rem" (cond (eq $pageWidth "full") "100%" "80rem") -}}
+
+{{- $navbarWidth := .Site.Params.navbar.width -}}
+{{- $maxNavbarWidth := cond (eq $navbarWidth "wide") "90rem" (cond (eq $navbarWidth "full") "100%" "80rem") -}}
+
+{{- $footerWidth := .Site.Params.footer.width -}}
+{{- $maxFooterWidth := cond (eq $footerWidth "wide") "90rem" (cond (eq $footerWidth "full") "100%" "80rem") -}}
+*/
+
+:root {
+  --hextra-max-page-width: {{ $maxPageWidth }};
+  --hextra-max-navbar-width: {{ $maxNavbarWidth }};
+  --hextra-max-footer-width: {{ $maxFooterWidth }};
+}
+
+.hextra-max-page-width {
+  max-width: var(--hextra-max-page-width);
+}
+
+.hextra-max-navbar-width {
+  max-width: var(--hextra-max-navbar-width);
+}
+
+.hextra-max-footer-width {
+  max-width: var(--hextra-max-footer-width);
+}
diff --git a/exampleSite/hugo.yaml b/exampleSite/hugo.yaml
index 9c42586..f948971 100644
--- a/exampleSite/hugo.yaml
+++ b/exampleSite/hugo.yaml
@@ -122,7 +122,7 @@ params:
     width: wide
 
   page:
-    # full (100%), wide (90rem), normal (1280px)
+    # full (100%), wide (90rem), normal (80rem)
     width: normal
 
   theme:
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index ee041d6..653f6f1 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,5 +1,5 @@
 {{ define "main" }}
-  <div class='hx:mx-auto hx:flex {{ partial "utils/page-width" . }}'>
+  <div class='hx:mx-auto hx:flex hextra-max-page-width'>
     {{ partial "sidebar.html" (dict "context" .) }}
     {{ partial "toc.html" . }}
     <article class="hx:w-full hx:break-words hx:flex hx:min-h-[calc(100vh-var(--navbar-height))] hx:min-w-0 hx:justify-center hx:pb-8 hx:pr-[calc(env(safe-area-inset-right)-1.5rem)]">
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 6d52394..fe9f338 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,5 +1,5 @@
 {{ define "main" }}
-  <div class='hx:mx-auto hx:flex {{ partial "utils/page-width" . }}'>
+  <div class='hx:mx-auto hx:flex hextra-max-page-width'>
     {{ partial "sidebar.html" (dict "context" . "disableSidebar" true "displayPlaceholder" true) }}
     {{ partial "toc.html" . }}
     <article class="hx:w-full hx:break-words hx:flex hx:min-h-[calc(100vh-var(--navbar-height))] hx:min-w-0 hx:justify-center hx:pb-8 hx:pr-[calc(env(safe-area-inset-right)-1.5rem)]">
diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html
index ea4b982..41add74 100644
--- a/layouts/_default/taxonomy.html
+++ b/layouts/_default/taxonomy.html
@@ -1,5 +1,5 @@
 {{ define "main" }}
-  <div class='hx:mx-auto hx:flex {{ partial "utils/page-width" . }}'>
+  <div class='hx:mx-auto hx:flex hextra-max-page-width'>
     {{ partial "sidebar.html" (dict "context" . "disableSidebar" true "displayPlaceholder" true) }}
     {{ partial "toc.html" (dict "Params" (dict "toc" false)) }}
     <article class="hx:w-full hx:break-words hx:flex hx:min-h-[calc(100vh-var(--navbar-height))] hx:min-w-0 hx:justify-center hx:pb-8 hx:pr-[calc(env(safe-area-inset-right)-1.5rem)]">
diff --git a/layouts/_default/term.html b/layouts/_default/term.html
index ed4c6a4..07ae191 100644
--- a/layouts/_default/term.html
+++ b/layouts/_default/term.html
@@ -1,5 +1,5 @@
 {{ define "main" }}
-  <div class='hx:mx-auto hx:flex {{ partial "utils/page-width" . }}'>
+  <div class='hx:mx-auto hx:flex hextra-max-page-width'>
     {{ partial "sidebar.html" (dict "context" . "disableSidebar" true "displayPlaceholder" true) }}
     {{ partial "toc.html" (dict "Params" (dict "toc" false)) }}
     <article class="hx:w-full hx:break-words hx:flex hx:min-h-[calc(100vh-var(--navbar-height))] hx:min-w-0 hx:justify-center hx:pb-8 hx:pr-[calc(env(safe-area-inset-right)-1.5rem)]">
diff --git a/layouts/blog/list.html b/layouts/blog/list.html
index 16dfa6e..5b2cad1 100644
--- a/layouts/blog/list.html
+++ b/layouts/blog/list.html
@@ -1,6 +1,6 @@
 {{ define "main" }}
   {{- $readMore := (T "readMore") | default "Read more →" -}}
-  <div class="hx:mx-auto hx:flex {{ partial `utils/page-width` . }}">
+  <div class="hx:mx-auto hx:flex hextra-max-page-width">
     {{ partial "sidebar.html" (dict "context" . "disableSidebar" true "displayPlaceholder" true) }}
     <article class="hx:w-full hx:break-words hx:flex hx:min-h-[calc(100vh-var(--navbar-height))] hx:min-w-0 hx:justify-center hx:pb-8 hx:pr-[calc(env(safe-area-inset-right)-1.5rem)]">
       <main class="hx:w-full hx:min-w-0 hx:max-w-6xl hx:px-6 hx:pt-4 hx:md:px-12">
diff --git a/layouts/blog/single.html b/layouts/blog/single.html
index 009f755..605fd50 100644
--- a/layouts/blog/single.html
+++ b/layouts/blog/single.html
@@ -1,5 +1,5 @@
 {{ define "main" }}
-  <div class="hx:mx-auto hx:flex {{ partial `utils/page-width` . }}">
+  <div class="hx:mx-auto hx:flex hextra-max-page-width">
     {{ partial "sidebar.html" (dict "context" . "disableSidebar" true "displayPlaceholder" true) }}
     {{ partial "toc.html" . }}
     <article class="hx:w-full hx:break-words hx:flex hx:min-h-[calc(100vh-var(--navbar-height))] hx:min-w-0 hx:justify-center hx:pb-8 hx:pr-[calc(env(safe-area-inset-right)-1.5rem)]">
diff --git a/layouts/docs/list.html b/layouts/docs/list.html
index 9b9ca94..3c80126 100644
--- a/layouts/docs/list.html
+++ b/layouts/docs/list.html
@@ -1,5 +1,5 @@
 {{ define "main" }}
-  <div class='hx:mx-auto hx:flex {{ partial "utils/page-width" . }}'>
+  <div class='hx:mx-auto hx:flex hextra-max-page-width'>
     {{ partial "sidebar.html" (dict "context" .) }}
     {{ partial "toc.html" . }}
     <article class="hx:w-full hx:break-words hx:flex hx:min-h-[calc(100vh-var(--navbar-height))] hx:min-w-0 hx:justify-center hx:pb-8 hx:pr-[calc(env(safe-area-inset-right)-1.5rem)]">
diff --git a/layouts/docs/single.html b/layouts/docs/single.html
index 9b9ca94..3c80126 100644
--- a/layouts/docs/single.html
+++ b/layouts/docs/single.html
@@ -1,5 +1,5 @@
 {{ define "main" }}
-  <div class='hx:mx-auto hx:flex {{ partial "utils/page-width" . }}'>
+  <div class='hx:mx-auto hx:flex hextra-max-page-width'>
     {{ partial "sidebar.html" (dict "context" .) }}
     {{ partial "toc.html" . }}
     <article class="hx:w-full hx:break-words hx:flex hx:min-h-[calc(100vh-var(--navbar-height))] hx:min-w-0 hx:justify-center hx:pb-8 hx:pr-[calc(env(safe-area-inset-right)-1.5rem)]">
diff --git a/layouts/hextra-home.html b/layouts/hextra-home.html
index c0a27cf..8feb85f 100644
--- a/layouts/hextra-home.html
+++ b/layouts/hextra-home.html
@@ -1,5 +1,5 @@
 {{ define "main" }}
-  <div class='hx:mx-auto hx:flex {{ partial "utils/page-width" . }}'>
+  <div class='hx:mx-auto hx:flex hextra-max-page-width'>
     {{ partial "sidebar.html" (dict "context" . "disableSidebar" true) }}
     <div class="hx:w-full hx:break-words hx:min-h-[calc(100vh-var(--navbar-height))] hx:min-w-0 hx:pb-8 hx:pt-8 hx:md:pt-12 hx:pl-[max(env(safe-area-inset-left),1.5rem)] hx:pr-[max(env(safe-area-inset-left),1.5rem)]">
       <div class="hx:flex hx:flex-col hx:items-start">
diff --git a/layouts/index.html b/layouts/index.html
index c4a8239..6353140 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,5 +1,5 @@
 {{ define "main" }}
-  <div class='hx:mx-auto hx:flex {{ partial "utils/page-width" . }}'>
+  <div class='hx:mx-auto hx:flex hextra-max-page-width'>
     {{ partial "sidebar.html" (dict "context" . "disableSidebar" true "displayPlaceholder" true) }}
     {{ partial "toc.html" . }}
     <article class="hx:w-full hx:break-words hx:flex hx:min-h-[calc(100vh-var(--navbar-height))] hx:min-w-0 hx:justify-center hx:pb-8 hx:pr-[calc(env(safe-area-inset-right)-1.5rem)]">
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 6deeb18..4fd6911 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -6,19 +6,10 @@
 {{- $copyright := (T "copyright") | default "© 2024 Hextra." -}}
 {{- $poweredBy := (T "poweredBy") | default "Powered by Hextra" -}}
 
-{{- $footerWidth := "hx:max-w-screen-xl" -}}
-{{- with .Site.Params.footer.width -}}
-  {{ if eq . "wide" -}}
-    {{ $footerWidth = "hx:max-w-[90rem]" -}}
-  {{ else if eq . "full" -}}
-    {{ $footerWidth = "max-w-full" -}}
-  {{ end -}}
-{{- end -}}
-
 
 <footer class="hextra-footer hx:bg-gray-100 hx:pb-[env(safe-area-inset-bottom)] hx:dark:bg-neutral-900 hx:print:bg-transparent">
   {{- if $footerSwitchesVisible -}}
-    <div class="hx:mx-auto hx:flex hx:gap-2 hx:py-2 hx:px-4 {{ $footerWidth }}">
+    <div class="hx:mx-auto hx:flex hx:gap-2 hx:py-2 hx:px-4 hextra-max-footer-width">
       {{- partial "language-switch.html" (dict "context" .) -}}
       {{- with $displayThemeToggle }}{{ partial "theme-toggle.html" }}{{ end -}}
     </div>
@@ -26,21 +17,19 @@
       <hr class="hx:border-gray-200 hx:dark:border-neutral-800" />
     {{- end -}}
   {{- end -}}
+  <div class="hextra-custom-footer hextra-max-footer-width hx:pl-[max(env(safe-area-inset-left),1.5rem)] hx:pr-[max(env(safe-area-inset-right),1.5rem)] hx:text-gray-600 hx:dark:text-gray-400">
+    {{- partial "custom/footer.html" (dict "context" . "switchesVisible" $footerSwitchesVisible "copyrightVisible" $copyrightSectionVisible) -}}
+  </div>
+  {{- if $copyrightSectionVisible -}}
     <div
-      class="hextra-custom-footer {{ $footerWidth }} hx:mx-auto hx:pl-[max(env(safe-area-inset-left),1.5rem)] hx:pr-[max(env(safe-area-inset-right),1.5rem)] hx:text-gray-600 hx:dark:text-gray-400"
+      class="hextra-max-footer-width hx:mx-auto hx:flex hx:justify-center hx:py-12 hx:pl-[max(env(safe-area-inset-left),1.5rem)] hx:pr-[max(env(safe-area-inset-right),1.5rem)] hx:text-gray-600 hx:dark:text-gray-400 hx:md:justify-start"
     >
-      {{- partial "custom/footer.html" (dict "context" . "switchesVisible" $footerSwitchesVisible "copyrightVisible" $copyrightSectionVisible) -}}
-    </div>
-    {{- if $copyrightSectionVisible -}}
-      <div
-        class="{{ $footerWidth }} hx:mx-auto hx:flex hx:justify-center hx:py-12 hx:pl-[max(env(safe-area-inset-left),1.5rem)] hx:pr-[max(env(safe-area-inset-right),1.5rem)] hx:text-gray-600 hx:dark:text-gray-400 hx:md:justify-start"
-      >
-        <div class="hx:flex hx:w-full hx:flex-col hx:items-center hx:sm:items-start">
-            {{- if (.Site.Params.footer.displayPoweredBy | default true) }}<div class="hx:font-semibold">{{ template "theme-credit" $poweredBy }}</div>{{- end -}}
-            {{- if .Site.Params.footer.displayCopyright }}<div class="hx:mt-6 hx:text-xs">{{ $copyright | markdownify }}</div>{{- end -}}
-        </div>
+      <div class="hx:flex hx:w-full hx:flex-col hx:items-center hx:sm:items-start">
+        {{- if (.Site.Params.footer.displayPoweredBy | default true) }}<div class="hx:font-semibold">{{ template "theme-credit" $poweredBy }}</div>{{- end -}}
+        {{- if .Site.Params.footer.displayCopyright }}<div class="hx:mt-6 hx:text-xs">{{ $copyright | markdownify }}</div>{{- end -}}
       </div>
-    {{- end -}}
+    </div>
+  {{- end -}}
 </footer>
 
 {{- define "theme-credit" -}}
diff --git a/layouts/partials/head-css.html b/layouts/partials/head-css.html
deleted file mode 100644
index d4f999f..0000000
--- a/layouts/partials/head-css.html
+++ /dev/null
@@ -1,25 +0,0 @@
-{{- if and (not hugo.IsProduction) (eq hugo.Environment "theme") }}
-  {{- $styles := resources.Get "css/styles.css" }}
-  {{- $styles = $styles | postCSS (dict "inlineImports" true) }}
-  <link href="{{ $styles.RelPermalink }}" rel="stylesheet" />
-{{- else }}
-  {{- $styles := resources.Get "css/compiled/main.css" -}}
-
-  {{- if hugo.IsProduction }}
-    {{- $styles = $styles | minify | fingerprint }}
-    <link rel="preload" href="{{ $styles.RelPermalink }}" as="style" integrity="{{ $styles.Data.Integrity }}" />
-    <link href="{{ $styles.RelPermalink }}" rel="stylesheet" integrity="{{ $styles.Data.Integrity }}" />
-  {{- else }}
-    <link href="{{ $styles.RelPermalink }}" rel="stylesheet" />
-  {{- end }}
-{{- end }}
-
-
-<!-- Custom CSS -->
-{{- $custom := resources.Get "css/custom.css" }}
-{{- if hugo.IsProduction -}}
-  {{- $custom = $custom | minify | fingerprint }}
-  <link href="{{ $custom.RelPermalink }}" rel="stylesheet" integrity="{{ $custom.Data.Integrity }}" />
-{{- else }}
-  <link href="{{ $custom.RelPermalink }}" rel="stylesheet" />
-{{- end }}
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 25ab330..8766abc 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -12,7 +12,7 @@
     {{- if .IsHome -}}
       {{ .Site.Title -}}
     {{ else -}}
-      {{ with .Title }}{{ . }} – {{ end -}}
+      {{ with .Title }}{{ . }} –{{ end -}}
       {{ .Site.Title -}}
     {{ end -}}
   </title>
@@ -28,13 +28,26 @@
   {{- template "_internal/schema.html" . -}}
   {{- template "_internal/twitter_cards.html" . -}}
 
-  {{- partialCached "head-css.html" . -}}
+  {{- $mainCss := resources.Get "css/compiled/main.css" -}}
+  {{- $customCss := resources.Get "css/custom.css" -}}
+  {{- $variablesCss := resources.Get "css/variables.css" | resources.ExecuteAsTemplate "css/variables.css" . -}}
+
+  {{- if hugo.IsProduction }}
+    {{- $styles := slice $variablesCss $mainCss $customCss | resources.Concat "css/compiled/main.css" | minify | fingerprint }}
+    <link rel="preload" href="{{ $styles.RelPermalink }}" as="style" integrity="{{ $styles.Data.Integrity }}" />
+    <link href="{{ $styles.RelPermalink }}" rel="stylesheet" integrity="{{ $styles.Data.Integrity }}" />
+  {{- else }}
+    {{- $styles := resources.Get "css/styles.css" | postCSS (dict "inlineImports" true) }}
+    <link href="{{ $styles.RelPermalink }}" rel="stylesheet" />
+    <link href="{{ $variablesCss.RelPermalink }}" rel="stylesheet" />
+    <link href="{{ $customCss.RelPermalink }}" rel="stylesheet" />
+  {{- end }}
 
 
   <!-- Google Analytics -->
-  {{- if and (eq hugo.Environment "production") .Site.Config.Services.GoogleAnalytics.ID }}
+  {{- if and hugo.IsProduction .Site.Config.Services.GoogleAnalytics.ID }}
     <link rel="preconnect" href="https://www.googletagmanager.com" crossorigin />
-    {{ partial "google-analytics.html" . }}
+    {{ partial "google-analytics.html" . -}}
   {{- end }}
 
   <script>
diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html
index 419dfad..a4001b0 100644
--- a/layouts/partials/navbar.html
+++ b/layouts/partials/navbar.html
@@ -16,7 +16,7 @@
 <div class="nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div class="nav-container-blur hx:pointer-events-none hx:absolute hx:z-[-1] hx:h-full hx:w-full hx:bg-white hx:dark:bg-dark hx:shadow-[0_2px_4px_rgba(0,0,0,.02),0_1px_0_rgba(0,0,0,.06)] hx:contrast-more:shadow-[0_0_0_1px_#000] hx:dark:shadow-[0_-1px_0_rgba(255,255,255,.1)_inset] hx:contrast-more:dark:shadow-[0_0_0_1px_#fff]"></div>
 
-  <nav class="hx:mx-auto hx:flex hx:items-center hx:justify-end hx:gap-2 hx:h-16 hx:px-6 {{ $navWidth }}">
+  <nav class="hextra-max-navbar-width hx:mx-auto hx:flex hx:items-center hx:justify-end hx:gap-2 hx:h-16 hx:px-6">
     <a class="hx:flex hx:items-center hx:hover:opacity-75 hx:ltr:mr-auto hx:rtl:ml-auto" href="{{ $logoLink }}">
       {{- if (.Site.Params.navbar.displayLogo | default true) }}
         <img class="hx:mr-2 hx:block hx:dark:hidden" src="{{ $logoPath | relURL }}" alt="{{ .Site.Title }}" height="{{ $logoHeight }}" width="{{ $logoWidth }}" />
diff --git a/layouts/partials/utils/page-width.html b/layouts/partials/utils/page-width.html
deleted file mode 100644
index 8ae1674..0000000
--- a/layouts/partials/utils/page-width.html
+++ /dev/null
@@ -1,27 +0,0 @@
-{{/* Get page width from site configuration */}}
-
-{{/* Default page width */}}
-{{- $pageWidth := "" -}}
-
-{{/* Get page width setting from page front matter or site params */}}
-{{ with .Params.width -}}
-  {{ $pageWidth = . -}}
-{{ else -}}
-  {{ with .Site.Params.page.width -}}
-    {{ $pageWidth = . -}}
-  {{ end -}}
-{{ end -}}
-
-{{- with $pageWidth -}}
-  {{ if eq . "wide" -}}
-    {{ $pageWidth = "hx:max-w-[90rem]" -}}
-  {{ else if eq . "full" -}}
-    {{ $pageWidth = "max-w-full" -}}
-  {{ else -}}
-    {{ $pageWidth = "hx:max-w-screen-xl" -}}
-  {{ end -}}
-{{ else -}}
-  {{ $pageWidth = "hx:max-w-screen-xl" -}}
-{{ end -}}
-
-{{ return $pageWidth }}