diff --git a/layouts/_partials/components/pager.html b/layouts/_partials/components/pager.html
index 973b6b4..1adc43a 100644
--- a/layouts/_partials/components/pager.html
+++ b/layouts/_partials/components/pager.html
@@ -1,6 +1,6 @@
 {{/* Article navigation on the footer of the article */}}
 
-{{- $reversePagination := .Scratch.Get "reversePagination" | default false -}}
+{{- $reversePagination := .Store.Get "reversePagination" | default false -}}
 
 {{- $prev := cond $reversePagination .PrevInSection .NextInSection -}}
 {{- $next := cond $reversePagination .NextInSection .PrevInSection -}}
diff --git a/layouts/_partials/footer.html b/layouts/_partials/footer.html
index 4fd6911..889a005 100644
--- a/layouts/_partials/footer.html
+++ b/layouts/_partials/footer.html
@@ -1,4 +1,4 @@
-{{- $enableFooterSwitches := .Scratch.Get "enableFooterSwitches" | default false -}}
+{{- $enableFooterSwitches := .Store.Get "enableFooterSwitches" | default false -}}
 {{- $displayThemeToggle := site.Params.theme.displayToggle | default true -}}
 {{- $footerSwitchesVisible := and $enableFooterSwitches (or hugo.IsMultilingual $displayThemeToggle) -}}
 {{- $copyrightSectionVisible := or (.Site.Params.footer.displayPoweredBy | default true) .Site.Params.footer.displayCopyright -}}
diff --git a/layouts/_partials/sidebar.html b/layouts/_partials/sidebar.html
index 540261d..e5c69ae 100644
--- a/layouts/_partials/sidebar.html
+++ b/layouts/_partials/sidebar.html
@@ -30,7 +30,7 @@
     <!-- Sidebar on large screen -->
     {{- if $disableSidebar -}}
       {{- if $displayPlaceholder }}<div class="hx:max-xl:hidden hx:h-0 hx:w-64 hx:shrink-0"></div>{{ end -}}
-      {{ .context.Scratch.Set "enableFooterSwitches" true }}
+      {{ .context.Store.Set "enableFooterSwitches" true }}
     {{- else -}}
       <ul class="hx:flex hx:flex-col hx:gap-1 hx:max-md:hidden">
         {{ template "sidebar-main" (dict "context" $navRoot "page" $context  "pageURL" $pageURL) }}
diff --git a/layouts/blog/single.html b/layouts/blog/single.html
index 7a5b870..903a468 100644
--- a/layouts/blog/single.html
+++ b/layouts/blog/single.html
@@ -40,7 +40,7 @@
         </div>
         {{- partial "components/last-updated.html" . -}}
         {{- if (site.Params.blog.article.displayPagination | default true) -}}
-          {{- .Scratch.Set "reversePagination" (.Params.reversePagination | default true) -}}
+          {{- .Store.Set "reversePagination" (.Params.reversePagination | default true) -}}
           {{- partial "components/pager.html" . -}}
         {{ end }}
         {{- partial "components/comments.html" . -}}
diff --git a/layouts/list.rss.xml b/layouts/list.rss.xml
index 91db54b..c8eddcf 100644
--- a/layouts/list.rss.xml
+++ b/layouts/list.rss.xml
@@ -14,15 +14,15 @@
     {{ end }}
     {{ if not $.Section }}
       {{ $sections := .Site.Params.rss.sections | default (slice "blog") }}
-      {{ .Scratch.Set "rssPages" (first 50 (where $.Site.RegularPages "Type" "in" $sections )) }}
+      {{ .Store.Set "rssPages" (first 50 (where $.Site.RegularPages "Type" "in" $sections )) }}
     {{ else }}
       {{ if $.Parent.IsHome }}
-        {{ .Scratch.Set "rssPages" (first 50 (where $.Site.RegularPages "Type" $.Section )) }}
+        {{ .Store.Set "rssPages" (first 50 (where $.Site.RegularPages "Type" $.Section )) }}
       {{ else }}
-        {{ .Scratch.Set "rssPages" (first 50 $.Pages) }}
+        {{ .Store.Set "rssPages" (first 50 $.Pages) }}
       {{ end }}
     {{ end }}
-    {{ range (.Scratch.Get "rssPages")  }}
+    {{ range (.Store.Get "rssPages")  }}
     <item>
       <title>{{ .Title }}</title>
       <link>{{ .Permalink }}</link>