diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index d1c2719d..93a403c2 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -97,7 +97,7 @@
 {{ end }}
 
 {{ define "SingleAuthor" }}
-  {{ $authorsData := site.Data.authors }}
+  {{ $authorsData := hugo.Data.authors }}
   {{ $taxonomies := site.Taxonomies.authors }}
   {{ $baseURL := site.BaseURL }}
   {{ $taxonomyLink := 0 }}
diff --git a/layouts/partials/contributors.html b/layouts/partials/contributors.html
index ff6f3e9b..81199028 100644
--- a/layouts/partials/contributors.html
+++ b/layouts/partials/contributors.html
@@ -1,4 +1,4 @@
-{{ with site.Data.contributors }}
+{{ with hugo.Data.contributors }}
 <section class="contributors-section mt-12 mb-16">
   <div class="flex flex-col items-center mb-6">
     <div class="flex items-center gap-2 mb-2">
diff --git a/layouts/partials/sharing-links.html b/layouts/partials/sharing-links.html
index 5bda5cec..d04648de 100644
--- a/layouts/partials/sharing-links.html
+++ b/layouts/partials/sharing-links.html
@@ -1,5 +1,5 @@
 {{ with .Params.sharingLinks | default (.Site.Params.article.sharingLinks | default false) }}
-  {{ $links := site.Data.sharing }}
+  {{ $links := hugo.Data.sharing }}
   <section class="flex flex-row flex-wrap justify-center pt-4 text-xl">
     {{ range . }}
       {{ with index $links . }}
diff --git a/layouts/partials/sponsors.html b/layouts/partials/sponsors.html
index d811486b..fcd7e795 100644
--- a/layouts/partials/sponsors.html
+++ b/layouts/partials/sponsors.html
@@ -1,4 +1,4 @@
-{{ with site.Data.sponsors }}
+{{ with hugo.Data.sponsors }}
 <section class="sponsors-section mt-16 mb-8">
   <div class="flex flex-col items-center mb-6">
     <div class="flex items-center gap-2 mb-2">
diff --git a/layouts/partials/vendor.html b/layouts/partials/vendor.html
index ba685c10..79f03d55 100644
--- a/layouts/partials/vendor.html
+++ b/layouts/partials/vendor.html
@@ -124,7 +124,7 @@
 {{ end }}
 
 {{ if $hasRepoCards }}
-  {{ $repoColors := site.Data.repoColors }}
+  {{ $repoColors := hugo.Data.repoColors }}
   {{ $cssRules := slice }}
 
   {{/* default color */}}
diff --git a/layouts/shortcodes/article.html b/layouts/shortcodes/article.html
index 299319ff..d1f99127 100644
--- a/layouts/shortcodes/article.html
+++ b/layouts/shortcodes/article.html
@@ -3,7 +3,11 @@
 {{ $compactSummary := .Get "compactSummary" | default false }}
 {{ $target := .Page }}
 {{ if ne $link .Page.RelPermalink }}
-  {{ $target = index (first 1 (where .Site.AllPages "RelPermalink" $link)) 0 }}
+  {{ $pages := slice }}
+  {{ range hugo.Sites }}
+    {{ $pages = $pages | append .Pages }}
+  {{ end }}
+  {{ $target = index (first 1 (where $pages "RelPermalink" $link)) 0 }}
 {{ end }}
 {{ if $target }}
   <section class="space-y-10 w-full">
diff --git a/layouts/shortcodes/codeberg.html b/layouts/shortcodes/codeberg.html
index bb1921e4..ecfe46b5 100644
--- a/layouts/shortcodes/codeberg.html
+++ b/layouts/shortcodes/codeberg.html
@@ -1,6 +1,6 @@
 {{ $id := delimit (slice "codeberg" (partial "functions/uid.html" .)) "-" }}
 {{- $codebergURL := print "https://codeberg.org/api/v1/repos/" (.Get "repo") -}}
-{{- $repoColors := .Site.Data.repoColors -}}
+{{- $repoColors := hugo.Data.repoColors -}}
 {{- $codebergData := dict -}}
 {{- with try (resources.GetRemote $codebergURL) -}}
   {{- with .Err -}}
diff --git a/layouts/shortcodes/forgejo.html b/layouts/shortcodes/forgejo.html
index 43b9f0e8..9ca9d8e8 100644
--- a/layouts/shortcodes/forgejo.html
+++ b/layouts/shortcodes/forgejo.html
@@ -1,6 +1,6 @@
 {{ $id := delimit (slice "forgejo" (partial "functions/uid.html" .)) "-" }}
 {{- $forgejoURL := print (.Get "server" | default .Site.Params.forgejoDefaultServer) "/api/v1/repos/" (.Get "repo") -}}
-{{- $repoColors := .Site.Data.repoColors -}}
+{{- $repoColors := hugo.Data.repoColors -}}
 {{- $forgejoData := dict -}}
 {{- with try (resources.GetRemote $forgejoURL) -}}
   {{- with .Err -}}
diff --git a/layouts/shortcodes/gitea.html b/layouts/shortcodes/gitea.html
index e3782391..9c5917da 100644
--- a/layouts/shortcodes/gitea.html
+++ b/layouts/shortcodes/gitea.html
@@ -1,6 +1,6 @@
 {{ $id := delimit (slice "gitea" (partial "functions/uid.html" .)) "-" }}
 {{- $giteaURL := print (.Get "server" | default .Site.Params.giteaDefaultServer) "/api/v1/repos/" (.Get "repo") -}}
-{{- $repoColors := .Site.Data.repoColors -}}
+{{- $repoColors := hugo.Data.repoColors -}}
 {{- $giteaData := dict -}}
 {{- with try (resources.GetRemote $giteaURL) -}}
   {{- with .Err -}}
diff --git a/layouts/shortcodes/github.html b/layouts/shortcodes/github.html
index a8438f51..6035e6b4 100644
--- a/layouts/shortcodes/github.html
+++ b/layouts/shortcodes/github.html
@@ -2,7 +2,7 @@
 {{- $githubURL := print "https://api.github.com/repos/" (.Get "repo") -}}
 {{- $githubThumbnailURL := print "https://opengraph.githubassets.com/0/" (.Get "repo") -}}
 {{- $showThumbnail := .Get "showThumbnail" | default true -}}
-{{- $repoColors := .Site.Data.repoColors -}}
+{{- $repoColors := hugo.Data.repoColors -}}
 {{- $githubData := dict -}}
 {{- with try (resources.GetRemote $githubURL) -}}
   {{- with .Err -}}