diff --git a/doc/netlify.toml b/doc/netlify.toml
index e781badc..4c3799e2 100644
--- a/doc/netlify.toml
+++ b/doc/netlify.toml
@@ -1,6 +1,6 @@
 [build.environment]
   PYTHON_VERSION = "3.13"
-  HUGO_VERSION = "0.152.2"
+  HUGO_VERSION = "0.157.0"
   DART_SASS_VERSION = "1.93.2"
   DART_SASS_URL = "https://github.com/sass/dart-sass/releases/download/"
 
diff --git a/layouts/_default/section.html b/layouts/_default/section.html
index dac1d49d..1cc97c9b 100644
--- a/layouts/_default/section.html
+++ b/layouts/_default/section.html
@@ -1,11 +1,6 @@
 {{ define "main" }}
 <section class="section content-padding">
-  <div class="content-container">
-    {{ partial "breadcrumbs.html" . }}
-    <h1>{{ .Title }}</h1>
-    {{ if .Params.Subtitle }}
-    <h5 class="subtitle">{{ .Params.Subtitle }}</h5>
-    {{ end }}
+  {{ with partial "_decorators/content-container.html" . }}
     {{ if .Content }}
     {{ .Content }}
     {{ end }}
@@ -20,7 +15,7 @@ <h5 class="subtitle">{{ .Params.Subtitle }}</h5>
       </ul>
     </div>
     {{ end }}
