diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 207596ec..4bc5f542 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -2,7 +2,7 @@
{{ $credit := $page.Param "paige.hide_credit_data" | not }}
{{ $dark := eq ($page.Param "paige.color_scheme") "dark" }}
-{{ $lang := $page.Site.LanguageCode | default $page.Site.Language.Lang }}
+{{ $lang := site.LanguageCode | default site.Language.Lang }}
{{ $rtl := eq $page.Language.LanguageDirection "rtl" }}
diff --git a/layouts/_default/home.json b/layouts/_default/home.json
index a01c80b7..dafca5f4 100644
--- a/layouts/_default/home.json
+++ b/layouts/_default/home.json
@@ -1,7 +1,7 @@
{{- $page := . -}}
{{- $page.Scratch.Add "paige_index" slice -}}
-{{- range where $page.Site.RegularPages "Params.paige.hide_search" "ne" true -}}
+{{- range where site.RegularPages "Params.paige.hide_search" "ne" true -}}
{{- $page.Scratch.Add "paige_index" (dict
"categories" .Params.categories
"date" .PublishDate
diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml
index 15f49d80..bfcf3437 100644
--- a/layouts/_default/rss.xml
+++ b/layouts/_default/rss.xml
@@ -1,8 +1,8 @@
{{ $page := . }}
-{{ $limit := $page.Site.Config.Services.RSS.Limit }}
+{{ $limit := site.Config.Services.RSS.Limit }}
{{ $pages := "" }}
-{{ $pagesource := cond $page.IsHome $page.Site $page }}
+{{ $pagesource := cond $page.IsHome site $page }}
{{ $title := partial "paige/func-title.html" $page }}
{{ if or $page.IsHome $page.IsSection }}
@@ -23,11 +23,11 @@
{{ with $page.OutputFormats.Get "RSS" }}
{{ printf `` .Permalink .MediaType | safeHTML }}
{{ end }}
- {{ with $page.Site.Copyright }}
+ {{ with site.Copyright }}
{{ . }}
{{ end }}
{{ with $title -}} {{- . -}} {{- else -}} Recent content {{- end }}
- {{ with $page.Site.LanguageCode | default .Site.Language.Lang }}
+ {{ with site.LanguageCode | default site.Language.Lang }}
{{ . }}
{{ end }}
{{ if and $page.PublishDate (not $page.PublishDate.IsZero) }}
diff --git a/layouts/shortcodes/paige/vimeo.html b/layouts/shortcodes/paige/vimeo.html
index 71ff2b04..d430a436 100644
--- a/layouts/shortcodes/paige/vimeo.html
+++ b/layouts/shortcodes/paige/vimeo.html
@@ -5,7 +5,7 @@
{{ $color := .Get "color" }}
{{ $controls := .Get "controls" | default true }}
{{ $description := .Get "title" | default "Vimeo video" }}
-{{ $dnt := .Get "dnt" | default .Page.Site.Config.Privacy.Vimeo.EnableDNT }}
+{{ $dnt := .Get "dnt" | default site.Config.Privacy.Vimeo.EnableDNT }}
{{ $fullscreen := .Get "fullscreen" | default true }}
{{ $keyboard := .Get "keyboard" | default true }}
{{ $loop := .Get "loop" }}
diff --git a/layouts/shortcodes/paige/youtube.html b/layouts/shortcodes/paige/youtube.html
index 86c66e19..ec56c3d5 100644
--- a/layouts/shortcodes/paige/youtube.html
+++ b/layouts/shortcodes/paige/youtube.html
@@ -9,7 +9,7 @@
{{ $start := .Get "start" }}
{{ $video := .Get 0 | default (.Get "video") | default "dQw4w9WgXcQ" }}
-{{ $host := cond .Page.Site.Config.Privacy.YouTube.PrivacyEnhanced "www.youtube-nocookie.com" "www.youtube.com" }}
+{{ $host := cond site.Config.Privacy.YouTube.PrivacyEnhanced "www.youtube-nocookie.com" "www.youtube.com" }}
{{ $path := "" }}
@@ -19,7 +19,7 @@
{{ $path = printf "embed/%v" $video }}
{{ end }}
-{{ $params := slice (printf "hl=es" (.Site.LanguageCode | default .Site.Language.Lang)) "modestbranding=1" }}
+{{ $params := slice (printf "hl=es" (site.LanguageCode | default site.Language.Lang)) "modestbranding=1" }}
{{ if $autoplay }}
{{ $params = $params | append "autoplay=1" | append "mute=1" }}