-  </div>
+  {{ end }}
   {{ if .Content }}
   {{ partial "shortcuts.html" . }}
   {{ end }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 220cbcdd..68fbb200 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,13 +1,8 @@
 {{ define "main" }}
 <section class="content-padding">
-  <div class="content-container">
-    {{ partial "breadcrumbs.html" . }}
-    <h1>{{ .Title }}</h1>
-    {{ if .Params.Subtitle }}
-    <h5 class="subtitle">{{ .Params.Subtitle }}</h5>
-    {{ end }}
+  {{ with partial "_decorators/content-container.html" . }}
     {{ .Content }}
-  </div>
+  {{ end }}
   {{ partial "shortcuts.html" . }}
 </section>
 {{ end }}
diff --git a/layouts/partials/_decorators/article.html b/layouts/partials/_decorators/article.html
new file mode 100644
index 00000000..b61de093
--- /dev/null
+++ b/layouts/partials/_decorators/article.html
@@ -0,0 +1,6 @@
+<article>
+  <div class="post-title"><a href="{{ .RelPermalink }}">{{ .Title }}</a></div>
+  <div>
+    {{- inner . -}}
+  </div>
+</article>
diff --git a/layouts/partials/_decorators/content-container.html b/layouts/partials/_decorators/content-container.html
new file mode 100644
index 00000000..17ed620b
--- /dev/null
+++ b/layouts/partials/_decorators/content-container.html
@@ -0,0 +1,8 @@
+<div class="content-container">
+  {{ partial "breadcrumbs.html" . }}
+  <h1>{{ .Title }}</h1>
+  {{ if .Params.Subtitle }}
+  <h5 class="subtitle">{{ .Params.Subtitle }}</h5>
+  {{ end }}
+  {{- inner . -}}
+</div>
diff --git a/layouts/partials/posts/list-with-summary.html b/layouts/partials/posts/list-with-summary.html
index f8dea01c..b0c71c10 100644
--- a/layouts/partials/posts/list-with-summary.html
+++ b/layouts/partials/posts/list-with-summary.html
@@ -2,12 +2,9 @@
 
 <div class="post-list">
   {{ range $posts }}
-  <article>
-    <div class="post-title"><a href="{{ .RelPermalink }}">{{ .Title }}</a></div>
-    <div>
-    {{ partial "posts/meta.html" . }}
-    {{ partial "posts/summary.html" . }}
-    </div>
-  </article>
+    {{ with partial "_decorators/article.html" . }}
+      {{ partial "posts/meta.html" . }}
+      {{ partial "posts/summary.html" . }}
+    {{ end }}
   {{ end }}
 </div>
diff --git a/layouts/partials/posts/list-without-summary.html b/layouts/partials/posts/list-without-summary.html
index 480f21f8..204b518a 100644
--- a/layouts/partials/posts/list-without-summary.html
+++ b/layouts/partials/posts/list-without-summary.html
@@ -2,11 +2,10 @@
 
 <div class="post-list">
   {{ range $posts }}
-  <article>
-    <div class="post-title"><a href="{{ .RelPermalink }}">{{ .Title }}</a></div>
-    <div class="post-meta">
-      <div>{{ partial "posts/meta.html" . }}</div>
-    </div>
-  </article>
+    {{ with partial "_decorators/article.html" . }}
+      <div class="post-meta">
+        <div>{{ partial "posts/meta.html" . }}</div>
+      </div>
+    {{ end }}
   {{ end }}
 </div>
diff --git a/layouts/partials/posts/list.html b/layouts/partials/posts/list.html
index d2f8fb49..9a78dc70 100644
--- a/layouts/partials/posts/list.html
+++ b/layouts/partials/posts/list.html
@@ -28,18 +28,13 @@ <h2 class="tag-cloud-title">{{ i18n "tags" }}</h2>
       </ul>
       {{ end }}
   </div>
-  <div class="content-container">
-    {{ partial "breadcrumbs.html" . }}
-    <h1>{{ .Title }}</h1>
-    {{ if .Params.Subtitle }}
-    <h5 class="subtitle">{{ .Params.Subtitle }}</h5>
-    {{ end }}
+  {{ with partial "_decorators/content-container.html" . }}
     {{ if .Content }}
     {{ .Content }}
     {{ end }}
     {{ $posts := .RegularPagesRecursive.ByPublishDate.Reverse }}
     {{ partial "posts/list-without-summary.html" $posts }}
-  </div>
+  {{ end }}
   {{ if .Content }}
   {{ partial "shortcuts.html" . }}
   {{ end }}
diff --git a/layouts/partials/posts/post.html b/layouts/partials/posts/post.html
index bf93ea71..a802a680 100644
--- a/layouts/partials/posts/post.html
+++ b/layouts/partials/posts/post.html
@@ -1,14 +1,9 @@
-{{- $featuredImage := .Resources.GetMatch "featuredImage" -}}
 <section class="post content-padding">
-  <div class="content-container">
-    {{ partial "breadcrumbs.html" . }}
-    <h1>{{ .Title }}</h1>
-    {{ if .Params.Subtitle }}
-    <h5 class="subtitle">{{ .Params.Subtitle }}</h5>
-    {{ end }}
+  {{ with partial "_decorators/content-container.html" . }}
     <div class="post-meta">{{ partial "posts/meta.html" . }}
       <span class="post-please-comment">🖊️ Please add your comments <a href="#discourse-comments">below!</a></span>
     </div>
+    {{- $featuredImage := .Resources.GetMatch "featuredImage" -}}
     <div class="post-content">
       {{ with $featuredImage }}
       {{ if .Params.showOnTop }}
@@ -20,6 +15,6 @@ <h5 class="subtitle">{{ .Params.Subtitle }}</h5>
       {{ .Content }}
       {{ partial "posts/comments.html" .}}
     </div>
-  </div>
+  {{ end }}
   {{ partial "shortcuts.html" . }}
 </section>
diff --git a/layouts/partials/section/section.html b/layouts/partials/section/section.html
index 7ea44832..1c306226 100644
--- a/layouts/partials/section/section.html
+++ b/layouts/partials/section/section.html
@@ -1,10 +1,5 @@
 <section class="content-padding">
-<div class="content-container">
-  {{ partial "breadcrumbs.html" . }}
-  <h1>{{ .Title }}</h1>
-  {{ if .Params.Subtitle }}
-  <h5 class="subtitle">{{ .Params.Subtitle }}</h5>
-  {{ end }}
+{{ with partial "_decorators/content-container.html" . }}
   {{ if .Content }}
   {{ .Content }}
   {{ else }}
@@ -28,7 +23,7 @@ <h5 class="subtitle">{{ .Params.Subtitle }}</h5>
   </div>
   {{ end }}
   {{ end }}
-</div>
+{{ end }}
 <div id="shortcuts-container">
   <div id="shortcuts">
     <div id="shortcuts-header"><i class="fa-solid fa-list"></i> On this page</div>